From 1653503b5ab2558fb002eedec0387957a39726de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Mon, 28 Sep 2020 15:38:47 -0400 Subject: [PATCH 01/10] chore: archive merged proposal syntax plugins --- .../.npmignore | 3 --- .../babel-plugin-syntax-import-meta/README.md | 19 ------------- .../package.json | 27 ------------------- .../src/index.js | 13 --------- .../.npmignore | 3 --- .../README.md | 19 ------------- .../package.json | 27 ------------------- .../src/index.js | 13 --------- .../.npmignore | 3 --- .../README.md | 19 ------------- .../package.json | 27 ------------------- .../src/index.js | 13 --------- 12 files changed, 186 deletions(-) delete mode 100644 packages/babel-plugin-syntax-import-meta/.npmignore delete mode 100644 packages/babel-plugin-syntax-import-meta/README.md delete mode 100644 packages/babel-plugin-syntax-import-meta/package.json delete mode 100644 packages/babel-plugin-syntax-import-meta/src/index.js delete mode 100644 packages/babel-plugin-syntax-logical-assignment-operators/.npmignore delete mode 100644 packages/babel-plugin-syntax-logical-assignment-operators/README.md delete mode 100644 packages/babel-plugin-syntax-logical-assignment-operators/package.json delete mode 100644 packages/babel-plugin-syntax-logical-assignment-operators/src/index.js delete mode 100644 packages/babel-plugin-syntax-numeric-separator/.npmignore delete mode 100644 packages/babel-plugin-syntax-numeric-separator/README.md delete mode 100644 packages/babel-plugin-syntax-numeric-separator/package.json delete mode 100644 packages/babel-plugin-syntax-numeric-separator/src/index.js diff --git a/packages/babel-plugin-syntax-import-meta/.npmignore b/packages/babel-plugin-syntax-import-meta/.npmignore deleted file mode 100644 index f9806945836e..000000000000 --- a/packages/babel-plugin-syntax-import-meta/.npmignore +++ /dev/null @@ -1,3 +0,0 @@ -src -test -*.log diff --git a/packages/babel-plugin-syntax-import-meta/README.md b/packages/babel-plugin-syntax-import-meta/README.md deleted file mode 100644 index dc39f7ca0785..000000000000 --- a/packages/babel-plugin-syntax-import-meta/README.md +++ /dev/null @@ -1,19 +0,0 @@ -# @babel/plugin-syntax-import-meta - -> Allow parsing of import.meta - -See our website [@babel/plugin-syntax-import-meta](https://babeljs.io/docs/en/next/babel-plugin-syntax-import-meta.html) for more information. - -## Install - -Using npm: - -```sh -npm install --save-dev @babel/plugin-syntax-import-meta -``` - -or using yarn: - -```sh -yarn add @babel/plugin-syntax-import-meta --dev -``` diff --git a/packages/babel-plugin-syntax-import-meta/package.json b/packages/babel-plugin-syntax-import-meta/package.json deleted file mode 100644 index 2a7329285340..000000000000 --- a/packages/babel-plugin-syntax-import-meta/package.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "@babel/plugin-syntax-import-meta", - "version": "7.10.4", - "description": "Allow parsing of import.meta", - "repository": { - "type": "git", - "url": "https://github.com/babel/babel.git", - "directory": "packages/babel-plugin-syntax-import-meta" - }, - "license": "MIT", - "publishConfig": { - "access": "public" - }, - "main": "lib/index.js", - "keywords": [ - "babel-plugin" - ], - "dependencies": { - "@babel/helper-plugin-utils": "workspace:^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - }, - "devDependencies": { - "@babel/core": "workspace:^7.10.4" - } -} diff --git a/packages/babel-plugin-syntax-import-meta/src/index.js b/packages/babel-plugin-syntax-import-meta/src/index.js deleted file mode 100644 index efdbcba095df..000000000000 --- a/packages/babel-plugin-syntax-import-meta/src/index.js +++ /dev/null @@ -1,13 +0,0 @@ -import { declare } from "@babel/helper-plugin-utils"; - -export default declare(api => { - api.assertVersion(7); - - return { - name: "syntax-import-meta", - - manipulateOptions(opts, parserOpts) { - parserOpts.plugins.push("importMeta"); - }, - }; -}); diff --git a/packages/babel-plugin-syntax-logical-assignment-operators/.npmignore b/packages/babel-plugin-syntax-logical-assignment-operators/.npmignore deleted file mode 100644 index f9806945836e..000000000000 --- a/packages/babel-plugin-syntax-logical-assignment-operators/.npmignore +++ /dev/null @@ -1,3 +0,0 @@ -src -test -*.log diff --git a/packages/babel-plugin-syntax-logical-assignment-operators/README.md b/packages/babel-plugin-syntax-logical-assignment-operators/README.md deleted file mode 100644 index 02fa394eb4a4..000000000000 --- a/packages/babel-plugin-syntax-logical-assignment-operators/README.md +++ /dev/null @@ -1,19 +0,0 @@ -# @babel/plugin-syntax-logical-assignment-operators - -> Allow parsing of the logical assignment operators - -See our website [@babel/plugin-syntax-logical-assignment-operators](https://babeljs.io/docs/en/next/babel-plugin-syntax-logical-assignment-operators.html) for more information. - -## Install - -Using npm: - -```sh -npm install --save-dev @babel/plugin-syntax-logical-assignment-operators -``` - -or using yarn: - -```sh -yarn add @babel/plugin-syntax-logical-assignment-operators --dev -``` diff --git a/packages/babel-plugin-syntax-logical-assignment-operators/package.json b/packages/babel-plugin-syntax-logical-assignment-operators/package.json deleted file mode 100644 index 2277f4c5924b..000000000000 --- a/packages/babel-plugin-syntax-logical-assignment-operators/package.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "@babel/plugin-syntax-logical-assignment-operators", - "version": "7.10.4", - "description": "Allow parsing of the logical assignment operators", - "repository": { - "type": "git", - "url": "https://github.com/babel/babel.git", - "directory": "packages/babel-plugin-syntax-logical-assignment-operators" - }, - "license": "MIT", - "publishConfig": { - "access": "public" - }, - "main": "lib/index.js", - "keywords": [ - "babel-plugin" - ], - "dependencies": { - "@babel/helper-plugin-utils": "workspace:^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - }, - "devDependencies": { - "@babel/core": "workspace:^7.10.4" - } -} diff --git a/packages/babel-plugin-syntax-logical-assignment-operators/src/index.js b/packages/babel-plugin-syntax-logical-assignment-operators/src/index.js deleted file mode 100644 index 26499ffcb1df..000000000000 --- a/packages/babel-plugin-syntax-logical-assignment-operators/src/index.js +++ /dev/null @@ -1,13 +0,0 @@ -import { declare } from "@babel/helper-plugin-utils"; - -export default declare(api => { - api.assertVersion(7); - - return { - name: "syntax-logical-assignment-operators", - - manipulateOptions(opts, parserOpts) { - parserOpts.plugins.push("logicalAssignment"); - }, - }; -}); diff --git a/packages/babel-plugin-syntax-numeric-separator/.npmignore b/packages/babel-plugin-syntax-numeric-separator/.npmignore deleted file mode 100644 index cace0d6ddcdd..000000000000 --- a/packages/babel-plugin-syntax-numeric-separator/.npmignore +++ /dev/null @@ -1,3 +0,0 @@ -node_modules -*.log -src diff --git a/packages/babel-plugin-syntax-numeric-separator/README.md b/packages/babel-plugin-syntax-numeric-separator/README.md deleted file mode 100644 index 07856b86ab03..000000000000 --- a/packages/babel-plugin-syntax-numeric-separator/README.md +++ /dev/null @@ -1,19 +0,0 @@ -# @babel/plugin-syntax-numeric-separator - -> Allow parsing of Decimal, Binary, Hex and Octal literals that contain a Numeric Literal Separator - -See our website [@babel/plugin-syntax-numeric-separator](https://babeljs.io/docs/en/next/babel-plugin-syntax-numeric-separator.html) for more information. - -## Install - -Using npm: - -```sh -npm install --save-dev @babel/plugin-syntax-numeric-separator -``` - -or using yarn: - -```sh -yarn add @babel/plugin-syntax-numeric-separator --dev -``` diff --git a/packages/babel-plugin-syntax-numeric-separator/package.json b/packages/babel-plugin-syntax-numeric-separator/package.json deleted file mode 100644 index c8cc40c41936..000000000000 --- a/packages/babel-plugin-syntax-numeric-separator/package.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "@babel/plugin-syntax-numeric-separator", - "version": "7.10.4", - "description": "Allow parsing of Decimal, Binary, Hex and Octal literals that contain a Numeric Literal Separator", - "repository": { - "type": "git", - "url": "https://github.com/babel/babel.git", - "directory": "packages/babel-plugin-syntax-numeric-separator" - }, - "license": "MIT", - "publishConfig": { - "access": "public" - }, - "main": "lib/index.js", - "keywords": [ - "babel-plugin" - ], - "dependencies": { - "@babel/helper-plugin-utils": "workspace:^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - }, - "devDependencies": { - "@babel/core": "workspace:^7.10.4" - } -} diff --git a/packages/babel-plugin-syntax-numeric-separator/src/index.js b/packages/babel-plugin-syntax-numeric-separator/src/index.js deleted file mode 100644 index f4849990d9d4..000000000000 --- a/packages/babel-plugin-syntax-numeric-separator/src/index.js +++ /dev/null @@ -1,13 +0,0 @@ -import { declare } from "@babel/helper-plugin-utils"; - -export default declare(api => { - api.assertVersion(7); - - return { - name: "syntax-numeric-separator", - - manipulateOptions(opts, parserOpts) { - parserOpts.plugins.push("numericSeparator"); - }, - }; -}); From 138eea72eb1651b6e2457ee6f69fa63f520bdbdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Mon, 28 Sep 2020 15:53:20 -0400 Subject: [PATCH 02/10] chore: simplify eslint-shared-fixtures --- eslint/babel-eslint-shared-fixtures/config/babel.config.js | 7 ------- eslint/babel-eslint-shared-fixtures/package.json | 7 ------- 2 files changed, 14 deletions(-) diff --git a/eslint/babel-eslint-shared-fixtures/config/babel.config.js b/eslint/babel-eslint-shared-fixtures/config/babel.config.js index 202b888fe7b1..2e64c5214c20 100644 --- a/eslint/babel-eslint-shared-fixtures/config/babel.config.js +++ b/eslint/babel-eslint-shared-fixtures/config/babel.config.js @@ -7,17 +7,10 @@ module.exports = { "@babel/preset-react", ], plugins: [ - "@babel/plugin-syntax-dynamic-import", - "@babel/plugin-syntax-import-meta", "@babel/plugin-syntax-export-default-from", "@babel/plugin-proposal-class-properties", - "@babel/plugin-proposal-nullish-coalescing-operator", - "@babel/plugin-proposal-optional-chaining", - "@babel/plugin-syntax-numeric-separator", - "@babel/plugin-syntax-export-namespace-from", ["@babel/plugin-proposal-decorators", { decoratorsBeforeExport: false }], ["@babel/plugin-proposal-pipeline-operator", { proposal: "minimal" }], - "@babel/plugin-syntax-bigint", "@babel/plugin-proposal-private-methods", "@babel/plugin-proposal-do-expressions", ], diff --git a/eslint/babel-eslint-shared-fixtures/package.json b/eslint/babel-eslint-shared-fixtures/package.json index 0f91577ec2ed..82471df5f1fd 100644 --- a/eslint/babel-eslint-shared-fixtures/package.json +++ b/eslint/babel-eslint-shared-fixtures/package.json @@ -9,16 +9,9 @@ "@babel/plugin-proposal-class-properties": "workspace:^7.10.4", "@babel/plugin-proposal-decorators": "workspace:^7.10.4", "@babel/plugin-proposal-do-expressions": "workspace:^7.10.4", - "@babel/plugin-proposal-nullish-coalescing-operator": "workspace:^7.10.4", - "@babel/plugin-proposal-optional-chaining": "workspace:^7.11.0", "@babel/plugin-proposal-pipeline-operator": "workspace:^7.10.4", "@babel/plugin-proposal-private-methods": "workspace:^7.10.4", - "@babel/plugin-syntax-bigint": "^7.7.4", - "@babel/plugin-syntax-dynamic-import": "^7.0.0", "@babel/plugin-syntax-export-default-from": "workspace:^7.10.4", - "@babel/plugin-syntax-export-namespace-from": "^7.0.0", - "@babel/plugin-syntax-import-meta": "workspace:^7.10.4", - "@babel/plugin-syntax-numeric-separator": "workspace:^7.10.4", "@babel/preset-env": "workspace:^7.11.0", "@babel/preset-flow": "workspace:^7.10.4", "@babel/preset-react": "workspace:^7.10.4" From c6630f8427b4b76780995210c377b4a9557ed324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Mon, 28 Sep 2020 15:53:55 -0400 Subject: [PATCH 03/10] chore: update yarn lockfiles --- .../package.json | 2 +- .../package.json | 2 +- packages/babel-preset-env/package.json | 4 +- packages/babel-standalone/package.json | 2 +- yarn.lock | 68 ++++--------------- 5 files changed, 19 insertions(+), 59 deletions(-) diff --git a/packages/babel-plugin-proposal-logical-assignment-operators/package.json b/packages/babel-plugin-proposal-logical-assignment-operators/package.json index 9264047ca4d6..804a0b665d6d 100644 --- a/packages/babel-plugin-proposal-logical-assignment-operators/package.json +++ b/packages/babel-plugin-proposal-logical-assignment-operators/package.json @@ -17,7 +17,7 @@ ], "dependencies": { "@babel/helper-plugin-utils": "workspace:^7.10.4", - "@babel/plugin-syntax-logical-assignment-operators": "workspace:^7.10.4" + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" }, "peerDependencies": { "@babel/core": "^7.0.0-0" diff --git a/packages/babel-plugin-proposal-numeric-separator/package.json b/packages/babel-plugin-proposal-numeric-separator/package.json index 9e9a1d54b4c7..2a2f96ef120c 100644 --- a/packages/babel-plugin-proposal-numeric-separator/package.json +++ b/packages/babel-plugin-proposal-numeric-separator/package.json @@ -17,7 +17,7 @@ ], "dependencies": { "@babel/helper-plugin-utils": "workspace:^7.10.4", - "@babel/plugin-syntax-numeric-separator": "workspace:^7.10.4" + "@babel/plugin-syntax-numeric-separator": "^7.10.4" }, "peerDependencies": { "@babel/core": "^7.0.0-0" diff --git a/packages/babel-preset-env/package.json b/packages/babel-preset-env/package.json index b52945faa78a..b3888cbd069b 100644 --- a/packages/babel-preset-env/package.json +++ b/packages/babel-preset-env/package.json @@ -38,9 +38,9 @@ "@babel/plugin-syntax-dynamic-import": "^7.8.0", "@babel/plugin-syntax-export-namespace-from": "^7.8.3", "@babel/plugin-syntax-json-strings": "^7.8.0", - "@babel/plugin-syntax-logical-assignment-operators": "workspace:^7.10.4", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0", - "@babel/plugin-syntax-numeric-separator": "workspace:^7.10.4", + "@babel/plugin-syntax-numeric-separator": "^7.10.4", "@babel/plugin-syntax-object-rest-spread": "^7.8.0", "@babel/plugin-syntax-optional-catch-binding": "^7.8.0", "@babel/plugin-syntax-optional-chaining": "^7.8.0", diff --git a/packages/babel-standalone/package.json b/packages/babel-standalone/package.json index e70f848f058d..f20a5920586c 100644 --- a/packages/babel-standalone/package.json +++ b/packages/babel-standalone/package.json @@ -41,7 +41,7 @@ "@babel/plugin-syntax-flow": "workspace:^7.10.4", "@babel/plugin-syntax-function-bind": "workspace:^7.10.4", "@babel/plugin-syntax-function-sent": "workspace:^7.10.4", - "@babel/plugin-syntax-import-meta": "workspace:^7.10.4", + "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/plugin-syntax-jsx": "workspace:^7.10.4", "@babel/plugin-syntax-module-attributes": "workspace:^7.10.4", "@babel/plugin-syntax-object-rest-spread": "^7.8.0", diff --git a/yarn.lock b/yarn.lock index 28c103866229..2099ee96271a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -212,16 +212,9 @@ __metadata: "@babel/plugin-proposal-class-properties": "workspace:^7.10.4" "@babel/plugin-proposal-decorators": "workspace:^7.10.4" "@babel/plugin-proposal-do-expressions": "workspace:^7.10.4" - "@babel/plugin-proposal-nullish-coalescing-operator": "workspace:^7.10.4" - "@babel/plugin-proposal-optional-chaining": "workspace:^7.11.0" "@babel/plugin-proposal-pipeline-operator": "workspace:^7.10.4" "@babel/plugin-proposal-private-methods": "workspace:^7.10.4" - "@babel/plugin-syntax-bigint": ^7.7.4 - "@babel/plugin-syntax-dynamic-import": ^7.0.0 "@babel/plugin-syntax-export-default-from": "workspace:^7.10.4" - "@babel/plugin-syntax-export-namespace-from": ^7.0.0 - "@babel/plugin-syntax-import-meta": "workspace:^7.10.4" - "@babel/plugin-syntax-numeric-separator": "workspace:^7.10.4" "@babel/preset-env": "workspace:^7.11.0" "@babel/preset-flow": "workspace:^7.10.4" "@babel/preset-react": "workspace:^7.10.4" @@ -1163,7 +1156,7 @@ __metadata: "@babel/helper-plugin-test-runner": "workspace:^7.10.4" "@babel/helper-plugin-utils": "workspace:^7.10.4" "@babel/plugin-proposal-nullish-coalescing-operator": "workspace:^7.10.4" - "@babel/plugin-syntax-logical-assignment-operators": "workspace:^7.10.4" + "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4 "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.0 peerDependencies: "@babel/core": ^7.0.0-0 @@ -1214,7 +1207,7 @@ __metadata: "@babel/core": "workspace:^7.10.4" "@babel/helper-plugin-test-runner": "workspace:^7.10.4" "@babel/helper-plugin-utils": "workspace:^7.10.4" - "@babel/plugin-syntax-numeric-separator": "workspace:^7.10.4" + "@babel/plugin-syntax-numeric-separator": ^7.10.4 peerDependencies: "@babel/core": ^7.0.0-0 languageName: unknown @@ -1413,17 +1406,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-bigint@npm:^7.7.4": - version: 7.8.3 - resolution: "@babel/plugin-syntax-bigint@npm:7.8.3" - dependencies: - "@babel/helper-plugin-utils": ^7.8.0 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 8c9b610377af48e1d8ec0d5ad5eec5e462fbc775b20f367e0ebc2656b98b4cc73a952e8b5ab8641e6de0d04923f3843dd73ce00a71ef5cac9940822ff776c8ec - languageName: node - linkType: hard - "@babel/plugin-syntax-class-properties@npm:^7.10.4": version: 7.10.4 resolution: "@babel/plugin-syntax-class-properties@npm:7.10.4" @@ -1478,7 +1460,7 @@ __metadata: languageName: unknown linkType: soft -"@babel/plugin-syntax-dynamic-import@npm:^7.0.0, @babel/plugin-syntax-dynamic-import@npm:^7.2.0, @babel/plugin-syntax-dynamic-import@npm:^7.8.0": +"@babel/plugin-syntax-dynamic-import@npm:^7.2.0, @babel/plugin-syntax-dynamic-import@npm:^7.8.0": version: 7.8.3 resolution: "@babel/plugin-syntax-dynamic-import@npm:7.8.3" dependencies: @@ -1500,7 +1482,7 @@ __metadata: languageName: unknown linkType: soft -"@babel/plugin-syntax-export-namespace-from@npm:^7.0.0, @babel/plugin-syntax-export-namespace-from@npm:^7.8.3": +"@babel/plugin-syntax-export-namespace-from@npm:^7.8.3": version: 7.8.3 resolution: "@babel/plugin-syntax-export-namespace-from@npm:7.8.3" dependencies: @@ -1555,16 +1537,16 @@ __metadata: languageName: unknown linkType: soft -"@babel/plugin-syntax-import-meta@workspace:^7.10.4, @babel/plugin-syntax-import-meta@workspace:packages/babel-plugin-syntax-import-meta": - version: 0.0.0-use.local - resolution: "@babel/plugin-syntax-import-meta@workspace:packages/babel-plugin-syntax-import-meta" +"@babel/plugin-syntax-import-meta@npm:^7.10.4": + version: 7.10.4 + resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4" dependencies: - "@babel/core": "workspace:^7.10.4" - "@babel/helper-plugin-utils": "workspace:^7.10.4" + "@babel/helper-plugin-utils": ^7.10.4 peerDependencies: "@babel/core": ^7.0.0-0 - languageName: unknown - linkType: soft + checksum: 685ee8f0b5b675952e02e1cabcde4d92638918a66ed515b2663e2e0b2246210a0768325423d5642f8687653a449357826675ccfcb712676be260a0ae13313828 + languageName: node + linkType: hard "@babel/plugin-syntax-json-strings@npm:^7.8.0": version: 7.8.3 @@ -1599,17 +1581,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-logical-assignment-operators@workspace:^7.10.4, @babel/plugin-syntax-logical-assignment-operators@workspace:packages/babel-plugin-syntax-logical-assignment-operators": - version: 0.0.0-use.local - resolution: "@babel/plugin-syntax-logical-assignment-operators@workspace:packages/babel-plugin-syntax-logical-assignment-operators" - dependencies: - "@babel/core": "workspace:^7.10.4" - "@babel/helper-plugin-utils": "workspace:^7.10.4" - peerDependencies: - "@babel/core": ^7.0.0-0 - languageName: unknown - linkType: soft - "@babel/plugin-syntax-module-attributes@workspace:^7.10.4, @babel/plugin-syntax-module-attributes@workspace:packages/babel-plugin-syntax-module-attributes": version: 0.0.0-use.local resolution: "@babel/plugin-syntax-module-attributes@workspace:packages/babel-plugin-syntax-module-attributes" @@ -1643,17 +1614,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-numeric-separator@workspace:^7.10.4, @babel/plugin-syntax-numeric-separator@workspace:packages/babel-plugin-syntax-numeric-separator": - version: 0.0.0-use.local - resolution: "@babel/plugin-syntax-numeric-separator@workspace:packages/babel-plugin-syntax-numeric-separator" - dependencies: - "@babel/core": "workspace:^7.10.4" - "@babel/helper-plugin-utils": "workspace:^7.10.4" - peerDependencies: - "@babel/core": ^7.0.0-0 - languageName: unknown - linkType: soft - "@babel/plugin-syntax-object-rest-spread@npm:^7.0.0, @babel/plugin-syntax-object-rest-spread@npm:^7.7.4, @babel/plugin-syntax-object-rest-spread@npm:^7.8.0": version: 7.8.3 resolution: "@babel/plugin-syntax-object-rest-spread@npm:7.8.3" @@ -2981,9 +2941,9 @@ __metadata: "@babel/plugin-syntax-dynamic-import": ^7.2.0 "@babel/plugin-syntax-export-namespace-from": ^7.8.3 "@babel/plugin-syntax-json-strings": ^7.8.0 - "@babel/plugin-syntax-logical-assignment-operators": "workspace:^7.10.4" + "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4 "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.0 - "@babel/plugin-syntax-numeric-separator": "workspace:^7.10.4" + "@babel/plugin-syntax-numeric-separator": ^7.10.4 "@babel/plugin-syntax-object-rest-spread": ^7.8.0 "@babel/plugin-syntax-optional-catch-binding": ^7.8.0 "@babel/plugin-syntax-optional-chaining": ^7.8.0 @@ -3219,7 +3179,7 @@ __metadata: "@babel/plugin-syntax-flow": "workspace:^7.10.4" "@babel/plugin-syntax-function-bind": "workspace:^7.10.4" "@babel/plugin-syntax-function-sent": "workspace:^7.10.4" - "@babel/plugin-syntax-import-meta": "workspace:^7.10.4" + "@babel/plugin-syntax-import-meta": ^7.10.4 "@babel/plugin-syntax-jsx": "workspace:^7.10.4" "@babel/plugin-syntax-module-attributes": "workspace:^7.10.4" "@babel/plugin-syntax-object-rest-spread": ^7.8.0 From 849b5c405df320e76f17e4b63538944316c17877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Mon, 28 Sep 2020 17:29:56 -0400 Subject: [PATCH 04/10] chore: remove syntax-import-meta in the test config --- .../test/fixtures/import-meta/options.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/import-meta/options.json b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/import-meta/options.json index cb038f2e52c5..c812d885edba 100644 --- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/import-meta/options.json +++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/import-meta/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "syntax-import-meta", - "transform-modules-systemjs" - ] + "plugins": ["external-helpers", "transform-modules-systemjs"] } From e17919bf788dae2cf44881132ccfa23a66a9af1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Tue, 29 Sep 2020 14:59:38 -0400 Subject: [PATCH 05/10] test: remove moduleNameMapper --- jest.config.js | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/jest.config.js b/jest.config.js index ee63281e2c38..bd6807a82110 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,20 +1,3 @@ -// These packages under the @babel namespace aren't in this monorepo. -const externalBabelPackages = [ - "plugin-syntax-async-generators", - "plugin-syntax-bigint", - "plugin-syntax-dynamic-import", - "plugin-syntax-json-strings", - "plugin-syntax-nullish-coalescing-operator", - "plugin-syntax-object-rest-spread", - "plugin-syntax-optional-catch-binding", - "plugin-syntax-optional-chaining", - "plugin-syntax-export-namespace-from", -]; - -// prettier-ignore -const monorepoPackagePattern = - `^@babel/(?!eslint-)(?!${externalBabelPackages.join("|")})([a-zA-Z0-9_-]+)$`; - module.exports = { collectCoverageFrom: [ "packages/*/src/**/*.mjs", @@ -60,8 +43,8 @@ module.exports = { "/test/__data__/", "/build/", ], - moduleNameMapper: { - [monorepoPackagePattern]: "/packages/babel-$1/", - "^@babel/eslint-([a-zA-Z0-9_-]+)$": "/eslint/babel-eslint-$1/", - }, + // We don't need module name mappers here as depedencies of workspace + // package should be declared explicitly in the package.json + // Yarn will generate correct file links so that Jest can resolve correctly + moduleNameMapper: null, }; From 30ef11dff73619d8ab7b3d0020620a81277fd2fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Tue, 29 Sep 2020 16:19:29 -0400 Subject: [PATCH 06/10] chore: remove syntax meta from @babel/standalone --- packages/babel-standalone/package.json | 1 - packages/babel-standalone/scripts/pluginConfig.json | 1 - packages/babel-standalone/src/generated/plugins.js | 3 --- yarn.lock | 12 ------------ 4 files changed, 17 deletions(-) diff --git a/packages/babel-standalone/package.json b/packages/babel-standalone/package.json index f20a5920586c..91a6b4ee7c63 100644 --- a/packages/babel-standalone/package.json +++ b/packages/babel-standalone/package.json @@ -41,7 +41,6 @@ "@babel/plugin-syntax-flow": "workspace:^7.10.4", "@babel/plugin-syntax-function-bind": "workspace:^7.10.4", "@babel/plugin-syntax-function-sent": "workspace:^7.10.4", - "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/plugin-syntax-jsx": "workspace:^7.10.4", "@babel/plugin-syntax-module-attributes": "workspace:^7.10.4", "@babel/plugin-syntax-object-rest-spread": "^7.8.0", diff --git a/packages/babel-standalone/scripts/pluginConfig.json b/packages/babel-standalone/scripts/pluginConfig.json index 2b2c3f3a4219..a6a1ba477691 100644 --- a/packages/babel-standalone/scripts/pluginConfig.json +++ b/packages/babel-standalone/scripts/pluginConfig.json @@ -9,7 +9,6 @@ "syntax-flow", "syntax-function-bind", "syntax-function-sent", - "syntax-import-meta", "syntax-jsx", "syntax-module-attributes", "syntax-object-rest-spread", diff --git a/packages/babel-standalone/src/generated/plugins.js b/packages/babel-standalone/src/generated/plugins.js index 757d39e53cc9..c573d8b49e5b 100644 --- a/packages/babel-standalone/src/generated/plugins.js +++ b/packages/babel-standalone/src/generated/plugins.js @@ -13,7 +13,6 @@ import syntaxExportDefaultFrom from "@babel/plugin-syntax-export-default-from"; import syntaxFlow from "@babel/plugin-syntax-flow"; import syntaxFunctionBind from "@babel/plugin-syntax-function-bind"; import syntaxFunctionSent from "@babel/plugin-syntax-function-sent"; -import syntaxImportMeta from "@babel/plugin-syntax-import-meta"; import syntaxJsx from "@babel/plugin-syntax-jsx"; import syntaxModuleAttributes from "@babel/plugin-syntax-module-attributes"; import syntaxObjectRestSpread from "@babel/plugin-syntax-object-rest-spread"; @@ -106,7 +105,6 @@ export { syntaxFlow, syntaxFunctionBind, syntaxFunctionSent, - syntaxImportMeta, syntaxJsx, syntaxModuleAttributes, syntaxObjectRestSpread, @@ -200,7 +198,6 @@ export const all = { "syntax-flow": syntaxFlow, "syntax-function-bind": syntaxFunctionBind, "syntax-function-sent": syntaxFunctionSent, - "syntax-import-meta": syntaxImportMeta, "syntax-jsx": syntaxJsx, "syntax-module-attributes": syntaxModuleAttributes, "syntax-object-rest-spread": syntaxObjectRestSpread, diff --git a/yarn.lock b/yarn.lock index 2099ee96271a..6213bcb752aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1537,17 +1537,6 @@ __metadata: languageName: unknown linkType: soft -"@babel/plugin-syntax-import-meta@npm:^7.10.4": - version: 7.10.4 - resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4" - dependencies: - "@babel/helper-plugin-utils": ^7.10.4 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 685ee8f0b5b675952e02e1cabcde4d92638918a66ed515b2663e2e0b2246210a0768325423d5642f8687653a449357826675ccfcb712676be260a0ae13313828 - languageName: node - linkType: hard - "@babel/plugin-syntax-json-strings@npm:^7.8.0": version: 7.8.3 resolution: "@babel/plugin-syntax-json-strings@npm:7.8.3" @@ -3179,7 +3168,6 @@ __metadata: "@babel/plugin-syntax-flow": "workspace:^7.10.4" "@babel/plugin-syntax-function-bind": "workspace:^7.10.4" "@babel/plugin-syntax-function-sent": "workspace:^7.10.4" - "@babel/plugin-syntax-import-meta": ^7.10.4 "@babel/plugin-syntax-jsx": "workspace:^7.10.4" "@babel/plugin-syntax-module-attributes": "workspace:^7.10.4" "@babel/plugin-syntax-object-rest-spread": ^7.8.0 From f360af4ae5f5cebec1322bc99cc86b05a85ee9d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Tue, 29 Sep 2020 16:33:24 -0400 Subject: [PATCH 07/10] chore: remove import meta from stage-3 --- packages/babel-standalone/src/preset-stage-3.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/babel-standalone/src/preset-stage-3.js b/packages/babel-standalone/src/preset-stage-3.js index 2b42d24f4e83..c3da40251ec1 100644 --- a/packages/babel-standalone/src/preset-stage-3.js +++ b/packages/babel-standalone/src/preset-stage-3.js @@ -10,7 +10,6 @@ export default (_: any, opts: Object) => { return { plugins: [ - babelPlugins.syntaxImportMeta, babelPlugins.syntaxTopLevelAwait, babelPlugins.proposalExportNamespaceFrom, babelPlugins.proposalLogicalAssignmentOperators, From ae7ee01db3afd8a2eb02976494611990ee725e4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Tue, 29 Sep 2020 17:43:53 -0400 Subject: [PATCH 08/10] Revert "chore: remove import meta from stage-3" This reverts commit f360af4ae5f5cebec1322bc99cc86b05a85ee9d7. --- packages/babel-standalone/src/preset-stage-3.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/babel-standalone/src/preset-stage-3.js b/packages/babel-standalone/src/preset-stage-3.js index c3da40251ec1..2b42d24f4e83 100644 --- a/packages/babel-standalone/src/preset-stage-3.js +++ b/packages/babel-standalone/src/preset-stage-3.js @@ -10,6 +10,7 @@ export default (_: any, opts: Object) => { return { plugins: [ + babelPlugins.syntaxImportMeta, babelPlugins.syntaxTopLevelAwait, babelPlugins.proposalExportNamespaceFrom, babelPlugins.proposalLogicalAssignmentOperators, From a4b335c0148b6604d50913689c1d56d6d5799860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Tue, 29 Sep 2020 17:54:13 -0400 Subject: [PATCH 09/10] Revert "chore: remove syntax meta from @babel/standalone" This reverts commit 30ef11dff73619d8ab7b3d0020620a81277fd2fe. --- packages/babel-standalone/package.json | 1 + packages/babel-standalone/scripts/pluginConfig.json | 1 + packages/babel-standalone/src/generated/plugins.js | 3 +++ yarn.lock | 12 ++++++++++++ 4 files changed, 17 insertions(+) diff --git a/packages/babel-standalone/package.json b/packages/babel-standalone/package.json index 91a6b4ee7c63..f20a5920586c 100644 --- a/packages/babel-standalone/package.json +++ b/packages/babel-standalone/package.json @@ -41,6 +41,7 @@ "@babel/plugin-syntax-flow": "workspace:^7.10.4", "@babel/plugin-syntax-function-bind": "workspace:^7.10.4", "@babel/plugin-syntax-function-sent": "workspace:^7.10.4", + "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/plugin-syntax-jsx": "workspace:^7.10.4", "@babel/plugin-syntax-module-attributes": "workspace:^7.10.4", "@babel/plugin-syntax-object-rest-spread": "^7.8.0", diff --git a/packages/babel-standalone/scripts/pluginConfig.json b/packages/babel-standalone/scripts/pluginConfig.json index a6a1ba477691..2b2c3f3a4219 100644 --- a/packages/babel-standalone/scripts/pluginConfig.json +++ b/packages/babel-standalone/scripts/pluginConfig.json @@ -9,6 +9,7 @@ "syntax-flow", "syntax-function-bind", "syntax-function-sent", + "syntax-import-meta", "syntax-jsx", "syntax-module-attributes", "syntax-object-rest-spread", diff --git a/packages/babel-standalone/src/generated/plugins.js b/packages/babel-standalone/src/generated/plugins.js index c573d8b49e5b..757d39e53cc9 100644 --- a/packages/babel-standalone/src/generated/plugins.js +++ b/packages/babel-standalone/src/generated/plugins.js @@ -13,6 +13,7 @@ import syntaxExportDefaultFrom from "@babel/plugin-syntax-export-default-from"; import syntaxFlow from "@babel/plugin-syntax-flow"; import syntaxFunctionBind from "@babel/plugin-syntax-function-bind"; import syntaxFunctionSent from "@babel/plugin-syntax-function-sent"; +import syntaxImportMeta from "@babel/plugin-syntax-import-meta"; import syntaxJsx from "@babel/plugin-syntax-jsx"; import syntaxModuleAttributes from "@babel/plugin-syntax-module-attributes"; import syntaxObjectRestSpread from "@babel/plugin-syntax-object-rest-spread"; @@ -105,6 +106,7 @@ export { syntaxFlow, syntaxFunctionBind, syntaxFunctionSent, + syntaxImportMeta, syntaxJsx, syntaxModuleAttributes, syntaxObjectRestSpread, @@ -198,6 +200,7 @@ export const all = { "syntax-flow": syntaxFlow, "syntax-function-bind": syntaxFunctionBind, "syntax-function-sent": syntaxFunctionSent, + "syntax-import-meta": syntaxImportMeta, "syntax-jsx": syntaxJsx, "syntax-module-attributes": syntaxModuleAttributes, "syntax-object-rest-spread": syntaxObjectRestSpread, diff --git a/yarn.lock b/yarn.lock index 6213bcb752aa..2099ee96271a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1537,6 +1537,17 @@ __metadata: languageName: unknown linkType: soft +"@babel/plugin-syntax-import-meta@npm:^7.10.4": + version: 7.10.4 + resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4" + dependencies: + "@babel/helper-plugin-utils": ^7.10.4 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 685ee8f0b5b675952e02e1cabcde4d92638918a66ed515b2663e2e0b2246210a0768325423d5642f8687653a449357826675ccfcb712676be260a0ae13313828 + languageName: node + linkType: hard + "@babel/plugin-syntax-json-strings@npm:^7.8.0": version: 7.8.3 resolution: "@babel/plugin-syntax-json-strings@npm:7.8.3" @@ -3168,6 +3179,7 @@ __metadata: "@babel/plugin-syntax-flow": "workspace:^7.10.4" "@babel/plugin-syntax-function-bind": "workspace:^7.10.4" "@babel/plugin-syntax-function-sent": "workspace:^7.10.4" + "@babel/plugin-syntax-import-meta": ^7.10.4 "@babel/plugin-syntax-jsx": "workspace:^7.10.4" "@babel/plugin-syntax-module-attributes": "workspace:^7.10.4" "@babel/plugin-syntax-object-rest-spread": ^7.8.0 From 41a2d6bdc722c204ff526220d95293eceb6309e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Tue, 29 Sep 2020 18:51:30 -0400 Subject: [PATCH 10/10] chore: disable flow checks on generated/plugins --- .flowconfig | 4 +++- packages/babel-standalone/scripts/generate.js | 2 +- packages/babel-standalone/src/generated/plugins.js | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.flowconfig b/.flowconfig index c003d67d151d..9dd89e023d55 100644 --- a/.flowconfig +++ b/.flowconfig @@ -27,5 +27,7 @@ suppress_type=$FlowSubtype esproposal.export_star_as=enable esproposal.optional_chaining=enable esproposal.nullish_coalescing=enable -module.name_mapper='^@babel\/\([a-zA-Z0-9_\-]+\)$' -> '/packages/babel-\1/src/index' +module.name_mapper='^@babel/\([a-zA-Z0-9_-]+\)$' -> '/packages/babel-\1/src/index' +; Todo: can not make it works, 🤷‍♂️ +; module.name_mapper='^@babel/plugin-syntax-import-meta$' -> '/packages/babel-standalone/node_modules/@babel/plugin-syntax-import-meta/lib/index' module.ignore_non_literal_requires=true diff --git a/packages/babel-standalone/scripts/generate.js b/packages/babel-standalone/scripts/generate.js index a1c1cafb215d..77f80fac27d9 100644 --- a/packages/babel-standalone/scripts/generate.js +++ b/packages/babel-standalone/scripts/generate.js @@ -21,7 +21,7 @@ for (const plugin of pluginConfig) { allList += `"${plugin}": ${camelPlugin},`; } -const fileContent = `// @flow +const fileContent = ` /* * This file is auto-generated! Do not modify it directly. * To re-generate run 'make build' diff --git a/packages/babel-standalone/src/generated/plugins.js b/packages/babel-standalone/src/generated/plugins.js index 757d39e53cc9..c54939ad3450 100644 --- a/packages/babel-standalone/src/generated/plugins.js +++ b/packages/babel-standalone/src/generated/plugins.js @@ -1,4 +1,3 @@ -// @flow /* * This file is auto-generated! Do not modify it directly. * To re-generate run 'make build'