@next/codemod 16.3.0-canary.71 → 16.3.0-canary.73

package/bin/next-codemod.js

@@ -43,6 +43,7 @@ program
     .argument('[revision]', 'Specify the upgrade type ("patch", "minor", "major"), an NPM dist tag (e.g. "latest", "canary", "rc"), or an exact version (e.g. "15.0.0"). Defaults to "minor".')
     .usage('[revision] [options]')
     .option('--verbose', 'Verbose output', false)
+    .option('-y, --yes', 'Skip every interactive prompt and accept its default. Also auto-enabled when stdin is not a TTY (e.g. running under an agent or in CI).', false)
     .action(async (revision, options) => {
     try {
         await (0, upgrade_1.runUpgrade)(revision, options);

package/bin/upgrade.js

@@ -114,6 +114,10 @@ function resolveSemanticRevision(revision, installedVersion) {
 }
 async function runUpgrade(revision, options) {
     const { verbose } = options;
+    const nonInteractive = options.yes === true || !process.stdin.isTTY;
+    if (nonInteractive) {
+        console.log(`  Running in non-interactive mode. Every prompt will accept its default.`);
+    }
     const appPackageJsonPath = path_1.default.resolve(cwd, 'package.json');
     let appPackageJson = JSON.parse(fs_1.default.readFileSync(appPackageJsonPath, 'utf8'));
     const installedNextVersion = getInstalledNextVersion();
@@ -189,18 +193,24 @@ async function runUpgrade(revision, options) {
         // 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: `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',
-        }, { onCancel: utils_1.onCancel });
-        shouldStayOnReact18 = shouldStayOnReact18Res.shouldStayOnReact18;
+        if (nonInteractive) {
+            // Default: upgrade React past 18.
+            shouldStayOnReact18 = false;
+        }
+        else {
+            const shouldStayOnReact18Res = await (0, prompts_1.default)({
+                type: 'confirm',
+                name: 'shouldStayOnReact18',
+                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',
+            }, { onCancel: utils_1.onCancel });
+            shouldStayOnReact18 = shouldStayOnReact18Res.shouldStayOnReact18;
+        }
     }
     // We're resolving a specific version here to avoid including "ugly" version queries
     // in the manifest.
@@ -212,9 +222,9 @@ async function runUpgrade(revision, options) {
         : await loadHighestNPMVersionMatching(`react@${targetNextPackageJson.peerDependencies['react']}`);
     if ((0, semver_1.compare)(targetNextVersion, '15.0.0-canary') >= 0 &&
         (0, semver_1.compare)(targetNextVersion, '16.0.0-canary') < 0) {
-        await suggestTurbopack(appPackageJson, targetNextVersion);
+        await suggestTurbopack(appPackageJson, targetNextVersion, nonInteractive);
     }
-    const codemods = await suggestCodemods(installedNextVersion, targetNextVersion);
+    const codemods = await suggestCodemods(installedNextVersion, targetNextVersion, nonInteractive);
     const packageManager = (0, handle_package_1.getPkgManager)(cwd);
     let shouldRunReactCodemods = false;
     let shouldRunReactTypesCodemods = false;
@@ -223,8 +233,9 @@ async function runUpgrade(revision, options) {
     if (!shouldStayOnReact18 &&
         (0, semver_1.compare)(targetReactVersion, '19.0.0-0') >= 0 &&
         (0, semver_1.compare)(installedReactVersion, '19.0.0-0') < 0) {
-        shouldRunReactCodemods = await suggestReactCodemods();
-        shouldRunReactTypesCodemods = await suggestReactTypesCodemods();
+        shouldRunReactCodemods = await suggestReactCodemods(nonInteractive);
+        shouldRunReactTypesCodemods =
+            await suggestReactTypesCodemods(nonInteractive);
         execCommand = getNpxCommand(packageManager);
     }
     fs_1.default.writeFileSync(appPackageJsonPath, JSON.stringify(appPackageJson, null, 2));
@@ -284,6 +295,37 @@ async function runUpgrade(revision, options) {
             };
         }
     }
+    // Bump `eslint` alongside `eslint-config-next` so the install doesn't fail
+    // on a peer-dep mismatch. e.g. `eslint-config-next@16.x` requires
+    // `eslint@>=9`, but a project upgrading from Next 15 will still have
+    // `eslint@^8` from create-next-app. Skip silently if anything goes wrong;
+    // the worst case is the user hits the same peer-dep error they would have
+    // without this bump.
+    //
+    // Only act when the project is actually using `eslint-config-next` — we
+    // don't want to silently upgrade eslint majors for projects that use
+    // eslint for unrelated reasons.
+    if (allDependencies['eslint'] && allDependencies['eslint-config-next']) {
+        try {
+            const eslintConfigNextPeerDepsJSON = (0, child_process_1.execSync)(`npm --silent view "eslint-config-next@${targetNextVersion}" peerDependencies --json`, { encoding: 'utf-8' });
+            const eslintConfigNextPeerDeps = eslintConfigNextPeerDepsJSON.trim() === ''
+                ? {}
+                : JSON.parse(eslintConfigNextPeerDepsJSON);
+            const eslintRange = eslintConfigNextPeerDeps?.eslint;
+            if (eslintRange) {
+                const targetEslintVersion = await loadHighestNPMVersionMatching(`eslint@${eslintRange}`);
+                versionMapping['eslint'] = {
+                    version: targetEslintVersion,
+                    required: false,
+                };
+            }
+        }
+        catch (e) {
+            if (verbose) {
+                console.warn(`  Could not determine eslint peer range from eslint-config-next@${targetNextVersion}. Leaving eslint version alone.`, e);
+            }
+        }
+    }
     // Even though we only need those if we alias `@types/react` to types-react,
     // we still do it out of safety due to https://github.com/microsoft/DefinitelyTyped-tools/issues/433.
     const overrides = {};
@@ -320,10 +362,11 @@ async function runUpgrade(revision, options) {
     // understanding of the codemods, we run all of the applicable codemods.
     if (shouldRunReactCodemods) {
         // https://react.dev/blog/2024/04/25/react-19-upgrade-guide#run-all-react-19-codemods
-        (0, child_process_1.execSync)(
         // `--no-interactive` skips the interactive prompt that asks for confirmation
         // https://github.com/codemod-com/codemod/blob/c0cf00d13161a0ec0965b6cc6bc5d54076839cc8/apps/cli/src/flags.ts#L160
-        `${execCommand} codemod@latest react/19/migration-recipe --no-interactive`, { stdio: 'inherit' });
+        // `--allow-dirty` is required because the upgrade above modified package.json
+        // and the lockfile; the recipe refuses to run on a dirty tree otherwise.
+        (0, child_process_1.execSync)(`${execCommand} codemod@latest react/19/migration-recipe --no-interactive --allow-dirty`, { stdio: 'inherit' });
     }
     if (shouldRunReactTypesCodemods) {
         // https://react.dev/blog/2024/04/25/react-19-upgrade-guide#typescript-changes
@@ -383,7 +426,7 @@ function isUsingAppDir(projectPath) {
  * 3. Otherwise, we ask the user to manually add `--turbopack` to their dev command,
  *    showing the current dev command as the initial value.
  */
-async function suggestTurbopack(packageJson, targetNextVersion) {
+async function suggestTurbopack(packageJson, targetNextVersion, nonInteractive) {
     const devScript = packageJson.scripts?.['dev'];
     // Turbopack flag was changed from `--turbo` to `--turbopack` in v15.0.1-canary.3
     // PR: https://github.com/vercel/next.js/pull/71657
@@ -406,19 +449,28 @@ async function suggestTurbopack(packageJson, targetNextVersion) {
             }
             return;
         }
-        const responseTurbopack = await (0, prompts_1.default)({
-            type: 'confirm',
-            name: 'enable',
-            message: `Enable Turbopack for ${picocolors_1.default.bold('next dev')}?`,
-            initial: true,
-        }, { onCancel: utils_1.onCancel });
-        if (!responseTurbopack.enable) {
+        let enable = true;
+        if (!nonInteractive) {
+            const responseTurbopack = await (0, prompts_1.default)({
+                type: 'confirm',
+                name: 'enable',
+                message: `Enable Turbopack for ${picocolors_1.default.bold('next dev')}?`,
+                initial: true,
+            }, { onCancel: utils_1.onCancel });
+            enable = responseTurbopack.enable;
+        }
+        if (!enable) {
             return;
         }
         packageJson.scripts['dev'] = devScript.replace('next dev', `next dev ${turboPackFlag}`);
         return;
     }
     console.log(`${picocolors_1.default.yellow('⚠')} Could not find "${picocolors_1.default.bold('next dev')}" in your dev script.`);
+    if (nonInteractive) {
+        // Without a TTY we can't ask the user for a replacement script.
+        // Keep the existing dev script untouched.
+        return;
+    }
     const responseCustomDevScript = await (0, prompts_1.default)({
         type: 'text',
         name: 'customDevScript',
@@ -428,7 +480,7 @@ async function suggestTurbopack(packageJson, targetNextVersion) {
     packageJson.scripts['dev'] =
         responseCustomDevScript.customDevScript || devScript;
 }
-async function suggestCodemods(initialNextVersion, targetNextVersion) {
+async function suggestCodemods(initialNextVersion, targetNextVersion, nonInteractive) {
     // example:
     // codemod version: 15.0.0-canary.45
     // 14.3             -> 15.0.0-canary.45: apply
@@ -451,6 +503,13 @@ async function suggestCodemods(initialNextVersion, targetNextVersion) {
     if (relevantCodemods.length === 0) {
         return [];
     }
+    if (nonInteractive) {
+        // Default: apply every recommended codemod, matching `selected: true` below.
+        const all = relevantCodemods.map(({ value }) => value);
+        console.log(`  Applying all ${picocolors_1.default.blue('codemods')} recommended for your upgrade:\n` +
+            all.map((value) => `    - ${value}`).join('\n'));
+        return all;
+    }
     const { codemods } = await (0, prompts_1.default)({
         type: 'multiselect',
         name: 'codemods',
@@ -466,7 +525,10 @@ async function suggestCodemods(initialNextVersion, targetNextVersion) {
     }, { onCancel: utils_1.onCancel });
     return codemods;
 }
-async function suggestReactCodemods() {
+async function suggestReactCodemods(nonInteractive) {
+    if (nonInteractive) {
+        return true;
+    }
     const { runReactCodemod } = await (0, prompts_1.default)({
         type: 'confirm',
         name: 'runReactCodemod',
@@ -475,7 +537,10 @@ async function suggestReactCodemods() {
     }, { onCancel: utils_1.onCancel });
     return runReactCodemod;
 }
-async function suggestReactTypesCodemods() {
+async function suggestReactTypesCodemods(nonInteractive) {
+    if (nonInteractive) {
+        return true;
+    }
     const { runReactTypesCodemod } = await (0, prompts_1.default)({
         type: 'confirm',
         name: 'runReactTypesCodemod',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "16.3.0-canary.71",
+  "version": "16.3.0-canary.73",
   "license": "MIT",
   "repository": {
     "type": "git",