@next/codemod 15.0.0-canary.200 → 15.0.0-canary.201

package/bin/upgrade.js

@@ -110,6 +110,10 @@ async function runUpgrade(revision, options) {
     console.log(`  - React: v${installedReactVersion}`);
     console.log(`  - Next.js: v${installedNextVersion}`);
     let shouldStayOnReact18 = false;
+    const usesAppDir = isUsingAppDir(process.cwd());
+    const usesPagesDir = isUsingPagesDir(process.cwd());
+    const isPureAppRouter = usesAppDir && !usesPagesDir;
+    const isMixedApp = usesPagesDir && usesAppDir;
     if (
     // From release v14.3.0-canary.45, Next.js expects the React version to be 19.0.0-beta.0
     // If the user is on a version higher than this but is still on React 18, we ask them
@@ -119,11 +123,18 @@ async function runUpgrade(revision, options) {
     // x-ref(PR): https://github.com/vercel/next.js/pull/65058
     // x-ref(release): https://github.com/vercel/next.js/releases/tag/v14.3.0-canary.45
     (0, compare_1.default)(targetNextVersion, '14.3.0-canary.45') >= 0 &&
-        installedReactVersion.startsWith('18')) {
+        installedReactVersion.startsWith('18') &&
+        // Pure App Router always uses React 19
+        // The mixed case is tricky to handle from a types perspective.
+        // We'll recommend to upgrade in the prompt but users can decide to try 18.
+        !isPureAppRouter) {
         const shouldStayOnReact18Res = await (0, prompts_1.default)({
             type: 'confirm',
             name: 'shouldStayOnReact18',
-            message: `Are you using ${picocolors_1.default.underline('only the Pages Router')} (no App Router) and prefer to stay on React 18?`,
+            message: `Do you prefer to stay on React 18?` +
+                (isMixedApp
+                    ? " Since you're using both pages/ and app/, we recommend upgrading React to use a consistent version throughout your app."
+                    : ''),
             initial: false,
             active: 'Yes',
             inactive: 'No',
@@ -296,6 +307,14 @@ function getInstalledReactVersion() {
         });
     }
 }
+function isUsingPagesDir(projectPath) {
+    return (fs_1.default.existsSync(path_1.default.resolve(projectPath, 'pages')) ||
+        fs_1.default.existsSync(path_1.default.resolve(projectPath, 'src/pages')));
+}
+function isUsingAppDir(projectPath) {
+    return (fs_1.default.existsSync(path_1.default.resolve(projectPath, 'app')) ||
+        fs_1.default.existsSync(path_1.default.resolve(projectPath, 'src/app')));
+}
 /*
  * Heuristics are used to determine whether to Turbopack is enabled or not and
  * to determine how to update the dev script.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "15.0.0-canary.200",
+  "version": "15.0.0-canary.201",
   "license": "MIT",
   "repository": {
     "type": "git",

package/transforms/lib/async-request-api/next-async-dynamic-prop.js

@@ -155,7 +155,6 @@ function modifyTypes(paramTypeAnnotation, propsIdentifier, root, j) {
                         member.typeAnnotation.typeAnnotation &&
                         j.TSType.check(member.typeAnnotation.typeAnnotation)) {
                         member.typeAnnotation.typeAnnotation = j.tsTypeReference(j.identifier('Promise'), j.tsTypeParameterInstantiation([
-                            // @ts-ignore
                             member.typeAnnotation.typeAnnotation,
                         ]));
                         modified = true;
@@ -203,6 +202,42 @@ function modifyTypes(paramTypeAnnotation, propsIdentifier, root, j) {
                         });
                     }
                 }
+                // Deal with type aliases
+                if (foundTypes.typeAliases.length > 0) {
+                    const typeAliasDeclaration = foundTypes.typeAliases[0];
+                    if (j.TSTypeAliasDeclaration.check(typeAliasDeclaration)) {
+                        const typeAlias = typeAliasDeclaration.typeAnnotation;
+                        if (j.TSTypeLiteral.check(typeAlias) &&
+                            typeAlias.members.length > 0) {
+                            const typeLiteral = typeAlias;
+                            typeLiteral.members.forEach((member) => {
+                                if (j.TSPropertySignature.check(member) &&
+                                    j.Identifier.check(member.key) &&
+                                    utils_1.TARGET_PROP_NAMES.has(member.key.name)) {
+                                    // if it's already a Promise, don't wrap it again, return
+                                    if (member.typeAnnotation &&
+                                        member.typeAnnotation.typeAnnotation &&
+                                        member.typeAnnotation.typeAnnotation.type ===
+                                            'TSTypeReference' &&
+                                        member.typeAnnotation.typeAnnotation.typeName.type ===
+                                            'Identifier' &&
+                                        member.typeAnnotation.typeAnnotation.typeName.name ===
+                                            'Promise') {
+                                        return;
+                                    }
+                                    // Wrap the prop type in Promise<>
+                                    if (member.typeAnnotation &&
+                                        j.TSTypeLiteral.check(member.typeAnnotation.typeAnnotation)) {
+                                        member.typeAnnotation.typeAnnotation = j.tsTypeReference(j.identifier('Promise'), j.tsTypeParameterInstantiation([
+                                            member.typeAnnotation.typeAnnotation,
+                                        ]));
+                                        modified = true;
+                                    }
+                                }
+                            });
+                        }
+                    }
+                }
             }
         }
         propsIdentifier.typeAnnotation = paramTypeAnnotation;
@@ -303,9 +338,7 @@ function transformDynamicProps(source, _api, filePath) {
                     const awaited = awaitMemberAccessOfProp(argName, path, j);
                     modified ||= awaited;
                 }
-                if (modified) {
-                    modifyTypes(currentParam.typeAnnotation, propsIdentifier, root, j);
-                }
+                modified ||= modifyTypes(currentParam.typeAnnotation, propsIdentifier, root, j);
                 // cases of passing down `props` into any function
                 // Page(props) { callback(props) }
                 // search for all the argument of CallExpression, where currentParam is one of the arguments