@shopify/cli-hydrogen 11.1.3 → 11.1.5

package/dist/commands/hydrogen/codegen.js

@@ -6,7 +6,6 @@ import { Flags } from '@oclif/core';
 import { getProjectPaths, getRemixConfig } from '../../lib/remix-config.js';
 import { commonFlags, flagsToCamelObject } from '../../lib/flags.js';
 import { codegen } from '../../lib/codegen.js';
-import { prepareDiffDirectory } from '../../lib/template-diff.js';
 
 class Codegen extends Command {
   static descriptionWithMarkdown = "Automatically generates GraphQL types for your project\u2019s Storefront API queries.";
@@ -25,22 +24,15 @@ class Codegen extends Command {
       description: "Watch the project for changes to update types on file save.",
       required: false,
       default: false
-    }),
-    ...commonFlags.diff
+    })
   };
   async run() {
     const { flags } = await this.parse(Codegen);
-    const originalDirectory = flags.path ? resolvePath(flags.path) : process.cwd();
-    const diff = flags.diff ? await prepareDiffDirectory(originalDirectory, flags.watch) : void 0;
-    const directory = diff?.targetDirectory ?? originalDirectory;
+    const directory = flags.path ? resolvePath(flags.path) : process.cwd();
     await runCodegen({
       ...flagsToCamelObject(flags),
       directory
     });
-    if (diff) {
-      await diff.copyDiffCodegen();
-      await diff.cleanup();
-    }
   }
 }
 async function runCodegen({

package/dist/commands/hydrogen/debug/cpu.js

@@ -8,7 +8,6 @@ import ansiEscapes from 'ansi-escapes';
 import { getProjectPaths, isClassicProject } from '../../../lib/remix-config.js';
 import { muteDevLogs } from '../../../lib/log.js';
 import { commonFlags, flagsToCamelObject } from '../../../lib/flags.js';
-import { prepareDiffDirectory } from '../../../lib/template-diff.js';
 import { setupResourceCleanup } from '../../../lib/resource-cleanup.js';
 import { createCpuStartupProfiler } from '../../../lib/cpu-profiler.js';
 import { runBuild } from '../build.js';
@@ -23,7 +22,6 @@ class DebugCpu extends Command {
   static description = "Builds and profiles the server startup time the app.";
   static flags = {
     ...commonFlags.path,
-    ...commonFlags.diff,
     ...commonFlags.entry,
     output: Flags.string({
       description: `Specify a path to generate the profile file. Defaults to "${DEFAULT_OUTPUT_PATH}".`,
@@ -33,16 +31,14 @@ class DebugCpu extends Command {
   };
   async run() {
     const { flags } = await this.parse(DebugCpu);
-    const originalDirectory = flags.path ? resolvePath(flags.path) : process.cwd();
-    const diff = flags.diff ? await prepareDiffDirectory(originalDirectory, true) : void 0;
+    const directory = flags.path ? resolvePath(flags.path) : process.cwd();
     const { close } = await runDebugCpu({
       ...flagsToCamelObject(flags),
-      directory: diff?.targetDirectory ?? originalDirectory,
-      output: resolvePath(originalDirectory, flags.output)
+      directory,
+      output: resolvePath(directory, flags.output)
     });
     setupResourceCleanup(async () => {
       await close();
-      await diff?.cleanup();
     });
   }
 }

package/dist/commands/hydrogen/deploy.js

@@ -7,7 +7,7 @@ import { AbortError } from '@shopify/cli-kit/node/error';
 import { writeFile } from '@shopify/cli-kit/node/fs';
 import { ensureIsClean, getLatestGitCommit, GitDirectoryNotCleanError } from '@shopify/cli-kit/node/git';
 import { resolvePath, relativePath } from '@shopify/cli-kit/node/path';
-import { renderWarning, renderSelectPrompt, renderConfirmationPrompt, renderSuccess, renderTasks } from '@shopify/cli-kit/node/ui';
+import { renderWarning, renderSelectPrompt, renderConfirmationPrompt, renderInfo, renderSuccess, renderTasks } from '@shopify/cli-kit/node/ui';
 import { ciPlatform } from '@shopify/cli-kit/node/context/local';
 import { parseToken, createDeploy } from '@shopify/oxygen-cli/deploy';
 import { createRequire } from 'node:module';
@@ -17,10 +17,8 @@ import { commonFlags, overrideFlag, flagsToCamelObject } from '../../lib/flags.j
 import { getOxygenDeploymentData } from '../../lib/get-oxygen-deployment-data.js';
 import { runBuild } from './build.js';
 import { getViteConfig, REMIX_COMPILER_ERROR_MESSAGE } from '../../lib/vite-config.js';
-import { prepareDiffDirectory } from '../../lib/template-diff.js';
 import { isClassicProject, getProjectPaths } from '../../lib/remix-config.js';
 import { packageManagers } from '../../lib/package-managers.js';
-import { setupResourceCleanup } from '../../lib/resource-cleanup.js';
 
 const DEPLOY_OUTPUT_FILE_HANDLE = "h2_deploy_log.json";
 const deploymentLogger = (message, level = "info") => {
@@ -109,16 +107,14 @@ class Deploy extends Command {
       env: "SHOPIFY_HYDROGEN_FLAG_METADATA_VERSION",
       hidden: true
     }),
-    ...commonFlags.diff
+    "force-client-sourcemap": Flags.boolean({
+      description: "Client sourcemapping is avoided by default because it makes backend code visible in the browser. Use this flag to force enabling it.",
+      env: "SHOPIFY_HYDROGEN_FLAG_FORCE_CLIENT_SOURCEMAP"
+    })
   };
   async run() {
     const { flags } = await this.parse(Deploy);
     const deploymentOptions = this.flagsToOxygenDeploymentOptions(flags);
-    if (flags.diff) {
-      const diff = await prepareDiffDirectory(deploymentOptions.path, false);
-      deploymentOptions.path = diff.targetDirectory;
-      setupResourceCleanup(diff.cleanup);
-    }
     await runDeploy(deploymentOptions);
     process.exit(0);
   }
@@ -160,6 +156,7 @@ async function runDeploy(options) {
     envBranch,
     environmentFile,
     force: forceOnUncommitedChanges,
+    forceClientSourcemap = false,
     noVerify,
     lockfileCheck,
     jsonOutput,
@@ -434,6 +431,13 @@ Continue?`.value
     }
   };
   if (buildCommand) {
+    if (forceClientSourcemap) {
+      console.log("");
+      renderInfo({
+        headline: "The `--force-client-sourcemap` flag is not supported with a custom build command",
+        body: "Client sourcemaps will not be generated."
+      });
+    }
     config.buildCommand = buildCommand;
   } else {
     hooks.buildFunction = async (assetPath) => {
@@ -448,6 +452,7 @@ Continue?`.value
         assetPath,
         lockfileCheck,
         sourcemap: true,
+        forceClientSourcemap,
         useCodegen: false,
         entry: ssrEntry
       });

package/dist/commands/hydrogen/dev.js

@@ -11,7 +11,7 @@ import { commonFlags, overrideFlag, flagsToCamelObject, DEFAULT_INSPECTOR_PORT,
 import { spawnCodegenProcess } from '../../lib/codegen.js';
 import { getAllEnvironmentVariables } from '../../lib/environment-variables.js';
 import { displayDevUpgradeNotice } from './upgrade.js';
-import { prepareDiffDirectory } from '../../lib/template-diff.js';
+import { checkReactRouterVersions } from '../../lib/react-router-version-check.js';
 import { getDevConfigInBackground, TUNNEL_DOMAIN, startTunnelAndPushConfig, isMockShop, notifyIssueWithTunnelAndMockShop, getUtilityBannerlines, getDebugBannerLine } from '../../lib/dev-shared.js';
 import { getCliCommand } from '../../lib/shell.js';
 import { findPort } from '../../lib/find-port.js';
@@ -50,7 +50,6 @@ class Dev extends Command {
       default: false,
       required: false
     }),
-    ...commonFlags.diff,
     ...commonFlags.customerAccountPush,
     ...commonFlags.verbose,
     host: Flags.boolean({
@@ -66,12 +65,10 @@ class Dev extends Command {
   };
   async run() {
     const { flags } = await this.parse(Dev);
-    const originalDirectory = flags.path ? resolvePath(flags.path) : process.cwd();
-    const diff = flags.diff ? await prepareDiffDirectory(originalDirectory, true) : void 0;
-    const directory = diff?.targetDirectory ?? originalDirectory;
+    const directory = flags.path ? resolvePath(flags.path) : process.cwd();
     const devParams = {
       ...flagsToCamelObject(flags),
-      customerAccountPush: flags["customer-account-push__unstable"],
+      customerAccountPush: flags["customer-account-push"],
       path: directory,
       cliConfig: this.config
     };
@@ -82,10 +79,6 @@ class Dev extends Command {
     const { close } = await runDev(devParams);
     setupResourceCleanup(async () => {
       await close();
-      if (diff) {
-        await diff.copyShopifyConfig();
-        await diff.cleanup();
-      }
     });
   }
 }
@@ -243,6 +236,9 @@ async function runDev({
   viteServer.bindCLIShortcuts({ print: true });
   console.log("\n");
   const storefrontTitle = (await backgroundPromise).storefrontTitle;
+  if (!disableVersionCheck) {
+    await checkReactRouterVersions(root);
+  }
   showSuccessBanner({
     disableVirtualRoutes,
     debug,

package/dist/commands/hydrogen/env/pull.js

@@ -15,6 +15,14 @@ import { getStorefrontEnvironments } from '../../../lib/graphql/admin/list-envir
 import { getStorefrontEnvVariables } from '../../../lib/graphql/admin/pull-variables.js';
 import { verifyLinkedStorefront } from '../../../lib/verify-linked-storefront.js';
 
+function needsQuoting(value) {
+  return /[{}@#\s"'\\$`|;&<>()!?*\[\]]/.test(value) || /[\x00-\x1F\x7F]/.test(value);
+}
+function quoteEnvValue(value) {
+  if (!needsQuoting(value)) return value;
+  const escaped = value.replaceAll("\\", "\\\\").replaceAll('"', '\\"').replaceAll("\n", "\\n").replaceAll("\r", "\\r").replaceAll("	", "\\t");
+  return `"${escaped}"`;
+}
 class EnvPull extends Command {
   static descriptionWithMarkdown = "Pulls environment variables from the linked Hydrogen storefront and writes them to an `.env` file.";
   static description = "Populate your .env with variables from your Hydrogen storefront.";
@@ -83,7 +91,7 @@ async function runEnvPull({
   const dotEnvPath = resolvePath(root, envFile);
   const fetchedEnv = {};
   variables.forEach(({ isSecret, key, value }) => {
-    fetchedEnv[key] = isSecret ? `""` : value;
+    fetchedEnv[key] = isSecret ? `""` : quoteEnvValue(value);
   });
   if (await fileExists(dotEnvPath) && !force) {
     const existingEnv = await readFile(dotEnvPath);

package/dist/commands/hydrogen/init.d.ts

@@ -60,7 +60,7 @@ declare class Init extends Command {
 declare function runInit({ markets, ...options }?: InitOptions & {
     markets?: InitOptions['i18n'];
 }): Promise<{
-    language?: "js" | "ts";
+    language?: "ts" | "js";
     packageManager: "npm" | "pnpm" | "yarn" | "bun" | "unknown";
     cssStrategy?: CssStrategy;
     cliCommand: CliCommand;

package/dist/commands/hydrogen/preview.js

@@ -14,7 +14,6 @@ import { REMIX_COMPILER_ERROR_MESSAGE, getViteConfig } from '../../lib/vite-conf
 import { runBuild } from './build.js';
 import { setupResourceCleanup } from '../../lib/resource-cleanup.js';
 import { deferPromise } from '../../lib/defer.js';
-import { prepareDiffDirectory } from '../../lib/template-diff.js';
 
 class Preview extends Command {
   static descriptionWithMarkdown = "Runs a server in your local development environment that serves your Hydrogen app's production build. Requires running the [build](https://shopify.dev/docs/api/shopify-cli/hydrogen/hydrogen-build) command first.";
@@ -41,31 +40,17 @@ class Preview extends Command {
     }),
     ...overrideFlag(commonFlags.codegen, {
       codegen: { dependsOn: ["build"] }
-    }),
-    // Diff in preview only makes sense when combined with --build.
-    // Without the build flag, preview only needs access to the existing
-    // `dist` directory in the project, so there's no need to merge the
-    // project with the skeleton template in a temporary directory.
-    ...overrideFlag(commonFlags.diff, {
-      diff: { dependsOn: ["build"] }
     })
   };
   async run() {
     const { flags } = await this.parse(Preview);
-    const originalDirectory = flags.path ? resolvePath(flags.path) : process.cwd();
-    const diff = flags.build && flags.diff ? await prepareDiffDirectory(originalDirectory, flags.watch) : void 0;
-    const directory = diff?.targetDirectory ?? originalDirectory;
+    const directory = flags.path ? resolvePath(flags.path) : process.cwd();
     const { close } = await runPreview({
       ...flagsToCamelObject(flags),
       directory
     });
     setupResourceCleanup(async () => {
       await close();
-      if (diff) {
-        await diff.copyDiffBuild();
-        if (flags.codegen) await diff.copyDiffCodegen();
-        await diff.cleanup();
-      }
     });
   }
 }

package/dist/commands/hydrogen/upgrade.js

@@ -5,7 +5,7 @@ import { Flags } from '@oclif/core';
 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 { isDirectory, readFile, mkdir, fileExists, touchFile, removeFile, writeFile } from '@shopify/cli-kit/node/fs';
 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';
@@ -14,6 +14,7 @@ import { getCliCommand } from '../../lib/shell.js';
 import { commonFlags, flagsToCamelObject } from '../../lib/flags.js';
 import { getProjectPaths } from '../../lib/remix-config.js';
 import { isHydrogenMonorepo, hydrogenPackagesPath } from '../../lib/build.js';
+import { isCI } from '../../lib/is-ci.js';
 import { fetch } from '@shopify/cli-kit/node/http';
 
 const INSTRUCTIONS_FOLDER = ".hydrogen";
@@ -47,6 +48,17 @@ async function runUpgrade({
   version: targetVersion,
   force
 }) {
+  if (targetVersion === "next") {
+    const isInTests = process.env.SHOPIFY_UNIT_TEST === "1";
+    const isInCIEnvironment = isCI();
+    const runningFromMonorepo = await isRunningFromHydrogenMonorepo();
+    if (!runningFromMonorepo && !isInTests && !isInCIEnvironment) {
+      throw new AbortError(
+        "--version=next is only available when running from the Hydrogen monorepo",
+        "This feature is designed for internal development and testing of unreleased versions"
+      );
+    }
+  }
   if (!force) {
     await checkIsGitRepo(appPath);
     await checkDirtyGitBranch(appPath);
@@ -54,6 +66,16 @@ async function runUpgrade({
   const { currentVersion, currentDependencies } = await getHydrogenVersion({
     appPath
   });
+  if (targetVersion === "next") {
+    const hasNextHydrogen = currentDependencies["@shopify/hydrogen"] === "next";
+    const hasNextMiniOxygen = currentDependencies["@shopify/mini-oxygen"] === "next";
+    if (hasNextHydrogen || hasNextMiniOxygen) {
+      throw new AbortError(
+        "Project already uses next versions",
+        'Cannot upgrade to --version=next when @shopify/hydrogen or @shopify/mini-oxygen are already using "next" versions'
+      );
+    }
+  }
   const isPrerelease = semver.prerelease(currentVersion);
   if (isPrerelease) {
     throw new AbortError(
@@ -81,7 +103,8 @@ async function runUpgrade({
     selectedRelease = await getSelectedRelease({
       currentVersion,
       targetVersion,
-      availableUpgrades
+      availableUpgrades,
+      currentDependencies
     });
     cumulativeRelease = getCummulativeRelease({
       availableUpgrades,
@@ -91,7 +114,8 @@ async function runUpgrade({
     });
     confirmed = await displayConfirmation({
       cumulativeRelease,
-      selectedRelease
+      selectedRelease,
+      targetVersion
     });
   } while (!confirmed);
   const instrunctionsFilePathPromise = generateUpgradeInstructionsFile({
@@ -100,10 +124,16 @@ async function runUpgrade({
     currentVersion,
     selectedRelease
   });
-  await upgradeNodeModules({ appPath, selectedRelease, currentDependencies });
+  await upgradeNodeModules({
+    appPath,
+    selectedRelease,
+    currentDependencies,
+    targetVersion
+  });
   await validateUpgrade({
     appPath,
-    selectedRelease
+    selectedRelease,
+    targetVersion
   });
   const instrunctionsFilePath = await instrunctionsFilePathPromise;
   await displayUpgradeSummary({
@@ -113,6 +143,49 @@ async function runUpgrade({
     selectedRelease
   });
 }
+async function isRunningFromHydrogenMonorepo() {
+  try {
+    const cwd = process.cwd();
+    const potentialMonorepoRoots = [
+      cwd,
+      joinPath(cwd, "../"),
+      joinPath(cwd, "../../")
+    ];
+    for (const root of potentialMonorepoRoots) {
+      try {
+        const templatesPath = joinPath(root, "templates/skeleton");
+        const packagesPath = joinPath(root, "packages/cli");
+        const hasTemplates = await isDirectory(templatesPath);
+        const hasPackages = await isDirectory(packagesPath);
+        if (hasTemplates && hasPackages) {
+          return true;
+        }
+      } catch {
+        continue;
+      }
+    }
+    return false;
+  } catch {
+    return false;
+  }
+}
+function createNextRelease(latestRelease) {
+  const dependencies = { ...latestRelease.dependencies };
+  const devDependencies = { ...latestRelease.devDependencies };
+  if (dependencies["@shopify/hydrogen"]) {
+    dependencies["@shopify/hydrogen"] = "next";
+  }
+  if (devDependencies["@shopify/mini-oxygen"]) {
+    devDependencies["@shopify/mini-oxygen"] = "next";
+  }
+  const nextRelease = {
+    ...latestRelease,
+    title: `${latestRelease.title} (next versions)`,
+    dependencies,
+    devDependencies
+  };
+  return nextRelease;
+}
 function checkIsGitRepo(appPath) {
   return ensureInsideGitDirectory(appPath).catch(() => {
     throw new AbortError(
@@ -255,9 +328,10 @@ function getAvailableUpgrades({
 async function getSelectedRelease({
   targetVersion,
   availableUpgrades,
-  currentVersion
+  currentVersion,
+  currentDependencies
 }) {
-  const targetRelease = targetVersion ? availableUpgrades.find(
+  const targetRelease = targetVersion ? targetVersion === "next" ? createNextRelease(availableUpgrades[0]) : availableUpgrades.find(
     (release) => getAbsoluteVersion(release.version) === getAbsoluteVersion(targetVersion)
   ) : void 0;
   return targetRelease ?? promptUpgradeOptions(currentVersion, availableUpgrades);
@@ -272,6 +346,12 @@ function getCummulativeRelease({
   if (!availableUpgrades?.length) {
     return { features: [], fixes: [] };
   }
+  if (selectedRelease.dependencies?.["@shopify/hydrogen"] === "next") {
+    return {
+      features: selectedRelease.features || [],
+      fixes: selectedRelease.fixes || []
+    };
+  }
   const upgradingReleases = availableUpgrades.filter((release) => {
     const isHydrogenUpgrade = semver.gt(release.version, currentPinnedVersion) && semver.lte(release.version, selectedRelease.version);
     if (isHydrogenUpgrade) return true;
@@ -290,7 +370,8 @@ function getCummulativeRelease({
 }
 function displayConfirmation({
   cumulativeRelease,
-  selectedRelease
+  selectedRelease,
+  targetVersion
 }) {
   const { features, fixes } = cumulativeRelease;
   if (features.length || fixes.length) {
@@ -321,6 +402,9 @@ function displayConfirmation({
       ].filter(Boolean)
     });
   }
+  if (targetVersion === "next") {
+    return true;
+  }
   return renderConfirmationPrompt({
     message: `Are you sure you want to upgrade to ${selectedRelease.version}?`,
     cancellationMessage: `No, choose another version`,
@@ -339,10 +423,15 @@ function isReactRouterDependency([name]) {
   }
   return false;
 }
+function getPackageVersion(packageName, version, targetVersion) {
+  const shouldUseNext = targetVersion === "next" && (packageName === "@shopify/hydrogen" || packageName === "@shopify/mini-oxygen");
+  return shouldUseNext ? "next" : getAbsoluteVersion(version);
+}
 function maybeIncludeDependency({
   currentDependencies,
   dependency: [name, version],
-  selectedRelease
+  selectedRelease,
+  targetVersion
 }) {
   const existingDependencyVersion = currentDependencies[name];
   const isRemixPackage = isRemixDependency([name, version]);
@@ -350,7 +439,8 @@ function maybeIncludeDependency({
   const isReactRouterPackage = isReactRouterDependency([name, version]);
   if (isReactRouterPackage) return false;
   const isNextVersion = existingDependencyVersion === "next";
-  if (isNextVersion) return false;
+  const allowNextVersions = targetVersion === "next";
+  if (isNextVersion && !allowNextVersions) return false;
   const depMeta = selectedRelease.dependenciesMeta?.[name];
   if (!depMeta) return true;
   const isRequired = Boolean(
@@ -358,6 +448,9 @@ function maybeIncludeDependency({
   );
   if (!isRequired) return false;
   if (!existingDependencyVersion) return true;
+  if (targetVersion === "next" && (name === "@shopify/hydrogen" || name === "@shopify/mini-oxygen")) {
+    return true;
+  }
   const isOlderVersion = semver.lt(
     getAbsoluteVersion(existingDependencyVersion),
     getAbsoluteVersion(version)
@@ -367,26 +460,41 @@ function maybeIncludeDependency({
 }
 function buildUpgradeCommandArgs({
   selectedRelease,
-  currentDependencies
+  currentDependencies,
+  targetVersion
 }) {
   const args = [];
   for (const dependency of Object.entries(selectedRelease.dependencies)) {
     const shouldUpgradeDep = maybeIncludeDependency({
       currentDependencies,
       dependency,
-      selectedRelease
+      selectedRelease,
+      targetVersion
     });
     if (!shouldUpgradeDep) continue;
-    args.push(`${dependency[0]}@${getAbsoluteVersion(dependency[1])}`);
+    args.push(
+      `${dependency[0]}@${getPackageVersion(
+        dependency[0],
+        dependency[1],
+        targetVersion
+      )}`
+    );
   }
   for (const dependency of Object.entries(selectedRelease.devDependencies)) {
     const shouldUpgradeDep = maybeIncludeDependency({
       currentDependencies,
       dependency,
-      selectedRelease
+      selectedRelease,
+      targetVersion
     });
     if (!shouldUpgradeDep) continue;
-    args.push(`${dependency[0]}@${getAbsoluteVersion(dependency[1])}`);
+    args.push(
+      `${dependency[0]}@${getPackageVersion(
+        dependency[0],
+        dependency[1],
+        targetVersion
+      )}`
+    );
   }
   const currentRemix = Object.entries(currentDependencies).find(isRemixDependency);
   const selectedRemix = Object.entries(selectedRelease.dependencies).find(
@@ -428,7 +536,8 @@ function buildUpgradeCommandArgs({
 async function upgradeNodeModules({
   appPath,
   selectedRelease,
-  currentDependencies
+  currentDependencies,
+  targetVersion
 }) {
   const tasks = [];
   const depsToRemove = [
@@ -449,7 +558,8 @@ async function upgradeNodeModules({
   }
   const upgradeArgs = buildUpgradeCommandArgs({
     selectedRelease,
-    currentDependencies
+    currentDependencies,
+    targetVersion
   });
   if (upgradeArgs.length > 0) {
     tasks.push({
@@ -509,6 +619,13 @@ function appendReactRouterDependencies({
   return command;
 }
 function getAbsoluteVersion(version) {
+  if (version === "next") {
+    return "next";
+  }
+  const snapshotMatch = version.match(/^[\^~]?0\.0\.0-next-([a-f0-9]+)-(\d+)$/);
+  if (snapshotMatch) {
+    return version.replace(/^[\^~]?/, "");
+  }
   const result = semver.minVersion(version);
   if (!result) {
     throw new AbortError(`Invalid version: ${version}`);
@@ -606,7 +723,8 @@ ${releaseNotesUrl}`);
 }
 async function validateUpgrade({
   appPath,
-  selectedRelease
+  selectedRelease,
+  targetVersion
 }) {
   const dependencies = await getDependencies(joinPath(appPath, "package.json"));
   const updatedVersion = dependencies["@shopify/hydrogen"];
@@ -614,6 +732,13 @@ async function validateUpgrade({
     throw new AbortError("Hydrogen version not found in package.json");
   }
   const updatedPinnedVersion = getAbsoluteVersion(updatedVersion);
+  updatedPinnedVersion.match(
+    /^0\.0\.0-next-[a-f0-9]+-\d+$/
+  );
+  const targetIsNext = selectedRelease.dependencies?.["@shopify/hydrogen"] === "next";
+  if (targetVersion === "next" && targetIsNext) {
+    return;
+  }
   if (updatedPinnedVersion !== selectedRelease.version) {
     throw new AbortError(
       `Failed to upgrade to Hydrogen version ${selectedRelease.version}`,
@@ -662,7 +787,7 @@ async function generateUpgradeInstructionsFile({
     { featuresMd: [], breakingChangesMd: [] }
   );
   const fixesMd = cumulativeRelease.fixes.filter((fixes) => fixes.steps).map(generateStepMd);
-  if (!featuresMd.length && !fixesMd.length) {
+  if (!featuresMd.length && !fixesMd.length && !breakingChangesMd.length) {
     renderInfo({
       headline: `No upgrade instructions generated`,
       body: `There are no additional upgrade instructions for this version.`
@@ -814,4 +939,4 @@ async function displayDevUpgradeNotice({
   }
 }
 
-export { buildUpgradeCommandArgs, Upgrade as default, displayConfirmation, displayDevUpgradeNotice, getAbsoluteVersion, getAvailableUpgrades, getChangelog, getCummulativeRelease, getHydrogenVersion, getSelectedRelease, runUpgrade, upgradeNodeModules };
+export { buildUpgradeCommandArgs, Upgrade as default, displayConfirmation, displayDevUpgradeNotice, getAbsoluteVersion, getAvailableUpgrades, getChangelog, getCummulativeRelease, getHydrogenVersion, getPackageVersion, getSelectedRelease, isRunningFromHydrogenMonorepo, runUpgrade, upgradeNodeModules, validateUpgrade };

package/dist/index.d.ts

@@ -11,7 +11,6 @@ declare class Build extends Command {
         watch: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         'bundle-stats': _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         'force-client-sourcemap': _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
-        diff: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         codegen: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         'codegen-config-path': _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         'disable-route-warning': _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
@@ -39,7 +38,6 @@ declare class Codegen extends Command {
     static descriptionWithMarkdown: string;
     static description: string;
     static flags: {
-        diff: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         'codegen-config-path': _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         'force-sfapi-version': _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         watch: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
@@ -66,7 +64,6 @@ declare class DebugCpu extends Command {
     static flags: {
         output: _oclif_core_lib_interfaces_parser_js.OptionFlag<string, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         entry: _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
-        diff: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         path: _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
     };
     run(): Promise<void>;
@@ -87,8 +84,7 @@ declare class Dev extends Command {
         host: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         'disable-deps-optimizer': _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         verbose: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
-        'customer-account-push__unstable': _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
-        diff: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
+        'customer-account-push': _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         'disable-version-check': _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         'env-file': _oclif_core_lib_interfaces_parser_js.OptionFlag<string, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         'env-branch': _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
@@ -217,7 +213,6 @@ declare class Preview extends Command {
     static descriptionWithMarkdown: string;
     static description: string;
     static flags: {
-        diff: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         codegen: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         'codegen-config-path': _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         entry: _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;