@next/codemod 15.0.0-canary.190 → 15.0.0-canary.191

package/bin/next-codemod.js

@@ -13,6 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const upgrade_1 = require("./upgrade");
 const transform_1 = require("./transform");
+const shared_1 = require("./shared");
 const packageJson = require('../package.json');
 const program = new commander_1.Command(packageJson.name)
     .description('Codemods for updating Next.js apps.')
@@ -45,6 +46,19 @@ program
         : 'latest')
     .usage('[revision] [options]')
     .option('--verbose', 'Verbose output', false)
-    .action(upgrade_1.runUpgrade);
+    .action(async (revision, options) => {
+    try {
+        await (0, upgrade_1.runUpgrade)(revision, options);
+    }
+    catch (error) {
+        if (!options.verbose && error instanceof shared_1.BadInput) {
+            console.error(error.message);
+        }
+        else {
+            console.error(error);
+        }
+        process.exit(1);
+    }
+});
 program.parse(process.argv);
 //# sourceMappingURL=next-codemod.js.map

package/bin/shared.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BadInput = void 0;
+class BadInput extends Error {
+}
+exports.BadInput = BadInput;
+//# sourceMappingURL=shared.js.map

package/bin/upgrade.js

@@ -14,6 +14,7 @@ const picocolors_1 = __importDefault(require("picocolors"));
 const handle_package_1 = require("../lib/handle-package");
 const transform_1 = require("./transform");
 const utils_1 = require("../lib/utils");
+const shared_1 = require("./shared");
 /**
  * @param query
  * @example loadHighestNPMVersionMatching("react@^18.3.0 || ^19.0.0") === Promise<"19.0.0">
@@ -31,6 +32,22 @@ async function loadHighestNPMVersionMatching(query) {
     }
     return versionOrVersions;
 }
+function endMessage() {
+    console.log();
+    console.log(picocolors_1.default.white(picocolors_1.default.bold(`Please review the local changes and read the Next.js 15 migration guide to complete the migration.`)));
+    console.log(picocolors_1.default.underline('https://nextjs.org/docs/canary/app/building-your-application/upgrading/version-15'));
+}
+function addDependencyIfNeeded(packageName, version, appPackageJson, dependenciesToInstall, devDependenciesToInstall) {
+    const specifiedDependency = `${packageName}@${version}`;
+    // First check if it's dev dependencies, then add into dev deps;
+    // If it's not, fallback into dependencies.
+    if (appPackageJson.devDependencies?.[packageName]) {
+        devDependenciesToInstall.push(specifiedDependency);
+    }
+    else if (appPackageJson.dependencies?.[packageName]) {
+        dependenciesToInstall.push(specifiedDependency);
+    }
+}
 async function runUpgrade(revision, options) {
     const { verbose } = options;
     const appPackageJsonPath = path_1.default.resolve(process.cwd(), 'package.json');
@@ -45,21 +62,25 @@ async function runUpgrade(revision, options) {
         'version' in targetNextPackageJson &&
         'peerDependencies' in targetNextPackageJson;
     if (!validRevision) {
-        throw new Error(`Invalid revision provided: "${revision}". Please provide a valid Next.js version or dist-tag (e.g. "latest", "canary", "rc", or "15.0.0").\nCheck available versions at https://www.npmjs.com/package/next?activeTab=versions.`);
+        throw new shared_1.BadInput(`Invalid revision provided: "${revision}". Please provide a valid Next.js version or dist-tag (e.g. "latest", "canary", "rc", or "15.0.0").\nCheck available versions at https://www.npmjs.com/package/next?activeTab=versions.`);
     }
     const installedNextVersion = getInstalledNextVersion();
-    console.log(`Current Next.js version: v${installedNextVersion}`);
     const targetNextVersion = targetNextPackageJson.version;
     if ((0, compare_1.default)(installedNextVersion, targetNextVersion) === 0) {
         console.log(`${picocolors_1.default.green('✓')} Current Next.js version is already on the target version "v${targetNextVersion}".`);
+        endMessage();
         return;
     }
     if ((0, compare_1.default)(installedNextVersion, targetNextVersion) > 0) {
         console.log(`${picocolors_1.default.green('✓')} Current Next.js version is higher than the target version "v${targetNextVersion}".`);
+        endMessage();
         return;
     }
     const installedReactVersion = getInstalledReactVersion();
-    console.log(`Current React version: v${installedReactVersion}`);
+    // Align the prefix spaces
+    console.log(`  Detected installed versions:`);
+    console.log(`  - React: v${installedReactVersion}`);
+    console.log(`  - Next.js: v${installedNextVersion}`);
     let shouldStayOnReact18 = false;
     if (
     // From release v14.3.0-canary.45, Next.js expects the React version to be 19.0.0-beta.0
@@ -111,29 +132,40 @@ async function runUpgrade(revision, options) {
         execCommand = execCommandMap[packageManager];
     }
     fs_1.default.writeFileSync(appPackageJsonPath, JSON.stringify(appPackageJson, null, 2));
-    const nextDependency = `next@${targetNextVersion}`;
-    const reactDependencies = [
-        `react@${targetReactVersion}`,
-        `react-dom@${targetReactVersion}`,
-    ];
+    const dependenciesToInstall = [];
+    const devDependenciesToInstall = [];
+    const corePackageNameVersionMapping = {
+        react: targetReactVersion,
+        'react-dom': targetReactVersion,
+        next: targetNextVersion,
+    };
+    for (const packageName of Object.keys(corePackageNameVersionMapping)) {
+        addDependencyIfNeeded(packageName, corePackageNameVersionMapping[packageName], appPackageJson, dependenciesToInstall, devDependenciesToInstall);
+    }
     if (targetReactVersion.startsWith('19.0.0-canary') ||
         targetReactVersion.startsWith('19.0.0-beta') ||
         targetReactVersion.startsWith('19.0.0-rc')) {
-        reactDependencies.push(`@types/react@npm:types-react@rc`);
-        reactDependencies.push(`@types/react-dom@npm:types-react-dom@rc`);
+        corePackageNameVersionMapping['@types/react'] = 'npm:types-react@rc';
+        corePackageNameVersionMapping['@types/react-dom'] = 'npm:types-react-dom@rc';
     }
     else {
         const [targetReactTypesVersion, targetReactDOMTypesVersion] = await Promise.all([
             loadHighestNPMVersionMatching(`@types/react@${targetNextPackageJson.peerDependencies['react']}`),
             loadHighestNPMVersionMatching(`@types/react-dom@${targetNextPackageJson.peerDependencies['react']}`),
         ]);
-        reactDependencies.push(`@types/react@${targetReactTypesVersion}`);
-        reactDependencies.push(`@types/react-dom@${targetReactDOMTypesVersion}`);
+        corePackageNameVersionMapping['@types/react'] = targetReactTypesVersion;
+        corePackageNameVersionMapping['@types/react-dom'] =
+            targetReactDOMTypesVersion;
     }
     console.log(`Upgrading your project to ${picocolors_1.default.blue('Next.js ' + targetNextVersion)}...\n`);
-    (0, handle_package_1.installPackages)([nextDependency, ...reactDependencies], {
+    (0, handle_package_1.installPackages)(dependenciesToInstall, {
+        packageManager,
+        silent: !verbose,
+    });
+    (0, handle_package_1.installPackages)(devDependenciesToInstall, {
         packageManager,
         silent: !verbose,
+        dev: true,
     });
     for (const codemod of codemods) {
         await (0, transform_1.runTransform)(codemod, process.cwd(), { force: true, verbose });
@@ -159,7 +191,7 @@ async function runUpgrade(revision, options) {
     if (codemods.length > 0) {
         console.log(`${picocolors_1.default.green('✔')} Codemods have been applied successfully.`);
     }
-    console.log(`Please review the local changes and read the Next.js 15 migration guide to complete the migration. https://nextjs.org/docs/canary/app/building-your-application/upgrading/version-15`);
+    endMessage();
 }
 function getInstalledNextVersion() {
     try {
@@ -168,7 +200,7 @@ function getInstalledNextVersion() {
         })).version;
     }
     catch (error) {
-        throw new Error(`Failed to get the installed Next.js version at "${process.cwd()}".\nIf you're using a monorepo, please run this command from the Next.js app directory.`, {
+        throw new shared_1.BadInput(`Failed to get the installed Next.js version at "${process.cwd()}".\nIf you're using a monorepo, please run this command from the Next.js app directory.`, {
             cause: error,
         });
     }
@@ -180,7 +212,7 @@ function getInstalledReactVersion() {
         })).version;
     }
     catch (error) {
-        throw new Error(`Failed to detect the installed React version in "${process.cwd()}".\nIf you're working in a monorepo, please run this command from the Next.js app directory.`, {
+        throw new shared_1.BadInput(`Failed to detect the installed React version in "${process.cwd()}".\nIf you're working in a monorepo, please run this command from the Next.js app directory.`, {
             cause: error,
         });
     }

package/lib/handle-package.js

@@ -40,20 +40,44 @@ function uninstallPackage(packageToUninstall, pkgManager) {
         command = 'remove';
     }
     try {
-        execa_1.default.sync(pkgManager, [command, packageToUninstall], { stdio: 'inherit' });
+        execa_1.default.sync(pkgManager, [command, packageToUninstall], {
+            stdio: 'inherit',
+            shell: true,
+        });
     }
     catch (error) {
         throw new Error(`Failed to uninstall "${packageToUninstall}". Please uninstall it manually.`, { cause: error });
     }
 }
+const ADD_CMD_FLAG = {
+    npm: 'install',
+    yarn: 'add',
+    pnpm: 'add',
+    bun: 'add',
+};
+const DEV_DEP_FLAG = {
+    npm: '--save-dev',
+    yarn: '--dev',
+    pnpm: '--save-dev',
+    bun: '--dev',
+};
 function installPackages(packageToInstall, options = {}) {
-    const { packageManager = getPkgManager(process.cwd()), silent = false } = options;
+    if (packageToInstall.length === 0)
+        return;
+    const { packageManager = getPkgManager(process.cwd()), silent = false, dev = false, } = options;
     if (!packageManager)
         throw new Error('Failed to find package manager');
+    const addCmd = ADD_CMD_FLAG[packageManager];
+    const devDepFlag = dev ? DEV_DEP_FLAG[packageManager] : undefined;
+    const installFlags = [addCmd];
+    if (devDepFlag) {
+        installFlags.push(devDepFlag);
+    }
     try {
-        execa_1.default.sync(packageManager, ['add', ...packageToInstall], {
+        execa_1.default.sync(packageManager, [...installFlags, ...packageToInstall], {
             // Keeping stderr since it'll likely be relevant later when it fails.
             stdio: silent ? ['ignore', 'ignore', 'inherit'] : 'inherit',
+            shell: true,
         });
     }
     catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "15.0.0-canary.190",
+  "version": "15.0.0-canary.191",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -37,6 +37,7 @@
     "@types/find-up": "4.0.0",
     "@types/jscodeshift": "0.11.0",
     "@types/prompts": "2.4.2",
-    "@types/semver": "7.3.1"
+    "@types/semver": "7.3.1",
+    "typescript": "5.5.3"
   }
 }