@shopify/hydrogen 1.3.1 → 1.3.2

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

@@ -4,10 +4,23 @@ import MagicString from 'magic-string';
 import path from 'path';
 import fs from 'fs';
 import fastGlob from 'fast-glob';
+import { isVite3 } from '../../utilities/vite.js';
 const SSR_BUNDLE_NAME = 'index.js';
 // Keep this in the outer scope to share it
 // across client <> server builds.
 let clientBuildPath;
+/* -- Plugin notes:
+ * This plugin simplifies the way a platform entry file imports user files. This is
+ * needed to write generic integrations with different platform providers.
+ *
+ * Instead of using relative paths:
+ * `import handleRequest from '../../<arbitrary_path>/src/App.server';`
+ * `import indexTemplate from '../../<arbitrary_path>/dist/client/index.html?raw';`
+ *
+ *  It allows importing from a known static path which dynamically resolves the user files:
+ * `import {handleRequest, indexTemplate} from '@shopify/hydrogen/platforms';`
+ *
+ */
 export default () => {
     let config;
     let isESM;
@@ -18,7 +31,7 @@ export default () => {
             config = _config;
             if (config.build.ssr) {
                 const { output = {} } = config.build.rollupOptions || {};
-                const { format = '' } = (Array.isArray(output) ? output[0] : output) || {};
+                const { format = isVite3 ? 'es' : '' } = (Array.isArray(output) ? output[0] : output) || {};
                 isESM = Boolean(process.env.WORKER) || ['es', 'esm'].includes(format);
             }
         },

package/dist/esnext/framework/plugins/vite-plugin-ssr-interop.js

@@ -1,6 +1,10 @@
+/* -- Plugin notes:
+ * This plugin makes sure we don't leak server logic to the browser when importing
+ * the `useEnvContext` utility.
+ */
 export default () => {
     return {
-        name: 'vite-plugin-ssr-interop',
+        name: 'hydrogen:ssr-interop',
         enforce: 'pre',
         transform(code, id, options = {}) {
             if (options.ssr && id.includes('foundation/ssr-interop')) {

package/dist/esnext/framework/viteception.js

@@ -1,10 +1,16 @@
 import { createServer } from 'vite';
+import { isVite3 } from '../utilities/vite.js';
 export async function viteception(paths, options) {
     const isWorker = process.env.WORKER;
     delete process.env.WORKER;
     const server = await createServer({
         clearScreen: false,
-        server: { middlewareMode: 'ssr' },
+        server: {
+            middlewareMode: isVite3 ? true : 'ssr',
+            hmr: false,
+        },
+        // @ts-ignore
+        appType: 'custom',
         ...options,
     });
     if (isWorker) {

package/dist/esnext/types.d.ts

@@ -8,6 +8,7 @@ import type { HydrogenResponse } from './foundation/HydrogenResponse/HydrogenRes
 import type { Metafield } from './storefront-api-types.js';
 import type { SessionStorageAdapter } from './foundation/session/session-types.js';
 import type { PartialDeep, JsonValue } from 'type-fest';
+import type { TemplateParts } from './utilities/template.js';
 export declare type AssembleHtmlParams = {
     ssrHtml: string;
     rscPayload?: string;
@@ -26,7 +27,7 @@ export declare type RunSsrParams = {
     response: HydrogenResponse;
     log: Logger;
     dev?: boolean;
-    template: string;
+    template: TemplateParts;
     nonce?: string;
     nodeResponse?: ServerResponse;
     revalidate?: Boolean;

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

@@ -1,9 +1,11 @@
 import { ResolvedHydrogenConfig, ResolvedHydrogenRoutes } from '../types.js';
+import { Logger } from '../utilities/log/index.js';
 import type { HydrogenRequest } from '../foundation/HydrogenRequest/HydrogenRequest.server.js';
 import type { SessionApi, SessionStorageAdapter } from '../foundation/session/session-types.js';
 import { UseShopQueryResponse } from '../hooks/useShopQuery/hooks.js';
 declare type RouteParams = Record<string, string>;
 export declare type RequestOptions = {
+    log: Logger;
     params: RouteParams;
     queryShop: <T>(args: QueryShopArgs) => Promise<UseShopQueryResponse<T>>;
     session: SessionApi | null;

package/dist/esnext/utilities/apiRoutes.js

@@ -104,6 +104,7 @@ export async function renderApiRoute(request, route, hydrogenConfig, { session,
     let cookieToSet = '';
     try {
         response = await route.resource(request, {
+            log,
             params: route.params,
             queryShop: queryShopBuilder(hydrogenConfig.shopify, request),
             hydrogenConfig,

package/dist/esnext/utilities/log/log.js

@@ -28,9 +28,18 @@ const defaultLogger = {
 };
 let currentLogger = defaultLogger;
 function doLog(method, request, ...args) {
-    const maybePromise = currentLogger[method](request, ...args);
-    if (maybePromise instanceof Promise) {
-        request?.ctx?.runtime?.waitUntil?.(maybePromise);
+    try {
+        const maybePromise = currentLogger[method](request, ...args);
+        if (maybePromise instanceof Promise) {
+            request?.ctx?.runtime?.waitUntil?.(maybePromise.catch((e) => {
+                const message = e instanceof Error ? e.stack : e;
+                defaultLogger.error(`Promise error from the custom logging implementation for logger.${method} failed:\n${message}`);
+            }));
+        }
+    }
+    catch (e) {
+        const message = e instanceof Error ? e.stack : e;
+        defaultLogger.error(`The custom logging implementation for logger.${method} failed:\n${message}`);
     }
 }
 export function getLoggerWithContext(context) {

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

@@ -1,9 +1,10 @@
-/**
- * Strip out script `src` values from <script> tags in a given HTML template.
- * Returns two lists of scripts, split based on whether they are `type="module"`.
- */
-export declare function stripScriptsFromTemplate(template: string): {
+export declare function getTemplate(indexTemplate: string | ((url: string) => Promise<string | {
+    default: string;
+}>), url?: URL): Promise<{
     noScriptTemplate: string;
     bootstrapScripts: string[];
     bootstrapModules: string[];
-};
+    raw: string;
+    linkHeader: string;
+}>;
+export declare type TemplateParts = Awaited<ReturnType<typeof getTemplate>>;

package/dist/esnext/utilities/template.js

@@ -2,7 +2,7 @@
  * Strip out script `src` values from <script> tags in a given HTML template.
  * Returns two lists of scripts, split based on whether they are `type="module"`.
  */
-export function stripScriptsFromTemplate(template) {
+function stripScriptsFromTemplate(template) {
     const bootstrapScripts = [];
     const bootstrapModules = [];
     const scripts = template.matchAll(/<script\n*?.+?src="(?<script>([^"]+?))"\n*.*?><\/script>/g);
@@ -20,3 +20,41 @@ export function stripScriptsFromTemplate(template) {
     }
     return { noScriptTemplate: template, bootstrapScripts, bootstrapModules };
 }
+function extractAttributes(string) {
+    const attributes = {};
+    for (const [, attr, value] of string.matchAll(/\s([\w-]+)="([^"]*?)"/gm)) {
+        attributes[attr] = value;
+    }
+    return attributes;
+}
+export async function getTemplate(indexTemplate, url) {
+    let raw = typeof indexTemplate === 'function'
+        ? await indexTemplate(url?.toString() || '')
+        : indexTemplate;
+    if (raw && typeof raw !== 'string') {
+        raw = raw.default;
+    }
+    return {
+        raw,
+        linkHeader: createLinkHeader(raw),
+        ...stripScriptsFromTemplate(raw),
+    };
+}
+const ALLOWED_REL_ATTRS = ['stylesheet', 'preconnect', 'preload'];
+function createLinkHeader(template) {
+    const assets = (template.match(/\s*<link[^<>]+?>/gim) || []).map(extractAttributes);
+    const links = [];
+    for (const { href, rel = '', ...attrs } of assets) {
+        if (href && ALLOWED_REL_ATTRS.includes(rel)) {
+            const isStyle = rel === 'stylesheet';
+            if (isStyle && !attrs.as)
+                attrs.as = 'style';
+            links.push([
+                `<${encodeURI(href.replace(/^https?:/i, ''))}>`,
+                `rel=${isStyle ? 'preload' : rel}`,
+                ...Object.entries(attrs).map((entry) => entry.join('=')),
+            ].join('; '));
+        }
+    }
+    return links.join(', ');
+}

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

@@ -0,0 +1 @@
+export declare const isVite3: any;

package/dist/esnext/utilities/vite.js

@@ -0,0 +1,4 @@
+// `version` is only exported in Vite 3
+import * as vite from 'vite';
+// @ts-ignore
+export const isVite3 = vite.version?.startsWith('3.');

package/dist/esnext/version.d.ts

@@ -1 +1 @@
-export declare const LIB_VERSION = "1.3.1";
+export declare const LIB_VERSION = "1.3.2";

package/dist/esnext/version.js

@@ -1 +1 @@
-export const LIB_VERSION = '1.3.1';
+export const LIB_VERSION = '1.3.2';

package/dist/node/framework/plugin.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 const vite_plugin_hydrogen_config_js_1 = __importDefault(require("./plugins/vite-plugin-hydrogen-config.js"));
 const vite_plugin_hydrogen_middleware_js_1 = __importDefault(require("./plugins/vite-plugin-hydrogen-middleware.js"));
-const vite_plugin_hydrogen_client_middleware_js_1 = __importDefault(require("./plugins/vite-plugin-hydrogen-client-middleware.js"));
+const vite_plugin_hydrogen_client_components_cache_js_1 = __importDefault(require("./plugins/vite-plugin-hydrogen-client-components-cache.js"));
 const vite_plugin_hydrogen_virtual_files_js_1 = __importDefault(require("./plugins/vite-plugin-hydrogen-virtual-files.js"));
 const vite_plugin_platform_entry_js_1 = __importDefault(require("./plugins/vite-plugin-platform-entry.js"));
 const vite_plugin_hydrogen_rsc_js_1 = __importDefault(require("./plugins/vite-plugin-hydrogen-rsc.js"));
@@ -21,7 +21,7 @@ const hydrogenPlugin = (pluginOptions = {}) => {
     return [
         process.env.VITE_INSPECT && (0, vite_plugin_inspect_1.default)(),
         (0, vite_plugin_hydrogen_config_js_1.default)(pluginOptions),
-        (0, vite_plugin_hydrogen_client_middleware_js_1.default)(),
+        (0, vite_plugin_hydrogen_client_components_cache_js_1.default)(),
         (0, vite_plugin_client_imports_js_1.default)(),
         (0, vite_plugin_hydrogen_middleware_js_1.default)(pluginOptions),
         (0, vite_plugin_hydrogen_virtual_files_js_1.default)(pluginOptions),

package/dist/node/framework/plugins/vite-plugin-assets-version.js

@@ -1,5 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* -- Plugin notes:
+ * Used to manually change the hash of output chunks (`index.k12dw5q.js`)
+ * when their content have not been updated.
+ */
 function assetsVersion(version) {
     return {
         name: 'hydrogen:augment-with-version',

package/dist/node/framework/plugins/vite-plugin-client-imports.js

@@ -1,5 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* -- Plugin notes:
+ * This plugin allows to import always from '@shopify/hydrogen' path, instead of
+ * using '@shopify/hydrogen/client' in browser files. It does this by redirecting
+ * the server path to the browser path if the importer file is a client component.
+ */
 function clientImports() {
     return {
         name: 'hydrogen:client-imports',
@@ -16,9 +21,7 @@ function clientImports() {
                 return;
             if ('@shopify/hydrogen' !== source)
                 return;
-            const resolution = await this.resolve('@shopify/hydrogen/client', importer, {
-                skipSelf: true,
-            });
+            const resolution = await this.resolve('@shopify/hydrogen/client', importer, { skipSelf: true });
             if (resolution) {
                 return resolution.id;
             }

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

@@ -6,6 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const vite_plugin_hydrogen_middleware_js_1 = require("./vite-plugin-hydrogen-middleware.js");
 const magic_string_1 = __importDefault(require("magic-string"));
 const path_1 = __importDefault(require("path"));
+/* -- Plugin notes:
+ * Old approach to inlining CSS inside server components. This is deprecated.
+ */
 const cssModuleRE = /\.module\.(s?css|sass|less|stylus)/;
 function cssModulesRsc() {
     // 1. Original CSS module: `.myStyle { color: red; }`

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

@@ -11,6 +11,14 @@ const INJECT_STYLES_COMMENT = '<!--__INJECT_STYLES__-->';
 // Keep this in the outer scope to share it
 // across client <> server builds.
 let clientBuildPath;
+/* -- Plugin notes:
+ * This plugin collects all the CSS imported in both client and server components and
+ * extracts it in a single stylesheet that is added to the <head>. It does this by:
+ * 1. Removing all the CSS generated during the client build. The client build CSS is a sub-set of the
+ * server build CSS because it can only find CSS imported in client components. This avoids duplicates.
+ * 2. Force Vite to collect CSS in every file during the server build, and emit it as a chunk.
+ * 3. Move the generated CSS chunk in the server build to the client build output as an asset, and link to it in `index.html`.
+ */
 function cssRsc() {
     let config;
     return {

package/dist/node/framework/plugins/vite-plugin-hydration-auto-import.js

@@ -7,10 +7,16 @@ const vite_1 = require("vite");
 const path_1 = __importDefault(require("path"));
 const magic_string_1 = __importDefault(require("magic-string"));
 const HYDROGEN_ENTRY_FILE = 'hydrogen-entry-client.jsx';
+/* -- Plugin notes:
+ * Originally, every Hydrogen app required a `src/entry-client.jsx` file. However, this file
+ * was rarely modified by the user. This plugin provides a virtual file with the same content of
+ * that file, which allows to remove it by default from the file system.
+ * The virtual file created here is imported in `index.html` in a script tag.
+ */
 exports.default = () => {
     let config;
     return {
-        name: 'vite-plugin-hydration-auto-import',
+        name: 'hydrogen:client-hydration-auto-import',
         enforce: 'pre',
         configResolved(_config) {
             config = _config;

package/dist/node/framework/plugins/vite-plugin-hydrogen-client-components-cache.d.ts

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

package/dist/node/framework/plugins/{vite-plugin-hydrogen-client-middleware.js → vite-plugin-hydrogen-client-components-cache.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const vite_1 = require("vite");
-/**
+/* -- Plugin notes:
  * 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
@@ -9,7 +9,7 @@ const vite_1 = require("vite");
  */
 exports.default = () => {
     return {
-        name: 'vite-plugin-hydrogen-client-middleware',
+        name: 'hydrogen:client-components-cache',
         enforce: 'pre',
         configureServer(server) {
             server.middlewares.use(async (req, res, next) => {

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

@@ -4,108 +4,118 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const crypto_1 = __importDefault(require("crypto"));
+/* -- Plugin notes:
+ * Provide configuration options to Vite to ensure Hydrogen is built correctly
+ * for worker environments, using latest ES syntax, and some other requirements.
+ */
 exports.default = (pluginOptions) => {
     const rollupOptions = {
         output: {},
     };
     const isWorker = Boolean(process.env.WORKER) && process.env.WORKER !== 'undefined';
-    if (isWorker) {
-        /**
-         * By default, SSR dedupe logic gets bundled which runs `require('module')`.
-         * We don't want this in our workers runtime, because `require` is not supported.
-         */
-        rollupOptions.output = {
-            format: 'es',
-        };
-    }
-    if (process.env.NODE_ENV !== 'development' && !process.env.LOCAL_DEV) {
-        /**
-         * Ofuscate production asset name - To prevent ad blocker logics that blocks
-         * certain files due to how it is named.
-         */
-        rollupOptions.output = {
-            ...rollupOptions.output,
-            chunkFileNames: 'assets/[hash].js',
-        };
-    }
     return {
         name: 'hydrogen:config',
-        config: async (config, env) => ({
-            resolve: {
-                alias: {
-                    // This library is currently included as a compiled vendor lib, not published yet to NPM
-                    'react-server-dom-vite/client-proxy': require.resolve('@shopify/hydrogen/vendor/react-server-dom-vite/esm/react-server-dom-vite-client-proxy.js'),
-                },
-            },
-            build: {
-                minify: config.build?.minify ?? (process.env.LOCAL_DEV ? false : 'esbuild'),
-                sourcemap: true,
-                rollupOptions: config.build?.rollupOptions
-                    ? Object.assign(rollupOptions, config.build.rollupOptions)
-                    : rollupOptions,
-                target: config.build?.ssr
-                    ? isWorker
-                        ? 'es2022' // CFW (Updates weekly to latest V8)
-                        : 'es2020' // Node (Support for v14.19 used in SB)
-                    : 'modules', // Browsers (Vite default value)
-            },
-            ssr: {
+        config: async (config, env) => {
+            // @ts-ignore
+            const isSsrBuild = env.ssrBuild ?? !!config.build?.ssr;
+            /**
+             * By default, SSR dedupe logic gets bundled which runs `require('module')`.
+             * We don't want this in our workers runtime, because `require` is not supported.
+             */
+            rollupOptions.output = {
+                format: isWorker || !isSsrBuild ? 'es' : 'cjs',
+                inlineDynamicImports: isSsrBuild ? true : undefined,
+            };
+            if (process.env.NODE_ENV !== 'development' && !process.env.LOCAL_DEV) {
                 /**
-                 * Tell Vite to bundle everything when we're building for Workers.
-                 * Otherwise, bundle RSC plugin as a workaround to apply the vendor alias above.
+                 * Ofuscate production asset name - To prevent ad blocker logics that blocks
+                 * certain files due to how it is named.
                  */
-                noExternal: isWorker || [/react-server-dom-vite/, /@shopify\/hydrogen/],
-                target: isWorker ? 'webworker' : 'node',
-            },
-            // Reload when updating local Hydrogen lib
-            server: process.env.LOCAL_DEV && {
-                watch: {
-                    ignored: [
-                        '!**/node_modules/@shopify/hydrogen/**',
-                        '!**/node_modules/@shopify/hydrogen-ui/**',
-                    ],
+                rollupOptions.output = {
+                    ...rollupOptions.output,
+                    chunkFileNames: 'assets/[hash].js',
+                };
+            }
+            return {
+                resolve: {
+                    alias: {
+                        // This library is currently included as a compiled vendor lib, not published yet to NPM
+                        'react-server-dom-vite/client-proxy': require.resolve('@shopify/hydrogen/vendor/react-server-dom-vite/esm/react-server-dom-vite-client-proxy.js'),
+                    },
                 },
-            },
-            optimizeDeps: {
-                exclude: [
-                    '@shopify/hydrogen',
-                    '@shopify/hydrogen/client',
-                    '@shopify/hydrogen/entry-client',
-                    '@shopify/hydrogen-ui',
-                ],
-                include: [
-                    /**
-                     * Additionally, the following dependencies have trouble loading the
-                     * correct version of the dependency (server vs client). This tells Vite to take the
-                     * server versions and optimize them for ESM.
-                     */
-                    'react-helmet-async',
-                    'react-error-boundary',
+                build: {
+                    minify: config.build?.minify ?? (process.env.LOCAL_DEV ? false : 'esbuild'),
+                    sourcemap: true,
+                    rollupOptions: config.build?.rollupOptions
+                        ? Object.assign(rollupOptions, config.build.rollupOptions)
+                        : rollupOptions,
+                    target: config.build?.ssr
+                        ? isWorker
+                            ? 'es2022' // CFW (Updates weekly to latest V8)
+                            : 'es2020' // Node (Support for v14.19 used in SB)
+                        : 'modules', // Browsers (Vite default value)
+                },
+                ssr: {
                     /**
-                     * Vite cannot find the following dependencies since they might be
-                     * required in RSC asynchronously. This tells Vite to optimize them
-                     * at server start to avoid posterior page reloads and issues (#429 #430).
+                     * Tell Vite to bundle everything when we're building for Workers.
+                     * Otherwise, bundle RSC plugin as a workaround to apply the vendor alias above.
                      */
-                    'react',
-                    'react-dom/client',
-                    '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',
-                    'undici',
-                ],
-            },
-            define: {
-                __HYDROGEN_DEV__: env.mode !== 'production',
-                __HYDROGEN_WORKER__: isWorker,
-                __HYDROGEN_TEST__: false,
-                __HYDROGEN_CACHE_ID__: pluginOptions.purgeQueryCacheOnBuild
-                    ? `"${crypto_1.default.randomBytes(8).toString('hex').slice(0, 8)}"`
-                    : '"__QUERY_CACHE_ID__"',
-            },
-            envPrefix: ['VITE_', 'PUBLIC_'],
-            base: process.env.HYDROGEN_ASSET_BASE_URL,
-        }),
+                    noExternal: isWorker || [
+                        /react-server-dom-vite/,
+                        /@shopify\/hydrogen/,
+                    ],
+                    target: isWorker ? 'webworker' : 'node',
+                },
+                // Reload when updating local Hydrogen lib
+                server: process.env.LOCAL_DEV && {
+                    watch: {
+                        ignored: [
+                            '!**/node_modules/@shopify/hydrogen/**',
+                            '!**/node_modules/@shopify/hydrogen-ui/**',
+                        ],
+                    },
+                },
+                optimizeDeps: {
+                    exclude: [
+                        '@shopify/hydrogen',
+                        '@shopify/hydrogen/client',
+                        '@shopify/hydrogen/entry-client',
+                        '@shopify/hydrogen-ui',
+                    ],
+                    include: [
+                        /**
+                         * Additionally, the following dependencies have trouble loading the
+                         * correct version of the dependency (server vs client). This tells Vite to take the
+                         * server versions and optimize them for ESM.
+                         */
+                        'react-helmet-async',
+                        'react-error-boundary',
+                        /**
+                         * Vite cannot find the following dependencies since they might be
+                         * required in RSC asynchronously. This tells Vite to optimize them
+                         * at server start to avoid posterior page reloads and issues (#429 #430).
+                         */
+                        'react',
+                        'react-dom/client',
+                        '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',
+                        'undici',
+                    ],
+                },
+                define: {
+                    __HYDROGEN_DEV__: env.mode !== 'production',
+                    __HYDROGEN_WORKER__: isWorker,
+                    __HYDROGEN_TEST__: false,
+                    __HYDROGEN_CACHE_ID__: pluginOptions.purgeQueryCacheOnBuild
+                        ? `"${crypto_1.default.randomBytes(8).toString('hex').slice(0, 8)}"`
+                        : '"__QUERY_CACHE_ID__"',
+                },
+                envPrefix: ['VITE_', 'PUBLIC_'],
+                base: process.env.HYDROGEN_ASSET_BASE_URL,
+            };
+        },
     };
 };

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

@@ -12,15 +12,15 @@ const middleware_js_1 = require("../middleware.js");
 const in_memory_js_1 = require("../cache/in-memory.js");
 const vite_plugin_hydrogen_virtual_files_js_1 = require("./vite-plugin-hydrogen-virtual-files.js");
 exports.HYDROGEN_DEFAULT_SERVER_ENTRY = process.env.HYDROGEN_SERVER_ENTRY || '/src/App.server';
+/* -- Plugin notes:
+ * 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,
+ * loading them in an SSR context, rendering them using the `entry-server` endpoint in the
+ * user's project, and injecting the static HTML into the template.
+ */
 exports.default = (pluginOptions) => {
     return {
         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,
-         * loading them in an SSR context, rendering them using the `entry-server` endpoint in the
-         * user's project, and injecting the static HTML into the template.
-         */
         async configureServer(server) {
             const resolve = (p) => path_1.default.resolve(server.config.root, p);
             async function getIndexTemplate(url) {

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

@@ -1,5 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* -- Plugin notes:
+ * Vite prints some warnings automatically are not important and
+ * not actionable. We hide them here to prevent confusing devs when
+ * real warnings or errors appear.
+ */
 exports.default = () => {
     return {
         name: 'hydrogen:suppress-warnings',

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

@@ -9,6 +9,14 @@ const path_1 = __importDefault(require("path"));
 const fs_1 = require("fs");
 const viteception_js_1 = require("../viteception.js");
 const magic_string_1 = __importDefault(require("magic-string"));
+const vite_js_1 = require("../../utilities/vite.js");
+/* -- Plugin notes:
+ * The Hydrogen framework needs to import certain files from the user app, such as
+ * routes and config. A priori, we can't import these files from the framework
+ * because we don't know the user path to write it in an `import * from '...'` statement.
+ * Instead, we import "virtual files" that are resolved by Vite in this plugin.
+ * These virtual files can include the user path and re-export the in-app files.
+ */
 exports.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__';
@@ -21,6 +29,7 @@ exports.VIRTUAL_PROXY_HYDROGEN_CONFIG_ID = VIRTUAL_PREFIX + PROXY_PREFIX + HYDRO
 const HYDROGEN_ROUTES_ID = 'hydrogen-routes.server.jsx';
 const VIRTUAL_HYDROGEN_ROUTES_ID = VIRTUAL_PREFIX + HYDROGEN_ROUTES_ID;
 exports.VIRTUAL_PROXY_HYDROGEN_ROUTES_ID = VIRTUAL_PREFIX + PROXY_PREFIX + HYDROGEN_ROUTES_ID;
+const VIRTUAL_STREAM_ID = 'virtual__stream';
 exports.default = (pluginOptions) => {
     let config;
     let server;
@@ -47,6 +56,7 @@ exports.default = (pluginOptions) => {
                 exports.VIRTUAL_PROXY_HYDROGEN_ROUTES_ID,
                 VIRTUAL_HYDROGEN_ROUTES_ID,
                 VIRTUAL_ERROR_FILE,
+                VIRTUAL_STREAM_ID,
             ].includes(source)) {
                 // Virtual modules convention
                 // https://vitejs.dev/guide/api-plugin.html#virtual-modules-convention
@@ -54,6 +64,13 @@ exports.default = (pluginOptions) => {
             }
         },
         load(id) {
+            if (id === '\0' + VIRTUAL_STREAM_ID) {
+                return {
+                    code: process.env.WORKER
+                        ? `export default {};`
+                        : `export {default} from 'stream';`,
+                };
+            }
             // 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' + exports.VIRTUAL_PROXY_HYDROGEN_CONFIG_ID) {
@@ -76,7 +93,10 @@ exports.default = (pluginOptions) => {
                         routesPath += '**/*.server.[jt](s|sx)';
                     }
                     const [dirPrefix] = routesPath.split('/*');
-                    let code = `export default {\n  dirPrefix: '${dirPrefix}',\n  basePath: '${hc.routes?.basePath ?? ''}',\n  files: import.meta.globEager('${routesPath}')\n};`;
+                    const importGlob = vite_js_1.isVite3
+                        ? `import.meta.glob('${routesPath}', {eager: true})`
+                        : `import.meta.globEager('${routesPath}')`;
+                    let code = `export default {\n  dirPrefix: '${dirPrefix}',\n  basePath: '${hc.routes?.basePath ?? ''}',\n  files: ${importGlob}\n};`;
                     if (config.command === 'serve') {
                         // Add dependency on Hydrogen config for HMR
                         code += `\nimport '${VIRTUAL_HYDROGEN_CONFIG_ID}';`;