Remove importReflection parser plugin

nicolo-ribaudo · nicolo-ribaudo · commit 497edf233c37 · 2024-09-05T15:37:19.000+02:00
diff --git a/packages/babel-generator/test/fixtures/comments/import-reflection-inner-comment/input.mjs b/packages/babel-generator/test/fixtures/comments/import-reflection-inner-comment/input.mjs
diff --git a/packages/babel-generator/test/fixtures/comments/import-reflection-inner-comment/options.json b/packages/babel-generator/test/fixtures/comments/import-reflection-inner-comment/options.json
diff --git a/packages/babel-generator/test/fixtures/comments/import-reflection-inner-comment/output.js b/packages/babel-generator/test/fixtures/comments/import-reflection-inner-comment/output.js
diff --git a/packages/babel-generator/test/fixtures/comments/source-phase-import-inner-comment/input.mjs b/packages/babel-generator/test/fixtures/comments/source-phase-import-inner-comment/input.mjs
@@ -0,0 +1 @@
+/* 0 */import /* 1 */source /* 2 */from /* 3 */from /* 4 */"./module.wasm"/* 5 */;
diff --git a/packages/babel-generator/test/fixtures/comments/source-phase-import-inner-comment/options.json b/packages/babel-generator/test/fixtures/comments/source-phase-import-inner-comment/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["sourcePhaseImports"]
+}
diff --git a/packages/babel-generator/test/fixtures/comments/source-phase-import-inner-comment/output.js b/packages/babel-generator/test/fixtures/comments/source-phase-import-inner-comment/output.js
@@ -0,0 +1 @@
+/* 0 */import /* 1 */ source /* 2 */from /* 3 */ from /* 4 */"./module.wasm" /* 5 */;
diff --git a/packages/babel-generator/test/fixtures/import-reflection/options.json b/packages/babel-generator/test/fixtures/import-reflection/options.json
@@ -1,3 +1,4 @@
 {
-  "plugins": ["importReflection"]
+  "plugins": ["importReflection"],
+  "BABEL_8_BREAKING": false
 }
diff --git a/packages/babel-parser/src/parser/statement.ts b/packages/babel-parser/src/parser/statement.ts
@@ -2940,7 +2940,7 @@ export default abstract class StatementParser extends ExpressionParser {
     return (
       this.isContextual(tt._source) ||
       this.isContextual(tt._defer) ||
-      this.isContextual(tt._module)
+      (!process.env.BABEL_8_BREAKING && this.isContextual(tt._module))
     );
   }
 
@@ -2952,7 +2952,10 @@ export default abstract class StatementParser extends ExpressionParser {
   ): void {
     if (isExport) {
       if (!process.env.IS_PUBLISH) {
-        if (phase === "module" || phase === "source") {
+        if (
+          (!process.env.BABEL_8_BREAKING && phase === "module") ||
+          phase === "source"
+        ) {
           throw new Error(
             `Assertion failure: export declarations do not support the '${phase}' phase.`,
           );
@@ -2961,7 +2964,7 @@ export default abstract class StatementParser extends ExpressionParser {
       return;
     }
 
-    if (phase === "module") {
+    if (!process.env.BABEL_8_BREAKING && phase === "module") {
       this.expectPlugin("importReflection", loc);
       (node as N.ImportDeclaration).module = true;
     } else if (this.hasPlugin("importReflection")) {
@@ -2980,18 +2983,15 @@ export default abstract class StatementParser extends ExpressionParser {
   }
 
   /*
-   * Parse `module` in `import module x from "x"`, disambiguating
-   * `import module from "x"` and `import module from from "x"`.
+   * Parse `source` in `import source x from "x"`, disambiguating
+   * `import source from "x"` and `import source from from "x"`.
    *
-   * This function might return an identifier representing the `module`
-   * if it eats `module` and then discovers that it was the default import
+   * This function might return an identifier representing the `source`
+   * if it eats `source` and then discovers that it was the default import
    * binding and not the import reflection.
    *
    * This function is also used to parse `import type` and `import typeof`
-   * in the TS and Flow plugins.
-   *
-   * Note: the proposal has been updated to use `source` instead of `module`,
-   * but it has not been implemented yet.
+   * in the TS and Flow plugins, and for parsing `import defer`.
    */
   parseMaybeImportPhase(
     node: Undone<N.ImportDeclaration | N.TsImportEqualsDeclaration>,
diff --git a/packages/babel-parser/src/plugin-utils.ts b/packages/babel-parser/src/plugin-utils.ts
@@ -179,10 +179,19 @@ export function validatePlugins(pluginsMap: Map<string, any>) {
         " only supported value is '2023-07'.",
     );
   }
-  if (process.env.BABEL_8_BREAKING && pluginsMap.has("decimal")) {
-    throw new Error(
-      "The 'decimal' plugin has been removed in Babel 8. Please remove it from your configuration.",
-    );
+
+  if (process.env.BABEL_8_BREAKING) {
+    if (pluginsMap.has("decimal")) {
+      throw new Error(
+        "The 'decimal' plugin has been removed in Babel 8. Please remove it from your configuration.",
+      );
+    }
+    if (pluginsMap.has("importReflection")) {
+      throw new Error(
+        "The 'importReflection' plugin has been removed in Babel 8. Use 'sourcePhaseImports' instead, and " +
+          "replace 'import module' with 'import source' in your code.",
+      );
+    }
   }
 }
 
diff --git a/packages/babel-parser/src/typings.d.ts b/packages/babel-parser/src/typings.d.ts
@@ -28,7 +28,7 @@ export type Plugin =
   | IF_BABEL_7<"logicalAssignment">
   | "importAssertions" // deprecated
   | "importAttributes"
-  | "importReflection"
+  | IF_BABEL_7<"importReflection">
   | "moduleBlocks"
   | IF_BABEL_7<"moduleStringNames">
   | IF_BABEL_7<"nullishCoalescingOperator">
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/import-reflection-babel-7/input.mjs b/packages/babel-parser/test/fixtures/experimental/_no-plugin/import-reflection-babel-7/input.mjs
@@ -0,0 +1 @@
+import module foo from "./module.wasm";
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/import-reflection-babel-7/options.json b/packages/babel-parser/test/fixtures/experimental/_no-plugin/import-reflection-babel-7/options.json
@@ -0,0 +1,4 @@
+{
+  "throws": "This experimental syntax requires enabling the parser plugin: \"importReflection\". (1:7)",
+  "BABEL_8_BREAKING": false
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/import-reflection/options.json b/packages/babel-parser/test/fixtures/experimental/_no-plugin/import-reflection/options.json
@@ -1,3 +1,4 @@
 {
-  "throws": "This experimental syntax requires enabling the parser plugin: \"importReflection\". (1:7)"
+  "BABEL_8_BREAKING": true,
+  "throws": "Unexpected token, expected \"from\" (1:14)"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/import-reflection/options.json b/packages/babel-parser/test/fixtures/experimental/import-reflection/options.json
@@ -1,4 +1,5 @@
 {
   "plugins": ["importReflection"],
-  "sourceType": "module"
+  "sourceType": "module",
+  "BABEL_8_BREAKING": false
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+/* 0 /import / 1 /source / 2 /from / 3 /from / 4 /"./module.wasm"/ 5 */;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "plugins": ["sourcePhaseImports"]`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+/* 0 /import / 1 / source / 2 /from / 3 / from / 4 /"./module.wasm" / 5 */;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`{`
`2`		`- "plugins": ["importReflection"]`
	`2`	`+ "plugins": ["importReflection"],`
	`3`	`+ "BABEL_8_BREAKING": false`
`3`	`4`	`}`