@shopify/hydrogen 0.21.0 → 0.23.0

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

@@ -0,0 +1,104 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useQuery = void 0;
+const log_1 = require("../../utilities/log");
+const cache_sub_request_1 = require("../Cache/cache-sub-request");
+const ServerRequestProvider_1 = require("../ServerRequestProvider");
+const strategies_1 = require("../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
+ * hook to call any third-party APIs from a server component.
+ *
+ * \> Note:
+ * \> If you're making a simple fetch call on the server, then we recommend using the [`fetchSync`](https://shopify.dev/api/hydrogen/hooks/global/fetchsync) hook instead.
+ */
+function useQuery(
+/** A string or array to uniquely identify the current query. */
+key, 
+/** An asynchronous query function like `fetch` which returns data. */
+queryFn, 
+/** The options to manage the cache behavior of the sub-request. */
+queryOptions) {
+    const request = (0, ServerRequestProvider_1.useServerRequest)();
+    const withCacheIdKey = [
+        '__QUERY_CACHE_ID__',
+        ...(typeof key === 'string' ? [key] : key),
+    ];
+    const fetcher = cachedQueryFnBuilder(withCacheIdKey, queryFn, queryOptions);
+    (0, log_1.collectQueryTimings)(request, withCacheIdKey, 'requested');
+    if (queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.preload) {
+        request.savePreloadQuery({
+            preload: queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.preload,
+            key: withCacheIdKey,
+            fetcher,
+        });
+    }
+    return (0, ServerRequestProvider_1.useRequestCacheData)(withCacheIdKey, fetcher);
+}
+exports.useQuery = useQuery;
+function cachedQueryFnBuilder(key, queryFn, queryOptions) {
+    var _a;
+    const resolvedQueryOptions = {
+        ...(queryOptions !== null && queryOptions !== void 0 ? queryOptions : {}),
+    };
+    const shouldCacheResponse = (_a = queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.shouldCacheResponse) !== null && _a !== void 0 ? _a : (() => true);
+    /**
+     * 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 = (0, ServerRequestProvider_1.useServerRequest)();
+        const log = (0, log_1.getLoggerWithContext)(request);
+        const cacheResponse = await (0, cache_sub_request_1.getItemFromCache)(key);
+        async function generateNewOutput() {
+            return await queryFn();
+        }
+        if (cacheResponse) {
+            const [output, response] = cacheResponse;
+            (0, log_1.collectQueryCacheControlHeaders)(request, key, response.headers.get('cache-control'));
+            /**
+             * Important: Do this async
+             */
+            if ((0, cache_sub_request_1.isStale)(key, response)) {
+                const lockKey = ['lock', ...(typeof key === 'string' ? [key] : key)];
+                // Run revalidation asynchronously
+                const revalidatingPromise = (0, cache_sub_request_1.getItemFromCache)(lockKey).then(async (lockExists) => {
+                    if (lockExists)
+                        return;
+                    await (0, cache_sub_request_1.setItemInCache)(lockKey, true, (0, strategies_1.CacheSeconds)({
+                        maxAge: 10,
+                    }));
+                    try {
+                        const output = await generateNewOutput();
+                        if (shouldCacheResponse(output)) {
+                            await (0, cache_sub_request_1.setItemInCache)(key, output, resolvedQueryOptions === null || resolvedQueryOptions === void 0 ? void 0 : resolvedQueryOptions.cache);
+                        }
+                    }
+                    catch (e) {
+                        log.error(`Error generating async response: ${e.message}`);
+                    }
+                    finally {
+                        await (0, cache_sub_request_1.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;
+        }
+        const newOutput = await generateNewOutput();
+        /**
+         * Important: Do this async
+         */
+        if (shouldCacheResponse(newOutput)) {
+            const setItemInCachePromise = (0, cache_sub_request_1.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);
+        }
+        (0, log_1.collectQueryCacheControlHeaders)(request, key, (0, cache_sub_request_1.generateSubRequestCacheControlHeader)(resolvedQueryOptions === null || resolvedQueryOptions === void 0 ? void 0 : resolvedQueryOptions.cache));
+        return newOutput;
+    }
+    return useCachedQueryFn;
+}

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

@@ -0,0 +1,10 @@
+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/node/foundation/useRouteParams/RouteParamsProvider.client.js

@@ -0,0 +1,34 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RouteParamsProvider = exports.RouteParamsContext = void 0;
+const react_1 = __importStar(require("react"));
+exports.RouteParamsContext = (0, react_1.createContext)({
+    routeParams: {},
+});
+const RouteParamsProvider = ({ children, routeParams }) => {
+    return (react_1.default.createElement(exports.RouteParamsContext.Provider, { value: { routeParams } }, children));
+};
+exports.RouteParamsProvider = RouteParamsProvider;

package/dist/node/foundation/useRouteParams/useRouteParams.d.ts

@@ -0,0 +1,4 @@
+/**
+ *  The `useRouteParams` hook retrieves the parameters of an active route. The hook is available in both server and client components.
+ */
+export declare function useRouteParams(): Record<string, string>;

package/dist/node/foundation/useRouteParams/useRouteParams.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useRouteParams = void 0;
+const ssr_interop_1 = require("../ssr-interop");
+const RouteParamsProvider_client_1 = require("./RouteParamsProvider.client");
+/**
+ *  The `useRouteParams` hook retrieves the parameters of an active route. The hook is available in both server and client components.
+ */
+function useRouteParams() {
+    const router = (0, ssr_interop_1.useEnvContext)((req) => req.ctx.router, RouteParamsProvider_client_1.RouteParamsContext);
+    return router.routeParams;
+}
+exports.useRouteParams = useRouteParams;

package/dist/node/foundation/useServerProps/index.d.ts

@@ -0,0 +1 @@
+export { useServerProps } from './use-server-props';

package/dist/node/foundation/useServerProps/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useServerProps = void 0;
+var use_server_props_1 = require("./use-server-props");
+Object.defineProperty(exports, "useServerProps", { enumerable: true, get: function () { return use_server_props_1.useServerProps; } });

package/dist/node/foundation/useSession/useSession.d.ts

@@ -0,0 +1,2 @@
+/** The `useSession` hook reads session data in server components. */
+export declare const useSession: () => Record<string, string>;

package/dist/node/foundation/useSession/useSession.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useSession = void 0;
+const ServerRequestProvider_1 = require("../ServerRequestProvider");
+/** The `useSession` hook reads session data in server components. */
+const useSession = function () {
+    var _a;
+    const request = (0, ServerRequestProvider_1.useServerRequest)();
+    const session = ((_a = request.ctx.session) === null || _a === void 0 ? void 0 : _a.get()) || {};
+    return session;
+};
+exports.useSession = useSession;

package/dist/node/foundation/useShop/index.d.ts

@@ -0,0 +1 @@
+export { useShop } from './use-shop';

package/dist/node/foundation/useShop/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useShop = void 0;
+var use_shop_1 = require("./use-shop");
+Object.defineProperty(exports, "useShop", { enumerable: true, get: function () { return use_shop_1.useShop; } });

package/dist/node/foundation/useShop/use-shop.d.ts

@@ -0,0 +1,6 @@
+/**
+ * The `useShop` hook provides access to values within
+ * [the `shopify` property in the `hydrogen.config.js` file](https://shopify.dev/custom-storefronts/hydrogen/framework/hydrogen-config).
+ * The `useShop` hook must be a descendent of a `ShopifyProvider` component.
+ */
+export declare function useShop(): import("../ShopifyProvider/types").ShopifyContextValue;

package/dist/node/foundation/useShop/use-shop.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useShop = void 0;
+const ShopifyProvider_1 = require("../ShopifyProvider");
+const ssr_interop_1 = require("../ssr-interop");
+/**
+ * The `useShop` hook provides access to values within
+ * [the `shopify` property in the `hydrogen.config.js` file](https://shopify.dev/custom-storefronts/hydrogen/framework/hydrogen-config).
+ * The `useShop` hook must be a descendent of a `ShopifyProvider` component.
+ */
+function useShop() {
+    const config = (0, ssr_interop_1.useEnvContext)((req) => req.ctx.shopifyConfig, ShopifyProvider_1.ShopifyContext);
+    if (!config) {
+        throw new Error('No Shopify Context found');
+    }
+    return config;
+}
+exports.useShop = useShop;

package/dist/node/foundation/useUrl/index.d.ts

@@ -0,0 +1 @@
+export { useUrl } from './useUrl';

package/dist/node/foundation/useUrl/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useUrl = void 0;
+var useUrl_1 = require("./useUrl");
+Object.defineProperty(exports, "useUrl", { enumerable: true, get: function () { return useUrl_1.useUrl; } });

package/dist/node/foundation/useUrl/useUrl.d.ts

@@ -0,0 +1,4 @@
+/**
+ * The `useUrl` hook retrieves the current URL in a server or client component.
+ */
+export declare function useUrl(): URL;

package/dist/node/foundation/useUrl/useUrl.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useUrl = void 0;
+const react_1 = require("react");
+const constants_1 = require("../../constants");
+const parse_1 = require("../../utilities/parse");
+const BrowserRouter_client_1 = require("../Router/BrowserRouter.client");
+const ssr_interop_1 = require("../ssr-interop");
+/**
+ * The `useUrl` hook retrieves the current URL in a server or client component.
+ */
+function useUrl() {
+    var _a, _b;
+    if (ssr_interop_1.META_ENV_SSR) {
+        const serverUrl = new URL((0, ssr_interop_1.useEnvContext)((req) => req.url) // eslint-disable-line react-hooks/rules-of-hooks
+        );
+        if (serverUrl.pathname === constants_1.RSC_PATHNAME) {
+            const state = (0, parse_1.parseJSON)(serverUrl.searchParams.get('state') || '{}');
+            const parsedUrl = `${serverUrl.origin}${(_a = state.pathname) !== null && _a !== void 0 ? _a : ''}${(_b = state.search) !== null && _b !== void 0 ? _b : ''}`;
+            return new URL(parsedUrl);
+        }
+        return new URL(serverUrl);
+    }
+    /**
+     * We return a `URL` object instead of passing through `location` because
+     * the URL object contains important info like hostname, etc.
+     */
+    const location = (0, BrowserRouter_client_1.useLocation)(); // eslint-disable-line react-hooks/rules-of-hooks
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    return (0, react_1.useMemo)(() => new URL(window.location.href), [location]); // eslint-disable-line react-hooks/exhaustive-deps
+}
+exports.useUrl = useUrl;

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

@@ -4,16 +4,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useRefresh = exports.useServerResponse = void 0;
 const react_server_dom_vite_1 = require("@shopify/hydrogen/vendor/react-server-dom-vite");
+const client_1 = require("../../client");
 const constants_1 = require("../../constants");
-const utilities_1 = require("../../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((0, utilities_1.htmlDecode)(chunk));
+        flightChunks.push(chunk);
     }
 }
 // Get initial payload
@@ -89,6 +90,7 @@ function useServerResponse(state) {
             /* @ts-ignore */
             window.BOOMR.plugins.Hydrogen.trackSubPageLoadPerformance();
         }
+        client_1.ClientAnalytics.resetPageAnalyticsData();
         // Request a new flight response.
         response = (0, react_server_dom_vite_1.createFromFetch)(fetch(`${constants_1.RSC_PATHNAME}?state=` + encodeURIComponent(key)));
     }

package/dist/node/framework/middleware.js

@@ -75,26 +75,12 @@ function hydrogenMiddleware({ dev, cache, indexTemplate, getServerEntrypoint, de
                 }
             }
             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/node/framework/plugin.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const vite_plugin_hydrogen_config_1 = __importDefault(require("./plugins/vite-plugin-hydrogen-config"));
 const vite_plugin_hydrogen_middleware_1 = __importDefault(require("./plugins/vite-plugin-hydrogen-middleware"));
 const vite_plugin_hydrogen_client_middleware_1 = __importDefault(require("./plugins/vite-plugin-hydrogen-client-middleware"));
+const vite_plugin_hydrogen_virtual_files_1 = __importDefault(require("./plugins/vite-plugin-hydrogen-virtual-files"));
 const vite_plugin_platform_entry_1 = __importDefault(require("./plugins/vite-plugin-platform-entry"));
 const vite_plugin_hydrogen_rsc_1 = __importDefault(require("./plugins/vite-plugin-hydrogen-rsc"));
 const vite_plugin_ssr_interop_1 = __importDefault(require("./plugins/vite-plugin-ssr-interop"));
@@ -15,6 +16,7 @@ const vite_plugin_inspect_1 = __importDefault(require("vite-plugin-inspect"));
 const plugin_react_1 = __importDefault(require("@vitejs/plugin-react"));
 const vite_plugin_css_modules_rsc_1 = __importDefault(require("./plugins/vite-plugin-css-modules-rsc"));
 const vite_plugin_client_imports_1 = __importDefault(require("./plugins/vite-plugin-client-imports"));
+const vite_plugin_hydrogen_suppress_warnings_1 = __importDefault(require("./plugins/vite-plugin-hydrogen-suppress-warnings"));
 exports.default = (pluginOptions = {}) => {
     return [
         process.env.VITE_INSPECT && (0, vite_plugin_inspect_1.default)(),
@@ -22,12 +24,14 @@ exports.default = (pluginOptions = {}) => {
         (0, vite_plugin_hydrogen_client_middleware_1.default)(),
         (0, vite_plugin_client_imports_1.default)(),
         (0, vite_plugin_hydrogen_middleware_1.default)(pluginOptions),
+        (0, vite_plugin_hydrogen_virtual_files_1.default)(pluginOptions),
         (0, plugin_react_1.default)(),
         (0, vite_plugin_hydration_auto_import_1.default)(),
         (0, vite_plugin_ssr_interop_1.default)(),
         (0, vite_plugin_css_modules_rsc_1.default)(),
         (0, vite_plugin_hydrogen_rsc_1.default)(),
         (0, vite_plugin_platform_entry_1.default)(),
+        (0, vite_plugin_hydrogen_suppress_warnings_1.default)(),
         pluginOptions.purgeQueryCacheOnBuild && (0, vite_plugin_purge_query_cache_1.default)(),
     ];
 };

package/dist/node/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/node/framework/plugins/vite-plugin-hydrogen-config.js

@@ -14,7 +14,7 @@ exports.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.
@@ -84,11 +84,14 @@ exports.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/node/framework/plugins/vite-plugin-hydrogen-middleware.js

@@ -10,16 +10,11 @@ const path_1 = __importDefault(require("path"));
 const fs_1 = require("fs");
 const middleware_1 = require("../middleware");
 const in_memory_1 = require("../cache/in-memory");
+const vite_plugin_hydrogen_virtual_files_1 = require("./vite-plugin-hydrogen-virtual-files");
 exports.HYDROGEN_DEFAULT_SERVER_ENTRY = process.env.HYDROGEN_SERVER_ENTRY || '/src/App.server';
-const virtualModuleId = 'virtual:hydrogen-config';
-const virtualProxyModuleId = virtualModuleId + ':proxy';
 exports.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,
@@ -39,7 +34,7 @@ exports.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(vite_plugin_hydrogen_virtual_files_1.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}`);
@@ -47,11 +42,10 @@ exports.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(body_parser_1.default.raw({ type: '*/*' }));
@@ -65,26 +59,6 @@ exports.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) {
@@ -99,18 +73,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_1.promises.readdir(root);
-        configPath = files.find((file) => /^hydrogen\.config\.[jt]s$/.test(file));
-    }
-    if (configPath) {
-        configPath = (0, vite_1.normalizePath)(configPath);
-        if (!configPath.startsWith('/'))
-            configPath = path_1.default.resolve(root, configPath);
-    }
-    return (configPath ||
-        require.resolve('@shopify/hydrogen/dist/esnext/utilities/empty-hydrogen-config.js'));
-}

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

@@ -6,9 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-ignore
 const plugin_1 = __importDefault(require("@shopify/hydrogen/vendor/react-server-dom-vite/plugin"));
 const vite_plugin_hydrogen_middleware_1 = require("./vite-plugin-hydrogen-middleware");
-const vite_1 = require("vite");
+const vite_plugin_hydrogen_virtual_files_1 = require("./vite-plugin-hydrogen-virtual-files");
 function default_1() {
     return (0, plugin_1.default)({
+        serverBuildEntries: [
+            vite_plugin_hydrogen_middleware_1.HYDROGEN_DEFAULT_SERVER_ENTRY,
+            vite_plugin_hydrogen_virtual_files_1.VIRTUAL_PROXY_HYDROGEN_ROUTES_ID,
+        ],
         isServerComponentImporterAllowed(importer, source) {
             return (
             // Always allow the entry server (e.g. App.server.jsx) to be imported
@@ -19,23 +23,6 @@ function default_1() {
                 // 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 (0, vite_1.createServer)({
-                clearScreen: false,
-                server: { middlewareMode: 'ssr' },
-            });
-            await Promise.all([
-                // Load server entry to discover client components early
-                server.ssrLoadModule(vite_plugin_hydrogen_middleware_1.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 plugin_1.default.findClientComponentsFromServer(server);
-        },
     });
 }
 exports.default = default_1;

package/dist/node/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/node/framework/plugins/vite-plugin-hydrogen-suppress-warnings.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.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/node/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;