@shopify/cli-hydrogen 11.0.1 → 11.1.0

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

@@ -1,5 +1,11 @@
 # skeleton
 
+## 2025.5.2
+
+### Patch Changes
+
+- Fixing the skeleton's Vite Config ([#2958](https://github.com/Shopify/hydrogen/pull/2958)) by [@balazsbajorics](https://github.com/balazsbajorics)
+
 ## 2025.5.1
 
 ### Patch Changes

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

@@ -2,7 +2,7 @@
   "name": "skeleton",
   "private": true,
   "sideEffects": false,
-  "version": "2025.5.1",
+  "version": "2025.5.2",
   "type": "module",
   "scripts": {
     "build": "shopify hydrogen build --codegen",

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

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

package/dist/lib/route-validator.js

@@ -1,6 +1,6 @@
 import { renderWarning, renderSuccess } from '@shopify/cli-kit/node/ui';
 
-const RESERVED_ROUTES = ["^api/[^/]+/graphql.json", "^cdn/", "^_t/"];
+const RESERVED_ROUTES = ["^cdn/", "^_t/"];
 function findReservedRoutes(config) {
   const routes = /* @__PURE__ */ new Set();
   Object.values(config.routes).filter(

package/dist/lib/vite-config.js

@@ -37,7 +37,7 @@ async function getViteConfig(root, ssrEntryFlag) {
     mode,
     mode
   );
-  const { appDirectory, serverBuildFile, routes } = getRemixConfigFromVite(resolvedViteConfig);
+  const { appDirectory, serverBuildFile, routes } = getReactRouterOrRemixConfigFromVite(resolvedViteConfig);
   const serverOutDir = resolvedViteConfig.build.outDir;
   const clientOutDir = serverOutDir.replace(/server$/, "client");
   const rollupOutput = resolvedViteConfig.build.rollupOptions.output;
@@ -58,8 +58,8 @@ async function getViteConfig(root, ssrEntryFlag) {
     resolvedViteConfig,
     userViteConfig: maybeConfig.config,
     remixConfig: {
-      routes,
-      appDirectory,
+      routes: routes ?? {},
+      appDirectory: appDirectory ?? joinPath(resolvedViteConfig.root, "app"),
       rootDirectory: resolvedViteConfig.root,
       serverEntryPoint: (await findFileWithExtension(
         dirname(resolvedSsrEntry),
@@ -68,7 +68,16 @@ async function getViteConfig(root, ssrEntryFlag) {
     }
   };
 }
-function getRemixConfigFromVite(viteConfig) {
+function getReactRouterOrRemixConfigFromVite(viteConfig) {
+  try {
+    const reactRouterConfig = getReactRouterConfigFromVite(viteConfig);
+    return reactRouterConfig;
+  } catch (error) {
+    const remixConfig = getRemixConfigFromVite(viteConfig);
+    return remixConfig;
+  }
+}
+function getReactRouterConfigFromVite(viteConfig) {
   if (!viteConfig.__reactRouterPluginContext) {
     throw new Error("Could not resolve React Router config");
   }
@@ -79,6 +88,14 @@ function getRemixConfigFromVite(viteConfig) {
     routes
   };
 }
+function getRemixConfigFromVite(viteConfig) {
+  const { remixConfig } = findHydrogenPlugin(viteConfig)?.api?.getPluginOptions() ?? {};
+  return remixConfig ? {
+    appDirectory: remixConfig.appDirectory,
+    serverBuildFile: remixConfig.serverBuildFile,
+    routes: remixConfig.routes
+  } : {};
+}
 function findPlugin(config, name) {
   return config.plugins.find((plugin) => plugin.name === name);
 }

package/oclif.manifest.json

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

package/package.json

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