Migrate from Yarn Classic to Yarn Berry

Kocal · Kocal · commit 8bbaf010abca · 2024-09-29T09:43:24.000+02:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,4 @@
+/.yarn/**            linguist-vendored
+/.yarn/releases/*    binary
+/.yarn/plugins/**/*  binary
+/.pnp.*              binary linguist-generated
diff --git a/.github/workflows/high-depends.yml b/.github/workflows/high-depends.yml
@@ -25,14 +25,16 @@ jobs:
                 with:
                     node-version: ${{matrix.node-versions}}
 
+            -   run: corepack enable
+
             -   name: Remove Lock File
                 run: rm yarn.lock
 
             -   name: Install Yarn Dependencies
-                run: yarn install
+                run: yarn install --mode update-lockfile && yarn install
 
             -   name: Show Installed Versions
-                run: yarn list --depth=0
+                run: yarn info --name-only
 
             -   name: Run Tests
                 run: yarn test
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -18,6 +18,8 @@ jobs:
                 with:
                     node-version: '22'
 
+            -   run: corepack enable
+
             -   name: Install Yarn Dependencies
                 run: yarn install
 
diff --git a/.github/workflows/low-depends.yml b/.github/workflows/low-depends.yml
@@ -25,6 +25,8 @@ jobs:
                 with:
                     node-version: ${{matrix.node-versions}}
 
+            -   run: corepack enable
+
             -   name: Remove Lock File
                 run: rm yarn.lock
 
@@ -40,10 +42,10 @@ jobs:
                     git commit -am "Force Lowest Dependencies"
 
             -   name: Install Yarn Dependencies
-                run: yarn install
+                run: yarn install --mode update-lockfile && yarn install
 
             -   name: Show Installed Versions
-                run: yarn list --depth=0
+                run: yarn info --name-only
 
             -   name: Run Tests
                 run: yarn test
diff --git a/.github/workflows/stable-tests.yml b/.github/workflows/stable-tests.yml
@@ -25,11 +25,13 @@ jobs:
                 with:
                     node-version: ${{matrix.node-versions}}
 
+            -   run: corepack enable
+   
             -   name: Install Yarn Dependencies
                 run: yarn install
 
             -   name: Show Installed Versions
-                run: yarn list --depth=0
+                run: yarn info --name-only
 
             -   name: Run Tests
                 run: yarn test
diff --git a/.github/workflows/testing_apps.yml b/.github/workflows/testing_apps.yml
@@ -97,6 +97,8 @@ jobs:
           with:
             node-version: '22'
 
+      -   run: corepack enable
+
       -   if: ${{ contains(matrix.app.name, 'pnpm') }}
           name: Install pnpm
           uses: pnpm/action-setup@v4
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,13 @@
-node_modules/
-npm-debug.log*
+# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
+.yarn/*
+!.yarn/cache
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
+node_modules
+yarn-error.log
+
 /test_tmp
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
   "version": "4.7.0",
   "description": "Webpack Encore is a simpler way to integrate Webpack into your application",
   "main": "index.js",
+  "packageManager": "yarn@4.5.0",
   "scripts": {
     "test": "yarn run test:main && yarn run test:persistent-cache",
     "test:main": "mocha --reporter spec test --recursive --ignore test/persistent-cache/*",
@@ -51,7 +52,7 @@
     "@babel/preset-react": "^7.9.0",
     "@babel/preset-typescript": "^7.0.0",
     "@hotwired/stimulus": "^3.0.0",
-    "@symfony/mock-module": "file:fixtures/stimulus/mock-module",
+    "@symfony/mock-module": "portal:fixtures/stimulus/mock-module",
     "@symfony/stimulus-bridge": "^3.0.0",
     "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
     "@vue/babel-plugin-jsx": "^1.0.0",
@@ -223,6 +224,5 @@
     "lib/",
     "bin/",
     "index.js"
-  ],
-  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+  ]
 }
diff --git a/scripts/force-lowest-dependencies.js b/scripts/force-lowest-dependencies.js
@@ -22,7 +22,7 @@ const vueLoaderLowVersion = '15.0.11';
  */
 function getLowestVersion(dependency, range) {
     return new Promise((resolve, reject) => {
-        if (range.startsWith('file:')) {
+        if (range.startsWith('file:') || range.startsWith('portal:')) {
             resolve([dependency, range]);
         }
 
diff --git a/test/bin/encore.js b/test/bin/encore.js
@@ -286,13 +286,17 @@ module.exports = Encore.getWebpackConfig();
 
     describe('Without webpack-dev-server installed', () => {
         before(() => {
-            execSync('yarn remove webpack-dev-server --dev', { cwd: projectDir });
+            execSync('yarn remove webpack-dev-server', { cwd: projectDir });
         });
 
         after(() => {
+            // Yarn install can take a long time
+            this.timeout(10000);
+            let output;
             // Re-install webpack-dev-server and ensure the project is in a clean state
-            execSync('git checkout package.json', { cwd: projectDir });
-            execSync('yarn install', { cwd: projectDir });
+            try { output = execSync('git checkout package.json yarn.lock', { cwd: projectDir }); console.log(output.toString()) } catch(e) { console.error(e); }
+            // try { output = execSync('yarn install --mode update-lockfile' , { cwd: projectDir }); console.log(output.toString()) } catch(e) { console.error(e); }
+            try { output = execSync('yarn install ', { cwd: projectDir }); console.log(output.toString()) } catch(e) { console.error(e); }
         });
 
         it('Throw an error when trying to use the webpack-dev-server if not installed', done => {
diff --git a/test/functional.js b/test/functional.js
@@ -2070,14 +2070,14 @@ module.exports = {
                     'main.js',
                     'main.css',
                     'manifest.json',
-                    'node_modules_symfony_mock-module_dist_controller_js.js',
+                    'fixtures_stimulus_mock-module_dist_controller_js.js',
                     'entrypoints.json',
                     'runtime.js',
                 ]);
 
                 // test controllers and style are shipped
                 webpackAssert.assertOutputFileContains('main.js', 'app-controller');
-                webpackAssert.assertOutputFileContains('node_modules_symfony_mock-module_dist_controller_js.js', 'mock-module-controller');
+                webpackAssert.assertOutputFileContains('fixtures_stimulus_mock-module_dist_controller_js.js', 'mock-module-controller');
                 webpackAssert.assertOutputFileContains('main.css', 'body {}');
 
                 done();
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ const vueLoaderLowVersion = '15.0.11';`
`22`	`22`	`*/`
`23`	`23`	`function getLowestVersion(dependency, range) {`
`24`	`24`	`return new Promise((resolve, reject) => {`
`25`		`- if (range.startsWith('file:')) {`
	`25`	`+ if (range.startsWith('file:') \|\| range.startsWith('portal:')) {`
`26`	`26`	`resolve([dependency, range]);`
`27`	`27`	`}`
`28`	`28`