@next/codemod 15.0.0-canary.193 → 15.0.0-canary.195

package/bin/upgrade.js

@@ -123,6 +123,10 @@ async function runUpgrade(revision, options) {
     fs_1.default.writeFileSync(appPackageJsonPath, JSON.stringify(appPackageJson, null, 2));
     const dependenciesToInstall = [];
     const devDependenciesToInstall = [];
+    const allDependencies = {
+        ...appPackageJson.dependencies,
+        ...appPackageJson.devDependencies,
+    };
     const versionMapping = {
         next: { version: targetNextVersion, required: true },
         react: { version: targetReactVersion, required: true },
@@ -132,47 +136,68 @@ async function runUpgrade(revision, options) {
     if (targetReactVersion.startsWith('19.0.0-canary') ||
         targetReactVersion.startsWith('19.0.0-beta') ||
         targetReactVersion.startsWith('19.0.0-rc')) {
-        versionMapping['@types/react'] = {
-            version: `npm:types-react@rc`,
-            required: false,
-        };
-        versionMapping['@types/react-dom'] = {
-            version: `npm:types-react-dom@rc`,
-            required: false,
-        };
+        const [targetReactTypesVersion, targetReactDOMTypesVersion] = await Promise.all([
+            loadHighestNPMVersionMatching(`types-react@rc`),
+            loadHighestNPMVersionMatching(`types-react-dom@rc`),
+        ]);
+        if (allDependencies['@types/react']) {
+            versionMapping['@types/react'] = {
+                version: `npm:types-react@${targetReactTypesVersion}`,
+                required: false,
+            };
+        }
+        if (allDependencies['@types/react-dom']) {
+            versionMapping['@types/react-dom'] = {
+                version: `npm:types-react-dom@${targetReactDOMTypesVersion}`,
+                required: false,
+            };
+        }
     }
     else {
         const [targetReactTypesVersion, targetReactDOMTypesVersion] = await Promise.all([
             loadHighestNPMVersionMatching(`@types/react@${targetNextPackageJson.peerDependencies['react']}`),
             loadHighestNPMVersionMatching(`@types/react-dom@${targetNextPackageJson.peerDependencies['react']}`),
         ]);
-        versionMapping['@types/react'] = {
-            version: targetReactTypesVersion,
-            required: false,
-        };
-        versionMapping['@types/react-dom'] = {
-            version: targetReactDOMTypesVersion,
-            required: false,
-        };
+        if (allDependencies['@types/react']) {
+            versionMapping['@types/react'] = {
+                version: targetReactTypesVersion,
+                required: false,
+            };
+        }
+        if (allDependencies['@types/react-dom']) {
+            versionMapping['@types/react-dom'] = {
+                version: targetReactDOMTypesVersion,
+                required: false,
+            };
+        }
+    }
+    // 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']) {
+        overrides['@types/react'] = versionMapping['@types/react'].version;
     }
+    if (allDependencies['@types/react-dom']) {
+        overrides['@types/react-dom'] = versionMapping['@types/react-dom'].version;
+    }
+    writeOverridesField(appPackageJson, packageManager, overrides);
     for (const [packageName, { version, required }] of Object.entries(versionMapping)) {
         if (appPackageJson.devDependencies?.[packageName]) {
-            devDependenciesToInstall.push(`${packageName}@${version}`);
+            devDependenciesToInstall.push([packageName, version]);
         }
         else if (required || appPackageJson.dependencies?.[packageName]) {
-            dependenciesToInstall.push(`${packageName}@${version}`);
+            dependenciesToInstall.push([packageName, version]);
         }
     }
     console.log(`Upgrading your project to ${picocolors_1.default.blue('Next.js ' + targetNextVersion)}...\n`);
-    (0, handle_package_1.installPackages)(dependenciesToInstall, {
-        packageManager,
-        silent: !verbose,
-    });
-    (0, handle_package_1.installPackages)(devDependenciesToInstall, {
-        packageManager,
-        silent: !verbose,
-        dev: true,
-    });
+    for (const [dep, version] of dependenciesToInstall) {
+        (0, handle_package_1.addPackageDependency)(appPackageJson, dep, version, false);
+    }
+    for (const [dep, version] of devDependenciesToInstall) {
+        (0, handle_package_1.addPackageDependency)(appPackageJson, dep, version, true);
+    }
+    fs_1.default.writeFileSync(appPackageJsonPath, JSON.stringify(appPackageJson, null, 2));
+    (0, handle_package_1.runInstallation)(packageManager);
     for (const codemod of codemods) {
         await (0, transform_1.runTransform)(codemod, process.cwd(), { force: true, verbose });
     }
@@ -325,4 +350,41 @@ async function suggestReactTypesCodemods() {
     }, { onCancel: utils_1.onCancel });
     return runReactTypesCodemod;
 }
+function writeOverridesField(packageJson, packageManager, overrides) {
+    if (packageManager === 'bun' || packageManager === 'npm') {
+        if (!packageJson.overrides) {
+            packageJson.overrides = {};
+        }
+        for (const [key, value] of Object.entries(overrides)) {
+            packageJson.overrides[key] = value;
+        }
+    }
+    else if (packageManager === 'pnpm') {
+        // pnpm supports pnpm.overrides and pnpm.resolutions
+        if (packageJson.resolutions) {
+            for (const [key, value] of Object.entries(overrides)) {
+                packageJson.resolutions[key] = value;
+            }
+        }
+        else {
+            if (!packageJson.pnpm) {
+                packageJson.pnpm = {};
+            }
+            if (!packageJson.pnpm.overrides) {
+                packageJson.pnpm.overrides = {};
+            }
+            for (const [key, value] of Object.entries(overrides)) {
+                packageJson.pnpm.overrides[key] = value;
+            }
+        }
+    }
+    else if (packageManager === 'yarn') {
+        if (!packageJson.resolutions) {
+            packageJson.resolutions = {};
+        }
+        for (const [key, value] of Object.entries(overrides)) {
+            packageJson.resolutions[key] = value;
+        }
+    }
+}
 //# sourceMappingURL=upgrade.js.map

package/lib/handle-package.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPkgManager = getPkgManager;
 exports.uninstallPackage = uninstallPackage;
 exports.installPackages = installPackages;
+exports.runInstallation = runInstallation;
+exports.addPackageDependency = addPackageDependency;
 const find_up_1 = __importDefault(require("find-up"));
 const execa_1 = __importDefault(require("execa"));
 const node_path_1 = require("node:path");
@@ -84,4 +86,25 @@ function installPackages(packageToInstall, options = {}) {
         throw new Error(`Failed to install "${packageToInstall}". Please install it manually.`, { cause: error });
     }
 }
+function runInstallation(packageManager) {
+    try {
+        execa_1.default.sync(packageManager, ['install'], {
+            stdio: 'inherit',
+            shell: true,
+        });
+    }
+    catch (error) {
+        throw new Error('Failed to install dependencies', { cause: error });
+    }
+}
+function addPackageDependency(packageJson, name, version, dev) {
+    if (dev) {
+        packageJson.devDependencies = packageJson.devDependencies || {};
+    }
+    else {
+        packageJson.dependencies = packageJson.dependencies || {};
+    }
+    const deps = dev ? packageJson.devDependencies : packageJson.dependencies;
+    deps[name] = version;
+}
 //# sourceMappingURL=handle-package.js.map

package/package.json

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