@shopify/hydrogen 1.0.0 → 1.1.0

package/dist/esnext/foundation/ShopifyProvider/ShopifyProvider.client.js

@@ -1,8 +1,10 @@
 import React, { createContext } from 'react';
 export const ShopifyContext = createContext(null);
-export function ShopifyProviderClient({ children, shopifyConfig, }) {
+export const LocalizationContext = createContext(null);
+export function ShopifyProviderClient({ children, shopifyConfig, localization, }) {
     if (!shopifyConfig) {
         throw new Error('The `shopifyConfig` prop should be passed to `ShopifyProvider`');
     }
-    return (React.createElement(ShopifyContext.Provider, { value: shopifyConfig }, children));
+    return (React.createElement(ShopifyContext.Provider, { value: shopifyConfig },
+        React.createElement(LocalizationContext.Provider, { value: localization }, children)));
 }

package/dist/esnext/foundation/ShopifyProvider/ShopifyProvider.server.d.ts

@@ -1,4 +1,5 @@
-import type { ShopifyProviderProps } from './types';
+import type { ShopifyProviderProps, LocalizationContextValue } from './types';
+import type { CountryCode, LanguageCode } from '../../storefront-api-types';
 export declare const SHOPIFY_PROVIDER_CONTEXT_KEY: unique symbol;
 /**
  * The `ShopifyProvider` component wraps your entire app and provides support for hooks.
@@ -11,6 +12,7 @@ export declare function ShopifyProvider({
  * Shopify connection information. Defaults to
  * [the `shopify` property in the `hydrogen.config.js` file](https://shopify.dev/custom-storefronts/hydrogen/framework/hydrogen-config).
  */
-shopifyConfig, 
+shopifyConfig, countryCode, languageCode, 
 /** Any `ReactNode` elements. */
 children, }: ShopifyProviderProps): JSX.Element;
+export declare function getLocalizationContextValue(defaultLanguageCode: `${LanguageCode}`, defaultCountryCode: `${CountryCode}`, languageCode?: `${LanguageCode}`, countryCode?: `${CountryCode}`): LocalizationContextValue;

package/dist/esnext/foundation/ShopifyProvider/ShopifyProvider.server.js

@@ -30,7 +30,7 @@ export function ShopifyProvider({
  * Shopify connection information. Defaults to
  * [the `shopify` property in the `hydrogen.config.js` file](https://shopify.dev/custom-storefronts/hydrogen/framework/hydrogen-config).
  */
-shopifyConfig, 
+shopifyConfig, countryCode, languageCode, 
 /** Any `ReactNode` elements. */
 children, }) {
     const request = useServerRequest();
@@ -55,6 +55,23 @@ children, }) {
         actualShopifyConfig = shopifyConfig;
     }
     const shopifyProviderValue = useMemo(() => makeShopifyContext(actualShopifyConfig), [actualShopifyConfig]);
+    const localization = getLocalizationContextValue(shopifyProviderValue.defaultLanguageCode, shopifyProviderValue.defaultCountryCode, languageCode, countryCode);
+    request.ctx.localization = localization;
     request.ctx.shopifyConfig = shopifyProviderValue;
-    return (React.createElement(ShopifyProviderClient, { shopifyConfig: shopifyProviderValue }, children));
+    return (React.createElement(ShopifyProviderClient, { shopifyConfig: shopifyProviderValue, localization: localization }, children));
+}
+export function getLocalizationContextValue(defaultLanguageCode, defaultCountryCode, languageCode, countryCode) {
+    return useMemo(() => {
+        const runtimeLanguageCode = (languageCode ?? defaultLanguageCode).toUpperCase();
+        const runtimeCountryCode = (countryCode ?? defaultCountryCode).toUpperCase();
+        return {
+            country: {
+                isoCode: runtimeCountryCode,
+            },
+            language: {
+                isoCode: runtimeLanguageCode,
+            },
+            locale: `${runtimeLanguageCode}-${runtimeCountryCode}`,
+        };
+    }, [defaultLanguageCode, defaultCountryCode, countryCode, languageCode]);
 }

package/dist/esnext/foundation/ShopifyProvider/types.d.ts

@@ -6,9 +6,26 @@ export interface ShopifyContextValue extends Omit<ShopifyConfig, 'defaultLanguag
     defaultCountryCode: `${CountryCode}`;
     storefrontId: string | null;
 }
+export interface LocalizationContextValue {
+    country: {
+        isoCode: `${CountryCode}`;
+    };
+    language: {
+        isoCode: `${LanguageCode}`;
+    };
+    locale: `${LanguageCode}-${CountryCode}`;
+}
 export declare type ShopifyProviderProps = {
     /** Shopify connection information. Defaults to the `shopify` property in the `hydrogen.config.js` file. */
     shopifyConfig?: ShopifyConfig | ShopifyConfigFetcher;
     /** Any `ReactNode` elements. */
     children?: ReactNode;
+    /**
+     * Override the `isoCode` to define the active country
+     */
+    countryCode?: `${CountryCode}`;
+    /**
+     * Override the `languageCode` to define the active language
+     */
+    languageCode?: `${LanguageCode}`;
 };

package/dist/esnext/foundation/fetchSync/ResponseSync.d.ts

@@ -0,0 +1,14 @@
+declare type ResponseSyncInit = [string, ResponseInit];
+export declare class ResponseSync extends Response {
+    #private;
+    bodyUsed: boolean;
+    constructor(init: ResponseSyncInit);
+    text(): string;
+    json(): any;
+    /**
+     * @deprecated Access response properties at the top level instead.
+     */
+    get response(): this;
+    static toSerializable(response: Response): Promise<ResponseSyncInit>;
+}
+export {};

package/dist/esnext/foundation/fetchSync/ResponseSync.js

@@ -0,0 +1,38 @@
+import { parseJSON } from '../../utilities/parse';
+import { log } from '../../utilities/log';
+export class ResponseSync extends Response {
+    bodyUsed = true;
+    #text;
+    #json;
+    constructor(init) {
+        super(...init);
+        this.#text = init[0];
+    }
+    // @ts-expect-error Changing inherited types
+    text() {
+        return this.#text;
+    }
+    json() {
+        return (this.#json ??= parseJSON(this.#text));
+    }
+    /**
+     * @deprecated Access response properties at the top level instead.
+     */
+    get response() {
+        if (__HYDROGEN_DEV__) {
+            log.warn(`Property 'response' is deprecated from the result of 'fetchSync'.` +
+                ` Access response properties at the top level instead.`);
+        }
+        return this;
+    }
+    static async toSerializable(response) {
+        return [
+            await response.text(),
+            {
+                status: response.status,
+                statusText: response.statusText,
+                headers: Array.from(response.headers.entries()),
+            },
+        ];
+    }
+}

package/dist/esnext/foundation/fetchSync/client/fetchSync.d.ts

@@ -1,8 +1,8 @@
-import type { FetchResponse } from '../types';
+import { ResponseSync } from '../ResponseSync';
 /**
  * Fetch a URL for use in a client component Suspense boundary.
  */
-export declare function fetchSync(url: string, options?: RequestInit): FetchResponse;
+export declare function fetchSync(url: string, options?: RequestInit): ResponseSync;
 /**
  * Preload a URL for use in  a client component Suspense boundary.
  * Useful for placing higher in the tree to avoid waterfalls.

package/dist/esnext/foundation/fetchSync/client/fetchSync.js

@@ -1,19 +1,14 @@
-import { parseJSON } from '../../../utilities/parse';
 import { suspendFunction, preloadFunction } from '../../../utilities/suspense';
+import { ResponseSync } from '../ResponseSync';
 /**
  * Fetch a URL for use in a client component Suspense boundary.
  */
 export function fetchSync(url, options) {
-    const [text, response] = suspendFunction([url, options], async () => {
-        const response = await globalThis.fetch(url, options);
-        const text = await response.text();
-        return [text, response];
+    const responseSyncInit = suspendFunction([url, options], async () => {
+        const response = await globalThis.fetch(new URL(url, window.location.origin), options);
+        return ResponseSync.toSerializable(response);
     });
-    return {
-        response,
-        json: () => parseJSON(text),
-        text: () => text,
-    };
+    return new ResponseSync(responseSyncInit);
 }
 /**
  * Preload a URL for use in  a client component Suspense boundary.

package/dist/esnext/foundation/fetchSync/server/fetchSync.d.ts

@@ -1,8 +1,8 @@
 import { type HydrogenUseQueryOptions } from '../../useQuery/hooks';
-import type { FetchResponse } from '../types';
+import { ResponseSync } from '../ResponseSync';
 /**
  * The `fetchSync` hook makes API requests and is the recommended way to make simple fetch calls on the server and the client.
  * It's designed similar to the [Web API's `fetch`](https://developer.mozilla.org/en-US/docs/Web/API/fetch), only in a way
  * that supports [Suspense](https://reactjs.org/docs/concurrent-mode-suspense.html).
  */
-export declare function fetchSync(url: string, options?: Omit<RequestInit, 'cache'> & HydrogenUseQueryOptions): FetchResponse;
+export declare function fetchSync(url: string, options?: Omit<RequestInit, 'cache'> & HydrogenUseQueryOptions): ResponseSync;

package/dist/esnext/foundation/fetchSync/server/fetchSync.js

@@ -1,5 +1,6 @@
-import { parseJSON } from '../../../utilities/parse';
 import { useQuery } from '../../useQuery/hooks';
+import { useUrl } from '../../useUrl';
+import { ResponseSync } from '../ResponseSync';
 /**
  * The `fetchSync` hook makes API requests and is the recommended way to make simple fetch calls on the server and the client.
  * It's designed similar to the [Web API's `fetch`](https://developer.mozilla.org/en-US/docs/Web/API/fetch), only in a way
@@ -7,11 +8,12 @@ import { useQuery } from '../../useQuery/hooks';
  */
 export function fetchSync(url, options) {
     const { cache, preload, shouldCacheResponse, ...requestInit } = options ?? {};
-    const { data: useQueryResponse, error } = useQuery(// eslint-disable-line react-hooks/rules-of-hooks
-    [url, requestInit], async () => {
-        const response = await globalThis.fetch(url, requestInit);
-        const text = await response.text();
-        return [text, response];
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    const { origin } = useUrl();
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    const { data, error } = useQuery([url, requestInit], async () => {
+        const response = await globalThis.fetch(new URL(url, origin), requestInit);
+        return ResponseSync.toSerializable(response);
     }, {
         cache,
         preload,
@@ -20,10 +22,5 @@ export function fetchSync(url, options) {
     if (error) {
         throw error;
     }
-    const [data, response] = useQueryResponse;
-    return {
-        response,
-        json: () => parseJSON(data),
-        text: () => data,
-    };
+    return new ResponseSync(data);
 }

package/dist/esnext/framework/graphiql.js

@@ -1,38 +1,34 @@
 export function graphiqlHtml(shop, token, apiVersion) {
-    return `<html>
-  <head>
-    <title>Shopify Storefront API</title>
-    <link href="https://unpkg.com/graphiql/graphiql.min.css" rel="stylesheet" />
-  </head>
-  <body style="margin: 0;">
-    <div id="graphiql" style="height: 100vh;"></div>
-    <script
-      crossorigin
-      src="https://unpkg.com/react/umd/react.production.min.js"
-    ></script>
-    <script
-      crossorigin
-      src="https://unpkg.com/react-dom/umd/react-dom.production.min.js"
-    ></script>
-    <script
-      crossorigin
-      src="https://unpkg.com/graphiql/graphiql.min.js"
-    ></script>
-    <script>
-      const fetcher = GraphiQL.createFetcher({
-        url: 'https://${shop}/api/${apiVersion}/graphql.json',
-        headers: {
+    return `
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset=utf-8/>
+  <meta name="viewport" content="user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, minimal-ui">
+  <title>Shopify Storefront API</title>
+  <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/graphql-playground-react/build/static/css/index.css" />
+  <link rel="shortcut icon" href="//cdn.jsdelivr.net/npm/graphql-playground-react/build/favicon.png" />
+  <script src="//cdn.jsdelivr.net/npm/graphql-playground-react/build/static/js/middleware.js"></script>
+</head>
+<body>
+  <div id="root"></div>
+  <script>window.addEventListener('load', function (event) {
+    GraphQLPlayground.init(document.getElementById('root'), {
+      endpoint:'https://${shop}/api/${apiVersion}/graphql.json',
+      settings:{
+        'request.globalHeaders': {
           Accept: 'application/json',
           'Content-Type': 'application/graphql',
           'X-Shopify-Storefront-Access-Token': '${token}'
         }
-      });
-      ReactDOM.render(
-        React.createElement(GraphiQL, { fetcher: fetcher }),
-        document.getElementById('graphiql'),
-      );
-    </script>
-  </body>
+      },
+      tabs: [{
+        endpoint: 'https://${shop}/api/${apiVersion}/graphql.json',
+        query: '{ shop { name } }'
+      }]
+    })
+  })</script>
+</body>
 </html>
 `;
 }

package/dist/esnext/framework/plugins/vite-plugin-platform-entry.js

@@ -3,12 +3,16 @@ import { HYDROGEN_DEFAULT_SERVER_ENTRY } from './vite-plugin-hydrogen-middleware
 import MagicString from 'magic-string';
 import path from 'path';
 import fs from 'fs';
+import fastGlob from 'fast-glob';
 const SSR_BUNDLE_NAME = 'index.js';
+// Keep this in the outer scope to share it
+// across client <> server builds.
+let clientBuildPath;
 export default () => {
     let config;
     let isESM;
     return {
-        name: 'vite-plugin-platform-entry',
+        name: 'hydrogen:platform-entry',
         enforce: 'pre',
         configResolved(_config) {
             config = _config;
@@ -29,18 +33,43 @@ export default () => {
             }
             return null;
         },
-        transform(code, id) {
-            if (normalizePath(id).includes('/hydrogen/dist/esnext/platforms/')) {
+        async transform(code, id, options) {
+            if (config.command === 'build' &&
+                options?.ssr &&
+                /@shopify\/hydrogen\/.+platforms\/virtual\./.test(normalizePath(id))) {
                 const ms = new MagicString(code);
-                ms.replace('__SERVER_ENTRY__', HYDROGEN_DEFAULT_SERVER_ENTRY);
-                const indexTemplatePath = normalizePath(path.resolve(config.root, config.build.outDir, '..', 'client', 'index.html'));
-                ms.replace('__INDEX_TEMPLATE__', indexTemplatePath);
+                ms.replace('__HYDROGEN_ENTRY__', HYDROGEN_DEFAULT_SERVER_ENTRY);
+                if (!clientBuildPath) {
+                    // Default value
+                    clientBuildPath = normalizePath(path.resolve(config.root, config.build.outDir, '..', 'client'));
+                }
+                ms.replace('__HYDROGEN_HTML_TEMPLATE__', normalizePath(path.resolve(clientBuildPath, 'index.html')));
+                ms.replace('__HYDROGEN_RELATIVE_CLIENT_BUILD__', normalizePath(path.relative(normalizePath(path.resolve(config.root, config.build.outDir)), clientBuildPath)));
+                const files = clientBuildPath
+                    ? (await fastGlob('**/*', {
+                        cwd: clientBuildPath,
+                        ignore: ['**/index.html', `**/${config.build.assetsDir}/**`],
+                    })).map((file) => '/' + file)
+                    : [];
+                ms.replace("\\['__HYDROGEN_ASSETS__'\\]", JSON.stringify(files));
+                ms.replace('__HYDROGEN_ASSETS_DIR__', config.build.assetsDir);
+                ms.replace('__HYDROGEN_ASSETS_BASE_URL__', (process.env.HYDROGEN_ASSET_BASE_URL || '').replace(/\/$/, ''));
+                // Remove the poison pill
+                ms.replace('throw', '//');
                 return {
                     code: ms.toString(),
                     map: ms.generateMap({ file: id, source: id }),
                 };
             }
         },
+        buildEnd(err) {
+            if (!err && !config.build.ssr && config.command === 'build') {
+                // Save outDir from client build in the outer scope in order
+                // to read it during the server build. The CLI runs Vite in
+                // the same process so the scope is shared across builds.
+                clientBuildPath = normalizePath(path.resolve(config.root, config.build.outDir));
+            }
+        },
         generateBundle(options, bundle) {
             if (config.build.ssr) {
                 const [key, value] = Object.entries(bundle).find(([, value]) => value.type === 'chunk' && value.isEntry);

package/dist/esnext/hooks/index.d.ts

@@ -3,3 +3,4 @@ export * from './useProductOptions/types';
 export { useMoney } from './useMoney';
 export { useMeasurement } from './useMeasurement';
 export { useLoadScript } from './useLoadScript';
+export { useLocalization } from './useLocalization/useLocalization';

package/dist/esnext/hooks/index.js

@@ -3,3 +3,4 @@ export * from './useProductOptions/types';
 export { useMoney } from './useMoney';
 export { useMeasurement } from './useMeasurement';
 export { useLoadScript } from './useLoadScript';
+export { useLocalization } from './useLocalization/useLocalization';

package/dist/esnext/hooks/useLocalization/useLocalization.d.ts

@@ -1,4 +1,5 @@
-import { type LocalizationContextValue } from '../../components/LocalizationProvider/LocalizationContext.client';
+import type { LocalizationContextValue } from '../../foundation/ShopifyProvider/types';
+import { CountryCode, LanguageCode } from '../../storefront-api-types';
 export declare function useLocalization(): LocalizationContextValue & {
-    locale: string;
+    locale: `${LanguageCode}-${CountryCode}`;
 };

package/dist/esnext/hooks/useLocalization/useLocalization.js

@@ -1,14 +1,9 @@
-import { useMemo } from 'react';
-import { LocalizationContext, } from '../../components/LocalizationProvider/LocalizationContext.client';
+import { LocalizationContext } from '../../foundation/ShopifyProvider/ShopifyProvider.client';
 import { useEnvContext } from '../../foundation/ssr-interop';
 export function useLocalization() {
     const localization = useEnvContext((req) => req.ctx.localization, LocalizationContext);
     if (localization == null) {
         throw new Error('No Localization Context available');
     }
-    const localizationValue = useMemo(() => ({
-        ...localization,
-        locale: localization.language.isoCode + '-' + localization.country.isoCode,
-    }), [localization]);
-    return localizationValue;
+    return localization;
 }

package/dist/esnext/hooks/useProductOptions/helpers.js

@@ -19,7 +19,7 @@ export function getSelectedVariant(variants, choices) {
 export function getOptions(variants) {
     const map = variants.reduce((memo, variant) => {
         if (!variant.selectedOptions) {
-            throw new Error(`getOptions requires 'variant.selectedOptions`);
+            throw new Error(`'getOptions' requires 'variant.selectedOptions'`);
         }
         variant?.selectedOptions?.forEach((opt) => {
             memo[opt?.name ?? ''] = memo[opt?.name ?? ''] || new Set();

package/dist/esnext/hooks/useShopQuery/hooks.js

@@ -40,15 +40,17 @@ export function useShopQuery({ query, variables = {}, cache, preload = false, })
     let text;
     let data;
     let useQueryError;
+    let response = null;
     try {
-        text = fetchSync(url, {
+        response = fetchSync(url, {
             ...requestInit,
             cache,
             preload,
             shouldCacheResponse,
-        }).text();
+        });
+        text = response.text();
         try {
-            data = JSON.parse(text);
+            data = response.json();
         }
         catch (error) {
             useQueryError = new Error('Unable to parse response:\n' + text);
@@ -82,15 +84,16 @@ export function useShopQuery({ query, variables = {}, cache, preload = false, })
      */
     if (data?.errors) {
         const errors = Array.isArray(data.errors) ? data.errors : [data.errors];
+        const requestId = response?.headers?.get('x-request-id') ?? '';
         for (const error of errors) {
             if (__HYDROGEN_DEV__ && !__HYDROGEN_TEST__) {
-                throw new Error(error.message);
+                throw new Error(`Storefront API GraphQL Error: ${error.message}.\nRequest id: ${requestId}`);
             }
             else {
-                log.error('GraphQL Error', error);
+                log.error('Storefront API GraphQL Error', error, 'Storefront API GraphQL request id', requestId);
             }
         }
-        log.error(`GraphQL errors: ${errors.length}`);
+        log.error(`Storefront API GraphQL error count: ${errors.length}`);
     }
     if (__HYDROGEN_DEV__ &&
         (log.options().showUnusedQueryProperties ||

package/dist/esnext/index.d.ts

@@ -9,10 +9,12 @@ export * from './client';
  * The following are exported from this file because they are intended to be available
  * *only* on the server.
  */
-export * from './foundation/';
-export * from './hooks/useShopQuery/hooks';
-export * from './foundation/useQuery/hooks';
-export * from './foundation/useServerProps';
+export { ServerPropsProvider, ServerPropsContext, type ServerProps, type ServerPropsContextValue, } from './foundation/ServerPropsProvider';
+export { useShop } from './foundation/useShop';
+export { useUrl } from './foundation/useUrl';
+export { useShopQuery, type UseShopQueryResponse, } from './hooks/useShopQuery/hooks';
+export { useQuery, type HydrogenUseQueryOptions, } from './foundation/useQuery/hooks';
+export { useServerProps } from './foundation/useServerProps';
 export { FileRoutes } from './foundation/FileRoutes/FileRoutes.server';
 export { Route } from './foundation/Route/Route.server';
 export { Router } from './foundation/Router/Router.server';
@@ -25,7 +27,6 @@ export { useServerAnalytics } from './foundation/Analytics/hook';
 export { ShopifyAnalytics } from './foundation/Analytics/connectors/Shopify/ShopifyAnalytics.server';
 export { ShopifyAnalyticsConstants } from './foundation/Analytics/connectors/Shopify/const';
 export { useSession } from './foundation/useSession/useSession';
-export { useLocalization } from './hooks/useLocalization/useLocalization';
 export { Cookie } from './foundation/Cookie/Cookie';
 /**
  * Export server-only CartQuery here instead of `CartProvider.client` to prevent

package/dist/esnext/index.js

@@ -9,10 +9,12 @@ export * from './client';
  * The following are exported from this file because they are intended to be available
  * *only* on the server.
  */
-export * from './foundation/';
-export * from './hooks/useShopQuery/hooks';
-export * from './foundation/useQuery/hooks';
-export * from './foundation/useServerProps';
+export { ServerPropsProvider, ServerPropsContext, } from './foundation/ServerPropsProvider';
+export { useShop } from './foundation/useShop';
+export { useUrl } from './foundation/useUrl';
+export { useShopQuery, } from './hooks/useShopQuery/hooks';
+export { useQuery, } from './foundation/useQuery/hooks';
+export { useServerProps } from './foundation/useServerProps';
 export { FileRoutes } from './foundation/FileRoutes/FileRoutes.server';
 export { Route } from './foundation/Route/Route.server';
 export { Router } from './foundation/Router/Router.server';
@@ -25,7 +27,6 @@ export { useServerAnalytics } from './foundation/Analytics/hook';
 export { ShopifyAnalytics } from './foundation/Analytics/connectors/Shopify/ShopifyAnalytics.server';
 export { ShopifyAnalyticsConstants } from './foundation/Analytics/connectors/Shopify/const';
 export { useSession } from './foundation/useSession/useSession';
-export { useLocalization } from './hooks/useLocalization/useLocalization';
 export { Cookie } from './foundation/Cookie/Cookie';
 /**
  * Export server-only CartQuery here instead of `CartProvider.client` to prevent

package/dist/esnext/platforms/index.d.ts

@@ -0,0 +1 @@
+export * from './virtual';

package/dist/esnext/platforms/index.js

@@ -0,0 +1 @@
+export * from './virtual';

package/dist/esnext/platforms/node.js

@@ -1,11 +1,6 @@
 import '../utilities/web-api-polyfill';
 import path from 'path';
-// @ts-ignore
-// eslint-disable-next-line node/no-missing-import
-import entrypoint from '__SERVER_ENTRY__';
-// @ts-ignore
-// eslint-disable-next-line node/no-missing-import
-import indexTemplate from '__INDEX_TEMPLATE__?raw';
+import { handleRequest, indexTemplate, relativeClientBuildPath } from './virtual';
 import { hydrogenMiddleware } from '../framework/middleware';
 // @ts-ignore
 import serveStatic from 'serve-static';
@@ -14,13 +9,12 @@ import compression from 'compression';
 import bodyParser from 'body-parser';
 import connect from 'connect';
 import { InMemoryCache } from '../framework/cache/in-memory';
-const handleRequest = entrypoint;
 export async function createServer({ cache = new InMemoryCache(), } = {}) {
     // @ts-ignore
     globalThis.Oxygen = { env: process.env };
     const app = connect();
     app.use(compression());
-    app.use(serveStatic(path.resolve(__dirname, '../client'), {
+    app.use(serveStatic(path.resolve(__dirname, relativeClientBuildPath), {
         index: false,
     }));
     app.use(bodyParser.raw({ type: '*/*' }));

package/dist/esnext/platforms/virtual.d.ts

@@ -0,0 +1,8 @@
+import type { RequestHandler } from '../shared-types';
+export declare const handleRequest: RequestHandler;
+export { default as indexTemplate } from '__HYDROGEN_HTML_TEMPLATE__?raw';
+export declare const assets: Set<string>;
+export declare const assetPrefix: string;
+export declare const isAsset: (pathname?: string) => boolean;
+export declare const relativeClientBuildPath: string;
+export declare const assetBasePath: string;

package/dist/esnext/platforms/virtual.js

@@ -0,0 +1,14 @@
+// This file is modified by Vite at build time
+// with user project information and re-exports it.
+// @ts-ignore
+// eslint-disable-next-line node/no-missing-import
+import appEntry from '__HYDROGEN_ENTRY__';
+export const handleRequest = appEntry;
+// eslint-disable-next-line node/no-missing-import
+export { default as indexTemplate } from '__HYDROGEN_HTML_TEMPLATE__?raw';
+export const assets = new Set(['__HYDROGEN_ASSETS__']);
+export const assetPrefix = '/__HYDROGEN_ASSETS_DIR__/';
+export const isAsset = (pathname = '') => pathname.startsWith(assetPrefix) || assets.has(pathname);
+export const relativeClientBuildPath = '__HYDROGEN_RELATIVE_CLIENT_BUILD__';
+export const assetBasePath = '__HYDROGEN_ASSETS_BASE_URL__';
+throw new Error('This file must be overwritten in a Vite plugin');

package/dist/esnext/platforms/worker.js

@@ -1,12 +1,12 @@
-// @ts-ignore
-// eslint-disable-next-line node/no-missing-import
-import entrypoint from '__SERVER_ENTRY__';
-// @ts-ignore
-// eslint-disable-next-line node/no-missing-import
-import indexTemplate from '__INDEX_TEMPLATE__?raw';
-const handleRequest = entrypoint;
+import { handleRequest, indexTemplate, isAsset, assetBasePath } from './virtual';
 export default {
     async fetch(request, env, context) {
+        // Proxy assets to the CDN. This should be removed
+        // once the proxy is implemented in Oxygen itself.
+        const url = new URL(request.url);
+        if (assetBasePath && isAsset(url.pathname)) {
+            return fetch(request.url.replace(url.origin, assetBasePath), request);
+        }
         if (!globalThis.Oxygen) {
             globalThis.Oxygen = { env };
         }

package/dist/esnext/utilities/image_size.d.ts

@@ -1,6 +1,7 @@
 import type { Image as ImageType } from '../storefront-api-types';
 import type { PartialDeep } from 'type-fest';
 import type { ShopifyLoaderOptions, ShopifyLoaderParams } from '../components/Image';
+export declare const IMG_SRC_SET_SIZES: number[];
 /**
  * Adds image size parameters to an image URL hosted by Shopify's CDN
  */