Merge branch 'canary' into fix/hide-learn-more-when-fresh

vercel · Feb 27, 2023 · f81043c · f81043c
2 parents fa8bec7 + aa61463
commit f81043c
Show file tree

Hide file tree

Showing 49 changed files with 462 additions and 175 deletions.
diff --git a/packages/create-next-app/templates/app/js/jsconfig.json b/packages/create-next-app/templates/app/js/jsconfig.json
@@ -1,6 +1,5 @@
 {
   "compilerOptions": {
-    "baseUrl": ".",
     "paths": {
       "@/*": ["./*"]
     }

diff --git a/packages/create-next-app/templates/app/ts/tsconfig.json b/packages/create-next-app/templates/app/ts/tsconfig.json
@@ -19,7 +19,6 @@
         "name": "next"
       }
     ],
-    "baseUrl": ".",
     "paths": {
       "@/*": ["./*"]
     }

diff --git a/packages/create-next-app/templates/default/js/jsconfig.json b/packages/create-next-app/templates/default/js/jsconfig.json
@@ -1,6 +1,5 @@
 {
   "compilerOptions": {
-    "baseUrl": ".",
     "paths": {
       "@/*": ["./*"]
     }

diff --git a/packages/create-next-app/templates/default/ts/tsconfig.json b/packages/create-next-app/templates/default/ts/tsconfig.json
@@ -14,7 +14,6 @@
     "isolatedModules": true,
     "jsx": "preserve",
     "incremental": true,
-    "baseUrl": ".",
     "paths": {
       "@/*": ["./*"]
     }

diff --git a/...xtures__/built-in-next-font/page.input.js → ...tures__/built-in-next-font/page.input.tsx b/...xtures__/built-in-next-font/page.input.js → ...tures__/built-in-next-font/page.input.tsx
@@ -1,5 +1,8 @@
+// @ts-nocheck
+/* eslint-disable */
 import { Oswald } from "@next/font/google";
 import localFont1 from "@next/font/local";
+import type { AdjustFontFallback } from "@next/font"
 
 const oswald = Oswald({ subsets: ["latin"] });
 const myFont = localFont1({

diff --git a/...tures__/built-in-next-font/page.output.js → ...ures__/built-in-next-font/page.output.tsx b/...tures__/built-in-next-font/page.output.js → ...ures__/built-in-next-font/page.output.tsx
@@ -1,5 +1,8 @@
+// @ts-nocheck
+/* eslint-disable */
 import { Oswald } from "next/font/google";
 import localFont1 from "next/font/local";
+import type { AdjustFontFallback } from "next/font"
 
 const oswald = Oswald({ subsets: ["latin"] });
 const myFont = localFont1({

diff --git a/.../next-image-experimental/general.input.js → ...next-image-experimental/general.input.tsx b/.../next-image-experimental/general.input.js → ...next-image-experimental/general.input.tsx
@@ -1,5 +1,9 @@
+// @ts-nocheck
+/* eslint-disable */
 import Image from "next/legacy/image";
 import Named, { Blarg } from "next/legacy/image";
+import type { ImageProps } from "next/legacy/image";
+import { type ImageLoaderProps } from "next/legacy/image";
 import Foo from "foo";
 import img from "../public/img.jpg";
 
@@ -30,4 +34,4 @@ export default function Home() {
       <Image src="/test.dot" width="200" height="300" layout="responsive" style={{...myStyle}} />
     </div>
   );
-}
+}
diff --git a/...next-image-experimental/general.output.js → ...ext-image-experimental/general.output.tsx b/...next-image-experimental/general.output.js → ...ext-image-experimental/general.output.tsx
@@ -1,5 +1,9 @@
+// @ts-nocheck
+/* eslint-disable */
 import Image from "next/image";
 import Named, { Blarg } from "next/image";
+import type { ImageProps } from "next/image";
+import { type ImageLoaderProps } from "next/image";
 import Foo from "foo";
 import img from "../public/img.jpg";
 
@@ -99,4 +103,4 @@ export default function Home() {
         }} />
     </div>
   );
-}
+}
diff --git a/.../next-image-experimental/require.input.js → ...next-image-experimental/require.input.tsx b/.../next-image-experimental/require.input.js → ...next-image-experimental/require.input.tsx
@@ -1,3 +1,5 @@
+// @ts-nocheck
+/* eslint-disable */
 const Image = require("next/legacy/image");
 const Named = require("next/legacy/image");
 const Foo = require("foo");
@@ -11,4 +13,4 @@ export default function Home() {
       <Foo />
     </div>
   );
-}
+}
diff --git a/...next-image-experimental/require.output.js → ...ext-image-experimental/require.output.tsx b/...next-image-experimental/require.output.js → ...ext-image-experimental/require.output.tsx
@@ -1,3 +1,5 @@
+// @ts-nocheck
+/* eslint-disable */
 const Image = require("next/image");
 const Named = require("next/image");
 const Foo = require("foo");
@@ -11,4 +13,4 @@ export default function Home() {
       <Foo />
     </div>
   );
-}
+}
diff --git a/...ges/next-codemod/transforms/__testfixtures__/next-image-to-legacy-image/general.input.tsx b/...ges/next-codemod/transforms/__testfixtures__/next-image-to-legacy-image/general.input.tsx
@@ -7,6 +7,8 @@ import { type ImageLoaderProps } from "next/image";
 import Foo from "foo";
 import Future1 from "next/future/image";
 import Future2 from "next/future/image";
+import type { ImageProps as ImageFutureProps } from "next/future/image";
+import { type ImageLoaderProps as ImageFutureLoaderProps } from "next/future/image";
 
 export default function Home() {
   return (<div>

diff --git a/...es/next-codemod/transforms/__testfixtures__/next-image-to-legacy-image/general.output.tsx b/...es/next-codemod/transforms/__testfixtures__/next-image-to-legacy-image/general.output.tsx
@@ -7,6 +7,8 @@ import { type ImageLoaderProps } from "next/legacy/image";
 import Foo from "foo";
 import Future1 from "next/image";
 import Future2 from "next/image";
+import type { ImageProps as ImageFutureProps } from "next/image";
+import { type ImageLoaderProps as ImageFutureLoaderProps } from "next/image";
 
 export default function Home() {
   return (<div>

diff --git a/packages/next-codemod/transforms/__tests__/built-in-next-font.test.js b/packages/next-codemod/transforms/__tests__/built-in-next-font.test.js
@@ -7,10 +7,10 @@ const { join } = require('path')
 const fixtureDir = 'built-in-next-font'
 const fixtureDirPath = join(__dirname, '..', '__testfixtures__', fixtureDir)
 const fixtures = readdirSync(fixtureDirPath)
-  .filter(file => file.endsWith('.input.js'))
-  .map(file => file.replace('.input.js', ''))
+  .filter(file => file.endsWith('.input.tsx'))
+  .map(file => file.replace('.input.tsx', ''))
 
 for (const fixture of fixtures) {
   const prefix = `${fixtureDir}/${fixture}`;
-  defineTest(__dirname, fixtureDir,  null, prefix)
+  defineTest(__dirname, fixtureDir, null, prefix, { parser: 'tsx' });
 }
diff --git a/packages/next-codemod/transforms/__tests__/next-image-experimental.test.js b/packages/next-codemod/transforms/__tests__/next-image-experimental.test.js
@@ -7,10 +7,10 @@ const { join } = require('path')
 const fixtureDir = 'next-image-experimental'
 const fixtureDirPath = join(__dirname, '..', '__testfixtures__', fixtureDir)
 const fixtures = readdirSync(fixtureDirPath)
-  .filter(file => file.endsWith('.input.js'))
-  .map(file => file.replace('.input.js', ''))
+  .filter(file => file.endsWith('.input.tsx'))
+  .map(file => file.replace('.input.tsx', ''))
 
 for (const fixture of fixtures) {
   const prefix = `${fixtureDir}/${fixture}`;
-  defineTest(__dirname, fixtureDir,  null, prefix)
+  defineTest(__dirname, fixtureDir, null, prefix, { parser: 'tsx' })
 }
diff --git a/packages/next-codemod/transforms/built-in-next-font.ts b/packages/next-codemod/transforms/built-in-next-font.ts
@@ -8,19 +8,24 @@ export default function transformer(
   const j = api.jscodeshift.withParser('tsx')
   const root = j(file.source)
 
+  // Before: import { ... } from '@next/font'
+  // After: import { ... } from 'next/font'
+  root
+    .find(j.ImportDeclaration, {
+      source: { value: '@next/font' },
+    })
+    .forEach((fontImport) => {
+      fontImport.node.source = j.stringLiteral('next/font')
+    })
+
   // Before: import { ... } from '@next/font/google'
   // After: import { ... } from 'next/font/google'
   root
     .find(j.ImportDeclaration, {
       source: { value: '@next/font/google' },
     })
-    .forEach((imageImport) => {
-      j(imageImport).replaceWith(
-        j.importDeclaration(
-          imageImport.node.specifiers,
-          j.stringLiteral('next/font/google')
-        )
-      )
+    .forEach((fontImport) => {
+      fontImport.node.source = j.stringLiteral('next/font/google')
     })
 
   // Before: import localFont from '@next/font/local'
@@ -29,13 +34,8 @@ export default function transformer(
     .find(j.ImportDeclaration, {
       source: { value: '@next/font/local' },
     })
-    .forEach((imageImport) => {
-      j(imageImport).replaceWith(
-        j.importDeclaration(
-          imageImport.node.specifiers,
-          j.stringLiteral('next/font/local')
-        )
-      )
+    .forEach((fontImport) => {
+      fontImport.node.source = j.stringLiteral('next/font/local')
     })
 
   return root.toSource(options)

diff --git a/packages/next-codemod/transforms/next-image-experimental.ts b/packages/next-codemod/transforms/next-image-experimental.ts
@@ -284,14 +284,8 @@ export default function transformer(
         (node) => node.type === 'ImportDefaultSpecifier'
       ) as ImportDefaultSpecifier | undefined
       const tagName = defaultSpecifier?.local?.name
-
+      imageImport.node.source = j.stringLiteral('next/image')
       if (tagName) {
-        j(imageImport).replaceWith(
-          j.importDeclaration(
-            imageImport.node.specifiers,
-            j.stringLiteral('next/image')
-          )
-        )
         findAndReplaceProps(j, root, tagName)
       }
     })

diff --git a/packages/next-codemod/transforms/next-image-to-legacy-image.ts b/packages/next-codemod/transforms/next-image-to-legacy-image.ts
@@ -38,12 +38,7 @@ export default function transformer(
       source: { value: 'next/future/image' },
     })
     .forEach((imageFutureImport) => {
-      j(imageFutureImport).replaceWith(
-        j.importDeclaration(
-          imageFutureImport.node.specifiers,
-          j.stringLiteral('next/image')
-        )
-      )
+      imageFutureImport.node.source = j.stringLiteral('next/image')
     })
 
   // Before: const Image = await import("next/future/image")

diff --git a/packages/next-swc/crates/core/src/auto_cjs/mod.rs b/packages/next-swc/crates/core/src/auto_cjs/mod.rs
@@ -20,7 +20,10 @@ impl Visit for CjsFinder {
     fn visit_member_expr(&mut self, e: &MemberExpr) {
         if let Expr::Ident(obj) = &*e.obj {
             if let MemberProp::Ident(prop) = &e.prop {
-                if &*obj.sym == "module" && &*prop.sym == "exports" {
+                // Detect `module.exports` and `exports.__esModule`
+                if (&*obj.sym == "module" && &*prop.sym == "exports")
+                    || (&*obj.sym == "exports" && &*prop.sym == "__esModule")
+                {
                     self.found = true;
                     return;
                 }
@@ -31,9 +34,35 @@ impl Visit for CjsFinder {
         e.prop.visit_with(self);
     }
 
-    fn visit_str(&mut self, s: &Str) {
-        if s.value.contains("__esModule") {
-            self.found = true;
+    // Detect `Object.defineProperty(exports, "__esModule", ...)`
+    // Note that `Object.defineProperty(module.exports, ...)` will be handled by
+    // `visit_member_expr`.
+    fn visit_call_expr(&mut self, e: &CallExpr) {
+        if let Callee::Expr(expr) = &e.callee {
+            if let Expr::Member(member_expr) = &**expr {
+                if let (Expr::Ident(obj), MemberProp::Ident(prop)) =
+                    (&*member_expr.obj, &member_expr.prop)
+                {
+                    if &*obj.sym == "Object" && &*prop.sym == "defineProperty" {
+                        if let Some(ExprOrSpread { expr: expr0, .. }) = e.args.get(0) {
+                            if let Expr::Ident(arg0) = &**expr0 {
+                                if &*arg0.sym == "exports" {
+                                    if let Some(ExprOrSpread { expr: expr1, .. }) = e.args.get(1) {
+                                        if let Expr::Lit(Lit::Str(arg1)) = &**expr1 {
+                                            if &*arg1.value == "__esModule" {
+                                                self.found = true;
+                                                return;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
         }
+
+        e.callee.visit_with(self);
     }
 }
diff --git a/packages/next-swc/crates/core/tests/full/auto-cjs/2/input.js b/packages/next-swc/crates/core/tests/full/auto-cjs/2/input.js
@@ -0,0 +1,2 @@
+export default 1
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/packages/next-swc/crates/core/tests/full/auto-cjs/2/output.js b/packages/next-swc/crates/core/tests/full/auto-cjs/2/output.js
@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), Object.defineProperty(exports, "default", {
+    enumerable: !0,
+    get: function() {
+        return e;
+    }
+});
+var e = 1;
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+});
diff --git a/packages/next-swc/crates/core/tests/full/auto-cjs/3/input.js b/packages/next-swc/crates/core/tests/full/auto-cjs/3/input.js
@@ -0,0 +1,4 @@
+export default 1
+console.log("__esModule")
+Object.defineProperty({}, '__esModule', { value: true })
+Object.defineProperty()
diff --git a/packages/next-swc/crates/core/tests/full/auto-cjs/3/output.js b/packages/next-swc/crates/core/tests/full/auto-cjs/3/output.js
@@ -0,0 +1,4 @@
+export default 1;
+console.log("__esModule"), Object.defineProperty({}, "__esModule", {
+    value: !0
+}), Object.defineProperty();