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

package/bin/upgrade.js

@@ -1,9 +1,33 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runUpgrade = runUpgrade;
+const os = __importStar(require("os"));
 const prompts_1 = __importDefault(require("prompts"));
 const fs_1 = __importDefault(require("fs"));
 const semver_1 = __importDefault(require("semver"));
@@ -15,6 +39,22 @@ const handle_package_1 = require("../lib/handle-package");
 const transform_1 = require("./transform");
 const utils_1 = require("../lib/utils");
 const shared_1 = require("./shared");
+const optionalNextjsPackages = [
+    'create-next-app',
+    'eslint-config-next',
+    '@next/bundle-analyzer',
+    '@next/codemod',
+    '@next/env',
+    '@next/eslint-plugin-next',
+    '@next/font',
+    '@next/mdx',
+    '@next/plugin-storybook',
+    '@next/polyfill-module',
+    '@next/polyfill-nomodule',
+    '@next/swc',
+    '@next/react-refresh-utils',
+    '@next/third-parties',
+];
 /**
  * @param query
  * @example loadHighestNPMVersionMatching("react@^18.3.0 || ^19.0.0") === Promise<"19.0.0">
@@ -79,7 +119,7 @@ async function runUpgrade(revision, options) {
     // we should only let the user stay on React 18 if they are using pure Pages Router.
     // x-ref(PR): https://github.com/vercel/next.js/pull/65058
     // x-ref(release): https://github.com/vercel/next.js/releases/tag/v14.3.0-canary.45
-    (0, compare_1.default)(installedNextVersion, '14.3.0-canary.45') >= 0 &&
+    (0, compare_1.default)(targetNextVersion, '14.3.0-canary.45') >= 0 &&
         installedReactVersion.startsWith('18')) {
         const shouldStayOnReact18Res = await (0, prompts_1.default)({
             type: 'confirm',
@@ -109,7 +149,8 @@ async function runUpgrade(revision, options) {
     let execCommand = 'npx';
     // The following React codemods are for React 19
     if (!shouldStayOnReact18 &&
-        (0, compare_1.default)(targetReactVersion, '19.0.0-beta.0') >= 0) {
+        (0, compare_1.default)(targetReactVersion, '18.9999.9999') > 0 &&
+        (0, compare_1.default)(installedReactVersion, '18.9999.9999') <= 0) {
         shouldRunReactCodemods = await suggestReactCodemods();
         shouldRunReactTypesCodemods = await suggestReactTypesCodemods();
         const execCommandMap = {
@@ -133,6 +174,12 @@ async function runUpgrade(revision, options) {
         'react-dom': { version: targetReactVersion, required: true },
         'react-is': { version: targetReactVersion, required: false },
     };
+    for (const optionalNextjsPackage of optionalNextjsPackages) {
+        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')) {
@@ -196,7 +243,9 @@ async function runUpgrade(revision, options) {
     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));
+    fs_1.default.writeFileSync(appPackageJsonPath, JSON.stringify(appPackageJson, null, 2) +
+        // Common IDE formatters would add a newline as well.
+        os.EOL);
     (0, handle_package_1.runInstallation)(packageManager);
     for (const codemod of codemods) {
         await (0, transform_1.runTransform)(codemod, process.cwd(), { force: true, verbose });
@@ -351,18 +400,24 @@ async function suggestReactTypesCodemods() {
     return runReactTypesCodemod;
 }
 function writeOverridesField(packageJson, packageManager, overrides) {
-    if (packageManager === 'bun' || packageManager === 'npm') {
+    const entries = Object.entries(overrides);
+    // Avoids writing an empty overrides field into package.json
+    // which would be an unnecessary diff.
+    if (entries.length === 0) {
+        return;
+    }
+    if (packageManager === 'npm') {
         if (!packageJson.overrides) {
             packageJson.overrides = {};
         }
-        for (const [key, value] of Object.entries(overrides)) {
+        for (const [key, value] of entries) {
             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)) {
+            for (const [key, value] of entries) {
                 packageJson.resolutions[key] = value;
             }
         }
@@ -373,7 +428,7 @@ function writeOverridesField(packageJson, packageManager, overrides) {
             if (!packageJson.pnpm.overrides) {
                 packageJson.pnpm.overrides = {};
             }
-            for (const [key, value] of Object.entries(overrides)) {
+            for (const [key, value] of entries) {
                 packageJson.pnpm.overrides[key] = value;
             }
         }
@@ -382,9 +437,27 @@ function writeOverridesField(packageJson, packageManager, overrides) {
         if (!packageJson.resolutions) {
             packageJson.resolutions = {};
         }
-        for (const [key, value] of Object.entries(overrides)) {
+        for (const [key, value] of entries) {
             packageJson.resolutions[key] = value;
         }
     }
+    else if (packageManager === 'bun') {
+        // bun supports both overrides and resolutions
+        // x-ref: https://bun.sh/docs/install/overrides
+        if (packageJson.resolutions) {
+            for (const [key, value] of entries) {
+                packageJson.resolutions[key] = value;
+            }
+        }
+        else {
+            // add overrides field if it's missing and add overrides
+            if (!packageJson.overrides) {
+                packageJson.overrides = {};
+            }
+            for (const [key, value] of entries) {
+                packageJson.overrides[key] = value;
+            }
+        }
+    }
 }
 //# sourceMappingURL=upgrade.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "15.0.0-canary.195",
+  "version": "15.0.0-canary.197",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -30,7 +30,8 @@
     "build": "pnpm tsc -d -p tsconfig.json",
     "prepublishOnly": "cd ../../ && turbo run build",
     "dev": "pnpm tsc -d -w -p tsconfig.json",
-    "test": "jest"
+    "test": "jest",
+    "test:upgrade-fixture": "./scripts/test-upgrade-fixture.sh"
   },
   "bin": "./bin/next-codemod.js",
   "devDependencies": {