Skip to content

Commit 8bbaf01

Browse files
committed
Migrate from Yarn Classic to Yarn Berry
1 parent 15ad6a9 commit 8bbaf01

File tree

13 files changed

+10843
-7404
lines changed

13 files changed

+10843
-7404
lines changed

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/.yarn/** linguist-vendored
2+
/.yarn/releases/* binary
3+
/.yarn/plugins/**/* binary
4+
/.pnp.* binary linguist-generated

.github/workflows/high-depends.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,16 @@ jobs:
2525
with:
2626
node-version: ${{matrix.node-versions}}
2727

28+
- run: corepack enable
29+
2830
- name: Remove Lock File
2931
run: rm yarn.lock
3032

3133
- name: Install Yarn Dependencies
32-
run: yarn install
34+
run: yarn install --mode update-lockfile && yarn install
3335

3436
- name: Show Installed Versions
35-
run: yarn list --depth=0
37+
run: yarn info --name-only
3638

3739
- name: Run Tests
3840
run: yarn test

.github/workflows/lint.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ jobs:
1818
with:
1919
node-version: '22'
2020

21+
- run: corepack enable
22+
2123
- name: Install Yarn Dependencies
2224
run: yarn install
2325

.github/workflows/low-depends.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ jobs:
2525
with:
2626
node-version: ${{matrix.node-versions}}
2727

28+
- run: corepack enable
29+
2830
- name: Remove Lock File
2931
run: rm yarn.lock
3032

@@ -40,10 +42,10 @@ jobs:
4042
git commit -am "Force Lowest Dependencies"
4143
4244
- name: Install Yarn Dependencies
43-
run: yarn install
45+
run: yarn install --mode update-lockfile && yarn install
4446

4547
- name: Show Installed Versions
46-
run: yarn list --depth=0
48+
run: yarn info --name-only
4749

4850
- name: Run Tests
4951
run: yarn test

.github/workflows/stable-tests.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@ jobs:
2525
with:
2626
node-version: ${{matrix.node-versions}}
2727

28+
- run: corepack enable
29+
2830
- name: Install Yarn Dependencies
2931
run: yarn install
3032

3133
- name: Show Installed Versions
32-
run: yarn list --depth=0
34+
run: yarn info --name-only
3335

3436
- name: Run Tests
3537
run: yarn test

.github/workflows/testing_apps.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ jobs:
9797
with:
9898
node-version: '22'
9999

100+
- run: corepack enable
101+
100102
- if: ${{ contains(matrix.app.name, 'pnpm') }}
101103
name: Install pnpm
102104
uses: pnpm/action-setup@v4

.gitignore

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1-
node_modules/
2-
npm-debug.log*
1+
# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
2+
.yarn/*
3+
!.yarn/cache
4+
!.yarn/patches
5+
!.yarn/plugins
6+
!.yarn/releases
7+
!.yarn/sdks
8+
!.yarn/versions
9+
10+
node_modules
11+
yarn-error.log
12+
313
/test_tmp

.yarnrc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nodeLinker: node-modules

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"version": "4.7.0",
44
"description": "Webpack Encore is a simpler way to integrate Webpack into your application",
55
"main": "index.js",
6+
"packageManager": "yarn@4.5.0",
67
"scripts": {
78
"test": "yarn run test:main && yarn run test:persistent-cache",
89
"test:main": "mocha --reporter spec test --recursive --ignore test/persistent-cache/*",
@@ -51,7 +52,7 @@
5152
"@babel/preset-react": "^7.9.0",
5253
"@babel/preset-typescript": "^7.0.0",
5354
"@hotwired/stimulus": "^3.0.0",
54-
"@symfony/mock-module": "file:fixtures/stimulus/mock-module",
55+
"@symfony/mock-module": "portal:fixtures/stimulus/mock-module",
5556
"@symfony/stimulus-bridge": "^3.0.0",
5657
"@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
5758
"@vue/babel-plugin-jsx": "^1.0.0",
@@ -223,6 +224,5 @@
223224
"lib/",
224225
"bin/",
225226
"index.js"
226-
],
227-
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
227+
]
228228
}

scripts/force-lowest-dependencies.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const vueLoaderLowVersion = '15.0.11';
2222
*/
2323
function getLowestVersion(dependency, range) {
2424
return new Promise((resolve, reject) => {
25-
if (range.startsWith('file:')) {
25+
if (range.startsWith('file:') || range.startsWith('portal:')) {
2626
resolve([dependency, range]);
2727
}
2828

test/bin/encore.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,13 +286,17 @@ module.exports = Encore.getWebpackConfig();
286286

287287
describe('Without webpack-dev-server installed', () => {
288288
before(() => {
289-
execSync('yarn remove webpack-dev-server --dev', { cwd: projectDir });
289+
execSync('yarn remove webpack-dev-server', { cwd: projectDir });
290290
});
291291

292292
after(() => {
293+
// Yarn install can take a long time
294+
this.timeout(10000);
295+
let output;
293296
// Re-install webpack-dev-server and ensure the project is in a clean state
294-
execSync('git checkout package.json', { cwd: projectDir });
295-
execSync('yarn install', { cwd: projectDir });
297+
try { output = execSync('git checkout package.json yarn.lock', { cwd: projectDir }); console.log(output.toString()) } catch(e) { console.error(e); }
298+
// try { output = execSync('yarn install --mode update-lockfile' , { cwd: projectDir }); console.log(output.toString()) } catch(e) { console.error(e); }
299+
try { output = execSync('yarn install ', { cwd: projectDir }); console.log(output.toString()) } catch(e) { console.error(e); }
296300
});
297301

298302
it('Throw an error when trying to use the webpack-dev-server if not installed', done => {

test/functional.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2070,14 +2070,14 @@ module.exports = {
20702070
'main.js',
20712071
'main.css',
20722072
'manifest.json',
2073-
'node_modules_symfony_mock-module_dist_controller_js.js',
2073+
'fixtures_stimulus_mock-module_dist_controller_js.js',
20742074
'entrypoints.json',
20752075
'runtime.js',
20762076
]);
20772077

20782078
// test controllers and style are shipped
20792079
webpackAssert.assertOutputFileContains('main.js', 'app-controller');
2080-
webpackAssert.assertOutputFileContains('node_modules_symfony_mock-module_dist_controller_js.js', 'mock-module-controller');
2080+
webpackAssert.assertOutputFileContains('fixtures_stimulus_mock-module_dist_controller_js.js', 'mock-module-controller');
20812081
webpackAssert.assertOutputFileContains('main.css', 'body {}');
20822082

20832083
done();

0 commit comments

Comments
 (0)