Revert "feat: support import attributes" (#65001)

Reverts #59480 This PR have a test with incorrect assertion supposed to fail on CI with turbopack. #65000
vercel · Apr 24, 2024 · 5dd8043 · 5dd8043
1 parent d3cb79c
commit 5dd8043
Show file tree

Hide file tree

Showing 19 changed files with 29 additions and 98 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -32,9 +32,6 @@ packages/next-env/**/*.d.ts
 test/**/out/**
 test/development/basic/hmr/components/parse-error.js
 
-# TODO: upgrade prettier to 3.1.1 to support import attributes
-test/integration/import-attributes/**/*
-
 bench/nested-deps/pages/**/*
 bench/nested-deps/components/**/*
 

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -131,7 +131,7 @@
     "@babel/plugin-proposal-object-rest-spread": "7.20.7",
     "@babel/plugin-syntax-bigint": "7.8.3",
     "@babel/plugin-syntax-dynamic-import": "7.8.3",
-    "@babel/plugin-syntax-import-attributes": "7.22.5",
+    "@babel/plugin-syntax-import-assertions": "7.22.5",
     "@babel/plugin-syntax-jsx": "7.22.5",
     "@babel/plugin-transform-modules-commonjs": "7.22.5",
     "@babel/plugin-transform-runtime": "7.22.5",

diff --git a/packages/next/src/build/babel/preset.ts b/packages/next/src/build/babel/preset.ts
@@ -154,12 +154,7 @@ export default (
         },
       ],
       require('next/dist/compiled/babel/plugin-syntax-dynamic-import'),
-      [
-        require('next/dist/compiled/babel/plugin-syntax-import-attributes'),
-        {
-          deprecatedAssertSyntax: true,
-        },
-      ],
+      require('next/dist/compiled/babel/plugin-syntax-import-assertions'),
       require('./plugins/react-loadable-plugin'),
       [
         require('next/dist/compiled/babel/plugin-proposal-class-properties'),

diff --git a/packages/next/src/bundles/babel/bundle.js b/packages/next/src/bundles/babel/bundle.js
@@ -72,8 +72,8 @@ function pluginSyntaxDynamicImport() {
   return require('next/dist/compiled/babel-packages').pluginSyntaxDynamicImport()
 }
 
-function pluginSyntaxImportAttributes() {
-  return require('next/dist/compiled/babel-packages').pluginSyntaxImportAttributes()
+function pluginSyntaxImportAssertions() {
+  return require('next/dist/compiled/babel-packages').pluginSyntaxImportAssertions()
 }
 
 function pluginSyntaxJsx() {
@@ -127,7 +127,7 @@ module.exports = {
   pluginProposalObjectRestSpread,
   pluginSyntaxBigint,
   pluginSyntaxDynamicImport,
-  pluginSyntaxImportAttributes,
+  pluginSyntaxImportAssertions,
   pluginSyntaxJsx,
   pluginTransformDefine,
   pluginTransformModulesCommonjs,

diff --git a/packages/next/src/bundles/babel/packages-bundle.js b/packages/next/src/bundles/babel/packages-bundle.js
@@ -28,8 +28,8 @@ function pluginSyntaxDynamicImport() {
   return require('@babel/plugin-syntax-dynamic-import')
 }
 
-function pluginSyntaxImportAttributes() {
-  return require('@babel/plugin-syntax-import-attributes')
+function pluginSyntaxImportAssertions() {
+  return require('@babel/plugin-syntax-import-assertions')
 }
 
 function pluginSyntaxJsx() {
@@ -72,7 +72,7 @@ module.exports = {
   pluginProposalObjectRestSpread,
   pluginSyntaxBigint,
   pluginSyntaxDynamicImport,
-  pluginSyntaxImportAttributes,
+  pluginSyntaxImportAssertions,
   pluginSyntaxJsx,
   pluginTransformDefine,
   pluginTransformModulesCommonjs,

diff --git a/packages/next/src/bundles/babel/packages/plugin-syntax-import-assertions.js b/packages/next/src/bundles/babel/packages/plugin-syntax-import-assertions.js
@@ -0,0 +1 @@
+module.exports = require('./bundle').pluginSyntaxImportAssertions()
diff --git a/packages/next/src/bundles/babel/packages/plugin-syntax-import-attributes.js b/packages/next/src/bundles/babel/packages/plugin-syntax-import-attributes.js
diff --git a/packages/next/src/compiled/babel-packages/packages-bundle.js b/packages/next/src/compiled/babel-packages/packages-bundle.js
diff --git a/packages/next/src/compiled/babel/bundle.js b/packages/next/src/compiled/babel/bundle.js
diff --git a/packages/next/src/compiled/babel/plugin-syntax-import-assertions.js b/packages/next/src/compiled/babel/plugin-syntax-import-assertions.js
@@ -0,0 +1 @@
+module.exports = require('./bundle').pluginSyntaxImportAssertions()
diff --git a/packages/next/src/compiled/babel/plugin-syntax-import-attributes.js b/packages/next/src/compiled/babel/plugin-syntax-import-attributes.js
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/integration/import-attributes/data b/test/integration/import-attributes/data
diff --git a/test/integration/import-attributes/data.d.ts b/test/integration/import-attributes/data.d.ts
diff --git a/test/integration/import-attributes/pages/es.js b/test/integration/import-attributes/pages/es.js
diff --git a/test/integration/import-attributes/pages/ts.ts b/test/integration/import-attributes/pages/ts.ts
diff --git a/test/integration/import-attributes/test/index.test.js b/test/integration/import-attributes/test/index.test.js
diff --git a/test/integration/import-attributes/tsconfig.json b/test/integration/import-attributes/tsconfig.json
diff --git a/test/turbopack-build-tests-manifest.json b/test/turbopack-build-tests-manifest.json
@@ -11417,15 +11417,6 @@
       "flakey": [],
       "runtimeError": false
     },
-    "test/integration/import-attributes/test/index.test.js": {
-      "passed": ["import-attributes dev should handle json attributes"],
-      "failed": [
-        "production mode import-attributes prod should handle json attributes"
-      ],
-      "pending": [],
-      "flakey": [],
-      "runtimeError": false
-    },
     "test/integration/index-index/test/index.test.js": {
       "passed": [
         "nested index.js production mode should 404 on /index/index/index",