Don't throw when enabling both syntax-import-{assertions,attributes} (#16781)

nicolo-ribaudo · web-flow · commit 279aa82bc441 · 2024-08-28T23:19:38.000+02:00
* Don't throw when enabling both syntax-import-{assertions,attributes}

* Update lockfile
diff --git a/packages/babel-plugin-syntax-import-assertions/src/index.ts b/packages/babel-plugin-syntax-import-assertions/src/index.ts
@@ -6,8 +6,20 @@ export default declare(api => {
   return {
     name: "syntax-import-assertions",
 
-    manipulateOptions(opts, parserOpts) {
-      parserOpts.plugins.push("importAssertions");
+    manipulateOptions(opts, { plugins }) {
+      for (let i = 0; i < plugins.length; i++) {
+        const plugin = plugins[i];
+        if (plugin === "importAttributes") {
+          plugins[i] = ["importAttributes", { deprecatedAssertSyntax: true }];
+          return;
+        }
+        if (Array.isArray(plugin) && plugin[0] === "importAttributes") {
+          if (plugin.length < 2) (plugins[i] as any[]).push({});
+          plugin[1].deprecatedAssertSyntax = true;
+          return;
+        }
+      }
+      plugins.push("importAssertions");
     },
   };
 });
diff --git a/packages/babel-plugin-syntax-import-attributes/package.json b/packages/babel-plugin-syntax-import-attributes/package.json
@@ -22,7 +22,8 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "workspace:^"
+    "@babel/core": "workspace:^",
+    "@babel/helper-plugin-test-runner": "workspace:^"
   },
   "engines": {
     "node": ">=6.9.0"
diff --git a/packages/babel-plugin-syntax-import-attributes/src/index.ts b/packages/babel-plugin-syntax-import-attributes/src/index.ts
@@ -21,6 +21,14 @@ export default declare((api, { deprecatedAssertSyntax }: Options) => {
 
     manipulateOptions({ parserOpts, generatorOpts }) {
       generatorOpts.importAttributesKeyword ??= "with";
+
+      const importAssertionsPluginIndex =
+        parserOpts.plugins.indexOf("importAssertions");
+      if (importAssertionsPluginIndex !== -1) {
+        parserOpts.plugins.splice(importAssertionsPluginIndex, 1);
+        deprecatedAssertSyntax = true;
+      }
+
       parserOpts.plugins.push([
         "importAttributes",
         { deprecatedAssertSyntax: Boolean(deprecatedAssertSyntax) },
diff --git a/packages/babel-plugin-syntax-import-attributes/test/fixtures/with-import-assertions-plugin/after/input.js b/packages/babel-plugin-syntax-import-attributes/test/fixtures/with-import-assertions-plugin/after/input.js
@@ -0,0 +1,2 @@
+import "x" with { type: "json" };
+import "x" assert { type: "json" };
diff --git a/packages/babel-plugin-syntax-import-attributes/test/fixtures/with-import-assertions-plugin/after/options.json b/packages/babel-plugin-syntax-import-attributes/test/fixtures/with-import-assertions-plugin/after/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "plugins": ["syntax-import-assertions", "syntax-import-attributes"]
+}
diff --git a/packages/babel-plugin-syntax-import-attributes/test/fixtures/with-import-assertions-plugin/after/output.mjs b/packages/babel-plugin-syntax-import-attributes/test/fixtures/with-import-assertions-plugin/after/output.mjs
@@ -0,0 +1,2 @@
+import "x" with { type: "json" };
+import "x" with { type: "json" };
diff --git a/packages/babel-plugin-syntax-import-attributes/test/fixtures/with-import-assertions-plugin/before/input.js b/packages/babel-plugin-syntax-import-attributes/test/fixtures/with-import-assertions-plugin/before/input.js
@@ -0,0 +1,2 @@
+import "x" with { type: "json" };
+import "x" assert { type: "json" };
diff --git a/packages/babel-plugin-syntax-import-attributes/test/fixtures/with-import-assertions-plugin/before/options.json b/packages/babel-plugin-syntax-import-attributes/test/fixtures/with-import-assertions-plugin/before/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "plugins": ["syntax-import-attributes", "syntax-import-assertions"]
+}
diff --git a/packages/babel-plugin-syntax-import-attributes/test/fixtures/with-import-assertions-plugin/before/output.mjs b/packages/babel-plugin-syntax-import-attributes/test/fixtures/with-import-assertions-plugin/before/output.mjs
@@ -0,0 +1,2 @@
+import "x" with { type: "json" };
+import "x" with { type: "json" };
diff --git a/packages/babel-plugin-syntax-import-attributes/test/index.js b/packages/babel-plugin-syntax-import-attributes/test/index.js
@@ -0,0 +1,3 @@
+import runner from "@babel/helper-plugin-test-runner";
+
+runner(import.meta.url);
diff --git a/yarn.lock b/yarn.lock
@@ -1957,6 +1957,7 @@ __metadata:
   resolution: "@babel/plugin-syntax-import-attributes@workspace:packages/babel-plugin-syntax-import-attributes"
   dependencies:
     "@babel/core": "workspace:^"
+    "@babel/helper-plugin-test-runner": "workspace:^"
     "@babel/helper-plugin-utils": "workspace:^"
   peerDependencies:
     "@babel/core": ^7.0.0-0

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+import "x" with { type: "json" };`
	`2`	`+import "x" assert { type: "json" };`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "sourceType": "module",
 +  "plugins": ["syntax-import-assertions", "syntax-import-attributes"]
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import runner from "@babel/helper-plugin-test-runner";`
	`2`	`+`
	`3`	`+runner(import.meta.url);`