@next/codemod 15.0.0-canary.173 → 15.0.0-canary.174

package/bin/next-codemod.js

@@ -30,7 +30,8 @@ const program = new commander_1.Command(packageJson.name)
 program
     .command('upgrade')
     .description('Upgrade Next.js apps to desired versions with a single command.')
-    .usage('[options]')
+    .argument('[revision]', 'NPM dist tag or exact version to upgrade to (e.g. "latest" or "15.0.0-canary.167"). Prompts to choose a dist tag if omitted.')
+    .option('--verbose', 'Verbose output', false)
     .action(upgrade_1.runUpgrade);
 program.parse(process.argv);
 //# sourceMappingURL=next-codemod.js.map

package/bin/transform.js

@@ -98,7 +98,7 @@ async function runTransform(transform, path, options) {
     }
     if (!dry && transformer === 'next-request-geo-ip') {
         console.log('Installing `@vercel/functions`...');
-        (0, handle_package_1.installPackage)('@vercel/functions');
+        (0, handle_package_1.installPackages)(['@vercel/functions']);
     }
 }
 //# sourceMappingURL=transform.js.map

package/bin/upgrade.js

@@ -12,21 +12,34 @@ const compare_versions_1 = require("compare-versions");
 const chalk_1 = __importDefault(require("chalk"));
 const codemods_1 = require("../lib/codemods");
 const handle_package_1 = require("../lib/handle-package");
-async function runUpgrade() {
+const transform_1 = require("./transform");
+/**
+ * @param query
+ * @example loadHighestNPMVersionMatching("react@^18.3.0 || ^19.0.0") === Promise<"19.0.0">
+ */
+async function loadHighestNPMVersionMatching(query) {
+    const versionsJSON = (0, child_process_1.execSync)(`npm --silent view "${query}" --json --field version`, { encoding: 'utf-8' });
+    const versions = JSON.parse(versionsJSON);
+    if (versions.length < 1) {
+        throw new Error(`Found no React versions matching "${query}". This is a bug in the upgrade tool.`);
+    }
+    return versions[versions.length - 1];
+}
+async function runUpgrade(revision, options) {
+    const { verbose } = options;
     const appPackageJsonPath = path_1.default.resolve(process.cwd(), 'package.json');
     let appPackageJson = JSON.parse(fs_1.default.readFileSync(appPackageJsonPath, 'utf8'));
     await detectWorkspace(appPackageJson);
     let targetNextPackageJson;
     let targetVersionSpecifier = '';
-    const shortcutVersion = process.argv[2]?.replace('@', '');
-    if (shortcutVersion) {
-        const res = await fetch(`https://registry.npmjs.org/next/${shortcutVersion}`);
+    if (revision !== undefined) {
+        const res = await fetch(`https://registry.npmjs.org/next/${revision}`);
         if (res.status === 200) {
             targetNextPackageJson = await res.json();
             targetVersionSpecifier = targetNextPackageJson.version;
         }
         else {
-            console.error(`${chalk_1.default.yellow('Next.js ' + shortcutVersion)} does not exist. Check available versions at ${chalk_1.default.underline('https://www.npmjs.com/package/next?activeTab=versions')}, or choose one from below\n`);
+            console.error(`${chalk_1.default.yellow(`next@${revision}`)} does not exist. Check available versions at ${chalk_1.default.underline('https://www.npmjs.com/package/next?activeTab=versions')}, or choose one from below\n`);
         }
     }
     const installedNextVersion = await getInstalledNextVersion();
@@ -83,21 +96,41 @@ async function runUpgrade() {
         targetVersionSpecifier = response.version;
     }
     const targetNextVersion = targetNextPackageJson.version;
-    if (targetNextVersion &&
-        (0, compare_versions_1.compareVersions)(targetNextVersion, '15.0.0-canary') >= 0) {
+    // We're resolving a specific version here to avoid including "ugly" version queries
+    // in the manifest.
+    // 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, targetReactTypesVersion, targetReactDOMTypesVersion,] = await Promise.all([
+        loadHighestNPMVersionMatching(`react@${targetNextPackageJson.peerDependencies['react']}`),
+        loadHighestNPMVersionMatching(`@types/react@${targetNextPackageJson.peerDependencies['react']}`),
+        loadHighestNPMVersionMatching(`@types/react-dom@${targetNextPackageJson.peerDependencies['react']}`),
+    ]);
+    if ((0, compare_versions_1.compareVersions)(targetNextVersion, '15.0.0-canary') >= 0) {
         await suggestTurbopack(appPackageJson);
     }
     fs_1.default.writeFileSync(appPackageJsonPath, JSON.stringify(appPackageJson, null, 2));
     const packageManager = (0, handle_package_1.getPkgManager)(process.cwd());
     const nextDependency = `next@${targetNextVersion}`;
     const reactDependencies = [
-        `react@${targetNextPackageJson.peerDependencies['react']}`,
-        `@types/react@${targetNextPackageJson.devDependencies['@types/react']}`,
-        `react-dom@${targetNextPackageJson.peerDependencies['react-dom']}`,
-        `@types/react-dom@${targetNextPackageJson.devDependencies['@types/react-dom']}`,
+        `react@${targetReactVersion}`,
+        `react-dom@${targetReactVersion}`,
     ];
-    (0, handle_package_1.installPackage)([nextDependency, ...reactDependencies], packageManager);
+    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`);
+    }
+    else {
+        reactDependencies.push(`@types/react@${targetReactTypesVersion}`);
+        reactDependencies.push(`@types/react-dom@${targetReactDOMTypesVersion}`);
+    }
     console.log(`Upgrading your project to ${chalk_1.default.blue('Next.js ' + targetVersionSpecifier)}...\n`);
+    (0, handle_package_1.installPackages)([nextDependency, ...reactDependencies], {
+        packageManager,
+        silent: !verbose,
+    });
     await suggestCodemods(installedNextVersion, targetNextVersion);
     console.log(`\n${chalk_1.default.green('✔')} Your Next.js project has been upgraded successfully. ${chalk_1.default.bold('Time to ship! 🚢')}`);
 }
@@ -196,29 +229,24 @@ async function suggestCodemods(initialNextVersion, targetNextVersion) {
     if (relevantCodemods.length === 0) {
         return;
     }
-    let codemodsString = `\nThe following ${chalk_1.default.blue('codemods')} are available for your upgrade:`;
-    relevantCodemods.forEach((codemod) => {
-        codemodsString += `\n- ${codemod.title} ${chalk_1.default.gray(`(${codemod.value})`)}`;
-    });
-    codemodsString += '\n';
-    console.log(codemodsString);
-    const responseCodemods = await (0, prompts_1.default)({
-        type: 'confirm',
-        name: 'apply',
-        message: `Do you want to apply these codemods?`,
-        initial: true,
+    const { codemods } = await (0, prompts_1.default)({
+        type: 'multiselect',
+        name: 'codemods',
+        message: `\nThe following ${chalk_1.default.blue('codemods')} are recommended for your upgrade. Would you like to apply them?`,
+        choices: relevantCodemods.map((codemod) => {
+            return {
+                title: `${codemod.title} ${chalk_1.default.grey(`(${codemod.value})`)}`,
+                value: codemod.value,
+                selected: true,
+            };
+        }),
     }, {
         onCancel: () => {
             process.exit(0);
         },
     });
-    if (!responseCodemods.apply) {
-        return;
-    }
-    for (const codemod of relevantCodemods) {
-        (0, child_process_1.execSync)(`npx @next/codemod@latest ${codemod.value} ${process.cwd()} --force`, {
-            stdio: 'inherit',
-        });
+    for (const codemod of codemods) {
+        await (0, transform_1.runTransform)(codemod, process.cwd(), { force: true });
     }
 }
 //# sourceMappingURL=upgrade.js.map

package/lib/codemods.js

@@ -87,17 +87,22 @@ exports.availableCodemods = [
         ],
     },
     {
-        version: '15.0',
+        version: '15.0.0-canary.153',
         codemods: [
-            {
-                title: 'Transforms usage of Next.js async Request APIs',
-                value: 'next-async-request-api',
-            },
             {
                 title: 'Migrate `geo` and `ip` properties on `NextRequest`',
                 value: 'next-request-geo-ip',
             },
         ],
     },
+    {
+        version: '15.0.0-canary.171',
+        codemods: [
+            {
+                title: 'Transforms usage of Next.js async Request APIs',
+                value: 'next-async-request-api',
+            },
+        ],
+    },
 ];
 //# sourceMappingURL=codemods.js.map

package/lib/handle-package.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPkgManager = getPkgManager;
 exports.uninstallPackage = uninstallPackage;
-exports.installPackage = installPackage;
+exports.installPackages = installPackages;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const execa_1 = __importDefault(require("execa"));
@@ -59,15 +59,15 @@ function uninstallPackage(packageToUninstall, pkgManager) {
     }
     execa_1.default.sync(pkgManager, [command, packageToUninstall], { stdio: 'inherit' });
 }
-function installPackage(packageToInstall, pkgManager) {
-    pkgManager ??= getPkgManager(process.cwd());
-    if (!pkgManager)
+function installPackages(packageToInstall, options = {}) {
+    const { packageManager = getPkgManager(process.cwd()), silent = false } = options;
+    if (!packageManager)
         throw new Error('Failed to find package manager');
-    if (Array.isArray(packageToInstall)) {
-        packageToInstall = packageToInstall.join(' ');
-    }
     try {
-        execa_1.default.sync(pkgManager, ['add', packageToInstall], { stdio: 'inherit' });
+        execa_1.default.sync(packageManager, ['add', ...packageToInstall], {
+            // Keeping stderr since it'll likely be relevant later when it fails.
+            stdio: silent ? ['ignore', 'ignore', 'inherit'] : 'inherit',
+        });
     }
     catch (error) {
         throw new Error(`Failed to install "${packageToInstall}". Please install it manually.`, { cause: error });

package/package.json

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