@shopify/cli-hydrogen 11.1.0 → 11.1.2

package/dist/commands/hydrogen/upgrade.js

@@ -6,7 +6,8 @@ import { ensureInsideGitDirectory, isClean } from '@shopify/cli-kit/node/git';
 import Command from '@shopify/cli-kit/node/base-command';
 import { renderSuccess, renderInfo, renderConfirmationPrompt, renderTasks, renderSelectPrompt, renderWarning } from '@shopify/cli-kit/node/ui';
 import { readFile, isDirectory, mkdir, fileExists, touchFile, removeFile, writeFile } from '@shopify/cli-kit/node/fs';
-import { installNodeModules, getPackageManager, getDependencies } from '@shopify/cli-kit/node/node-package-manager';
+import { getPackageManager, getDependencies, installNodeModules } from '@shopify/cli-kit/node/node-package-manager';
+import { exec } from '@shopify/cli-kit/node/system';
 import { AbortError } from '@shopify/cli-kit/node/error';
 import { resolvePath, joinPath, dirname } from '@shopify/cli-kit/node/path';
 import { getCliCommand } from '../../lib/shell.js';
@@ -155,11 +156,25 @@ async function getHydrogenVersion({ appPath }) {
 }
 async function getChangelog() {
   if (CACHED_CHANGELOG) return CACHED_CHANGELOG;
-  if (isHydrogenMonorepo && hydrogenPackagesPath && process.env.FORCE_CHANGELOG_SOURCE !== "remote") {
+  if (process.env.FORCE_CHANGELOG_SOURCE === "local" || isHydrogenMonorepo && hydrogenPackagesPath && process.env.FORCE_CHANGELOG_SOURCE !== "remote") {
     const require2 = createRequire(import.meta.url);
-    return require2(
-      joinPath(dirname(hydrogenPackagesPath), "docs", "changelog.json")
-    );
+    const localChangelogPath = isHydrogenMonorepo && hydrogenPackagesPath ? joinPath(dirname(hydrogenPackagesPath), "docs", "changelog.json") : joinPath(process.cwd(), "docs", "changelog.json");
+    try {
+      const changelog = require2(localChangelogPath);
+      CACHED_CHANGELOG = changelog;
+      return changelog;
+    } catch (error) {
+      console.warn(
+        `Failed to load local changelog from ${localChangelogPath}:`,
+        error.message
+      );
+      if (process.env.FORCE_CHANGELOG_SOURCE === "local") {
+        throw new AbortError(
+          "Failed to load local changelog",
+          `Could not read changelog from ${localChangelogPath}`
+        );
+      }
+    }
   }
   try {
     const response = await fetch("https://hydrogen.shopify.dev/changelog.json");
@@ -394,8 +409,8 @@ function buildUpgradeCommandArgs({
   const selectedReactRouter = Object.entries(selectedRelease.dependencies).find(
     isReactRouterDependency
   );
-  if (currentReactRouter && selectedReactRouter) {
-    const shouldUpgradeReactRouter = semver.lt(
+  if (selectedReactRouter) {
+    const shouldUpgradeReactRouter = !currentReactRouter || semver.lt(
       getAbsoluteVersion(currentReactRouter[1]),
       getAbsoluteVersion(selectedReactRouter[1])
     );
@@ -415,24 +430,52 @@ async function upgradeNodeModules({
   selectedRelease,
   currentDependencies
 }) {
-  await renderTasks(
-    [
-      {
-        title: `Upgrading dependencies`,
-        task: async () => {
-          await installNodeModules({
-            directory: appPath,
-            packageManager: await getPackageManager(appPath),
-            args: buildUpgradeCommandArgs({
-              selectedRelease,
-              currentDependencies
-            })
-          });
-        }
+  const tasks = [];
+  const depsToRemove = [
+    ...selectedRelease.removeDependencies || [],
+    ...selectedRelease.removeDevDependencies || []
+  ].filter((dep) => dep in currentDependencies);
+  if (depsToRemove.length > 0) {
+    tasks.push({
+      title: `Removing deprecated dependencies`,
+      task: async () => {
+        await uninstallNodeModules({
+          directory: appPath,
+          packageManager: await getPackageManager(appPath),
+          args: depsToRemove
+        });
       }
-    ],
-    {}
-  );
+    });
+  }
+  const upgradeArgs = buildUpgradeCommandArgs({
+    selectedRelease,
+    currentDependencies
+  });
+  if (upgradeArgs.length > 0) {
+    tasks.push({
+      title: `Upgrading dependencies`,
+      task: async () => {
+        await installNodeModules({
+          directory: appPath,
+          packageManager: await getPackageManager(appPath),
+          args: upgradeArgs
+        });
+      }
+    });
+  }
+  if (tasks.length > 0) {
+    await renderTasks(tasks, {});
+  }
+}
+async function uninstallNodeModules({
+  directory,
+  packageManager,
+  args
+}) {
+  if (args.length === 0) return;
+  const command = packageManager === "npm" ? "uninstall" : packageManager === "yarn" ? "remove" : packageManager === "pnpm" ? "remove" : packageManager === "bun" ? "remove" : "uninstall";
+  const actualPackageManager = packageManager === "unknown" ? "npm" : packageManager;
+  await exec(actualPackageManager, [command, ...args], { cwd: directory });
 }
 function appendRemixDependencies({
   currentDependencies,
@@ -453,12 +496,15 @@ function appendReactRouterDependencies({
   selectedReactRouter
 }) {
   const command = [];
-  for (const [name, version] of Object.entries(currentDependencies)) {
-    const isReactRouterPackage = isReactRouterDependency([name, version]);
-    if (!isReactRouterPackage) {
-      continue;
-    }
-    command.push(`${name}@${getAbsoluteVersion(selectedReactRouter[1])}`);
+  const targetVersion = getAbsoluteVersion(selectedReactRouter[1]);
+  const reactRouterPackages = [
+    "react-router",
+    "react-router-dom",
+    "@react-router/dev",
+    "@react-router/fs-routes"
+  ];
+  for (const packageName of reactRouterPackages) {
+    command.push(`${packageName}@${targetVersion}`);
   }
   return command;
 }

package/oclif.manifest.json

@@ -1728,5 +1728,5 @@
       ]
     }
   },
-  "version": "11.1.0"
+  "version": "11.1.2"
 }

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "@shopify:registry": "https://registry.npmjs.org"
   },
-  "version": "11.1.0",
+  "version": "11.1.2",
   "license": "MIT",
   "type": "module",
   "repository": {