fix: Enable CJS annotations for next.js files (#48811)

### What? Enable import/export annotations for next.js files. ### Why? It's required to allow importing next.js modules from node. `cjs-module-lexer` needs these annotations to import CJS modules. ### How? Closes WEB-949 Fixes #48801
vercel · Apr 27, 2023 · e260adb · e260adb
1 parent 7b66e8a
commit e260adb
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 66 deletions.
diff --git a/package.json b/package.json
@@ -76,7 +76,7 @@
     "@opentelemetry/api": "1.4.1",
     "@svgr/webpack": "5.5.0",
     "@swc/cli": "0.1.55",
-    "@swc/core": "1.3.51",
+    "@swc/core": "1.3.55",
     "@swc/helpers": "0.5.1",
     "@testing-library/react": "13.0.0",
     "@types/cheerio": "0.22.16",

diff --git a/...ror resolving commonjs request-05df34.txt → ...ror resolving commonjs request-1512ce.txt b/...ror resolving commonjs request-05df34.txt → ...ror resolving commonjs request-1512ce.txt
@@ -12,11 +12,11 @@ PlainIssue {
                 ident: "[project]/packages/next/dist/server/lib/mock-request.js",
             },
             start: SourcePos {
-                line: 21,
+                line: 26,
                 column: 56,
             },
             end: SourcePos {
-                line: 21,
+                line: 26,
                 column: 73,
             },
         },

diff --git a/...ror resolving commonjs request-87bf95.txt → ...ror resolving commonjs request-708788.txt b/...ror resolving commonjs request-87bf95.txt → ...ror resolving commonjs request-708788.txt
@@ -12,11 +12,11 @@ PlainIssue {
                 ident: "[project]/packages/next/dist/server/api-utils/node.js",
             },
             start: SourcePos {
-                line: 25,
+                line: 30,
                 column: 17,
             },
             end: SourcePos {
-                line: 25,
+                line: 30,
                 column: 34,
             },
         },

diff --git a/...ror resolving commonjs request-3cc718.txt → ...ror resolving commonjs request-92367b.txt b/...ror resolving commonjs request-3cc718.txt → ...ror resolving commonjs request-92367b.txt
@@ -12,11 +12,11 @@ PlainIssue {
                 ident: "[project]/packages/next/dist/server/api-utils/node.js",
             },
             start: SourcePos {
-                line: 149,
+                line: 154,
                 column: 20,
             },
             end: SourcePos {
-                line: 149,
+                line: 154,
                 column: 42,
             },
         },

diff --git a/...ror resolving commonjs request-88373b.txt → ...ror resolving commonjs request-f703fb.txt b/...ror resolving commonjs request-88373b.txt → ...ror resolving commonjs request-f703fb.txt
@@ -12,11 +12,11 @@ PlainIssue {
                 ident: "[project]/packages/next/dist/server/crypto-utils.js",
             },
             start: SourcePos {
-                line: 18,
+                line: 22,
                 column: 56,
             },
             end: SourcePos {
-                line: 18,
+                line: 22,
                 column: 73,
             },
         },

diff --git a/...ror resolving commonjs request-bbf8bb.txt → ...ror resolving commonjs request-393c11.txt b/...ror resolving commonjs request-bbf8bb.txt → ...ror resolving commonjs request-393c11.txt
@@ -12,11 +12,11 @@ PlainIssue {
                 ident: "[project]/packages/next/dist/server/api-utils/node.js",
             },
             start: SourcePos {
-                line: 25,
+                line: 30,
                 column: 17,
             },
             end: SourcePos {
-                line: 25,
+                line: 30,
                 column: 34,
             },
         },

diff --git a/...ror resolving commonjs request-c01a7a.txt → ...ror resolving commonjs request-4d3572.txt b/...ror resolving commonjs request-c01a7a.txt → ...ror resolving commonjs request-4d3572.txt
@@ -12,11 +12,11 @@ PlainIssue {
                 ident: "[project]/packages/next/dist/server/crypto-utils.js",
             },
             start: SourcePos {
-                line: 18,
+                line: 22,
                 column: 56,
             },
             end: SourcePos {
-                line: 18,
+                line: 22,
                 column: 73,
             },
         },

diff --git a/...ror resolving commonjs request-440c3c.txt → ...ror resolving commonjs request-b48125.txt b/...ror resolving commonjs request-440c3c.txt → ...ror resolving commonjs request-b48125.txt
@@ -12,11 +12,11 @@ PlainIssue {
                 ident: "[project]/packages/next/dist/server/api-utils/node.js",
             },
             start: SourcePos {
-                line: 149,
+                line: 154,
                 column: 20,
             },
             end: SourcePos {
-                line: 149,
+                line: 154,
                 column: 42,
             },
         },

diff --git a/...ror resolving commonjs request-386341.txt → ...ror resolving commonjs request-d1c759.txt b/...ror resolving commonjs request-386341.txt → ...ror resolving commonjs request-d1c759.txt
@@ -12,11 +12,11 @@ PlainIssue {
                 ident: "[project]/packages/next/dist/server/lib/mock-request.js",
             },
             start: SourcePos {
-                line: 21,
+                line: 26,
                 column: 56,
             },
             end: SourcePos {
-                line: 21,
+                line: 26,
                 column: 73,
             },
         },

diff --git a/packages/next/taskfile-swc.js b/packages/next/taskfile-swc.js
@@ -32,6 +32,7 @@ module.exports = function (task) {
         module: {
           type: esm ? 'es6' : 'commonjs',
           ignoreDynamic: true,
+          exportInteropAnnotation: true,
         },
         env: {
           targets: MODERN_BROWSERSLIST_TARGET,
@@ -65,6 +66,7 @@ module.exports = function (task) {
         module: {
           type: esm ? 'es6' : 'commonjs',
           ignoreDynamic: true,
+          exportInteropAnnotation: true,
         },
         env: {
           targets: {