@shopify/cli-hydrogen 11.1.15 → 11.1.16

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

@@ -1,4 +1,4 @@
-import type {LoaderFunctionArgs} from '@shopify/remix-oxygen';
+import type {LoaderFunctionArgs} from 'react-router';
 
 export async function loader({params, context}: LoaderFunctionArgs) {
   const {language, country} = context.storefront.i18n;

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

@@ -1,5 +1,14 @@
 # skeleton
 
+## 2026.4.1
+
+### Patch Changes
+
+- Fix `set-cookie-parser` and `cookie` resolution warnings during `dev` by using Vite's nested dependency syntax (`react-router > dep`). These are CJS transitive dependencies of `react-router` that weren't resolvable by bare name with strict package managers like pnpm. ([#3698](https://github.com/Shopify/hydrogen/pull/3698)) by [@fredericoo](https://github.com/fredericoo)
+
+- Updated dependencies [[`f84ab400c62d89827574d0fa65ba310a2e75f36f`](https://github.com/Shopify/hydrogen/commit/f84ab400c62d89827574d0fa65ba310a2e75f36f)]:
+  - @shopify/hydrogen@2026.4.1
+
 ## 2026.4.0
 
 ### Major Changes

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

@@ -2,7 +2,7 @@
   "name": "skeleton",
   "private": true,
   "sideEffects": false,
-  "version": "2026.4.0",
+  "version": "2026.4.1",
   "type": "module",
   "scripts": {
     "build": "shopify hydrogen build --codegen",
@@ -14,7 +14,7 @@
   },
   "prettier": "@shopify/prettier-config",
   "dependencies": {
-    "@shopify/hydrogen": "2026.4.0",
+    "@shopify/hydrogen": "2026.4.1",
     "graphql": "^16.10.0",
     "graphql-tag": "^2.12.6",
     "isbot": "^5.1.22",

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

@@ -23,7 +23,11 @@ export default defineConfig({
        * Include 'example-dep' in the array below.
        * @see https://vitejs.dev/config/dep-optimization-options
        */
-      include: ['set-cookie-parser', 'cookie', 'react-router'],
+      include: [
+        'react-router > set-cookie-parser',
+        'react-router > cookie',
+        'react-router',
+      ],
     },
   },
   server: {

package/dist/commands/hydrogen/generate/route.js

@@ -12,7 +12,7 @@ class GenerateRoute extends Command {
   static description = "Generates a standard Shopify route.";
   static flags = {
     adapter: Flags.string({
-      description: "Remix adapter used in the route. The default is `@shopify/remix-oxygen`.",
+      description: "React Router adapter used in the route. The default is `react-router`.",
       env: "SHOPIFY_HYDROGEN_FLAG_ADAPTER"
     }),
     typescript: Flags.boolean({

package/dist/commands/hydrogen/setup/markets.js

@@ -45,7 +45,7 @@ async function runSetupMarkets({
     }
   ]);
   renderSuccess({
-    headline: `Makerts support setup complete with strategy ${I18N_STRATEGY_NAME_MAP[strategy].toLocaleLowerCase()}.`,
+    headline: `Markets support setup complete with strategy ${I18N_STRATEGY_NAME_MAP[strategy].toLowerCase()}.`,
     body: `You can now modify the supported locales in ${remixConfig.serverEntryPoint ?? "your server entry file."}
 `
   });

package/dist/lib/setups/routes/generate.js

@@ -186,7 +186,10 @@ async function generateProjectFile(routeFrom, {
   return result;
 }
 function replaceAdapters(templateContent, adapter) {
-  return templateContent.replace(/@shopify\/remix-oxygen/g, adapter);
+  return templateContent.replace(
+    /(from\s+['"])react-router(['"])/g,
+    `$1${adapter}$2`
+  );
 }
 function getDestinationRoute(routeFrom, localePrefix, options) {
   const routePath = routeFrom.replace(ASSETS_STARTER_DIR_ROUTES + "/", "");

package/dist/lib/transpile/morph/functions.js

@@ -35,7 +35,7 @@ function isAnnotableType(type) {
 }
 function normalizeType(type) {
   const normalizedType = type.replace(/^\(\)\s+=>\s+/, "").replace(/typeof import\("[^"]+"\)\./, "typeof ");
-  return normalizedType === "SerializeFrom<any>" ? `{SerializeFrom<loader>}` : `{${normalizedType}}`;
+  return normalizedType === "SerializeFrom<any>" ? `{ReturnType<typeof useLoaderData<typeof loader>>}` : `{${normalizedType}}`;
 }
 function generateParameterDocumentation(functionNode, docNode) {
   const params = functionNode.getParameters();

package/dist/lib/transpile/morph/typedefs.js

@@ -28,7 +28,6 @@ function generateTypeDefs(sourceFile, code) {
   typedefs.push("");
   const knownGenerics = {
     MetaFunction: "T",
-    SerializeFrom: "T",
     Fetcher: "T",
     PartialPredictiveSearchResult: "ItemType, ExtraProps",
     PartialSearchResult: "ItemType"
@@ -52,7 +51,7 @@ function generateTypeDefs(sourceFile, code) {
     }
     if (/(function loader\(|const loader =)/.test(source)) {
       typedefs.push(
-        `/** @typedef {import('@shopify/remix-oxygen').SerializeFrom<typeof loader>} LoaderReturnData */`
+        `/** @typedef {ReturnType<typeof useLoaderData<typeof loader>>} LoaderReturnData */`
       );
       code = code.replace(
         /^\s+?const\s+([\w\d]+|\{[\w\d\s,.]+\})\s+?=\s+?useLoaderData\(\)/gms,
@@ -72,7 +71,7 @@ function generateTypeDefs(sourceFile, code) {
     }
     if (/(function action\(|const action =)/.test(source)) {
       typedefs.push(
-        `/** @typedef {import('@shopify/remix-oxygen').SerializeFrom<typeof action>} ActionReturnData */`
+        `/** @typedef {ReturnType<typeof useActionData<typeof action>>} ActionReturnData */`
       );
       code = code.replace(
         /^\s+?const\s+([\w\d]+|\{[\w\d\s,.]+\})\s+?=\s+?useActionData\(\)/gms,

package/oclif.manifest.json

@@ -854,7 +854,7 @@
       "description": "Generates a standard Shopify route.",
       "flags": {
         "adapter": {
-          "description": "Remix adapter used in the route. The default is `@shopify/remix-oxygen`.",
+          "description": "React Router adapter used in the route. The default is `react-router`.",
           "env": "SHOPIFY_HYDROGEN_FLAG_ADAPTER",
           "name": "adapter",
           "hasDynamicHelp": false,
@@ -917,7 +917,7 @@
       "description": "Generates all supported standard shopify routes.",
       "flags": {
         "adapter": {
-          "description": "Remix adapter used in the route. The default is `@shopify/remix-oxygen`.",
+          "description": "React Router adapter used in the route. The default is `react-router`.",
           "env": "SHOPIFY_HYDROGEN_FLAG_ADAPTER",
           "name": "adapter",
           "hasDynamicHelp": false,
@@ -1675,5 +1675,5 @@
       ]
     }
   },
-  "version": "11.1.15"
+  "version": "11.1.16"
 }

package/package.json

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