Visitar URL original
Enforce usage of Yarn catalog for reused dependencies (#18236) · babel/babel@8b01fec · GitHub
Skip to content

Commit 8b01fec

Browse files
nicolo-ribaudonicolo-ribaudo
authored
Enforce usage of Yarn catalog for reused dependencies (#18236)
* Enforce usage of Yarn catalog for reused dependencies * dedent -> catalog:dev * eslint -> catalog:dev * eslint-plugin-import -> catalog:dev * obug -> catalog: * core-js-pure -> catalog: * empathic -> catalog: * @cspotcode/source-map-support -> catalog: * charcodes -> calendar:dev * commander -> catalog: * flru -> catalog * globals -> !!! three catalogs !!! * convert-source-map -> catalog: * Read core-js version from `.yarnrc.yml` * Split top-level eslint from babel-eslint eslint * Fix eslint CI
1 parent 427f56c commit 8b01fec

29 files changed

Lines changed: 170 additions & 90 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ jobs:
542542
strategy:
543543
fail-fast: false
544544
matrix:
545-
eslint-version: [9.0.0]
545+
eslint-version: [9]
546546
steps:
547547
- name: Checkout code
548548
uses: actions/checkout@v6
@@ -557,7 +557,7 @@ jobs:
557557
with:
558558
name: babel-artifact
559559
- name: Downgrade ESLint to ${{ matrix.eslint-version }}
560-
run: yarn up eslint@${{ matrix.eslint-version }}
560+
run: yarn up eslint@catalog:babel-eslint--${{ matrix.eslint-version }} eslint-plugin-import@catalog:babel-eslint--${{ matrix.eslint-version }}
561561
- name: Run babel/eslint tests
562562
run: node ./node_modules/.bin/jest eslint
563563

‎.yarnrc.yml‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,48 @@
11
approvedGitRepositories: null
22

33
catalog:
4-
"@jridgewell/gen-mapping": 0.4.0-beta.0
4+
"@cspotcode/source-map-support": ^0.8.1
5+
"@jridgewell/gen-mapping": 0.4.0-beta.0 # pinned
56
"@jridgewell/trace-mapping": ^0.3.31
67
babel-plugin-polyfill-corejs3: ^1.0.0
8+
convert-source-map: ^2.0.0
9+
commander: ^14.0.2
710
core-js: ^3.48.0
811
core-js-compat: ^3.48.0
12+
core-js-pure: ^3.48.0
13+
empathic: ^2.0.1
14+
flru: 1.0.2 # pinned
15+
obug: ^2.1.1
916
verkit: ^0.3.2
1017

1118
catalogs:
1219
dev:
1320
"@jridgewell/sourcemap-codec": 1.6.0-beta.0
21+
charcodes: ^0.2.0
22+
dedent: ^1.5.3
23+
eslint: ^10.0.0
24+
eslint-plugin-import: ^2.32.0
1425
terser: ^5.46.2
1526
typescript: 6.0.2
1627

28+
babel-eslint:
29+
eslint: ^10.0.0
30+
eslint-plugin-import: ^2.32.0
31+
32+
# Used in the eslint-version-test workflow
33+
babel-eslint--9:
34+
eslint: 9.0.0
35+
eslint-plugin-import: ^2.32.0
36+
37+
# TODO: We depend on globals 15, 16, and 17. Figure out if we can
38+
# consolidate them.
39+
globals-dev-15:
40+
globals: ^15.9.0
41+
globals-16:
42+
globals: ^16.1.0
43+
globals-dev-17:
44+
globals: ^17.6.0
45+
1746
compressionLevel: mixed
1847

1948
conditions:

‎eslint/babel-eslint-parser/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
"@babel/core": "workspace:^",
4242
"@babel/helper-fixtures": "workspace:^",
4343
"@types/estree": "^1.0.5",
44-
"dedent": "^1.5.3",
45-
"eslint": "^10.0.0",
44+
"dedent": "catalog:dev",
45+
"eslint": "catalog:babel-eslint",
4646
"typescript-eslint": "8.60.0"
4747
}
4848
}

‎eslint/babel-eslint-plugin-development-internal/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"eslint-plugin-import": "^2.31.0"
2121
},
2222
"devDependencies": {
23-
"eslint": "^10.0.0",
24-
"eslint-plugin-import": "^2.31.0"
23+
"eslint": "catalog:babel-eslint",
24+
"eslint-plugin-import": "catalog:babel-eslint"
2525
},
2626
"type": "module",
2727
"exports": {

‎eslint/babel-eslint-plugin-development/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@
3737
"eslint": "^9.0.0 || ^10.0.0"
3838
},
3939
"devDependencies": {
40-
"eslint": "^10.0.0"
40+
"eslint": "catalog:babel-eslint"
4141
}
4242
}

‎eslint/babel-eslint-plugin/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@
4242
},
4343
"devDependencies": {
4444
"@babel/core": "workspace:^",
45-
"eslint": "^10.0.0"
45+
"eslint": "catalog:babel-eslint"
4646
}
4747
}

‎eslint/babel-eslint-shared-fixtures/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"@babel/plugin-syntax-flow": "workspace:^",
1414
"@babel/plugin-syntax-jsx": "workspace:^",
1515
"@babel/plugin-syntax-pipeline-operator": "workspace:^",
16-
"eslint": "^10.0.0"
16+
"eslint": "catalog:babel-eslint"
1717
},
1818
"type": "module"
1919
}

‎eslint/babel-eslint-tests/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"@babel/plugin-proposal-do-expressions": "workspace:^",
1313
"@babel/preset-flow": "workspace:^",
1414
"@babel/preset-react": "workspace:^",
15-
"dedent": "^1.5.3",
16-
"eslint": "^10.0.0",
17-
"eslint-plugin-import": "^2.31.0",
18-
"globals": "^15.9.0",
15+
"dedent": "catalog:dev",
16+
"eslint": "catalog:babel-eslint",
17+
"eslint-plugin-import": "catalog:babel-eslint",
18+
"globals": "catalog:globals-dev-15",
1919
"npm-babel-parser": "npm:@babel/parser@^7.14.0"
2020
},
2121
"type": "module"

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"@babel/preset-env": "^8.0.1",
3737
"@babel/preset-typescript": "^8.0.1",
3838
"@babel/runtime": "^8.0.0",
39-
"@cspotcode/source-map-support": "^0.8.1",
39+
"@cspotcode/source-map-support": "catalog:",
4040
"@eslint/js": "^10.0.1",
4141
"@rollup/plugin-babel": "^7.0.0",
4242
"@rollup/plugin-commonjs": "patch:@rollup/plugin-commonjs@npm%3A29.0.2#~/.yarn/patches/@rollup-plugin-commonjs-npm-29.0.2-18c3a497d8.patch",
@@ -50,19 +50,19 @@
5050
"@yarnpkg/types": "^4.0.0",
5151
"babel-plugin-transform-charcodes": "^0.2.1",
5252
"c8": "^11.0.0",
53-
"charcodes": "^0.2.0",
53+
"charcodes": "catalog:dev",
5454
"core-js": "catalog:",
55-
"eslint": "^10.0.0",
55+
"eslint": "catalog:dev",
5656
"eslint-config-prettier": "^10.1.8",
5757
"eslint-formatter-codeframe": "^7.32.1",
5858
"eslint-import-resolver-node": "^0.4.0",
59-
"eslint-plugin-import": "^2.32.0",
59+
"eslint-plugin-import": "catalog:dev",
6060
"eslint-plugin-jest": "^29.15.0",
6161
"eslint-plugin-n": "^17.24.0",
6262
"eslint-plugin-regexp": "^3.0.0",
6363
"eslint-plugin-unicorn": "^56.0.0",
6464
"execa": "^9.0.0",
65-
"globals": "^17.6.0",
65+
"globals": "catalog:globals-dev-17",
6666
"gulp": "^5.0.1",
6767
"husky": "^9.0.11",
6868
"is-ci": "^4.1.0",

‎packages/babel-build-external-helpers/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"external-helpers"
2020
],
2121
"dependencies": {
22-
"commander": "^14.0.2"
22+
"commander": "catalog:"
2323
},
2424
"peerDependencies": {
2525
"@babel/core": "^8.0.0"

0 commit comments

Comments
 (0)