Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump semver to 7.0.0 #12015

Merged
merged 3 commits into from Feb 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions Gulpfile.mjs
Expand Up @@ -315,6 +315,13 @@ function buildRollup(packages, targetBrowsers) {
"regexpu-core",
"regenerate-unicode-properties"
) + "/**/*.js",
// TODO(Babel 8) Remove when removing BABEL_8_BREAKING
resolveChain(
import.meta.url,
"./packages/babel-core",
"semver",
"semver-BABEL_8_BREAKING-false"
) + "/{functions,classes,internal,ranges}/**/*.js",
],
}),
rollupBabel({
Expand Down
10 changes: 10 additions & 0 deletions babel.config.js
Expand Up @@ -16,6 +16,14 @@ module.exports = function (api) {
loose: true,
shippedProposals: true,
modules: false,
exclude: [
// We need to enable useBuiltIns
"proposal-object-rest-spread",
// We want to enable it without `loose: true`, since it breaks
// https://github.com/npm/node-semver/blob/093b40f8a7cb67946527b739fe8f8974c888e2a0/classes/range.js#L136
// in our dependencies
"transform-spread",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With assumptions this will be easier 😂

],
};
const envOpts = Object.assign({}, envOptsNoTargets);

Expand Down Expand Up @@ -123,6 +131,8 @@ module.exports = function (api) {
{ useBuiltIns: true, loose: true },
],

env === "standalone" && ["@babel/transform-spread", { loose: false }],

convertESM ? "@babel/proposal-export-namespace-from" : null,
convertESM ? "@babel/transform-modules-commonjs" : null,

Expand Down
2 changes: 1 addition & 1 deletion eslint/babel-eslint-parser/package.json
Expand Up @@ -32,7 +32,7 @@
"dependencies": {
"eslint-scope": "5.1.0",
"eslint-visitor-keys": "^1.3.0",
"semver": "^6.3.0"
"semver": "condition:BABEL_8_BREAKING ? ^7.3.4 : 7.0.0"
},
"devDependencies": {
"@babel/core": "workspace:*",
Expand Down
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -26,6 +26,7 @@
"@babel/plugin-transform-for-of": "^7.10.4",
"@babel/plugin-transform-modules-commonjs": "^7.10.4",
"@babel/plugin-transform-runtime": "^7.12.0",
"@babel/plugin-transform-spread": "^7.12.13",
"@babel/preset-env": "^7.12.0",
"@babel/preset-flow": "^7.10.4",
"@babel/preset-typescript": "^7.12.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-core/package.json
Expand Up @@ -61,7 +61,7 @@
"gensync": "^1.0.0-beta.2",
"json5": "^2.1.2",
"lodash": "^4.17.19",
"semver": "^5.4.1",
"semver": "condition:BABEL_8_BREAKING ? ^7.3.4 : 7.0.0",
"source-map": "^0.5.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-helper-compilation-targets/package.json
Expand Up @@ -24,7 +24,7 @@
"@babel/compat-data": "workspace:^7.12.13",
"@babel/helper-validator-option": "workspace:^7.12.17",
"browserslist": "^4.14.5",
"semver": "^5.5.0"
"semver": "condition:BABEL_8_BREAKING ? ^7.3.4 : 7.0.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-helper-fixtures/package.json
Expand Up @@ -16,6 +16,6 @@
"main": "lib/index.js",
"dependencies": {
"lodash": "^4.17.19",
"semver": "^5.3.0"
"semver": "condition:BABEL_8_BREAKING ? ^7.3.4 : 7.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/babel-plugin-transform-runtime/package.json
Expand Up @@ -22,7 +22,7 @@
"dependencies": {
"@babel/helper-module-imports": "workspace:^7.12.13",
"@babel/helper-plugin-utils": "workspace:^7.12.13",
"semver": "^5.5.1"
"semver": "condition:BABEL_8_BREAKING ? ^7.3.4 : 7.0.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-preset-env/package.json
Expand Up @@ -83,7 +83,7 @@
"babel-plugin-polyfill-corejs3": "^0.1.0",
"babel-plugin-polyfill-regenerator": "^0.1.0",
"core-js-compat": "^3.9.0",
"semver": "^5.5.0"
"semver": "condition:BABEL_8_BREAKING ? ^7.3.4 : 7.0.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
Expand Down
93 changes: 62 additions & 31 deletions yarn.lock
Expand Up @@ -145,7 +145,7 @@ __metadata:
gensync: ^1.0.0-beta.2
json5: ^2.1.2
lodash: ^4.17.19
semver: ^5.4.1
semver: "condition:BABEL_8_BREAKING ? ^7.3.4 : 7.0.0"
source-map: ^0.5.0
languageName: unknown
linkType: soft
Expand All @@ -168,7 +168,7 @@ __metadata:
eslint: ^7.5.0
eslint-scope: 5.1.0
eslint-visitor-keys: ^1.3.0
semver: ^6.3.0
semver: "condition:BABEL_8_BREAKING ? ^7.3.4 : 7.0.0"
peerDependencies:
"@babel/core": ">=7.11.0"
eslint: ">=7.5.0"
Expand Down Expand Up @@ -348,7 +348,7 @@ __metadata:
"@babel/core": "workspace:*"
"@babel/helper-validator-option": "workspace:^7.12.17"
browserslist: ^4.14.5
semver: ^5.5.0
semver: "condition:BABEL_8_BREAKING ? ^7.3.4 : 7.0.0"
peerDependencies:
"@babel/core": ^7.0.0
languageName: unknown
Expand Down Expand Up @@ -483,7 +483,7 @@ __metadata:
resolution: "@babel/helper-fixtures@workspace:packages/babel-helper-fixtures"
dependencies:
lodash: ^4.17.19
semver: ^5.3.0
semver: "condition:BABEL_8_BREAKING ? ^7.3.4 : 7.0.0"
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -638,10 +638,10 @@ __metadata:
languageName: unknown
linkType: soft

"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
version: 7.10.4
resolution: "@babel/helper-plugin-utils@npm:7.10.4"
checksum: 9f617e619a3557cb5fae8885e91cd94ba4ee16fb345e0360de0d7dc037efb10cc604939ecc1038ccdb71aa37e7e78f20133d7bbbebecb8f6dcdb557650366d92
"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
version: 7.12.13
resolution: "@babel/helper-plugin-utils@npm:7.12.13"
checksum: 9cdfd7790c30ed1d538804544a2f82848533e1532670c8615befa20827332d82810b582035c3e67bba86adccaa7290b981fa31cc5e2881bb346b8ee5d69b1ed6
languageName: node
linkType: hard

Expand Down Expand Up @@ -724,12 +724,12 @@ __metadata:
languageName: unknown
linkType: soft

"@babel/helper-skip-transparent-expression-wrappers@npm:^7.11.0":
version: 7.11.0
resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.11.0"
"@babel/helper-skip-transparent-expression-wrappers@npm:^7.11.0, @babel/helper-skip-transparent-expression-wrappers@npm:^7.12.1":
version: 7.12.1
resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.12.1"
dependencies:
"@babel/types": ^7.11.0
checksum: c5995c834fbaeb8d573184c54e637add2c1b558f6f8a52a84d0c1777a564b634b94917f2b232d1ee4a96ae34587fdeb28b5dae1a45f3e3620cbff0da340aa287
"@babel/types": ^7.12.1
checksum: 2e690ed5659534f46387bde713d7c511865a309c5cd6f1d64ff94abdb64fe2e4d5e6cb6ed6c9856cbb16e9de60ecac86534b9d1eb93e877830442610889f6144
languageName: node
linkType: hard

Expand Down Expand Up @@ -2706,7 +2706,7 @@ __metadata:
"@babel/template": "workspace:*"
"@babel/types": "workspace:*"
make-dir: ^2.1.0
semver: ^5.5.1
semver: "condition:BABEL_8_BREAKING ? ^7.3.4 : 7.0.0"
peerDependencies:
"@babel/core": ^7.0.0-0
languageName: unknown
Expand Down Expand Up @@ -2735,15 +2735,15 @@ __metadata:
languageName: unknown
linkType: soft

"@babel/plugin-transform-spread@npm:^7.11.0":
version: 7.11.0
resolution: "@babel/plugin-transform-spread@npm:7.11.0"
"@babel/plugin-transform-spread@npm:^7.11.0, @babel/plugin-transform-spread@npm:^7.12.13":
version: 7.12.13
resolution: "@babel/plugin-transform-spread@npm:7.12.13"
dependencies:
"@babel/helper-plugin-utils": ^7.10.4
"@babel/helper-skip-transparent-expression-wrappers": ^7.11.0
"@babel/helper-plugin-utils": ^7.12.13
"@babel/helper-skip-transparent-expression-wrappers": ^7.12.1
peerDependencies:
"@babel/core": ^7.0.0-0
checksum: b10b0608d993441b649160db357161222e9e39afb4fc17c004aa67861cf21bcbfe757099bc68338c5119bc3068d1e4dcd3783fc84d11c5e76134e24e2b5a13a2
checksum: 56226dd121ecd3ef0e9571f19fc68e4b6e84c8d51023223e42eeb3ec1d44e851fb0f9a2f753a3712e290f85c1ab20ebb95e4c3cef55570b511e1881d7ae849be
languageName: node
linkType: hard

Expand Down Expand Up @@ -3071,7 +3071,7 @@ __metadata:
babel-plugin-polyfill-corejs3: ^0.1.0
babel-plugin-polyfill-regenerator: ^0.1.0
core-js-compat: ^3.9.0
semver: ^5.5.0
semver: "condition:BABEL_8_BREAKING ? ^7.3.4 : 7.0.0"
peerDependencies:
"@babel/core": ^7.0.0-0
languageName: unknown
Expand Down Expand Up @@ -4894,6 +4894,7 @@ __metadata:
"@babel/plugin-transform-for-of": ^7.10.4
"@babel/plugin-transform-modules-commonjs": ^7.10.4
"@babel/plugin-transform-runtime": ^7.12.0
"@babel/plugin-transform-spread": ^7.12.13
"@babel/preset-env": ^7.12.0
"@babel/preset-flow": ^7.10.4
"@babel/preset-typescript": ^7.12.1
Expand Down Expand Up @@ -9734,6 +9735,15 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"lru-cache@npm:^6.0.0":
version: 6.0.0
resolution: "lru-cache@npm:6.0.0"
dependencies:
yallist: ^4.0.0
checksum: b8b78353d2391c0f135cdc245c4744ad41c2efb1a6d98f31bc57a2cf48ebf02de96e4876657c3026673576bf1f1f61fc3fdd77ab00ad1ead737537bf17d8019d
languageName: node
linkType: hard

"magic-string@npm:^0.25.3, magic-string@npm:^0.25.5, magic-string@npm:^0.25.7":
version: 0.25.7
resolution: "magic-string@npm:0.25.7"
Expand Down Expand Up @@ -11839,6 +11849,26 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"semver-BABEL_8_BREAKING-false@npm:semver@7.0.0, semver@npm:7.0.0":
version: 7.0.0
resolution: "semver@npm:7.0.0"
bin:
semver: bin/semver.js
checksum: 5162b31e9902be1d51d63523eb21d28164d632f527cb0dc439a58d6eaf1a2f3c49c4e2a0f7cf8d650f673638ae34ac7e0c7c2048ff66bc5dc1298ef8551575b5
languageName: node
linkType: hard

"semver-BABEL_8_BREAKING-true@npm:semver@^7.3.4":
version: 7.3.4
resolution: "semver@npm:7.3.4"
dependencies:
lru-cache: ^6.0.0
bin:
semver: bin/semver.js
checksum: f2c7f9aeb976d1484b2f39aa7afc8332a1d21fd32ca4a6fbf650e1423455ebf3e7029f6e2e7ba0cd71935b85942521f1ec25b6cc2c031b953c8ca4ff2d7a823d
languageName: node
linkType: hard

"semver-compare@npm:^1.0.0":
version: 1.0.0
resolution: "semver-compare@npm:1.0.0"
Expand All @@ -11855,7 +11885,17 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.3.0, semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.5.1, semver@npm:^5.6.0, semver@npm:^5.7.0":
"semver@condition:BABEL_8_BREAKING ? ^7.3.4 : 7.0.0":
version: 0.0.0-condition-6bba4f
resolution: "semver@condition:BABEL_8_BREAKING?^7.3.4:7.0.0#6bba4f"
dependencies:
semver-BABEL_8_BREAKING-false: "npm:semver@7.0.0"
semver-BABEL_8_BREAKING-true: "npm:semver@^7.3.4"
checksum: 67856c5067bc7274fd47464243b87007ab56519042873ff1a8f0d26467b0b2fb83b48a3fc834a04ed594e99642f29987fefaa2bd471ecf526892cb3d1b74ab20
languageName: node
linkType: hard

"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.5.1, semver@npm:^5.6.0, semver@npm:^5.7.0":
version: 5.7.1
resolution: "semver@npm:5.7.1"
bin:
Expand All @@ -11864,15 +11904,6 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"semver@npm:7.0.0":
version: 7.0.0
resolution: "semver@npm:7.0.0"
bin:
semver: bin/semver.js
checksum: 5162b31e9902be1d51d63523eb21d28164d632f527cb0dc439a58d6eaf1a2f3c49c4e2a0f7cf8d650f673638ae34ac7e0c7c2048ff66bc5dc1298ef8551575b5
languageName: node
linkType: hard

"semver@npm:^6.0.0, semver@npm:^6.1.1, semver@npm:^6.1.2, semver@npm:^6.3.0":
version: 6.3.0
resolution: "semver@npm:6.3.0"
Expand Down