@shopify/cli-hydrogen 8.4.6 → 9.0.1

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

@@ -1,5 +1,152 @@
 # skeleton
 
+## 2024.10.0
+
+### Patch Changes
+
+- Stabilize `getSitemap`, `getSitemapIndex` and implement on skeleton ([#2589](https://github.com/Shopify/hydrogen/pull/2589)) by [@juanpprieto](https://github.com/juanpprieto)
+
+  1. Update the `getSitemapIndex` at `/app/routes/[sitemap.xml].tsx`
+
+  ```diff
+  - import {unstable__getSitemapIndex as getSitemapIndex} from '@shopify/hydrogen';
+  + import {getSitemapIndex} from '@shopify/hydrogen';
+  ```
+
+  2. Update the `getSitemap` at `/app/routes/sitemap.$type.$page[.xml].tsx`
+
+  ```diff
+  - import {unstable__getSitemap as getSitemap} from '@shopify/hydrogen';
+  + import {getSitemap} from '@shopify/hydrogen';
+  ```
+
+  For a reference implementation please see the skeleton template sitemap routes
+
+- [**Breaking change**] ([#2588](https://github.com/Shopify/hydrogen/pull/2588)) by [@wizardlyhel](https://github.com/wizardlyhel)
+
+  Set up Customer Privacy without the Shopify's cookie banner by default.
+
+  If you are using Shopify's cookie banner to handle user consent in your app, you need to set `withPrivacyBanner: true` to the consent config. Without this update, the Shopify cookie banner will not appear.
+
+  ```diff
+    return defer({
+      ...
+      consent: {
+        checkoutDomain: env.PUBLIC_CHECKOUT_DOMAIN,
+        storefrontAccessToken: env.PUBLIC_STOREFRONT_API_TOKEN,
+  +      withPrivacyBanner: true,
+        // localize the privacy banner
+        country: args.context.storefront.i18n.country,
+        language: args.context.storefront.i18n.language,
+      },
+    });
+  ```
+
+- Update to 2024-10 SFAPI ([#2570](https://github.com/Shopify/hydrogen/pull/2570)) by [@wizardlyhel](https://github.com/wizardlyhel)
+
+- [**Breaking change**] ([#2546](https://github.com/Shopify/hydrogen/pull/2546)) by [@frandiox](https://github.com/frandiox)
+
+  Update `createWithCache` to make it harder to accidentally cache undesired results. `request` is now mandatory prop when initializing `createWithCache`.
+
+  ```diff
+  // server.ts
+  export default {
+    async fetch(
+      request: Request,
+      env: Env,
+      executionContext: ExecutionContext,
+    ): Promise<Response> {
+      try {
+        // ...
+  -     const withCache = createWithCache({cache, waitUntil});
+  +     const withCache = createWithCache({cache, waitUntil, request});
+  ```
+
+  `createWithCache` now returns an object with two utility functions: `withCache.run` and `withCache.fetch`. Both have a new prop `shouldCacheResult` that must be defined.
+
+  The original `withCache` callback function is now `withCache.run`. This is useful to run _multiple_ fetch calls and merge their responses, or run any arbitrary code. It caches anything you return, but you can throw if you don't want to cache anything.
+
+  ```diff
+    const withCache = createWithCache({cache, waitUntil, request});
+
+    const fetchMyCMS = (query) => {
+  -    return withCache(['my-cms', query], CacheLong(), async (params) => {
+  +    return withCache.run({
+  +      cacheKey: ['my-cms', query],
+  +      cacheStrategy: CacheLong(),
+  +      // Cache if there are no data errors or a specific data that make this result not suited for caching
+  +      shouldCacheResult: (result) => !result?.errors,
+  +    }, async(params) => {
+        const response = await fetch('my-cms.com/api', {
+          method: 'POST',
+          body: query,
+        });
+        if (!response.ok) throw new Error(response.statusText);
+        const {data, error} = await response.json();
+        if (error || !data) throw new Error(error ?? 'Missing data');
+        params.addDebugData({displayName: 'My CMS query', response});
+        return data;
+      });
+    };
+  ```
+
+  New `withCache.fetch` is for caching simple fetch requests. This method caches the responses if they are OK responses, and you can pass `shouldCacheResponse`, `cacheKey`, etc. to modify behavior. `data` is the consumed body of the response (we need to consume to cache it).
+
+  ```ts
+  const withCache = createWithCache({cache, waitUntil, request});
+
+  const {data, response} = await withCache.fetch<{data: T; error: string}>(
+    'my-cms.com/api',
+    {
+      method: 'POST',
+      headers: {'Content-type': 'application/json'},
+      body,
+    },
+    {
+      cacheStrategy: CacheLong(),
+      // Cache if there are no data errors or a specific data that make this result not suited for caching
+      shouldCacheResponse: (result) => !result?.error,
+      cacheKey: ['my-cms', body],
+      displayName: 'My CMS query',
+    },
+  );
+  ```
+
+- [**Breaking change**] ([#2585](https://github.com/Shopify/hydrogen/pull/2585)) by [@wizardlyhel](https://github.com/wizardlyhel)
+
+  Deprecate usages of `product.options.values` and use `product.options.optionValues` instead.
+
+  1. Update your product graphql query to use the new `optionValues` field.
+
+  ```diff
+    const PRODUCT_FRAGMENT = `#graphql
+      fragment Product on Product {
+        id
+        title
+        options {
+          name
+  -        values
+  +        optionValues {
+  +          name
+  +        }
+        }
+  ```
+
+  2. Update your `<VariantSelector>` to use the new `optionValues` field.
+
+  ```diff
+    <VariantSelector
+      handle={product.handle}
+  -    options={product.options.filter((option) => option.values.length > 1)}
+  +    options={product.options.filter((option) => option.optionValues.length > 1)}
+      variants={variants}
+    >
+  ```
+
+- Updated dependencies [[`d97cd56e`](https://github.com/Shopify/hydrogen/commit/d97cd56e859abf8dd005fef2589d99e07fa87b6e), [`809c9f3d`](https://github.com/Shopify/hydrogen/commit/809c9f3d342b56dd3c0d340cb733e6f00053b71d), [`8c89f298`](https://github.com/Shopify/hydrogen/commit/8c89f298a8d9084ee510fb4d0d17766ec43c249c), [`a253ef97`](https://github.com/Shopify/hydrogen/commit/a253ef971acb08f2ee3a2743ca5c901c2922acc0), [`84a66b1e`](https://github.com/Shopify/hydrogen/commit/84a66b1e9d07bd6d6a10e5379ad3350b6bbecde9), [`227035e7`](https://github.com/Shopify/hydrogen/commit/227035e7e11df5fec5ac475b98fa6a318bdbe366), [`ac12293c`](https://github.com/Shopify/hydrogen/commit/ac12293c7b36e1b278bc929c682c65779c300cc7), [`c7c9f2eb`](https://github.com/Shopify/hydrogen/commit/c7c9f2ebd869a9d361504a10566c268e88b6096a), [`76cd4f9b`](https://github.com/Shopify/hydrogen/commit/76cd4f9ba3dd8eff4433d72f4422c06a7d567537), [`8337e534`](https://github.com/Shopify/hydrogen/commit/8337e5342ecca563fab557c3e833485466456cd5)]:
+  - @shopify/hydrogen@2024.10.0
+  - @shopify/remix-oxygen@2.0.9
+
 ## 2024.7.10
 
 ### Patch Changes

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

@@ -21,7 +21,7 @@ export function ProductForm({
     <div className="product-form">
       <VariantSelector
         handle={product.handle}
-        options={product.options.filter((option) => option.values.length > 1)}
+        options={product.options.filter((option) => option.optionValues.length > 1)}
         variants={variants}
       >
         {({option}) => <ProductOptions key={option.name} option={option} />}

package/dist/assets/hydrogen/starter/app/root.tsx

@@ -73,7 +73,7 @@ export async function loader(args: LoaderFunctionArgs) {
     consent: {
       checkoutDomain: env.PUBLIC_CHECKOUT_DOMAIN,
       storefrontAccessToken: env.PUBLIC_STOREFRONT_API_TOKEN,
-      withPrivacyBanner: true,
+      withPrivacyBanner: false,
       // localize the privacy banner
       country: args.context.storefront.i18n.country,
       language: args.context.storefront.i18n.language,

package/dist/assets/hydrogen/starter/app/routes/[sitemap.xml].tsx

@@ -1,177 +1,17 @@
-import {flattenConnection} from '@shopify/hydrogen';
 import type {LoaderFunctionArgs} from '@shopify/remix-oxygen';
-import type {SitemapQuery} from 'storefrontapi.generated';
-
-/**
- * the google limit is 50K, however, the storefront API
- * allows querying only 250 resources per pagination page
- */
-const MAX_URLS = 250;
-
-type Entry = {
-  url: string;
-  lastMod?: string;
-  changeFreq?: string;
-  image?: {
-    url: string;
-    title?: string;
-    caption?: string;
-  };
-};
+import {getSitemapIndex} from '@shopify/hydrogen';
 
 export async function loader({
   request,
   context: {storefront},
 }: LoaderFunctionArgs) {
-  const data = await storefront.query(SITEMAP_QUERY, {
-    variables: {
-      urlLimits: MAX_URLS,
-      language: storefront.i18n.language,
-    },
-  });
-
-  if (!data) {
-    throw new Response('No data found', {status: 404});
-  }
-
-  const sitemap = generateSitemap({data, baseUrl: new URL(request.url).origin});
-
-  return new Response(sitemap, {
-    headers: {
-      'Content-Type': 'application/xml',
-
-      'Cache-Control': `max-age=${60 * 60 * 24}`,
-    },
+  const response = await getSitemapIndex({
+    storefront,
+    request,
   });
-}
-
-function xmlEncode(string: string) {
-  return string.replace(/[&<>'"]/g, (char) => `&#${char.charCodeAt(0)};`);
-}
-
-function generateSitemap({
-  data,
-  baseUrl,
-}: {
-  data: SitemapQuery;
-  baseUrl: string;
-}) {
-  const products = flattenConnection(data.products)
-    .filter((product) => product.onlineStoreUrl)
-    .map((product) => {
-      const url = `${baseUrl}/products/${xmlEncode(product.handle)}`;
-
-      const productEntry: Entry = {
-        url,
-        lastMod: product.updatedAt,
-        changeFreq: 'daily',
-      };
-
-      if (product.featuredImage?.url) {
-        productEntry.image = {
-          url: xmlEncode(product.featuredImage.url),
-        };
-
-        if (product.title) {
-          productEntry.image.title = xmlEncode(product.title);
-        }
-
-        if (product.featuredImage.altText) {
-          productEntry.image.caption = xmlEncode(product.featuredImage.altText);
-        }
-      }
-
-      return productEntry;
-    });
-
-  const collections = flattenConnection(data.collections)
-    .filter((collection) => collection.onlineStoreUrl)
-    .map((collection) => {
-      const url = `${baseUrl}/collections/${collection.handle}`;
-
-      return {
-        url,
-        lastMod: collection.updatedAt,
-        changeFreq: 'daily',
-      };
-    });
-
-  const pages = flattenConnection(data.pages)
-    .filter((page) => page.onlineStoreUrl)
-    .map((page) => {
-      const url = `${baseUrl}/pages/${page.handle}`;
-
-      return {
-        url,
-        lastMod: page.updatedAt,
-        changeFreq: 'weekly',
-      };
-    });
-
-  const urls = [...products, ...collections, ...pages];
-
-  return `
-    <urlset
-      xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
-      xmlns:image="http://www.google.com/schemas/sitemap-image/1.1"
-    >
-      ${urls.map(renderUrlTag).join('')}
-    </urlset>`;
-}
 
-function renderUrlTag({url, lastMod, changeFreq, image}: Entry) {
-  const imageTag = image
-    ? `<image:image>
-        <image:loc>${image.url}</image:loc>
-        <image:title>${image.title ?? ''}</image:title>
-        <image:caption>${image.caption ?? ''}</image:caption>
-      </image:image>`.trim()
-    : '';
+  response.headers.set('Cache-Control', `max-age=${60 * 60 * 24}`);
 
-  return `
-    <url>
-      <loc>${url}</loc>
-      <lastmod>${lastMod}</lastmod>
-      <changefreq>${changeFreq}</changefreq>
-      ${imageTag}
-    </url>
-  `.trim();
+  return response;
 }
 
-const SITEMAP_QUERY = `#graphql
-  query Sitemap($urlLimits: Int, $language: LanguageCode)
-  @inContext(language: $language) {
-    products(
-      first: $urlLimits
-      query: "published_status:'online_store:visible'"
-    ) {
-      nodes {
-        updatedAt
-        handle
-        onlineStoreUrl
-        title
-        featuredImage {
-          url
-          altText
-        }
-      }
-    }
-    collections(
-      first: $urlLimits
-      query: "published_status:'online_store:visible'"
-    ) {
-      nodes {
-        updatedAt
-        handle
-        onlineStoreUrl
-      }
-    }
-    pages(first: $urlLimits, query: "published_status:'published'") {
-      nodes {
-        updatedAt
-        handle
-        onlineStoreUrl
-      }
-    }
-  }
-` as const;

package/dist/assets/hydrogen/starter/app/routes/cart.tsx

@@ -74,7 +74,7 @@ export async function action({request, context}: ActionFunctionArgs) {
 
   const cartId = result?.cart?.id;
   const headers = cartId ? cart.setCartId(result.cart.id) : new Headers();
-  const {cart: cartResult, errors} = result;
+  const {cart: cartResult, errors, warnings} = result;
 
   const redirectTo = formData.get('redirectTo') ?? null;
   if (typeof redirectTo === 'string') {
@@ -86,6 +86,7 @@ export async function action({request, context}: ActionFunctionArgs) {
     {
       cart: cartResult,
       errors,
+      warnings,
       analytics: {
         cartId,
       },

package/dist/assets/hydrogen/starter/app/routes/products.$handle.tsx

@@ -242,7 +242,9 @@ const PRODUCT_FRAGMENT = `#graphql
     description
     options {
       name
-      values
+      optionValues {
+        name
+      }
     }
     selectedVariant: variantBySelectedOptions(selectedOptions: $selectedOptions, ignoreUnknownOptions: true, caseInsensitiveMatch: true) {
       ...ProductVariant

package/dist/assets/hydrogen/starter/app/routes/sitemap.$type.$page[.xml].tsx

@@ -0,0 +1,24 @@
+import type {LoaderFunctionArgs} from '@shopify/remix-oxygen';
+import {getSitemap} from '@shopify/hydrogen';
+
+export async function loader({
+  request,
+  params,
+  context: {storefront},
+}: LoaderFunctionArgs) {
+  const response = await getSitemap({
+    storefront,
+    request,
+    params,
+    locales: ['EN-US', 'EN-CA', 'FR-CA'],
+    getLink: ({type, baseUrl, handle, locale}) => {
+      if (!locale) return `${baseUrl}/${type}/${handle}`;
+      return `${baseUrl}/${locale}/${type}/${handle}`;
+    },
+  });
+
+  response.headers.set('Cache-Control', `max-age=${60 * 60 * 24}`);
+
+  return response;
+}
+

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

@@ -2,7 +2,7 @@
   "name": "skeleton",
   "private": true,
   "sideEffects": false,
-  "version": "2024.7.10",
+  "version": "2024.10.0",
   "type": "module",
   "scripts": {
     "build": "shopify hydrogen build --codegen",
@@ -14,10 +14,10 @@
   },
   "prettier": "@shopify/prettier-config",
   "dependencies": {
-    "@remix-run/react": "^2.10.1",
-    "@remix-run/server-runtime": "^2.10.1",
-    "@shopify/hydrogen": "2024.7.9",
-    "@shopify/remix-oxygen": "^2.0.8",
+    "@remix-run/react": "^2.13.1",
+    "@remix-run/server-runtime": "^2.13.1",
+    "@shopify/hydrogen": "2024.10.0",
+    "@shopify/remix-oxygen": "^2.0.9",
     "graphql": "^16.6.0",
     "graphql-tag": "^2.12.6",
     "isbot": "^3.8.0",
@@ -26,11 +26,11 @@
   },
   "devDependencies": {
     "@graphql-codegen/cli": "5.0.2",
-    "@remix-run/dev": "^2.10.1",
-    "@remix-run/eslint-config": "^2.10.1",
-    "@shopify/cli": "~3.68.0",
-    "@shopify/hydrogen-codegen": "^0.3.1",
-    "@shopify/mini-oxygen": "^3.0.5",
+    "@remix-run/dev": "^2.13.1",
+    "@remix-run/eslint-config": "^2.13.1",
+    "@shopify/cli": "~3.69.3",
+    "@shopify/hydrogen-codegen": "^0.3.2",
+    "@shopify/mini-oxygen": "^3.1.0",
     "@shopify/oxygen-workers-types": "^4.1.2",
     "@shopify/prettier-config": "^1.1.2",
     "@total-typescript/ts-reset": "^0.4.2",

package/dist/assets/hydrogen/starter/storefrontapi.generated.d.ts

@@ -295,36 +295,6 @@ export type StoreRobotsQueryVariables = StorefrontAPI.Exact<{
 
 export type StoreRobotsQuery = {shop: Pick<StorefrontAPI.Shop, 'id'>};
 
-export type SitemapQueryVariables = StorefrontAPI.Exact<{
-  urlLimits?: StorefrontAPI.InputMaybe<StorefrontAPI.Scalars['Int']['input']>;
-  language?: StorefrontAPI.InputMaybe<StorefrontAPI.LanguageCode>;
-}>;
-
-export type SitemapQuery = {
-  products: {
-    nodes: Array<
-      Pick<
-        StorefrontAPI.Product,
-        'updatedAt' | 'handle' | 'onlineStoreUrl' | 'title'
-      > & {
-        featuredImage?: StorefrontAPI.Maybe<
-          Pick<StorefrontAPI.Image, 'url' | 'altText'>
-        >;
-      }
-    >;
-  };
-  collections: {
-    nodes: Array<
-      Pick<StorefrontAPI.Collection, 'updatedAt' | 'handle' | 'onlineStoreUrl'>
-    >;
-  };
-  pages: {
-    nodes: Array<
-      Pick<StorefrontAPI.Page, 'updatedAt' | 'handle' | 'onlineStoreUrl'>
-    >;
-  };
-};
-
 export type FeaturedCollectionFragment = Pick<
   StorefrontAPI.Collection,
   'id' | 'title' | 'handle'
@@ -782,7 +752,11 @@ export type ProductFragment = Pick<
   StorefrontAPI.Product,
   'id' | 'title' | 'vendor' | 'handle' | 'descriptionHtml' | 'description'
 > & {
-  options: Array<Pick<StorefrontAPI.ProductOption, 'name' | 'values'>>;
+  options: Array<
+    Pick<StorefrontAPI.ProductOption, 'name'> & {
+      optionValues: Array<Pick<StorefrontAPI.ProductOptionValue, 'name'>>;
+    }
+  >;
   selectedVariant?: StorefrontAPI.Maybe<
     Pick<
       StorefrontAPI.ProductVariant,
@@ -851,7 +825,11 @@ export type ProductQuery = {
       StorefrontAPI.Product,
       'id' | 'title' | 'vendor' | 'handle' | 'descriptionHtml' | 'description'
     > & {
-      options: Array<Pick<StorefrontAPI.ProductOption, 'name' | 'values'>>;
+      options: Array<
+        Pick<StorefrontAPI.ProductOption, 'name'> & {
+          optionValues: Array<Pick<StorefrontAPI.ProductOptionValue, 'name'>>;
+        }
+      >;
       selectedVariant?: StorefrontAPI.Maybe<
         Pick<
           StorefrontAPI.ProductVariant,
@@ -1212,10 +1190,6 @@ interface GeneratedQueryTypes {
     return: StoreRobotsQuery;
     variables: StoreRobotsQueryVariables;
   };
-  '#graphql\n  query Sitemap($urlLimits: Int, $language: LanguageCode)\n  @inContext(language: $language) {\n    products(\n      first: $urlLimits\n      query: "published_status:\'online_store:visible\'"\n    ) {\n      nodes {\n        updatedAt\n        handle\n        onlineStoreUrl\n        title\n        featuredImage {\n          url\n          altText\n        }\n      }\n    }\n    collections(\n      first: $urlLimits\n      query: "published_status:\'online_store:visible\'"\n    ) {\n      nodes {\n        updatedAt\n        handle\n        onlineStoreUrl\n      }\n    }\n    pages(first: $urlLimits, query: "published_status:\'published\'") {\n      nodes {\n        updatedAt\n        handle\n        onlineStoreUrl\n      }\n    }\n  }\n': {
-    return: SitemapQuery;
-    variables: SitemapQueryVariables;
-  };
   '#graphql\n  fragment FeaturedCollection on Collection {\n    id\n    title\n    image {\n      id\n      url\n      altText\n      width\n      height\n    }\n    handle\n  }\n  query FeaturedCollection($country: CountryCode, $language: LanguageCode)\n    @inContext(country: $country, language: $language) {\n    collections(first: 1, sortKey: UPDATED_AT, reverse: true) {\n      nodes {\n        ...FeaturedCollection\n      }\n    }\n  }\n': {
     return: FeaturedCollectionQuery;
     variables: FeaturedCollectionQueryVariables;
@@ -1260,7 +1234,7 @@ interface GeneratedQueryTypes {
     return: PoliciesQuery;
     variables: PoliciesQueryVariables;
   };
-  '#graphql\n  query Product(\n    $country: CountryCode\n    $handle: String!\n    $language: LanguageCode\n    $selectedOptions: [SelectedOptionInput!]!\n  ) @inContext(country: $country, language: $language) {\n    product(handle: $handle) {\n      ...Product\n    }\n  }\n  #graphql\n  fragment Product on Product {\n    id\n    title\n    vendor\n    handle\n    descriptionHtml\n    description\n    options {\n      name\n      values\n    }\n    selectedVariant: variantBySelectedOptions(selectedOptions: $selectedOptions, ignoreUnknownOptions: true, caseInsensitiveMatch: true) {\n      ...ProductVariant\n    }\n    variants(first: 1) {\n      nodes {\n        ...ProductVariant\n      }\n    }\n    seo {\n      description\n      title\n    }\n  }\n  #graphql\n  fragment ProductVariant on ProductVariant {\n    availableForSale\n    compareAtPrice {\n      amount\n      currencyCode\n    }\n    id\n    image {\n      __typename\n      id\n      url\n      altText\n      width\n      height\n    }\n    price {\n      amount\n      currencyCode\n    }\n    product {\n      title\n      handle\n    }\n    selectedOptions {\n      name\n      value\n    }\n    sku\n    title\n    unitPrice {\n      amount\n      currencyCode\n    }\n  }\n\n\n': {
+  '#graphql\n  query Product(\n    $country: CountryCode\n    $handle: String!\n    $language: LanguageCode\n    $selectedOptions: [SelectedOptionInput!]!\n  ) @inContext(country: $country, language: $language) {\n    product(handle: $handle) {\n      ...Product\n    }\n  }\n  #graphql\n  fragment Product on Product {\n    id\n    title\n    vendor\n    handle\n    descriptionHtml\n    description\n    options {\n      name\n      optionValues {\n        name\n      }\n    }\n    selectedVariant: variantBySelectedOptions(selectedOptions: $selectedOptions, ignoreUnknownOptions: true, caseInsensitiveMatch: true) {\n      ...ProductVariant\n    }\n    variants(first: 1) {\n      nodes {\n        ...ProductVariant\n      }\n    }\n    seo {\n      description\n      title\n    }\n  }\n  #graphql\n  fragment ProductVariant on ProductVariant {\n    availableForSale\n    compareAtPrice {\n      amount\n      currencyCode\n    }\n    id\n    image {\n      __typename\n      id\n      url\n      altText\n      width\n      height\n    }\n    price {\n      amount\n      currencyCode\n    }\n    product {\n      title\n      handle\n    }\n    selectedOptions {\n      name\n      value\n    }\n    sku\n    title\n    unitPrice {\n      amount\n      currencyCode\n    }\n  }\n\n\n': {
     return: ProductQuery;
     variables: ProductQueryVariables;
   };

package/dist/commands/hydrogen/build.js

@@ -8,7 +8,7 @@ import { commonFlags, flagsToCamelObject } from '../../lib/flags.js';
 import { prepareDiffDirectory } from '../../lib/template-diff.js';
 import { isViteProject, getViteConfig } from '../../lib/vite-config.js';
 import { checkLockfileStatus } from '../../lib/check-lockfile.js';
-import { findMissingRoutes } from '../../lib/missing-routes.js';
+import { findMissingRoutes, warnReservedRoutes, findReservedRoutes } from '../../lib/route-validator.js';
 import { runClassicCompilerBuild } from '../../lib/classic-compiler/build.js';
 import { hydrogenBundleAnalyzer } from '../../lib/bundle/vite-plugin.js';
 import { BUNDLE_ANALYZER_HTML_FILE, getBundleAnalysisSummary } from '../../lib/bundle/analyzer.js';
@@ -242,6 +242,9 @@ This build is missing ${missingRoutes.length} route${missingRoutes.length > 1 ?
       );
     }
   }
+  if (!watch && !disableRouteWarning) {
+    warnReservedRoutes(findReservedRoutes(remixConfig));
+  }
   return {
     async close() {
       codegenProcess?.removeAllListeners("close");

package/dist/commands/hydrogen/check.js

@@ -2,7 +2,7 @@ import Command from '@shopify/cli-kit/node/base-command';
 import { resolvePath } from '@shopify/cli-kit/node/path';
 import { commonFlags } from '../../lib/flags.js';
 import { getRemixConfig } from '../../lib/remix-config.js';
-import { logMissingRoutes, findMissingRoutes } from '../../lib/missing-routes.js';
+import { logMissingRoutes, findMissingRoutes, warnReservedRoutes, findReservedRoutes } from '../../lib/route-validator.js';
 import { Args } from '@oclif/core';
 
 class GenerateRoute extends Command {
@@ -32,6 +32,7 @@ class GenerateRoute extends Command {
 async function runCheckRoutes({ directory }) {
   const remixConfig = await getRemixConfig(directory);
   logMissingRoutes(findMissingRoutes(remixConfig));
+  warnReservedRoutes(findReservedRoutes(remixConfig));
 }
 
 export { GenerateRoute as default, runCheckRoutes };

package/dist/commands/hydrogen/deploy.js

@@ -42,7 +42,7 @@ class Deploy extends Command {
       }
     }),
     preview: Flags.boolean({
-      description: "Deploys to the Preview environment. Overrides --env-branch and Git metadata.",
+      description: "Deploys to the Preview environment.",
       required: false,
       default: false
     }),

package/dist/commands/hydrogen/dev.js

@@ -7,7 +7,7 @@ import { renderSuccess, renderInfo } from '@shopify/cli-kit/node/ui';
 import { AbortError } from '@shopify/cli-kit/node/error';
 import { removeFile } from '@shopify/cli-kit/node/fs';
 import { setH2OVerbose, isH2Verbose, muteDevLogs, enhanceH2Logs } from '../../lib/log.js';
-import { commonFlags, overrideFlag, deprecated, flagsToCamelObject, DEFAULT_INSPECTOR_PORT, DEFAULT_APP_PORT } from '../../lib/flags.js';
+import { commonFlags, overrideFlag, flagsToCamelObject, DEFAULT_INSPECTOR_PORT, DEFAULT_APP_PORT } from '../../lib/flags.js';
 import { spawnCodegenProcess } from '../../lib/codegen.js';
 import { getAllEnvironmentVariables } from '../../lib/environment-variables.js';
 import { displayDevUpgradeNotice } from './upgrade.js';
@@ -65,7 +65,6 @@ class Dev extends Command {
       default: false
     }),
     // For the classic compiler:
-    worker: deprecated("--worker", { isBoolean: true }),
     ...overrideFlag(commonFlags.legacyRuntime, {
       "legacy-runtime": {
         description: "[Classic Remix Compiler] " + commonFlags.legacyRuntime["legacy-runtime"].description

package/dist/commands/hydrogen/preview.js

@@ -5,7 +5,7 @@ import { outputInfo } from '@shopify/cli-kit/node/output';
 import { resolvePath, joinPath } from '@shopify/cli-kit/node/path';
 import { setH2OVerbose, isH2Verbose, muteDevLogs } from '../../lib/log.js';
 import { getProjectPaths, isClassicProject } from '../../lib/remix-config.js';
-import { commonFlags, deprecated, overrideFlag, flagsToCamelObject, DEFAULT_APP_PORT } from '../../lib/flags.js';
+import { commonFlags, overrideFlag, flagsToCamelObject, DEFAULT_APP_PORT } from '../../lib/flags.js';
 import { startMiniOxygen } from '../../lib/mini-oxygen/index.js';
 import { getAllEnvironmentVariables } from '../../lib/environment-variables.js';
 import { getConfig } from '../../lib/shopify-config.js';
@@ -23,7 +23,6 @@ class Preview extends Command {
   static flags = {
     ...commonFlags.path,
     ...commonFlags.port,
-    worker: deprecated("--worker", { isBoolean: true }),
     ...commonFlags.legacyRuntime,
     ...commonFlags.env,
     ...commonFlags.envBranch,

package/dist/index.d.ts

@@ -1,7 +1,6 @@
 import * as _oclif_core from '@oclif/core';
 import * as _oclif_core_lib_interfaces_parser_js from '@oclif/core/lib/interfaces/parser.js';
 import Command from '@shopify/cli-kit/node/base-command';
-import * as _oclif_core_lib_interfaces_alphabet_js from '@oclif/core/lib/interfaces/alphabet.js';
 import Init from './commands/hydrogen/init.js';
 import '@shopify/cli-kit/node/node-package-manager';
 
@@ -89,37 +88,6 @@ declare class Dev extends Command {
         'legacy-runtime': _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         host: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         'disable-deps-optimizer': _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
-        worker: {
-            type: "option";
-            name: string;
-            char?: _oclif_core_lib_interfaces_alphabet_js.AlphabetLowercase | _oclif_core_lib_interfaces_alphabet_js.AlphabetUppercase;
-            summary?: string;
-            description?: string;
-            helpLabel?: string;
-            helpGroup?: string;
-            env?: string;
-            hidden?: boolean;
-            required?: boolean;
-            dependsOn?: string[];
-            exclusive?: string[];
-            exactlyOne?: string[];
-            relationships?: _oclif_core_lib_interfaces_parser_js.Relationship[];
-            deprecated?: true | _oclif_core_lib_interfaces_parser_js.Deprecation;
-            aliases?: string[];
-            charAliases?: (_oclif_core_lib_interfaces_alphabet_js.AlphabetLowercase | _oclif_core_lib_interfaces_alphabet_js.AlphabetUppercase)[];
-            deprecateAliases?: boolean;
-            noCacheDefault?: boolean;
-            helpValue?: string;
-            options?: readonly string[];
-            multiple?: boolean;
-            multipleNonGreedy?: boolean;
-            delimiter?: ",";
-            allowStdin?: boolean | "only";
-            parse: _oclif_core_lib_interfaces_parser_js.FlagParser<unknown, string, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
-            defaultHelp?: unknown;
-            input: string[];
-            default?: unknown;
-        };
         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>;
@@ -264,37 +232,6 @@ declare class Preview extends Command {
         'env-branch': _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         env: _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         'legacy-runtime': _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
-        worker: {
-            type: "option";
-            name: string;
-            char?: _oclif_core_lib_interfaces_alphabet_js.AlphabetLowercase | _oclif_core_lib_interfaces_alphabet_js.AlphabetUppercase;
-            summary?: string;
-            description?: string;
-            helpLabel?: string;
-            helpGroup?: string;
-            env?: string;
-            hidden?: boolean;
-            required?: boolean;
-            dependsOn?: string[];
-            exclusive?: string[];
-            exactlyOne?: string[];
-            relationships?: _oclif_core_lib_interfaces_parser_js.Relationship[];
-            deprecated?: true | _oclif_core_lib_interfaces_parser_js.Deprecation;
-            aliases?: string[];
-            charAliases?: (_oclif_core_lib_interfaces_alphabet_js.AlphabetLowercase | _oclif_core_lib_interfaces_alphabet_js.AlphabetUppercase)[];
-            deprecateAliases?: boolean;
-            noCacheDefault?: boolean;
-            helpValue?: string;
-            options?: readonly string[];
-            multiple?: boolean;
-            multipleNonGreedy?: boolean;
-            delimiter?: ",";
-            allowStdin?: boolean | "only";
-            parse: _oclif_core_lib_interfaces_parser_js.FlagParser<unknown, string, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
-            defaultHelp?: unknown;
-            input: string[];
-            default?: unknown;
-        };
         port: _oclif_core_lib_interfaces_parser_js.OptionFlag<number | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         path: _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
     };

package/dist/lib/classic-compiler/build.js

@@ -5,7 +5,7 @@ import { getPackageManager } from '@shopify/cli-kit/node/node-package-manager';
 import colors from '@shopify/cli-kit/node/colors';
 import { getProjectPaths, getRemixConfig, handleRemixImportFail, assertOxygenChecks } from '../remix-config.js';
 import { checkLockfileStatus } from '../check-lockfile.js';
-import { findMissingRoutes } from '../missing-routes.js';
+import { findMissingRoutes } from '../route-validator.js';
 import { muteRemixLogs, createRemixLogger } from '../log.js';
 import { codegen } from '../codegen.js';
 import { classicBuildBundleAnalysis, classicGetBundleAnalysisSummary } from '../bundle/analyzer.js';

package/dist/lib/{missing-routes.js → route-validator.js}

@@ -1,5 +1,19 @@
 import { renderWarning, renderSuccess } from '@shopify/cli-kit/node/ui';
 
+const RESERVED_ROUTES = ["^api/[^/]+/graphql.json", "^cdn/", "^_t/"];
+function findReservedRoutes(config) {
+  const routes = /* @__PURE__ */ new Set();
+  Object.values(config.routes).filter(
+    (route) => RESERVED_ROUTES.some(
+      (pattern) => new RegExp(pattern).test(route.path ?? "")
+    )
+  ).forEach((route) => {
+    if (route.path) {
+      routes.add(route.path);
+    }
+  });
+  return [...routes];
+}
 const REQUIRED_ROUTES = [
   "",
   "cart",
@@ -84,5 +98,17 @@ Including these routes improves compatibility with Shopify\u2019s platform:
     });
   }
 }
+function warnReservedRoutes(routes) {
+  if (routes.length) {
+    renderWarning({
+      headline: "Reserved routes present",
+      body: `Your Hydrogen project is using ${routes.length} reserved route${routes.length > 1 ? "s" : ""}.
+These routes are reserved by Shopify and may cause issues with your storefront:
+
+` + routes.slice(0, LINE_LIMIT - (routes.length <= LINE_LIMIT ? 0 : 1)).map((route) => `\u2022 /${route}`).join("\n") + (routes.length > LINE_LIMIT ? `
+\u2022 ...and ${routes.length - LINE_LIMIT + 1} more` : "")
+    });
+  }
+}
 
-export { findMissingRoutes, logMissingRoutes };
+export { findMissingRoutes, findReservedRoutes, logMissingRoutes, warnReservedRoutes };

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

@@ -22,7 +22,7 @@ const ROUTE_MAP = {
   account: "account*",
   search: ["search", "api.predictive-search"],
   robots: "[robots.txt]",
-  sitemap: "[sitemap.xml]"
+  sitemap: ["[sitemap.xml]", "sitemap.$type.$page[.xml]"]
 };
 let allRouteTemplateFiles = [];
 async function getResolvedRoutes(routeKeys = Object.keys(ROUTE_MAP)) {

package/oclif.manifest.json

@@ -369,7 +369,7 @@
           "type": "option"
         },
         "preview": {
-          "description": "Deploys to the Preview environment. Overrides --env-branch and Git metadata.",
+          "description": "Deploys to the Preview environment.",
           "name": "preview",
           "required": false,
           "allowNo": false,
@@ -669,11 +669,6 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "worker": {
-          "hidden": true,
-          "name": "worker",
-          "type": "boolean"
-        },
         "legacy-runtime": {
           "description": "[Classic Remix Compiler] Runs the app in a Node.js sandbox instead of an Oxygen worker.",
           "env": "SHOPIFY_HYDROGEN_FLAG_LEGACY_RUNTIME",
@@ -1323,11 +1318,6 @@
           "multiple": false,
           "type": "option"
         },
-        "worker": {
-          "hidden": true,
-          "name": "worker",
-          "type": "boolean"
-        },
         "legacy-runtime": {
           "description": "Runs the app in a Node.js sandbox instead of an Oxygen worker.",
           "env": "SHOPIFY_HYDROGEN_FLAG_LEGACY_RUNTIME",
@@ -1758,5 +1748,5 @@
       ]
     }
   },
-  "version": "8.4.6"
+  "version": "9.0.1"
 }

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "@shopify:registry": "https://registry.npmjs.org"
   },
-  "version": "8.4.6",
+  "version": "9.0.1",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -16,7 +16,7 @@
     "test:watch": "cross-env SHOPIFY_UNIT_TEST=1 vitest --test-timeout=60000"
   },
   "devDependencies": {
-    "@remix-run/dev": "^2.10.1",
+    "@remix-run/dev": "^2.13.1",
     "@types/diff": "^5.0.2",
     "@types/gunzip-maybe": "^1.4.0",
     "@types/prettier": "^2.7.2",
@@ -27,16 +27,16 @@
     "fast-glob": "^3.2.12",
     "flame-chart-js": "2.3.2",
     "get-port": "^7.0.0",
-    "type-fest": "^4.5.0",
+    "type-fest": "^4.26.1",
     "vite": "^5.1.0",
     "vitest": "^1.0.4"
   },
   "dependencies": {
     "@ast-grep/napi": "0.11.0",
     "@oclif/core": "3.26.5",
-    "@shopify/cli-kit": "3.68.0",
-    "@shopify/oxygen-cli": "4.4.9",
-    "@shopify/plugin-cloudflare": "3.68.0",
+    "@shopify/cli": "3.69.3",
+    "@shopify/oxygen-cli": "4.5.3",
+    "@shopify/plugin-cloudflare": "3.69.3",
     "ansi-escapes": "^6.2.0",
     "chokidar": "3.5.3",
     "cli-truncate": "^4.0.0",
@@ -55,8 +55,8 @@
   "peerDependencies": {
     "@graphql-codegen/cli": "^5.0.2",
     "@remix-run/dev": "^2.1.0",
-    "@shopify/hydrogen-codegen": "^0.3.1",
-    "@shopify/mini-oxygen": "^3.0.6",
+    "@shopify/hydrogen-codegen": "^0.3.2",
+    "@shopify/mini-oxygen": "^3.1.0",
     "graphql-config": "^5.0.3",
     "vite": "^5.1.0"
   },