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

package/bin/upgrade.js

@@ -37,17 +37,6 @@ function endMessage() {
     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');
@@ -134,28 +123,45 @@ async function runUpgrade(revision, options) {
     fs_1.default.writeFileSync(appPackageJsonPath, JSON.stringify(appPackageJson, null, 2));
     const dependenciesToInstall = [];
     const devDependenciesToInstall = [];
-    const corePackageNameVersionMapping = {
-        react: targetReactVersion,
-        'react-dom': targetReactVersion,
-        next: targetNextVersion,
+    const versionMapping = {
+        next: { version: targetNextVersion, required: true },
+        react: { version: targetReactVersion, required: true },
+        'react-dom': { version: targetReactVersion, required: true },
+        'react-is': { version: targetReactVersion, required: false },
     };
-    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')) {
-        corePackageNameVersionMapping['@types/react'] = 'npm:types-react@rc';
-        corePackageNameVersionMapping['@types/react-dom'] = 'npm:types-react-dom@rc';
+        versionMapping['@types/react'] = {
+            version: `npm:types-react@rc`,
+            required: false,
+        };
+        versionMapping['@types/react-dom'] = {
+            version: `npm:types-react-dom@rc`,
+            required: false,
+        };
     }
     else {
         const [targetReactTypesVersion, targetReactDOMTypesVersion] = await Promise.all([
             loadHighestNPMVersionMatching(`@types/react@${targetNextPackageJson.peerDependencies['react']}`),
             loadHighestNPMVersionMatching(`@types/react-dom@${targetNextPackageJson.peerDependencies['react']}`),
         ]);
-        corePackageNameVersionMapping['@types/react'] = targetReactTypesVersion;
-        corePackageNameVersionMapping['@types/react-dom'] =
-            targetReactDOMTypesVersion;
+        versionMapping['@types/react'] = {
+            version: targetReactTypesVersion,
+            required: false,
+        };
+        versionMapping['@types/react-dom'] = {
+            version: targetReactDOMTypesVersion,
+            required: false,
+        };
+    }
+    for (const [packageName, { version, required }] of Object.entries(versionMapping)) {
+        if (appPackageJson.devDependencies?.[packageName]) {
+            devDependenciesToInstall.push(`${packageName}@${version}`);
+        }
+        else if (required || appPackageJson.dependencies?.[packageName]) {
+            dependenciesToInstall.push(`${packageName}@${version}`);
+        }
     }
     console.log(`Upgrading your project to ${picocolors_1.default.blue('Next.js ' + targetNextVersion)}...\n`);
     (0, handle_package_1.installPackages)(dependenciesToInstall, {

package/package.json

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