@next/codemod 16.4.0-canary.55 → 16.4.0-canary.57

package/bin/next-codemod.js

@@ -45,6 +45,8 @@ program
     .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)
     .option('--skip-adoption', 'Skip optional feature-adoption codemods while applying version migrations.', false)
+    .option('--skip-react-upgrade', 'Keep React dependencies, types, and overrides unchanged and skip React codemods.', false)
+    .option('--skip-eslint-upgrade', 'Keep ESLint dependencies unchanged and skip the next-lint-to-eslint-cli codemod.', false)
     .action(async (revision, options) => {
     try {
         await (0, upgrade_1.runUpgrade)(revision, options);

package/bin/transform.js

@@ -109,7 +109,10 @@ async function runTransform(transform, path, options) {
     const execaChildProcess = (0, execa_1.default)(exports.jscodeshiftExecutable, args, {
         // include ANSI color codes
         // Note: execa merges env with existing env by default.
-        env: process.stdout.isTTY ? { FORCE_COLOR: 'true' } : {},
+        env: {
+            ...process.env,
+            ...(process.stdout.isTTY ? { FORCE_COLOR: 'true' } : {}),
+        },
     });
     // "\n" + "a\n" + "b\n"
     let lastThreeLineBreaks = '';

package/bin/upgrade.js

@@ -190,6 +190,7 @@ async function runUpgrade(revision, options) {
     // x-ref(release): https://github.com/vercel/next.js/releases/tag/v14.3.0-canary.45
     (0, semver_1.compare)(targetNextVersion, '14.3.0-canary.45') >= 0 &&
         installedReactVersion.startsWith('18') &&
+        !options.skipReactUpgrade &&
         // 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.
@@ -218,9 +219,11 @@ async function runUpgrade(revision, options) {
     // E.g. in peerDependencies we could have `^18.2.0 || ^19.0.0 || 20.0.0-canary`
     // If we'd just `npm add` that, the manifest would read the same version query.
     // This is basically a `npm --save-exact react@$versionQuery` that works for every package manager.
-    const targetReactVersion = shouldStayOnReact18
-        ? '18.3.1'
-        : await loadHighestNPMVersionMatching(`react@${targetNextPackageJson.peerDependencies['react']}`);
+    const targetReactVersion = options.skipReactUpgrade
+        ? installedReactVersion
+        : shouldStayOnReact18
+            ? '18.3.1'
+            : 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, nonInteractive);
@@ -231,7 +234,8 @@ async function runUpgrade(revision, options) {
     let shouldRunReactTypesCodemods = false;
     let execCommand = 'npx --yes';
     // The following React codemods are for React 19
-    if (!shouldStayOnReact18 &&
+    if (!options.skipReactUpgrade &&
+        !shouldStayOnReact18 &&
         (0, semver_1.compare)(targetReactVersion, '19.0.0-0') >= 0 &&
         (0, semver_1.compare)(installedReactVersion, '19.0.0-0') < 0) {
         shouldRunReactCodemods = await suggestReactCodemods(nonInteractive);
@@ -248,19 +252,31 @@ async function runUpgrade(revision, options) {
     };
     const versionMapping = {
         next: { version: targetNextVersion, required: true },
-        react: { version: targetReactVersion, required: true },
-        'react-dom': { version: targetReactVersion, required: true },
-        'react-is': { version: targetReactVersion, required: false },
     };
+    // Recovery retries must preserve the repaired React declarations and pins.
+    if (!options.skipReactUpgrade) {
+        Object.assign(versionMapping, {
+            react: { version: targetReactVersion, required: true },
+            'react-dom': { version: targetReactVersion, required: true },
+            'react-is': { version: targetReactVersion, required: false },
+        });
+    }
     for (const optionalNextjsPackage of optionalNextjsPackages) {
+        // Preserve the lint stack together; its newer config can require newer ESLint.
+        if (options.skipEslintUpgrade &&
+            (optionalNextjsPackage === 'eslint-config-next' ||
+                optionalNextjsPackage === '@next/eslint-plugin-next')) {
+            continue;
+        }
         versionMapping[optionalNextjsPackage] = {
             version: targetNextVersion,
             required: false,
         };
     }
-    if (targetReactVersion.startsWith('19.0.0-canary') ||
-        targetReactVersion.startsWith('19.0.0-beta') ||
-        targetReactVersion.startsWith('19.0.0-rc')) {
+    if (!options.skipReactUpgrade &&
+        (targetReactVersion.startsWith('19.0.0-canary') ||
+            targetReactVersion.startsWith('19.0.0-beta') ||
+            targetReactVersion.startsWith('19.0.0-rc'))) {
         const [targetReactTypesVersion, targetReactDOMTypesVersion] = await Promise.all([
             loadHighestNPMVersionMatching(`types-react@rc`),
             loadHighestNPMVersionMatching(`types-react-dom@rc`),
@@ -278,7 +294,7 @@ async function runUpgrade(revision, options) {
             };
         }
     }
-    else {
+    else if (!options.skipReactUpgrade) {
         const [targetReactTypesVersion, targetReactDOMTypesVersion] = await Promise.all([
             loadHighestNPMVersionMatching(`@types/react@${targetNextPackageJson.peerDependencies['react']}`),
             loadHighestNPMVersionMatching(`@types/react-dom@${targetNextPackageJson.peerDependencies['react']}`),
@@ -306,7 +322,9 @@ async function runUpgrade(revision, options) {
     // 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']) {
+    if (!options.skipEslintUpgrade &&
+        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() === ''
@@ -336,10 +354,10 @@ async function runUpgrade(revision, options) {
     // 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 = {};
-    if (allDependencies['@types/react']) {
+    if (!options.skipReactUpgrade && allDependencies['@types/react']) {
         overrides['@types/react'] = versionMapping['@types/react'].version;
     }
-    if (allDependencies['@types/react-dom']) {
+    if (!options.skipReactUpgrade && allDependencies['@types/react-dom']) {
         overrides['@types/react-dom'] = versionMapping['@types/react-dom'].version;
     }
     writeOverridesField(appPackageJson, packageManager, overrides);
@@ -362,7 +380,12 @@ async function runUpgrade(revision, options) {
         // Common IDE formatters would add a newline as well.
         os.EOL);
     (0, handle_package_1.runInstallation)(packageManager, { cwd });
-    for (const codemod of codemods) {
+    // Opting out skips the lint migration as well as its dependency upgrades.
+    const selectedCodemods = codemods.filter((codemod) => !options.skipEslintUpgrade || codemod !== 'next-lint-to-eslint-cli');
+    if (selectedCodemods.length !== codemods.length) {
+        console.log('Skipping next-lint-to-eslint-cli. Complete any required lint migration manually before verification.');
+    }
+    for (const codemod of selectedCodemods) {
         await (0, transform_1.runTransform)(codemod, cwd, {
             force: true,
             verbose,
@@ -395,7 +418,7 @@ async function runUpgrade(revision, options) {
         });
     }
     console.log(); // new line
-    if (codemods.length > 0) {
+    if (selectedCodemods.length > 0) {
         console.log(`${picocolors_1.default.green('✔')} Codemods have been applied successfully.`);
     }
     try {

package/lib/handle-package.js

@@ -13,6 +13,7 @@ exports.addPackageDependency = addPackageDependency;
 const find_up_1 = __importDefault(require("find-up"));
 const execa_1 = __importDefault(require("execa"));
 const node_child_process_1 = require("node:child_process");
+const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 /**
  * Get the full version string for the given package manager.
@@ -57,6 +58,17 @@ function getPnpmMajorVersion() {
 }
 function getPkgManager(baseDir) {
     try {
+        // The app's declared manager takes precedence over the command launcher.
+        const manifestPath = (0, node_path_1.join)(baseDir, 'package.json');
+        if ((0, node_fs_1.existsSync)(manifestPath)) {
+            const { packageManager } = JSON.parse((0, node_fs_1.readFileSync)(manifestPath, 'utf8'));
+            const match = typeof packageManager === 'string'
+                ? packageManager.match(/^(npm|pnpm|yarn|bun)@/)
+                : null;
+            if (match) {
+                return match[1];
+            }
+        }
         const userAgent = process.env.npm_config_user_agent;
         if (userAgent) {
             if (userAgent.startsWith('yarn')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "16.4.0-canary.55",
+  "version": "16.4.0-canary.57",
   "license": "MIT",
   "repository": {
     "type": "git",