@shopify/cli-hydrogen 11.1.16 → 12.0.1

package/dist/assets/hydrogen/routes/locale-check.ts

@@ -7,8 +7,8 @@ export async function loader({params, context}: LoaderFunctionArgs) {
     params.locale &&
     params.locale.toLowerCase() !== `${language}-${country}`.toLowerCase()
   ) {
-    // If the locale URL param is defined, yet we still are still at the default locale
-    // then the the locale param must be invalid, send to the 404 page
+    // If the locale URL param is defined, yet we are still at the default locale
+    // then the locale param must be invalid, send to the 404 page
     throw new Response(null, {status: 404});
   }
 

package/dist/assets/hydrogen/starter/CHANGELOG.md

@@ -1,5 +1,31 @@
 # skeleton
 
+## 2026.4.3
+
+### Patch Changes
+
+- Include line item children recursively in cart. ([#3753](https://github.com/Shopify/hydrogen/pull/3753)) by [@martin-pettersson](https://github.com/martin-pettersson)
+
+- Add generic cart result typing to `createCartHandler` so custom cart fragments can use their generated fragment types. ([#3767](https://github.com/Shopify/hydrogen/pull/3767)) by [@andguy95](https://github.com/andguy95)
+
+- Widen React Router peer dependency ranges so Hydrogen packages accept compatible React Router 7.16 patch versions without npm peer dependency conflicts. New Hydrogen projects now default to React Router 7.16.0. ([#3771](https://github.com/Shopify/hydrogen/pull/3771)) by [@fredericoo](https://github.com/fredericoo)
+
+- Updated dependencies [[`3ccc22e0a3407298e835104e29adfb036f261474`](https://github.com/Shopify/hydrogen/commit/3ccc22e0a3407298e835104e29adfb036f261474), [`a810db483c108ac8bbeaac45595b130ed95a2ec7`](https://github.com/Shopify/hydrogen/commit/a810db483c108ac8bbeaac45595b130ed95a2ec7), [`d17057eb4630710743e81b83573973100ec56d23`](https://github.com/Shopify/hydrogen/commit/d17057eb4630710743e81b83573973100ec56d23), [`995190036d99e02ba6fb559b8e3c406c90043599`](https://github.com/Shopify/hydrogen/commit/995190036d99e02ba6fb559b8e3c406c90043599), [`39f2b326e9fddda36b1d12149794bf4ffcc0d4b8`](https://github.com/Shopify/hydrogen/commit/39f2b326e9fddda36b1d12149794bf4ffcc0d4b8)]:
+  - @shopify/hydrogen@2026.4.3
+
+## 2026.4.2
+
+### Patch Changes
+
+- Add support for Vite 7 and Vite 8. Hydrogen remains backwards-compatible with Vite 5+. ([#3617](https://github.com/Shopify/hydrogen/pull/3617)) by [@frandiox](https://github.com/frandiox)
+
+  Mini Oxygen's dev server has been refactored to use the [Vite Environment API](https://vite.dev/guide/api-environment), which is the standard way to run non-browser runtimes in Vite. This replaces the previous custom middleware approach with a first-class `FetchableDevEnvironment`, improving compatibility with Vite's built-in HMR and module invalidation.
+
+  New Hydrogen projects created with `npm create @shopify/hydrogen` will default to Vite 8. The `vite-tsconfig-paths` plugin is no longer needed in the skeleton template since Vite 8 supports `resolve.tsconfigPaths` natively.
+
+- Updated dependencies [[`dc49699c799997d5893bc06e444f888e86a3bc29`](https://github.com/Shopify/hydrogen/commit/dc49699c799997d5893bc06e444f888e86a3bc29), [`50df825c57159757529f5f9f62c258d4de2a4b97`](https://github.com/Shopify/hydrogen/commit/50df825c57159757529f5f9f62c258d4de2a4b97), [`51f1e77fe63be5e5ded4ef0c91942bc304f1abc4`](https://github.com/Shopify/hydrogen/commit/51f1e77fe63be5e5ded4ef0c91942bc304f1abc4)]:
+  - @shopify/hydrogen@2026.4.2
+
 ## 2026.4.1
 
 ### Patch Changes

package/dist/assets/hydrogen/starter/app/components/CartMain.tsx

@@ -23,8 +23,8 @@ function getLineItemChildrenMap(lines: CartLine[]): LineItemChildrenMap {
       children[parentId].push(line);
     }
     if ('lineComponents' in line) {
-      const children = getLineItemChildrenMap(line.lineComponents);
-      for (const [parentId, childIds] of Object.entries(children)) {
+      const lineChildren = getLineItemChildrenMap(line.lineComponents);
+      for (const [parentId, childIds] of Object.entries(lineChildren)) {
         if (!children[parentId]) children[parentId] = [];
         children[parentId].push(...childIds);
       }

package/dist/assets/hydrogen/starter/app/lib/context.ts

@@ -1,6 +1,7 @@
 import {createHydrogenContext} from '@shopify/hydrogen';
 import {AppSession} from '~/lib/session';
 import {CART_QUERY_FRAGMENT} from '~/lib/fragments';
+import type {CartApiQueryFragment} from 'storefrontapi.generated';
 
 // Define the additional context object
 const additionalContext = {
@@ -16,6 +17,10 @@ type AdditionalContextType = typeof additionalContext;
 
 declare global {
   interface HydrogenAdditionalContext extends AdditionalContextType {}
+
+  // Augment HydrogenCustomCartFragment with the codegen'd cart fragment type so
+  // that context.cart.get() and all cart mutations return the extended cart type.
+  interface HydrogenCustomCartFragment extends CartApiQueryFragment {}
 }
 
 /**

package/dist/assets/hydrogen/starter/package.json

@@ -2,7 +2,7 @@
   "name": "skeleton",
   "private": true,
   "sideEffects": false,
-  "version": "2026.4.1",
+  "version": "2026.4.3",
   "type": "module",
   "scripts": {
     "build": "shopify hydrogen build --codegen",
@@ -14,25 +14,25 @@
   },
   "prettier": "@shopify/prettier-config",
   "dependencies": {
-    "@shopify/hydrogen": "2026.4.1",
+    "@shopify/hydrogen": "2026.4.3",
     "graphql": "^16.10.0",
     "graphql-tag": "^2.12.6",
     "isbot": "^5.1.22",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router": "7.12.0",
-    "react-router-dom": "7.12.0"
+    "react-router": "7.16.0",
+    "react-router-dom": "7.16.0"
   },
   "devDependencies": {
     "@eslint/compat": "^1.2.5",
     "@eslint/eslintrc": "^3.2.0",
     "@eslint/js": "^9.18.0",
     "@graphql-codegen/cli": "5.0.2",
-    "@react-router/dev": "7.12.0",
-    "@react-router/fs-routes": "7.12.0",
+    "@react-router/dev": "7.16.0",
+    "@react-router/fs-routes": "7.16.0",
     "@shopify/cli": "3.93.2",
     "@shopify/hydrogen-codegen": "0.3.3",
-    "@shopify/mini-oxygen": "4.0.2",
+    "@shopify/mini-oxygen": "4.1.0",
     "@shopify/oxygen-workers-types": "^4.1.6",
     "@shopify/prettier-config": "^1.1.2",
     "@total-typescript/ts-reset": "^0.6.1",
@@ -54,8 +54,7 @@
     "graphql-config": "^5.0.3",
     "prettier": "^3.4.2",
     "typescript": "^5.9.2",
-    "vite": "^6.4.2",
-    "vite-tsconfig-paths": "^4.3.1"
+    "vite": "^8.0.1"
   },
   "engines": {
     "node": "^22 || ^24"

package/dist/assets/hydrogen/starter/vite.config.ts

@@ -2,10 +2,12 @@ import {defineConfig} from 'vite';
 import {hydrogen} from '@shopify/hydrogen/vite';
 import {oxygen} from '@shopify/mini-oxygen/vite';
 import {reactRouter} from '@react-router/dev/vite';
-import tsconfigPaths from 'vite-tsconfig-paths';
 
 export default defineConfig({
-  plugins: [hydrogen(), oxygen(), reactRouter(), tsconfigPaths()],
+  plugins: [hydrogen(), oxygen(), reactRouter()],
+  resolve: {
+    tsconfigPaths: true,
+  },
   build: {
     // Allow a strict Content-Security-Policy
     // without inlining assets as base64:

package/dist/assets/hydrogen/vite/package.json

@@ -8,7 +8,6 @@
     "isbot": "^5.1.21"
   },
   "devDependencies": {
-    "vite": "^6.2.0",
-    "vite-tsconfig-paths": "^4.3.1"
+    "vite": "^8.0.1"
   }
 }

package/dist/assets/hydrogen/vite/vite.config.js

@@ -2,9 +2,11 @@ import {defineConfig} from 'vite';
 import {hydrogen} from '@shopify/hydrogen/vite';
 import {oxygen} from '@shopify/mini-oxygen/vite';
 import {vitePlugin as remix} from '@remix-run/dev';
-import tsconfigPaths from 'vite-tsconfig-paths';
 
 export default defineConfig({
+  resolve: {
+    tsconfigPaths: true,
+  },
   plugins: [
     hydrogen(),
     oxygen(),
@@ -17,7 +19,6 @@ export default defineConfig({
         v3_routeConfig: false,
       },
     }),
-    tsconfigPaths(),
   ],
   build: {
     // Allow a strict Content-Security-Policy

package/dist/commands/hydrogen/deploy.js

@@ -46,7 +46,7 @@ class Deploy extends Command {
     }),
     force: Flags.boolean({
       char: "f",
-      description: "Forces a deployment to proceed if there are uncommited changes in its Git repository.",
+      description: "Forces a deployment to proceed if there are uncommitted changes in its Git repository.",
       default: false,
       env: "SHOPIFY_HYDROGEN_FLAG_FORCE",
       required: false
@@ -88,7 +88,7 @@ class Deploy extends Command {
       required: false
     }),
     "metadata-description": Flags.string({
-      description: "Description of the changes in the deployment. Defaults to the commit message of the latest commit if there are no uncommited changes.",
+      description: "Description of the changes in the deployment. Defaults to the commit message of the latest commit if there are no uncommitted changes.",
       required: false,
       env: "SHOPIFY_HYDROGEN_FLAG_METADATA_DESCRIPTION"
     }),
@@ -155,7 +155,7 @@ async function runDeploy(options) {
     env: envHandle,
     envBranch,
     environmentFile,
-    force: forceOnUncommitedChanges,
+    force: forceOnUncommittedChanges,
     forceClientSourcemap = false,
     noVerify,
     lockfileCheck,
@@ -175,7 +175,7 @@ async function runDeploy(options) {
     if (error instanceof GitDirectoryNotCleanError) {
       isCleanGit = false;
     }
-    if (!forceOnUncommitedChanges && !isCleanGit) {
+    if (!forceOnUncommittedChanges && !isCleanGit) {
       let errorMessage = "Uncommitted changes detected";
       let changedFiles = void 0;
       const nextSteps = [
@@ -231,7 +231,7 @@ ${changedFiles.trimEnd()}`;
     renderWarning({
       headline: "No deployment description provided",
       body: [
-        "Deploying uncommited changes, but no description has been provided. Use the ",
+        "Deploying uncommitted changes, but no description has been provided. Use the ",
         { command: "--metadata-description" },
         "flag to provide a description. If no description is provided, the description defaults to ",
         { userInput: "<sha> with additional changes" },

package/dist/commands/hydrogen/dev.js

@@ -201,7 +201,6 @@ async function runDev({
       "Add `hydrogen()` plugin to your Vite config."
     );
   }
-  h2Plugin.api?.getPluginOptions?.();
   const remixConfig = (await getViteConfig(root)).remixConfig;
   let codegenProcess;
   const setupCodegen = useCodegen ? () => {

package/dist/commands/hydrogen/upgrade.js

@@ -17,6 +17,9 @@ import { isHydrogenMonorepo, hydrogenPackagesPath } from '../../lib/build.js';
 import { isCI } from '../../lib/is-ci.js';
 import { fetch } from '@shopify/cli-kit/node/http';
 
+function getAllRemovedPackages(release) {
+  return [...release.removeDependencies, ...release.removeDevDependencies];
+}
 const INSTRUCTIONS_FOLDER = ".hydrogen";
 class Upgrade extends Command {
   static descriptionWithMarkdown = "Upgrade Hydrogen project dependencies, preview features, fixes and breaking changes. The command also generates an instruction file for each upgrade.";
@@ -440,7 +443,8 @@ function displayConfirmation({
   targetVersion
 }) {
   const { features, fixes } = cumulativeRelease;
-  if (features.length || fixes.length) {
+  const allRemovedPackages = getAllRemovedPackages(cumulativeRelease);
+  if (features.length || fixes.length || allRemovedPackages.length) {
     renderInfo({
       headline: `Included in this upgrade:`,
       // @ts-expect-error - filter(Boolean) removes falsy values, leaving only objects
@@ -464,6 +468,16 @@ function displayConfirmation({
               }
             }
           ]
+        },
+        allRemovedPackages.length && {
+          title: "Removed packages",
+          body: [
+            {
+              list: {
+                items: allRemovedPackages
+              }
+            }
+          ]
         }
       ].filter(Boolean)
     });
@@ -881,7 +895,8 @@ async function generateUpgradeInstructionsFile({
     { featuresMd: [], breakingChangesMd: [] }
   );
   const fixesMd = cumulativeRelease.fixes.filter((fixes) => fixes.steps).map(generateStepMd);
-  if (!featuresMd.length && !fixesMd.length && !breakingChangesMd.length) {
+  const allRemovedPackages = getAllRemovedPackages(cumulativeRelease);
+  if (!featuresMd.length && !fixesMd.length && !breakingChangesMd.length && !allRemovedPackages.length) {
     renderInfo({
       headline: `No upgrade instructions generated`,
       body: `There are no additional upgrade instructions for this version.`
@@ -921,6 +936,16 @@ ${fixesMd.join(
       "\n"
     )}`;
   }
+  if (allRemovedPackages.length) {
+    md += fixesMd.length ? "\n\n----\n\n" : "\n";
+    md += `## Removed packages
+
+The following packages have been removed as part of this upgrade:
+
+`;
+    md += allRemovedPackages.map((dep) => `- \`${dep}\``).join("\n");
+    md += "\n";
+  }
   const filePath = joinPath(instructionsFolderPath, filename);
   try {
     await isDirectory(instructionsFolderPath);
@@ -1048,4 +1073,4 @@ async function displayDevUpgradeNotice({
   }
 }
 
-export { buildUpgradeCommandArgs, Upgrade as default, displayConfirmation, displayDevUpgradeNotice, getAbsoluteVersion, getAvailableUpgrades, getChangelog, getCumulativeRelease, getHydrogenVersion, getPackageVersion, getSelectedRelease, isRunningFromHydrogenMonorepo, runUpgrade, upgradeNodeModules, validateUpgrade };
+export { buildUpgradeCommandArgs, Upgrade as default, displayConfirmation, displayDevUpgradeNotice, generateUpgradeInstructionsFile, getAbsoluteVersion, getAvailableUpgrades, getChangelog, getCumulativeRelease, getHydrogenVersion, getPackageVersion, getSelectedRelease, isRunningFromHydrogenMonorepo, runUpgrade, upgradeNodeModules, validateUpgrade };

package/dist/lib/bundle/vite-plugin.js

@@ -44,7 +44,7 @@ function hydrogenBundleAnalyzer(pluginOptions) {
         modsToAnalyze.map(async (mod) => {
           const relativeModId = relativePath(root, mod.id);
           const modBundleInfo = workerFile.modules[mod.id];
-          const originalCodeBytes = modBundleInfo?.originalLength ?? mod.code?.length ?? 0;
+          const originalCodeBytes = typeof modBundleInfo?.originalLength === "number" ? modBundleInfo.originalLength : mod.code?.length ?? 0;
           let resultingCodeBytes = modBundleInfo?.renderedLength ?? 0;
           if (pluginOptions?.minify && modBundleInfo?.code) {
             const minifiedCode = await pluginOptions.minify(modBundleInfo.code, mod.id).catch(() => null);
@@ -115,33 +115,19 @@ function hydrogenBundleAnalyzer(pluginOptions) {
           }
         }
       };
-      bundle[BUNDLE_ANALYZER_JSON_FILE] = {
+      this.emitFile({
         type: "asset",
         fileName: BUNDLE_ANALYZER_JSON_FILE,
-        needsCodeReference: false,
-        source: JSON.stringify(metafile, null, 2),
-        names: [BUNDLE_ANALYZER_JSON_FILE],
-        originalFileNames: [BUNDLE_ANALYZER_JSON_FILE],
-        // name and originalFileName should be deprecated .. but
-        // for some reason, removing them breaks typescript check
-        name: BUNDLE_ANALYZER_JSON_FILE,
-        originalFileName: BUNDLE_ANALYZER_JSON_FILE
-      };
-      bundle[BUNDLE_ANALYZER_HTML_FILE] = {
+        source: JSON.stringify(metafile, null, 2)
+      });
+      this.emitFile({
         type: "asset",
         fileName: BUNDLE_ANALYZER_HTML_FILE,
-        needsCodeReference: false,
         source: injectAnalyzerTemplateData(
           analysisTemplate,
           JSON.stringify(metafile)
-        ),
-        names: [BUNDLE_ANALYZER_HTML_FILE],
-        originalFileNames: [BUNDLE_ANALYZER_HTML_FILE],
-        // name and originalFileName should be deprecated .. but
-        // for some reason, removing them breaks typescript check
-        name: BUNDLE_ANALYZER_HTML_FILE,
-        originalFileName: BUNDLE_ANALYZER_HTML_FILE
-      };
+        )
+      });
     }
   };
 }

package/oclif.manifest.json

@@ -353,7 +353,7 @@
         },
         "force": {
           "char": "f",
-          "description": "Forces a deployment to proceed if there are uncommited changes in its Git repository.",
+          "description": "Forces a deployment to proceed if there are uncommitted changes in its Git repository.",
           "env": "SHOPIFY_HYDROGEN_FLAG_FORCE",
           "name": "force",
           "required": false,
@@ -437,7 +437,7 @@
           "type": "option"
         },
         "metadata-description": {
-          "description": "Description of the changes in the deployment. Defaults to the commit message of the latest commit if there are no uncommited changes.",
+          "description": "Description of the changes in the deployment. Defaults to the commit message of the latest commit if there are no uncommitted changes.",
           "env": "SHOPIFY_HYDROGEN_FLAG_METADATA_DESCRIPTION",
           "name": "metadata-description",
           "required": false,
@@ -1675,5 +1675,5 @@
       ]
     }
   },
-  "version": "11.1.16"
+  "version": "12.0.1"
 }

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "@shopify:registry": "https://registry.npmjs.org"
   },
-  "version": "11.1.16",
+  "version": "12.0.1",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -13,22 +13,22 @@
     "directory": "packages/cli-hydrogen"
   },
   "devDependencies": {
-    "@react-router/dev": "7.12.0",
+    "@react-router/dev": "7.16.0",
     "@types/diff": "^5.0.2",
     "@types/gunzip-maybe": "^1.4.0",
     "@types/node": "22.19.15",
-    "esbuild": "^0.25.0",
     "@types/prettier": "^2.7.2",
     "@types/source-map-support": "^0.5.10",
     "@types/tar-fs": "^2.0.1",
     "@vitest/coverage-v8": "^1.0.4",
     "devtools-protocol": "^0.0.1177611",
+    "esbuild": "^0.27.0",
     "fast-glob": "^3.2.12",
     "flame-chart-js": "2.3.2",
     "get-port": "^7.0.0",
     "type-fest": "^4.33.0",
-    "vite": "^6.4.2",
-    "vitest": "^1.0.4"
+    "vite": "^8.0.1",
+    "vitest": "^3.2.4"
   },
   "dependencies": {
     "@ast-grep/napi": "0.34.1",
@@ -40,7 +40,7 @@
     "chokidar": "3.5.3",
     "cli-truncate": "^4.0.0",
     "diff": "^5.1.0",
-    "esbuild": "^0.25.12",
+    "esbuild": "^0.27.0",
     "get-east-asian-width": "^1.3.0",
     "get-port": "^7.0.0",
     "gunzip-maybe": "^1.4.2",
@@ -55,11 +55,11 @@
   },
   "peerDependencies": {
     "@graphql-codegen/cli": "^5.0.2",
-    "@react-router/dev": "^7.12.0",
+    "@react-router/dev": "~7.16.0",
     "graphql-config": "^5.0.3",
-    "vite": "^5.1.0 || ^6.2.0",
+    "vite": "^5.1.0 || ^6.2.0 || ^7.0.0 || ^8.0.0",
     "@shopify/hydrogen-codegen": "0.3.3",
-    "@shopify/mini-oxygen": "4.0.2"
+    "@shopify/mini-oxygen": "4.1.0"
   },
   "peerDependenciesMeta": {
     "@graphql-codegen/cli": {