@shopify/hydrogen 0.25.1 → 0.26.0

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

@@ -15,9 +15,8 @@ exports.default = () => {
             server.middlewares.use(async (req, res, next) => {
                 const url = req.url;
                 try {
-                    if (url.includes('.client.js') &&
-                        url.includes('?v=') &&
-                        !url.includes('node_modules')) {
+                    if (/\.client\.[jt]sx?\?v=/.test(url) &&
+                        !/\/node_modules\//.test(url)) {
                         const result = await server.transformRequest(url, { html: false });
                         if (result) {
                             return (0, vite_1.send)(req, res, result.code, 'js', {

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

@@ -21,20 +21,25 @@ exports.VIRTUAL_PROXY_HYDROGEN_ROUTES_ID = VIRTUAL_PREFIX + PROXY_PREFIX + HYDRO
 exports.default = (pluginOptions) => {
     let config;
     let server;
+    let resolvedConfigPath;
     return {
         name: 'hydrogen:virtual-files',
         configResolved(_config) {
             config = _config;
+            // @ts-ignore
+            config.plugins.push(addPathToConfigProxy());
         },
         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 }));
+                return findHydrogenConfigPath(config.root, pluginOptions.configPath).then((hcPath) => {
+                    resolvedConfigPath = hcPath;
+                    // This direct dependency on a real file
+                    // makes HMR work for the virtual module.
+                    return this.resolve(hcPath, importer, { skipSelf: true });
+                });
             }
             if ([
                 exports.VIRTUAL_PROXY_HYDROGEN_CONFIG_ID,
@@ -87,6 +92,18 @@ exports.default = (pluginOptions) => {
         const { loaded } = await (0, viteception_1.viteception)([exports.VIRTUAL_PROXY_HYDROGEN_CONFIG_ID]);
         return loaded[0].default;
     }
+    function addPathToConfigProxy() {
+        return {
+            name: 'hydrogen:virtual-files-post',
+            enforce: 'post',
+            transform(code, id) {
+                if (id === '\0' + exports.VIRTUAL_PROXY_HYDROGEN_CONFIG_ID) {
+                    // The CLI needs to import the Hydrogen config path
+                    return (code + ` export const configPath = '${resolvedConfigPath || ''}';`);
+                }
+            },
+        };
+    }
 };
 async function findHydrogenConfigPath(root, userProvidedPath) {
     let configPath = userProvidedPath;

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

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

package/dist/node/framework/viteception.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.viteception = void 0;
 const vite_1 = require("vite");
-async function viteception(paths) {
+async function viteception(paths, options) {
     const isWorker = process.env.WORKER;
     delete process.env.WORKER;
     const server = await (0, vite_1.createServer)({
         clearScreen: false,
         server: { middlewareMode: 'ssr' },
+        ...options,
     });
     if (isWorker) {
         process.env.WORKER = isWorker;

package/package.json

@@ -7,7 +7,7 @@
   "engines": {
     "node": ">=14"
   },
-  "version": "0.25.1",
+  "version": "0.26.0",
   "description": "Modern custom Shopify storefronts",
   "license": "MIT",
   "main": "dist/esnext/index.js",
@@ -22,11 +22,19 @@
       "import": "./dist/esnext/framework/middleware.js",
       "require": "./dist/node/framework/middleware.js"
     },
+    "./load-config": {
+      "import": "./dist/esnext/framework/load-config.js",
+      "require": "./dist/node/framework/load-config.js"
+    },
     "./web-polyfills": {
       "import": "./dist/esnext/utilities/web-api-polyfill",
       "require": "./dist/node/utilities/web-api-polyfill"
     },
     "./vendor/*": "./vendor/*",
+    "./cache/*": {
+      "import": "./dist/esnext/framework/cache/*.js",
+      "require": "./dist/node/framework/cache/*.js"
+    },
     "./package.json": "./package.json",
     "./*": "./dist/esnext/*.js"
   },
@@ -111,6 +119,7 @@
     "@vitejs/plugin-react": "^1.3.0",
     "abort-controller": "^3.0.0",
     "body-parser": "^1.20.0",
+    "compression": "^1.7.4",
     "connect": "^3.7.0",
     "es-module-lexer": "^0.10.0",
     "fast-glob": "^3.2.11",
@@ -123,11 +132,12 @@
     "path-to-regexp": "^6.2.0",
     "react-error-boundary": "^3.1.3",
     "react-helmet-async": "^1.2.3",
+    "serve-static": "^1.15.0",
     "set-cookie-parser": "^2.5.0",
+    "undici": "^5.5.1",
     "uuid": "^8.3.2",
     "vite-plugin-inspect": "^0.3.6",
     "web-streams-polyfill": "^3.2.0",
-    "worktop": "^0.7.3",
-    "undici": "^5.5.1"
+    "worktop": "^0.7.3"
   }
 }

package/vendor/react-server-dom-vite/cjs/react-server-dom-vite-plugin.js

@@ -111,8 +111,9 @@ function ReactFlightVitePlugin() {
 
   var config;
   var server;
-  var globImporterPath;
   var resolveAlias;
+  var globImporterPath;
+  var allClientBoundaries = new Set();
   return {
     name: 'vite-plugin-react-server-components',
     enforce: 'pre',
@@ -250,7 +251,7 @@ function ReactFlightVitePlugin() {
           });
           var injectedGlobs = "Object.assign(Object.create(null), " + importers.map(function (glob) {
             return (// Mark the globs to modify the result after Vite resolves them.
-              "/* HASH_BEGIN */ " + ("import.meta.glob('" + vite.normalizePath(glob) + "') /* HASH_END */")
+              "\n/* HASH_BEGIN */ " + ("import.meta.glob('" + vite.normalizePath(glob) + "') /* HASH_END */")
             );
           }).join(', ') + ");";
           s.replace(INJECTING_RE, injectedGlobs);
@@ -264,8 +265,17 @@ function ReactFlightVitePlugin() {
         };
 
         if (config.command === 'serve') {
-          globImporterPath = id;
-          return injectGlobs(findClientBoundaries(server.moduleGraph));
+          globImporterPath = id; // When mixing client and server components from the same
+          // facade file, the module graph can break and miss certain
+          // import connections (bug in Vite?) due to HMR. Instead of
+          // creating a new list of discovered components from scratch,
+          // reuse the already discovered ones and simply add new ones
+          // to the list without removing anything.
+
+          findClientBoundaries(server.moduleGraph).forEach(function (boundary) {
+            return allClientBoundaries.add(boundary);
+          });
+          return injectGlobs(Array.from(allClientBoundaries));
         }
 
         if (!serverBuildEntries) {
@@ -457,7 +467,7 @@ function isDirectImportInServer(originalMod, currentMod, accModInfo) {
       });
     }
 
-    return Array.from((currentMod || originalMod).importers).some(function (importer) {
+    return Array.from((currentMod || originalMod).importers || []).some(function (importer) {
       return (// eslint-disable-next-line no-unused-vars
         isDirectImportInServer(originalMod, importer, accModInfo)
       );
@@ -531,10 +541,15 @@ function augmentModuleGraph(moduleGraph, id, code, root, resolveAlias) {
       var resolvedAliasPath = resolveAlias(modPath, 'rsc_importer', {});
 
       if (resolvedAliasPath && resolvedAliasPath.id) {
-        modPath = vite.normalizePath(path.join(root, resolvedAliasPath.id));
+        modPath = resolvedAliasPath.id;
       }
     }
 
+    if (modPath && modPath.startsWith('/src/')) {
+      // Vite default alias
+      modPath = vite.normalizePath(path.join(root, modPath));
+    }
+
     var resolvedPath = resolveModPath(modPath, dirname);
     if (!resolvedPath) return; // Virtual modules or other exceptions
 

package/vendor/react-server-dom-vite/esm/react-server-dom-vite-client-proxy.js

@@ -20,7 +20,8 @@ var MODULE_TAG = Symbol.for('react.module.reference');
 var STRING_SIZE_LIMIT = 64;
 var FN_RSC_ERROR = 'Functions exported from client components cannot be called or used as constructors from a server component.';
 function isRsc() {
-  return !!__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentDispatcher.current.isRsc;
+  var currentDispatcher = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentDispatcher.current;
+  return !!(currentDispatcher && currentDispatcher.isRsc);
 }
 
 function createModuleReference(id, value, name, isDefault) {

package/vendor/react-server-dom-vite/esm/react-server-dom-vite-plugin.js

@@ -107,8 +107,9 @@ function ReactFlightVitePlugin() {
 
   var config;
   var server;
-  var globImporterPath;
   var resolveAlias;
+  var globImporterPath;
+  var allClientBoundaries = new Set();
   return {
     name: 'vite-plugin-react-server-components',
     enforce: 'pre',
@@ -246,7 +247,7 @@ function ReactFlightVitePlugin() {
           });
           var injectedGlobs = "Object.assign(Object.create(null), " + importers.map(function (glob) {
             return (// Mark the globs to modify the result after Vite resolves them.
-              "/* HASH_BEGIN */ " + ("import.meta.glob('" + normalizePath(glob) + "') /* HASH_END */")
+              "\n/* HASH_BEGIN */ " + ("import.meta.glob('" + normalizePath(glob) + "') /* HASH_END */")
             );
           }).join(', ') + ");";
           s.replace(INJECTING_RE, injectedGlobs);
@@ -260,8 +261,17 @@ function ReactFlightVitePlugin() {
         };
 
         if (config.command === 'serve') {
-          globImporterPath = id;
-          return injectGlobs(findClientBoundaries(server.moduleGraph));
+          globImporterPath = id; // When mixing client and server components from the same
+          // facade file, the module graph can break and miss certain
+          // import connections (bug in Vite?) due to HMR. Instead of
+          // creating a new list of discovered components from scratch,
+          // reuse the already discovered ones and simply add new ones
+          // to the list without removing anything.
+
+          findClientBoundaries(server.moduleGraph).forEach(function (boundary) {
+            return allClientBoundaries.add(boundary);
+          });
+          return injectGlobs(Array.from(allClientBoundaries));
         }
 
         if (!serverBuildEntries) {
@@ -453,7 +463,7 @@ function isDirectImportInServer(originalMod, currentMod, accModInfo) {
       });
     }
 
-    return Array.from((currentMod || originalMod).importers).some(function (importer) {
+    return Array.from((currentMod || originalMod).importers || []).some(function (importer) {
       return (// eslint-disable-next-line no-unused-vars
         isDirectImportInServer(originalMod, importer, accModInfo)
       );
@@ -527,10 +537,15 @@ function augmentModuleGraph(moduleGraph, id, code, root, resolveAlias) {
       var resolvedAliasPath = resolveAlias(modPath, 'rsc_importer', {});
 
       if (resolvedAliasPath && resolvedAliasPath.id) {
-        modPath = normalizePath(path.join(root, resolvedAliasPath.id));
+        modPath = resolvedAliasPath.id;
       }
     }
 
+    if (modPath && modPath.startsWith('/src/')) {
+      // Vite default alias
+      modPath = normalizePath(path.join(root, modPath));
+    }
+
     var resolvedPath = resolveModPath(modPath, dirname);
     if (!resolvedPath) return; // Virtual modules or other exceptions
 

package/dist/esnext/components/CartEstimatedCost/index.d.ts

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

package/dist/esnext/components/CartEstimatedCost/index.js

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

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

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

package/dist/esnext/hooks/useCountry/index.js

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

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

@@ -1,7 +0,0 @@
-/**
- * The `useCountry` hook returns a tuple of the current localization country and a function for updating it.
- * It must be a descendent of a `LocalizationProvider` component.
- */
-export declare function useCountry(): (({
-    __typename?: "Country" | undefined;
-} & Pick<import("../../storefront-api-types").Country, "name" | "isoCode">) | undefined)[];

package/dist/esnext/hooks/useCountry/useCountry.js

@@ -1,17 +0,0 @@
-import { useContext } from 'react';
-import { LocalizationContext } from '../../components/LocalizationProvider/LocalizationContext.client';
-function useLocalization() {
-    const context = useContext(LocalizationContext);
-    if (context == null) {
-        throw new Error('No Localization Context available');
-    }
-    return context;
-}
-/**
- * The `useCountry` hook returns a tuple of the current localization country and a function for updating it.
- * It must be a descendent of a `LocalizationProvider` component.
- */
-export function useCountry() {
-    const context = useLocalization();
-    return [context.country];
-}