Merge pull request #213 from bartocc/bartocc/patch-69226

Properly configure Yarn v3
embroider-build · Oct 10, 2023 · 69f4c77 · 69f4c77
2 parents 08e7d6a + aa4d842
commit 69f4c77
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/files/.yarnrc.yml b/files/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/files/gitignore b/files/gitignore
@@ -19,3 +19,14 @@ yarn-error.log
 /package-lock.json.ember-try
 /yarn.lock.ember-try
 /pnpm-lock.ember-try.yaml
+
+<% if (yarn) { %>
+# https://yarnpkg.com/getting-started/qa/#which-files-should-be-gitignored
+.yarn/*
+!.yarn/cache
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+<% } %>
diff --git a/index.js b/index.js
@@ -323,6 +323,12 @@ module.exports = {
       files = files.filter((filename) => !filename.endsWith('.npmrc'));
     }
 
+    if (!this.yarn) {
+      let ignoredFiles = ['.yarnrc.yml'];
+
+      files = files.filter(filename => !ignoredFiles.includes(filename));
+    }
+
     return files;
   },