@shopify/hydrogen 0.21.0 → 0.23.0

package/dist/esnext/foundation/ssr-interop.d.ts

@@ -4,9 +4,9 @@
  * In the server, this file is transformed by Vite to inject server logic.
  * NOTE: Do not remove SSR-prefixed comments in this file.
  */
-import type { ServerComponentRequest } from '../framework/Hydration/ServerComponentRequest.server';
+import type { HydrogenRequest } from './HydrogenRequest/HydrogenRequest.server';
 export declare const META_ENV_SSR = false;
-declare type ServerGetter<T> = (request: ServerComponentRequest) => T;
+declare type ServerGetter<T> = (request: HydrogenRequest) => T;
 /**
  * Isomorphic hook to access context data. It gives access to the current request
  * when running on the server, and returns the provided client fallback in the browser.

package/dist/esnext/foundation/useNavigate/useNavigate.d.ts

@@ -5,6 +5,8 @@ declare type NavigationOptions = {
     reloadDocument?: boolean;
     /** The custom client state with the navigation. */
     clientState?: any;
+    /** Whether to emulate natural browser behavior and restore scroll position on navigation. Defaults to true. */
+    scroll?: any;
 };
 /**
  * The useNavigate hook imperatively navigates between routes.

package/dist/esnext/foundation/useNavigate/useNavigate.js

@@ -5,10 +5,17 @@ import { useRouter } from '../Router/BrowserRouter.client';
 export function useNavigate() {
     const router = useRouter();
     return (path, options = { replace: false, reloadDocument: false }) => {
+        var _a;
+        const state = {
+            ...options === null || options === void 0 ? void 0 : options.clientState,
+            scroll: (_a = options === null || options === void 0 ? void 0 : options.scroll) !== null && _a !== void 0 ? _a : true,
+        };
         // @todo wait for RSC and then change focus for a11y?
-        if (options === null || options === void 0 ? void 0 : options.replace)
-            router.history.replace(path, (options === null || options === void 0 ? void 0 : options.clientState) || {});
-        else
-            router.history.push(path, (options === null || options === void 0 ? void 0 : options.clientState) || {});
+        if (options === null || options === void 0 ? void 0 : options.replace) {
+            router.history.replace(path, state);
+        }
+        else {
+            router.history.push(path, state);
+        }
     };
 }

package/dist/esnext/foundation/useQuery/hooks.js

@@ -1,8 +1,7 @@
 import { getLoggerWithContext, collectQueryCacheControlHeaders, collectQueryTimings, } from '../../utilities/log';
-import { deleteItemFromCache, generateSubRequestCacheControlHeader, getItemFromCache, isStale, setItemInCache, } from '../../framework/cache-sub-request';
-import { runDelayedFunction } from '../../framework/runtime';
+import { deleteItemFromCache, generateSubRequestCacheControlHeader, getItemFromCache, isStale, setItemInCache, } from '../Cache/cache-sub-request';
 import { useRequestCacheData, useServerRequest } from '../ServerRequestProvider';
-import { CacheSeconds } from '../../framework/CachingStrategy';
+import { CacheSeconds } from '../Cache/strategies';
 /**
  * The `useQuery` hook executes an asynchronous operation like `fetch` in a way that
  * supports [Suspense](https://reactjs.org/docs/concurrent-mode-suspense.html). You can use this
@@ -44,6 +43,7 @@ function cachedQueryFnBuilder(key, queryFn, queryOptions) {
      * Attempt to read the query from cache. If it doesn't exist or if it's stale, regenerate it.
      */
     async function useCachedQueryFn() {
+        var _a, _b, _c, _d;
         // Call this hook before running any async stuff
         // to prevent losing the current React cycle.
         const request = useServerRequest();
@@ -60,8 +60,8 @@ function cachedQueryFnBuilder(key, queryFn, queryOptions) {
              */
             if (isStale(key, response)) {
                 const lockKey = ['lock', ...(typeof key === 'string' ? [key] : key)];
-                runDelayedFunction(async () => {
-                    const lockExists = await getItemFromCache(lockKey);
+                // Run revalidation asynchronously
+                const revalidatingPromise = getItemFromCache(lockKey).then(async (lockExists) => {
                     if (lockExists)
                         return;
                     await setItemInCache(lockKey, true, CacheSeconds({
@@ -80,6 +80,8 @@ function cachedQueryFnBuilder(key, queryFn, queryOptions) {
                         await deleteItemFromCache(lockKey);
                     }
                 });
+                // Asynchronously wait for it in workers
+                (_b = (_a = request.ctx.runtime) === null || _a === void 0 ? void 0 : _a.waitUntil) === null || _b === void 0 ? void 0 : _b.call(_a, revalidatingPromise);
             }
             return output;
         }
@@ -88,7 +90,8 @@ function cachedQueryFnBuilder(key, queryFn, queryOptions) {
          * Important: Do this async
          */
         if (shouldCacheResponse(newOutput)) {
-            runDelayedFunction(() => setItemInCache(key, newOutput, resolvedQueryOptions === null || resolvedQueryOptions === void 0 ? void 0 : resolvedQueryOptions.cache));
+            const setItemInCachePromise = setItemInCache(key, newOutput, resolvedQueryOptions === null || resolvedQueryOptions === void 0 ? void 0 : resolvedQueryOptions.cache);
+            (_d = (_c = request.ctx.runtime) === null || _c === void 0 ? void 0 : _c.waitUntil) === null || _d === void 0 ? void 0 : _d.call(_c, setItemInCachePromise);
         }
         collectQueryCacheControlHeaders(request, key, generateSubRequestCacheControlHeader(resolvedQueryOptions === null || resolvedQueryOptions === void 0 ? void 0 : resolvedQueryOptions.cache));
         return newOutput;

package/dist/esnext/foundation/useRouteParams/RouteParamsProvider.client.d.ts

@@ -1,9 +1,10 @@
-import React, { FC } from 'react';
+import React, { FC, ReactNode } from 'react';
 declare type RouteParamsContextValue = {
     routeParams: Record<string, string>;
 };
 export declare const RouteParamsContext: React.Context<RouteParamsContextValue>;
 export declare const RouteParamsProvider: FC<{
     routeParams: Record<string, string>;
+    children: ReactNode;
 }>;
 export {};

package/dist/esnext/foundation/useRouteParams/RouteParamsProvider.client.js

@@ -2,6 +2,6 @@ import React, { createContext } from 'react';
 export const RouteParamsContext = createContext({
     routeParams: {},
 });
-export const RouteParamsProvider = ({ children, routeParams, }) => {
+export const RouteParamsProvider = ({ children, routeParams }) => {
     return (React.createElement(RouteParamsContext.Provider, { value: { routeParams } }, children));
 };

package/dist/esnext/framework/Hydration/rsc.js

@@ -3,16 +3,17 @@
 import { createFromFetch, createFromReadableStream,
 // @ts-ignore
  } from '@shopify/hydrogen/vendor/react-server-dom-vite';
+import { ClientAnalytics } from '../../client';
 import { RSC_PATHNAME } from '../../constants';
-import { htmlDecode } from '../../utilities';
 let rscReader;
 // Hydrate an SSR response from <meta> tags placed in the DOM.
 const flightChunks = [];
 const FLIGHT_ATTRIBUTE = 'data-flight';
 function addElementToFlightChunks(el) {
+    // We don't need to decode, because `.getAttribute` already decodes
     const chunk = el.getAttribute(FLIGHT_ATTRIBUTE);
     if (chunk) {
-        flightChunks.push(htmlDecode(chunk));
+        flightChunks.push(chunk);
     }
 }
 // Get initial payload
@@ -88,6 +89,7 @@ export function useServerResponse(state) {
             /* @ts-ignore */
             window.BOOMR.plugins.Hydrogen.trackSubPageLoadPerformance();
         }
+        ClientAnalytics.resetPageAnalyticsData();
         // Request a new flight response.
         response = createFromFetch(fetch(`${RSC_PATHNAME}?state=` + encodeURIComponent(key)));
     }

package/dist/esnext/framework/middleware.js

@@ -49,26 +49,12 @@ export function hydrogenMiddleware({ dev, cache, indexTemplate, getServerEntrypo
                 }
             }
             entrypointError = null;
-            const eventResponse = await handleRequest(request, {
+            await handleRequest(request, {
                 dev,
                 cache,
                 indexTemplate,
                 streamableResponse: response,
             });
-            /**
-             * If a `Response` was returned, that means it was not streamed.
-             * Convert the response into a proper Node.js response.
-             */
-            if (eventResponse) {
-                eventResponse.headers.forEach((value, key) => {
-                    response.setHeader(key, value);
-                });
-                response.statusCode = eventResponse.status;
-                if (eventResponse.body) {
-                    response.write(eventResponse.body);
-                }
-                response.end();
-            }
         }
         catch (e) {
             if (dev && devServer)

package/dist/esnext/framework/plugin.js

@@ -1,6 +1,7 @@
 import hydrogenConfig from './plugins/vite-plugin-hydrogen-config';
 import hydrogenMiddleware from './plugins/vite-plugin-hydrogen-middleware';
 import hydrogenClientMiddleware from './plugins/vite-plugin-hydrogen-client-middleware';
+import hydrogenVirtualFiles from './plugins/vite-plugin-hydrogen-virtual-files';
 import platformEntry from './plugins/vite-plugin-platform-entry';
 import rsc from './plugins/vite-plugin-hydrogen-rsc';
 import ssrInterop from './plugins/vite-plugin-ssr-interop';
@@ -10,6 +11,7 @@ import inspect from 'vite-plugin-inspect';
 import react from '@vitejs/plugin-react';
 import cssModulesRsc from './plugins/vite-plugin-css-modules-rsc';
 import clientImports from './plugins/vite-plugin-client-imports';
+import suppressWarnings from './plugins/vite-plugin-hydrogen-suppress-warnings';
 export default (pluginOptions = {}) => {
     return [
         process.env.VITE_INSPECT && inspect(),
@@ -17,12 +19,14 @@ export default (pluginOptions = {}) => {
         hydrogenClientMiddleware(),
         clientImports(),
         hydrogenMiddleware(pluginOptions),
+        hydrogenVirtualFiles(pluginOptions),
         react(),
         hydrationAutoImport(),
         ssrInterop(),
         cssModulesRsc(),
         rsc(),
         platformEntry(),
+        suppressWarnings(),
         pluginOptions.purgeQueryCacheOnBuild && purgeQueryCache(),
     ];
 };

package/dist/esnext/framework/plugins/vite-plugin-hydrogen-client-middleware.d.ts

@@ -1,9 +1,9 @@
 import { type Plugin } from 'vite';
-declare const _default: () => Plugin;
 /**
  * This dev server middleware prevents Vite from applying immutable cache control headers to client
  * components. These client components are part of the user's local source, but since they are
  * referenced via import globs in the `react-dom-server-vite` NPM package, Vite assumes they
  * are 3P deps that can be cached. This middleware responds to the requests early with `no-cache`.
  */
+declare const _default: () => Plugin;
 export default _default;

package/dist/esnext/framework/plugins/vite-plugin-hydrogen-config.js

@@ -12,7 +12,7 @@ export default () => {
             format: 'es',
         };
     }
-    if (!process.env.LOCAL_DEV) {
+    if (process.env.NODE_ENV !== 'development') {
         /**
          * Ofuscate production asset name - To prevent ad blocker logics that blocks
          * certain files due to how it is named.
@@ -82,11 +82,14 @@ export default () => {
                         'react-server-dom-vite/client-proxy',
                         // https://github.com/vitejs/vite/issues/6215
                         'react/jsx-runtime',
+                        // https://github.com/nfriedly/set-cookie-parser/issues/50
+                        'set-cookie-parser',
                     ],
                 },
                 define: {
-                    __DEV__: env.mode !== 'production',
-                    __WORKER__: isWorker,
+                    __HYDROGEN_DEV__: env.mode !== 'production',
+                    __HYDROGEN_WORKER__: isWorker,
+                    __HYDROGEN_TEST__: false, // Used in unit tests
                 },
                 envPrefix: ['VITE_', 'PUBLIC_'],
                 base: process.env.HYDROGEN_ASSET_BASE_URL,

package/dist/esnext/framework/plugins/vite-plugin-hydrogen-middleware.js

@@ -1,19 +1,14 @@
-import { loadEnv, normalizePath } from 'vite';
+import { loadEnv } from 'vite';
 import bodyParser from 'body-parser';
 import path from 'path';
 import { promises as fs } from 'fs';
 import { hydrogenMiddleware, graphiqlMiddleware } from '../middleware';
 import { InMemoryCache } from '../cache/in-memory';
+import { VIRTUAL_PROXY_HYDROGEN_CONFIG_ID } from './vite-plugin-hydrogen-virtual-files';
 export const HYDROGEN_DEFAULT_SERVER_ENTRY = process.env.HYDROGEN_SERVER_ENTRY || '/src/App.server';
-const virtualModuleId = 'virtual:hydrogen-config';
-const virtualProxyModuleId = virtualModuleId + ':proxy';
 export default (pluginOptions) => {
-    let config;
     return {
-        name: 'vite-plugin-hydrogen-middleware',
-        configResolved(_config) {
-            config = _config;
-        },
+        name: 'hydrogen:middleware',
         /**
          * By adding a middleware to the Vite dev server, we can handle SSR without needing
          * a custom node script. It works by handling any requests for `text/html` documents,
@@ -33,7 +28,7 @@ export default (pluginOptions) => {
                 dev: true,
                 getShopifyConfig: async (incomingMessage) => {
                     var _a;
-                    const { default: hydrogenConfig } = await server.ssrLoadModule('virtual:hydrogen-config:proxy');
+                    const { default: hydrogenConfig } = await server.ssrLoadModule(VIRTUAL_PROXY_HYDROGEN_CONFIG_ID);
                     // @ts-ignore
                     const { address = 'localhost', port = '3000' } = ((_a = server.httpServer) === null || _a === void 0 ? void 0 : _a.address()) || {};
                     const url = new URL(`http://${address}:${port}${incomingMessage.url}`);
@@ -41,11 +36,10 @@ export default (pluginOptions) => {
                         headers: incomingMessage.headers,
                     });
                     // @ts-expect-error Manually set `normalizedUrl` which a developer expects to be available
-                    // via `ServerComponentRequest` during production runtime.
+                    // via `HydrogenRequest` during production runtime.
                     request.normalizedUrl = request.url;
-                    return typeof hydrogenConfig.shopify === 'function'
-                        ? hydrogenConfig.shopify(request)
-                        : hydrogenConfig.shopify;
+                    const { shopify } = hydrogenConfig;
+                    return typeof shopify === 'function' ? shopify(request) : shopify;
                 },
             }));
             server.middlewares.use(bodyParser.raw({ type: '*/*' }));
@@ -59,26 +53,6 @@ export default (pluginOptions) => {
                     : undefined,
             }));
         },
-        async resolveId(source, importer) {
-            if (source === virtualModuleId) {
-                const configPath = await findHydrogenConfigPath(config.root, pluginOptions.configPath);
-                return this.resolve(configPath, importer, {
-                    skipSelf: true,
-                });
-            }
-            if (source === virtualProxyModuleId) {
-                // Virtual modules convention
-                // https://vitejs.dev/guide/api-plugin.html#virtual-modules-convention
-                return '\0' + virtualProxyModuleId;
-            }
-        },
-        async load(id) {
-            if (id === '\0' + virtualProxyModuleId) {
-                // Likely due to a bug in Vite, but the config cannot be loaded
-                // directly using ssrLoadModule. It needs to be proxied as follows:
-                return `import hc from 'virtual:hydrogen-config'; export default hc;`;
-            }
-        },
     };
 };
 async function polyfillOxygenEnv(config) {
@@ -93,18 +67,3 @@ async function polyfillOxygenEnv(config) {
     }
     globalThis.Oxygen = { env };
 }
-async function findHydrogenConfigPath(root, userProvidedPath) {
-    let configPath = userProvidedPath;
-    if (!configPath) {
-        // Find the config file in the project root
-        const files = await fs.readdir(root);
-        configPath = files.find((file) => /^hydrogen\.config\.[jt]s$/.test(file));
-    }
-    if (configPath) {
-        configPath = normalizePath(configPath);
-        if (!configPath.startsWith('/'))
-            configPath = path.resolve(root, configPath);
-    }
-    return (configPath ||
-        require.resolve('@shopify/hydrogen/dist/esnext/utilities/empty-hydrogen-config.js'));
-}

package/dist/esnext/framework/plugins/vite-plugin-hydrogen-rsc.js

@@ -1,9 +1,13 @@
 // @ts-ignore
 import reactServerDomVite from '@shopify/hydrogen/vendor/react-server-dom-vite/plugin';
 import { HYDROGEN_DEFAULT_SERVER_ENTRY } from './vite-plugin-hydrogen-middleware';
-import { createServer } from 'vite';
+import { VIRTUAL_PROXY_HYDROGEN_ROUTES_ID } from './vite-plugin-hydrogen-virtual-files';
 export default function () {
     return reactServerDomVite({
+        serverBuildEntries: [
+            HYDROGEN_DEFAULT_SERVER_ENTRY,
+            VIRTUAL_PROXY_HYDROGEN_ROUTES_ID,
+        ],
         isServerComponentImporterAllowed(importer, source) {
             return (
             // Always allow the entry server (e.g. App.server.jsx) to be imported
@@ -14,22 +18,5 @@ export default function () {
                 // TODO: revisit this when RSC splits into two bundles
                 /\.test\.[tj]sx?$/.test(importer));
         },
-        async findClientComponentsForClientBuild() {
-            // In client build, we create a local server to discover client compoents.
-            const server = await createServer({
-                clearScreen: false,
-                server: { middlewareMode: 'ssr' },
-            });
-            await Promise.all([
-                // Load server entry to discover client components early
-                server.ssrLoadModule(HYDROGEN_DEFAULT_SERVER_ENTRY),
-                // Route globs are placed in hydrogen.config.js and need to
-                // be loaded to discover client components in routes
-                server.ssrLoadModule('virtual:hydrogen-config:proxy'),
-            ]);
-            await server.close();
-            // At this point, the server has loaded all the components in the module graph
-            return reactServerDomVite.findClientComponentsFromServer(server);
-        },
     });
 }

package/dist/esnext/framework/plugins/vite-plugin-hydrogen-suppress-warnings.d.ts

@@ -0,0 +1,3 @@
+import { Plugin } from 'vite';
+declare const _default: () => Plugin;
+export default _default;

package/dist/esnext/framework/plugins/vite-plugin-hydrogen-suppress-warnings.js

@@ -0,0 +1,19 @@
+export default () => {
+    return {
+        name: 'hydrogen:suppress-warnings',
+        configResolved(config) {
+            // TODO: Fix the actual issues that cause these warnings
+            const filterOut = (msg) => msg.startsWith("@shopify/hydrogen doesn't appear to be written in CJS") ||
+                (msg.includes('missing source files') &&
+                    ['kolorist'].some((lib) => msg.includes(lib)));
+            for (const method of ['warn', 'warnOnce']) {
+                const original = config.logger[method];
+                config.logger[method] = (msg, ...args) => {
+                    if (filterOut(msg))
+                        return;
+                    return original(msg, ...args);
+                };
+            }
+        },
+    };
+};

package/dist/esnext/framework/plugins/vite-plugin-hydrogen-virtual-files.d.ts

@@ -0,0 +1,7 @@
+import { Plugin } from 'vite';
+import type { HydrogenVitePluginOptions } from '../../types';
+export declare const HYDROGEN_DEFAULT_SERVER_ENTRY: string;
+export declare const VIRTUAL_PROXY_HYDROGEN_CONFIG_ID: string;
+export declare const VIRTUAL_PROXY_HYDROGEN_ROUTES_ID: string;
+declare const _default: (pluginOptions: HydrogenVitePluginOptions) => Plugin;
+export default _default;

package/dist/esnext/framework/plugins/vite-plugin-hydrogen-virtual-files.js

@@ -0,0 +1,99 @@
+import { normalizePath } from 'vite';
+import path from 'path';
+import { promises as fs } from 'fs';
+import { viteception } from '../viteception';
+export const HYDROGEN_DEFAULT_SERVER_ENTRY = process.env.HYDROGEN_SERVER_ENTRY || '/src/App.server';
+// The character ":" breaks Vite with Node >= 16.15. Use "_" instead
+const VIRTUAL_PREFIX = 'virtual__';
+const PROXY_PREFIX = 'proxy__';
+const HYDROGEN_CONFIG_ID = 'hydrogen.config.ts';
+const VIRTUAL_HYDROGEN_CONFIG_ID = VIRTUAL_PREFIX + HYDROGEN_CONFIG_ID;
+export const VIRTUAL_PROXY_HYDROGEN_CONFIG_ID = VIRTUAL_PREFIX + PROXY_PREFIX + HYDROGEN_CONFIG_ID;
+const HYDROGEN_ROUTES_ID = 'hydrogen-routes.server.jsx';
+const VIRTUAL_HYDROGEN_ROUTES_ID = VIRTUAL_PREFIX + HYDROGEN_ROUTES_ID;
+export const VIRTUAL_PROXY_HYDROGEN_ROUTES_ID = VIRTUAL_PREFIX + PROXY_PREFIX + HYDROGEN_ROUTES_ID;
+export default (pluginOptions) => {
+    let config;
+    let server;
+    return {
+        name: 'hydrogen:virtual-files',
+        configResolved(_config) {
+            config = _config;
+        },
+        configureServer(_server) {
+            server = _server;
+        },
+        resolveId(source, importer) {
+            if (source === VIRTUAL_HYDROGEN_CONFIG_ID) {
+                return findHydrogenConfigPath(config.root, pluginOptions.configPath).then((hcPath) => 
+                // This direct dependency on a real file
+                // makes HMR work for the virtual module.
+                this.resolve(hcPath, importer, { skipSelf: true }));
+            }
+            if ([
+                VIRTUAL_PROXY_HYDROGEN_CONFIG_ID,
+                VIRTUAL_PROXY_HYDROGEN_ROUTES_ID,
+                VIRTUAL_HYDROGEN_ROUTES_ID,
+            ].includes(source)) {
+                // Virtual modules convention
+                // https://vitejs.dev/guide/api-plugin.html#virtual-modules-convention
+                return '\0' + source;
+            }
+        },
+        load(id) {
+            // Likely due to a bug in Vite, but virtual modules cannot be loaded
+            // directly using ssrLoadModule from a Vite plugin. It needs to be proxied as follows:
+            if (id === '\0' + VIRTUAL_PROXY_HYDROGEN_CONFIG_ID) {
+                return `import hc from '${VIRTUAL_HYDROGEN_CONFIG_ID}'; export default hc;`;
+            }
+            if (id === '\0' + VIRTUAL_PROXY_HYDROGEN_ROUTES_ID) {
+                return `import hr from '${VIRTUAL_HYDROGEN_ROUTES_ID}'; export default hr;`;
+            }
+            if (id === '\0' + VIRTUAL_HYDROGEN_ROUTES_ID) {
+                return importHydrogenConfig().then((hc) => {
+                    var _a, _b, _c, _d;
+                    let routesPath = (_b = (typeof hc.routes === 'string' ? hc.routes : (_a = hc.routes) === null || _a === void 0 ? void 0 : _a.files)) !== null && _b !== void 0 ? _b : '/src/routes';
+                    if (routesPath.startsWith('./')) {
+                        routesPath = routesPath.slice(1);
+                    }
+                    if (!routesPath.includes('*')) {
+                        if (!routesPath.endsWith('/')) {
+                            routesPath += '/';
+                        }
+                        routesPath += '**/*.server.[jt](s|sx)';
+                    }
+                    const [dirPrefix] = routesPath.split('/*');
+                    let code = `export default {\n  dirPrefix: '${dirPrefix}',\n  basePath: '${(_d = (_c = hc.routes) === null || _c === void 0 ? void 0 : _c.basePath) !== null && _d !== void 0 ? _d : ''}',\n  files: import.meta.globEager('${routesPath}')\n};`;
+                    if (config.command === 'serve') {
+                        // Add dependency on Hydrogen config for HMR
+                        code += `\nimport '${VIRTUAL_HYDROGEN_CONFIG_ID}';`;
+                    }
+                    return { code };
+                });
+            }
+        },
+    };
+    async function importHydrogenConfig() {
+        if (server) {
+            const loaded = await server.ssrLoadModule(VIRTUAL_PROXY_HYDROGEN_CONFIG_ID);
+            return loaded.default;
+        }
+        const { loaded } = await viteception([VIRTUAL_PROXY_HYDROGEN_CONFIG_ID]);
+        return loaded[0].default;
+    }
+};
+async function findHydrogenConfigPath(root, userProvidedPath) {
+    let configPath = userProvidedPath;
+    if (!configPath) {
+        // Find the config file in the project root
+        const files = await fs.readdir(root);
+        configPath = files.find((file) => /^hydrogen\.config\.[jt]s$/.test(file));
+    }
+    if (configPath) {
+        configPath = normalizePath(configPath);
+        if (!configPath.startsWith('/'))
+            configPath = path.resolve(root, configPath);
+    }
+    return (configPath ||
+        require.resolve('@shopify/hydrogen/dist/esnext/utilities/empty-hydrogen-config.js'));
+}

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

@@ -31,10 +31,10 @@ export default () => {
         },
         transform(code, id) {
             if (normalizePath(id).includes('/hydrogen/dist/esnext/platforms/')) {
-                code = code
-                    .replace('__SERVER_ENTRY__', HYDROGEN_DEFAULT_SERVER_ENTRY)
-                    .replace('__INDEX_TEMPLATE__', normalizePath(path.resolve(config.root, config.build.outDir, '..', 'client', 'index.html')));
                 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);
                 return {
                     code: ms.toString(),
                     map: ms.generateMap({ file: id, source: id }),
@@ -51,7 +51,7 @@ export default () => {
                 // default export instead of exporting an
                 // object containing a 'default' property.
                 if (value.type === 'chunk' && !isESM) {
-                    value.code = value.code.replace(/((^|;)[\s]*)exports\[['"]default['"]\]\s*=/m, '$1module.exports =');
+                    value.code += `\nmodule.exports = exports.default || exports;`;
                 }
             }
         },

package/dist/esnext/framework/viteception.d.ts

@@ -0,0 +1,4 @@
+export declare function viteception(paths: string[]): Promise<{
+    server: import("vite").ViteDevServer;
+    loaded: Record<string, any>[];
+}>;

package/dist/esnext/framework/viteception.js

@@ -0,0 +1,15 @@
+import { createServer } from 'vite';
+export async function viteception(paths) {
+    const isWorker = process.env.WORKER;
+    delete process.env.WORKER;
+    const server = await createServer({
+        clearScreen: false,
+        server: { middlewareMode: 'ssr' },
+    });
+    if (isWorker) {
+        process.env.WORKER = isWorker;
+    }
+    const loaded = await Promise.all(paths.map((path) => server.ssrLoadModule(path)));
+    await server.close();
+    return { server, loaded };
+}

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

@@ -14,8 +14,8 @@ metafields?: PartialDeep<MetafieldConnection>): {
     description?: import("../../storefront-api-types").Maybe<string> | undefined;
     key?: string | undefined;
     namespace?: string | undefined;
-    parentResource?: import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").ProductVariant> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Product> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Blog> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Article> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Customer> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Order> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Collection> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Page> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Shop> | undefined;
-    reference?: import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Video> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").MediaImage> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").ProductVariant> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Product> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Page> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").GenericFile> | null | undefined;
+    parentResource?: import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Blog> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Article> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Customer> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").ProductVariant> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Order> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Collection> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Page> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Product> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Shop> | undefined;
+    reference?: import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Video> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").MediaImage> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").ProductVariant> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Page> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Product> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").GenericFile> | null | undefined;
     type?: string | undefined;
     updatedAt?: string | undefined;
 }[];

package/dist/esnext/hooks/useProductOptions/types.d.ts

@@ -1,4 +1,5 @@
-import type { SelectedOption as SelectedOptionType, ProductVariant as ProductVariantType, ProductVariantConnection, SellingPlan as SellingPlanType, SellingPlanAllocation as SellingPlanAllocationType, SellingPlanGroup as SellingPlanGroupType, SellingPlanConnection } from '../../storefront-api-types';
+import type { SelectedOption as SelectedOptionType, ProductVariant as ProductVariantType, ProductVariantConnection, SellingPlan as SellingPlanType, SellingPlanAllocation as SellingPlanAllocationType, SellingPlanGroup as SellingPlanGroupType, SellingPlanGroupConnection } from '../../storefront-api-types';
+import type { PartialDeep } from 'type-fest';
 export declare type SelectedOptions = {
     [key: string]: string;
 };
@@ -11,7 +12,7 @@ export interface OptionWithValues {
     name: SelectedOptionType['name'];
     values: SelectedOptionType['value'][];
 }
-export interface ProductOptionsHookValue {
+export declare type ProductOptionsHookValue = PartialDeep<{
     /** An array of the variant `nodes` from the `VariantConnection`. */
     variants: ProductVariantType[];
     variantsConnection?: ProductVariantConnection;
@@ -19,17 +20,7 @@ export interface ProductOptionsHookValue {
     options: OptionWithValues[];
     /** The selected variant. */
     selectedVariant?: ProductVariantType | null;
-    /** A callback to set the selected variant to the variant passed as an argument. */
-    setSelectedVariant: SelectVariantCallback;
     selectedOptions: SelectedOptions;
-    /** A callback to set the selected option. */
-    setSelectedOption: SelectOptionCallback;
-    /** A callback to set multiple selected options at once. */
-    setSelectedOptions: SelectOptionsCallback;
-    /** A callback that returns a boolean indicating if the option is in stock. */
-    isOptionInStock: OptionsInStockCallback;
-    /** A callback to set the selected selling plan to the one passed as an argument. */
-    setSelectedSellingPlan: SelectedSellingPlanCallback;
     /** The selected selling plan. */
     selectedSellingPlan?: SellingPlanType;
     /** The selected selling plan allocation. */
@@ -38,5 +29,16 @@ export interface ProductOptionsHookValue {
     sellingPlanGroups?: (Omit<SellingPlanGroupType, 'sellingPlans'> & {
         sellingPlans: SellingPlanType[];
     })[];
-    sellingPlanGroupsConnection?: SellingPlanConnection;
-}
+    sellingPlanGroupsConnection?: SellingPlanGroupConnection;
+}> & {
+    /** A callback to set the selected variant to the variant passed as an argument. */
+    setSelectedVariant: SelectVariantCallback;
+    /** A callback to set the selected option. */
+    setSelectedOption: SelectOptionCallback;
+    /** A callback to set multiple selected options at once. */
+    setSelectedOptions: SelectOptionsCallback;
+    /** A callback to set the selected selling plan to the one passed as an argument. */
+    setSelectedSellingPlan: SelectedSellingPlanCallback;
+    /** A callback that returns a boolean indicating if the option is in stock. */
+    isOptionInStock: OptionsInStockCallback;
+};