@shopify/hydrogen 0.24.0 → 0.26.0

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

@@ -107,17 +107,9 @@ function ReactFlightVitePlugin() {
 
   var config;
   var server;
-  var invalidateTimeout;
-  var globImporterPath;
   var resolveAlias;
-
-  function invalidateGlobImporter() {
-    clearTimeout(invalidateTimeout);
-    invalidateTimeout = setTimeout(function () {
-      return server.watcher.emit('change', globImporterPath);
-    }, 100);
-  }
-
+  var globImporterPath;
+  var allClientBoundaries = new Set();
   return {
     name: 'vite-plugin-react-server-components',
     enforce: 'pre',
@@ -200,7 +192,12 @@ function ReactFlightVitePlugin() {
 
         if (!moduleNode.meta.isClientComponent) {
           moduleNode.meta.isClientComponent = true;
-          if (globImporterPath) invalidateGlobImporter();
+
+          if (globImporterPath) {
+            // Invalidate glob importer file to account for the
+            // newly discovered client component.
+            server.watcher.emit('change', globImporterPath);
+          }
         }
       }
 
@@ -250,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);
@@ -264,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) {
@@ -405,21 +411,61 @@ var hashImportsPlugin = {
     }
   }
 };
+
 /**
  * A client module should behave as a client boundary
  * if it is imported by the server before encountering
  * another boundary in the process.
- * Traverse the module graph upwards to find non client
- * components that import the current module.
+ * This traverses the module graph upwards to find non client
+ * components that import the `originalMod`.
+ *
+ * The `accModInfo` represents the exported members from the
+ * `originalMod` but renamed accordingly to all the intermediate/facade
+ * files in the import chain from the `originalMod` to every parent importer.
  */
-
-function isDirectImportInServer(currentMod, originalMod) {
+function isDirectImportInServer(originalMod, currentMod, accModInfo) {
   // TODO: this should use recursion in any module that exports
   // the original one, not only in full facade files.
-  if (!originalMod || (currentMod.meta || {}).isFacade) {
-    return Array.from(currentMod.importers).some(function (importer) {
+  if (!currentMod || (currentMod.meta || {}).isFacade) {
+    if (!accModInfo && originalMod.meta && originalMod.meta.namedExports) {
+      // First iteration in the recursion, initialize the
+      // acumulator with data from the original module.
+      accModInfo = {
+        file: originalMod.file,
+        exports: originalMod.meta.namedExports
+      };
+    }
+
+    if (currentMod && accModInfo) {
+      // Update accumulator in subsequent iterations with
+      // whatever the current module is re-exporting.
+      var lastModExports = accModInfo.exports;
+      var lastModImports = currentMod.meta.imports.filter(function (importMeta) {
+        return importMeta.action === 'export' && importMeta.from === accModInfo.file;
+      });
+      accModInfo = {
+        file: currentMod.file,
+        exports: []
+      };
+      lastModImports.forEach(function (mod) {
+        mod.variables.forEach(function (_ref2) {
+          var name = _ref2[0],
+              alias = _ref2[1];
+
+          if (name === '*' && !alias) {
+            var _accModInfo$exports;
+
+            (_accModInfo$exports = accModInfo.exports).push.apply(_accModInfo$exports, lastModExports);
+          } else {
+            accModInfo.exports.push(alias || name);
+          }
+        });
+      });
+    }
+
+    return Array.from((currentMod || originalMod).importers || []).some(function (importer) {
       return (// eslint-disable-next-line no-unused-vars
-        isDirectImportInServer(importer, originalMod || currentMod)
+        isDirectImportInServer(originalMod, importer, accModInfo)
       );
     });
   } // Not enough information: safer to assume it is
@@ -435,14 +481,12 @@ function isDirectImportInServer(currentMod, originalMod) {
   // However, due to the lack of tree-shaking in the dev module graph,
   // we need to manually make sure this module is importing something from
   // the original module before marking it as client boundary.
-  // -- TODO: this only checks namedExports right now. It should
-  // consider default exports and variable renaming in facade modules.
 
   return currentMod.meta.imports.some(function (imp) {
-    return imp.action === 'import' && (imp.from === originalMod.file || (imp.variables || []).some(function (_ref2) {
-      var name = _ref2[0];
-      return originalMod.meta.namedExports.includes(name);
-    }));
+    return imp.action === 'import' && imp.from === accModInfo.file && (imp.variables || []).some(function (_ref3) {
+      var name = _ref3[0];
+      return accModInfo.exports.includes(name);
+    });
   });
 }
 
@@ -478,12 +522,12 @@ function augmentModuleGraph(moduleGraph, id, code, root, resolveAlias) {
 
 
   var imports = [];
-  rawImports.forEach(function (_ref3) {
-    var startMod = _ref3.s,
-        endMod = _ref3.e,
-        dynamicImportIndex = _ref3.d,
-        startStatement = _ref3.ss,
-        endStatement = _ref3.se;
+  rawImports.forEach(function (_ref4) {
+    var startMod = _ref4.s,
+        endMod = _ref4.e,
+        dynamicImportIndex = _ref4.d,
+        startStatement = _ref4.ss,
+        endStatement = _ref4.se;
     if (dynamicImportIndex !== -1) return; // Skip dynamic imports for now
 
     var rawModPath = code.slice(startMod, endMod);
@@ -493,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
 
@@ -509,7 +558,7 @@ function augmentModuleGraph(moduleGraph, id, code, root, resolveAlias) {
       action: action,
       // 'import' or 'export'
       variables: variables // [['originalName', 'alias']]
-      .replace(/[{}]/gm, '').trim().split(/\s*,\s*/m).filter(Boolean).map(function (s) {
+      .trim().replace(/^[^{*]/, 'default as $&').replace(/[{}]/gm, '').trim().split(/\s*,\s*/m).filter(Boolean).map(function (s) {
         return s.split(/\s+as\s+/m);
       }),
       from: resolvedPath,

package/vendor/react-server-dom-vite/esm/react-server-dom-vite-writer.browser.server.js

@@ -10,6 +10,8 @@
 
 import { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, createServerContext } from 'react';
 
+var assign = Object.assign;
+
 var ReactSharedInternals = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
 
 function error(format) {
@@ -537,10 +539,12 @@ var startPendingSuspenseBoundary1 = stringToPrecomputedChunk('<!--$?--><template
 var startPendingSuspenseBoundary2 = stringToPrecomputedChunk('"></template>');
 var startClientRenderedSuspenseBoundary = stringToPrecomputedChunk('<!--$!-->');
 var endSuspenseBoundary = stringToPrecomputedChunk('<!--/$-->');
-var clientRenderedSuspenseBoundaryError1 = stringToPrecomputedChunk('<template data-hash="');
-var clientRenderedSuspenseBoundaryError1A = stringToPrecomputedChunk('" data-msg="');
-var clientRenderedSuspenseBoundaryError1B = stringToPrecomputedChunk('" data-stack="');
-var clientRenderedSuspenseBoundaryError2 = stringToPrecomputedChunk('"></template>');
+var clientRenderedSuspenseBoundaryError1 = stringToPrecomputedChunk('<template');
+var clientRenderedSuspenseBoundaryErrorAttrInterstitial = stringToPrecomputedChunk('"');
+var clientRenderedSuspenseBoundaryError1A = stringToPrecomputedChunk(' data-dgst="');
+var clientRenderedSuspenseBoundaryError1B = stringToPrecomputedChunk(' data-msg="');
+var clientRenderedSuspenseBoundaryError1C = stringToPrecomputedChunk(' data-stck="');
+var clientRenderedSuspenseBoundaryError2 = stringToPrecomputedChunk('></template>');
 var startSegmentHTML = stringToPrecomputedChunk('<div hidden id="');
 var startSegmentHTML2 = stringToPrecomputedChunk('">');
 var endSegmentHTML = stringToPrecomputedChunk('</div>');
@@ -570,7 +574,7 @@ var endSegmentColGroup = stringToPrecomputedChunk('</colgroup></table>');
 // const SUSPENSE_PENDING_START_DATA = '$?';
 // const SUSPENSE_FALLBACK_START_DATA = '$!';
 //
-// function clientRenderBoundary(suspenseBoundaryID, errorHash, errorMsg, errorComponentStack) {
+// function clientRenderBoundary(suspenseBoundaryID, errorDigest, errorMsg, errorComponentStack) {
 //   // Find the fallback's first element.
 //   const suspenseIdNode = document.getElementById(suspenseBoundaryID);
 //   if (!suspenseIdNode) {
@@ -584,9 +588,9 @@ var endSegmentColGroup = stringToPrecomputedChunk('</colgroup></table>');
 //   suspenseNode.data = SUSPENSE_FALLBACK_START_DATA;
 //   // assign error metadata to first sibling
 //   let dataset = suspenseIdNode.dataset;
-//   if (errorHash) dataset.hash = errorHash;
+//   if (errorDigest) dataset.dgst = errorDigest;
 //   if (errorMsg) dataset.msg = errorMsg;
-//   if (errorComponentStack) dataset.stack = errorComponentStack;
+//   if (errorComponentStack) dataset.stck = errorComponentStack;
 //   // Tell React to retry it if the parent already hydrated.
 //   if (suspenseNode._reactRetry) {
 //     suspenseNode._reactRetry();
@@ -670,7 +674,7 @@ var endSegmentColGroup = stringToPrecomputedChunk('</colgroup></table>');
 
 var completeSegmentFunction = 'function $RS(a,b){a=document.getElementById(a);b=document.getElementById(b);for(a.parentNode.removeChild(a);a.firstChild;)b.parentNode.insertBefore(a.firstChild,b);b.parentNode.removeChild(b)}';
 var completeBoundaryFunction = 'function $RC(a,b){a=document.getElementById(a);b=document.getElementById(b);b.parentNode.removeChild(b);if(a){a=a.previousSibling;var f=a.parentNode,c=a.nextSibling,e=0;do{if(c&&8===c.nodeType){var d=c.data;if("/$"===d)if(0===e)break;else e--;else"$"!==d&&"$?"!==d&&"$!"!==d||e++}d=c.nextSibling;f.removeChild(c);c=d}while(c);for(;b.firstChild;)f.insertBefore(b.firstChild,c);a.data="$";a._reactRetry&&a._reactRetry()}}';
-var clientRenderFunction = 'function $RX(b,c,d,e){var a=document.getElementById(b);a&&(b=a.previousSibling,b.data="$!",a=a.dataset,c&&(a.hash=c),d&&(a.msg=d),e&&(a.stack=e),b._reactRetry&&b._reactRetry())}';
+var clientRenderFunction = 'function $RX(b,c,d,e){var a=document.getElementById(b);a&&(b=a.previousSibling,b.data="$!",a=a.dataset,c&&(a.dgst=c),d&&(a.msg=d),e&&(a.stck=e),b._reactRetry&&b._reactRetry())}';
 var completeSegmentScript1Full = stringToPrecomputedChunk(completeSegmentFunction + ';$RS("');
 var completeSegmentScript1Partial = stringToPrecomputedChunk('$RS("');
 var completeSegmentScript2 = stringToPrecomputedChunk('","');
@@ -875,6 +879,14 @@ function readContext(context) {
   return value;
 }
 
+var currentRequest = null;
+function prepareToUseHooksForRequest(request) {
+  currentRequest = request;
+}
+function resetHooksForRequest() {
+  currentRequest = null;
+}
+
 function readContext$1(context) {
   {
     if (context.$$typeof !== REACT_SERVER_CONTEXT_TYPE) {
@@ -923,7 +935,7 @@ var Dispatcher = {
   useLayoutEffect: unsupportedHook,
   useImperativeHandle: unsupportedHook,
   useEffect: unsupportedHook,
-  useId: unsupportedHook,
+  useId: useId,
   useMutableSource: unsupportedHook,
   useSyncExternalStore: unsupportedHook,
   useCacheRefresh: function () {
@@ -950,6 +962,16 @@ function getCurrentCache() {
   return currentCache;
 }
 
+function useId() {
+  if (currentRequest === null) {
+    throw new Error('useId can only be used while React is rendering');
+  }
+
+  var id = currentRequest.identifierCount++; // use 'S' for Flight components to distinguish from 'R' and 'r' in Fizz/Client
+
+  return ':' + currentRequest.identifierPrefix + 'S' + id.toString(32) + ':';
+}
+
 var ContextRegistry = ReactSharedInternals.ContextRegistry;
 function getOrCreateServerContext(globalName) {
   if (!ContextRegistry[globalName]) {
@@ -968,7 +990,7 @@ function defaultErrorHandler(error) {
 var OPEN = 0;
 var CLOSING = 1;
 var CLOSED = 2;
-function createRequest(model, bundlerConfig, onError, context) {
+function createRequest(model, bundlerConfig, onError, context, identifierPrefix) {
   var pingedSegments = [];
   var request = {
     status: OPEN,
@@ -985,6 +1007,8 @@ function createRequest(model, bundlerConfig, onError, context) {
     writtenSymbols: new Map(),
     writtenModules: new Map(),
     writtenProviders: new Map(),
+    identifierPrefix: identifierPrefix || '',
+    identifierCount: 1,
     onError: onError === undefined ? defaultErrorHandler : onError,
     toJSON: function (key, value) {
       return resolveModelToJSON(request, this, key, value);
@@ -1597,6 +1621,7 @@ function performWork(request) {
   var prevCache = getCurrentCache();
   ReactCurrentDispatcher.current = Dispatcher;
   setCurrentCache(request.cache);
+  prepareToUseHooksForRequest(request);
 
   try {
     var pingedSegments = request.pingedSegments;
@@ -1616,6 +1641,7 @@ function performWork(request) {
   } finally {
     ReactCurrentDispatcher.current = prevDispatcher;
     setCurrentCache(prevCache);
+    resetHooksForRequest();
   }
 }
 
@@ -1741,9 +1767,20 @@ function importServerContexts(contexts) {
   return rootContextSnapshot;
 }
 
-function renderToReadableStream(model, options, context) {
-  var request = createRequest(model, {}, // Manifest, not used
-  options ? options.onError : undefined, context);
+function renderToReadableStream(model, options) {
+  var request = createRequest( // Wrap root in a dummy element that simply adds a flag
+  // to the current dispatcher to check later in the proxies.
+  assign({}, model, {
+    $$typeof: Symbol.for('react.element'),
+    props: {
+      children: model
+    },
+    type: function () {
+      __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentDispatcher.current.isRsc = true;
+      return model;
+    }
+  }), {}, // Manifest, not used
+  options ? options.onError : undefined, options ? options.context : undefined, options ? options.identifierPrefix : undefined);
   var stream = new ReadableStream({
     type: 'bytes',
     start: function (controller) {

package/vendor/react-server-dom-vite/esm/react-server-dom-vite-writer.node.server.js

@@ -11,6 +11,8 @@
 import { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, createServerContext } from 'react';
 import { TextEncoder } from 'util';
 
+var assign = Object.assign;
+
 var ReactSharedInternals = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
 
 function error(format) {
@@ -603,10 +605,12 @@ var startPendingSuspenseBoundary1 = stringToPrecomputedChunk('<!--$?--><template
 var startPendingSuspenseBoundary2 = stringToPrecomputedChunk('"></template>');
 var startClientRenderedSuspenseBoundary = stringToPrecomputedChunk('<!--$!-->');
 var endSuspenseBoundary = stringToPrecomputedChunk('<!--/$-->');
-var clientRenderedSuspenseBoundaryError1 = stringToPrecomputedChunk('<template data-hash="');
-var clientRenderedSuspenseBoundaryError1A = stringToPrecomputedChunk('" data-msg="');
-var clientRenderedSuspenseBoundaryError1B = stringToPrecomputedChunk('" data-stack="');
-var clientRenderedSuspenseBoundaryError2 = stringToPrecomputedChunk('"></template>');
+var clientRenderedSuspenseBoundaryError1 = stringToPrecomputedChunk('<template');
+var clientRenderedSuspenseBoundaryErrorAttrInterstitial = stringToPrecomputedChunk('"');
+var clientRenderedSuspenseBoundaryError1A = stringToPrecomputedChunk(' data-dgst="');
+var clientRenderedSuspenseBoundaryError1B = stringToPrecomputedChunk(' data-msg="');
+var clientRenderedSuspenseBoundaryError1C = stringToPrecomputedChunk(' data-stck="');
+var clientRenderedSuspenseBoundaryError2 = stringToPrecomputedChunk('></template>');
 var startSegmentHTML = stringToPrecomputedChunk('<div hidden id="');
 var startSegmentHTML2 = stringToPrecomputedChunk('">');
 var endSegmentHTML = stringToPrecomputedChunk('</div>');
@@ -636,7 +640,7 @@ var endSegmentColGroup = stringToPrecomputedChunk('</colgroup></table>');
 // const SUSPENSE_PENDING_START_DATA = '$?';
 // const SUSPENSE_FALLBACK_START_DATA = '$!';
 //
-// function clientRenderBoundary(suspenseBoundaryID, errorHash, errorMsg, errorComponentStack) {
+// function clientRenderBoundary(suspenseBoundaryID, errorDigest, errorMsg, errorComponentStack) {
 //   // Find the fallback's first element.
 //   const suspenseIdNode = document.getElementById(suspenseBoundaryID);
 //   if (!suspenseIdNode) {
@@ -650,9 +654,9 @@ var endSegmentColGroup = stringToPrecomputedChunk('</colgroup></table>');
 //   suspenseNode.data = SUSPENSE_FALLBACK_START_DATA;
 //   // assign error metadata to first sibling
 //   let dataset = suspenseIdNode.dataset;
-//   if (errorHash) dataset.hash = errorHash;
+//   if (errorDigest) dataset.dgst = errorDigest;
 //   if (errorMsg) dataset.msg = errorMsg;
-//   if (errorComponentStack) dataset.stack = errorComponentStack;
+//   if (errorComponentStack) dataset.stck = errorComponentStack;
 //   // Tell React to retry it if the parent already hydrated.
 //   if (suspenseNode._reactRetry) {
 //     suspenseNode._reactRetry();
@@ -736,7 +740,7 @@ var endSegmentColGroup = stringToPrecomputedChunk('</colgroup></table>');
 
 var completeSegmentFunction = 'function $RS(a,b){a=document.getElementById(a);b=document.getElementById(b);for(a.parentNode.removeChild(a);a.firstChild;)b.parentNode.insertBefore(a.firstChild,b);b.parentNode.removeChild(b)}';
 var completeBoundaryFunction = 'function $RC(a,b){a=document.getElementById(a);b=document.getElementById(b);b.parentNode.removeChild(b);if(a){a=a.previousSibling;var f=a.parentNode,c=a.nextSibling,e=0;do{if(c&&8===c.nodeType){var d=c.data;if("/$"===d)if(0===e)break;else e--;else"$"!==d&&"$?"!==d&&"$!"!==d||e++}d=c.nextSibling;f.removeChild(c);c=d}while(c);for(;b.firstChild;)f.insertBefore(b.firstChild,c);a.data="$";a._reactRetry&&a._reactRetry()}}';
-var clientRenderFunction = 'function $RX(b,c,d,e){var a=document.getElementById(b);a&&(b=a.previousSibling,b.data="$!",a=a.dataset,c&&(a.hash=c),d&&(a.msg=d),e&&(a.stack=e),b._reactRetry&&b._reactRetry())}';
+var clientRenderFunction = 'function $RX(b,c,d,e){var a=document.getElementById(b);a&&(b=a.previousSibling,b.data="$!",a=a.dataset,c&&(a.dgst=c),d&&(a.msg=d),e&&(a.stck=e),b._reactRetry&&b._reactRetry())}';
 var completeSegmentScript1Full = stringToPrecomputedChunk(completeSegmentFunction + ';$RS("');
 var completeSegmentScript1Partial = stringToPrecomputedChunk('$RS("');
 var completeSegmentScript2 = stringToPrecomputedChunk('","');
@@ -941,6 +945,14 @@ function readContext(context) {
   return value;
 }
 
+var currentRequest = null;
+function prepareToUseHooksForRequest(request) {
+  currentRequest = request;
+}
+function resetHooksForRequest() {
+  currentRequest = null;
+}
+
 function readContext$1(context) {
   {
     if (context.$$typeof !== REACT_SERVER_CONTEXT_TYPE) {
@@ -989,7 +1001,7 @@ var Dispatcher = {
   useLayoutEffect: unsupportedHook,
   useImperativeHandle: unsupportedHook,
   useEffect: unsupportedHook,
-  useId: unsupportedHook,
+  useId: useId,
   useMutableSource: unsupportedHook,
   useSyncExternalStore: unsupportedHook,
   useCacheRefresh: function () {
@@ -1016,6 +1028,16 @@ function getCurrentCache() {
   return currentCache;
 }
 
+function useId() {
+  if (currentRequest === null) {
+    throw new Error('useId can only be used while React is rendering');
+  }
+
+  var id = currentRequest.identifierCount++; // use 'S' for Flight components to distinguish from 'R' and 'r' in Fizz/Client
+
+  return ':' + currentRequest.identifierPrefix + 'S' + id.toString(32) + ':';
+}
+
 var ContextRegistry = ReactSharedInternals.ContextRegistry;
 function getOrCreateServerContext(globalName) {
   if (!ContextRegistry[globalName]) {
@@ -1034,7 +1056,7 @@ function defaultErrorHandler(error) {
 var OPEN = 0;
 var CLOSING = 1;
 var CLOSED = 2;
-function createRequest(model, bundlerConfig, onError, context) {
+function createRequest(model, bundlerConfig, onError, context, identifierPrefix) {
   var pingedSegments = [];
   var request = {
     status: OPEN,
@@ -1051,6 +1073,8 @@ function createRequest(model, bundlerConfig, onError, context) {
     writtenSymbols: new Map(),
     writtenModules: new Map(),
     writtenProviders: new Map(),
+    identifierPrefix: identifierPrefix || '',
+    identifierCount: 1,
     onError: onError === undefined ? defaultErrorHandler : onError,
     toJSON: function (key, value) {
       return resolveModelToJSON(request, this, key, value);
@@ -1663,6 +1687,7 @@ function performWork(request) {
   var prevCache = getCurrentCache();
   ReactCurrentDispatcher.current = Dispatcher;
   setCurrentCache(request.cache);
+  prepareToUseHooksForRequest(request);
 
   try {
     var pingedSegments = request.pingedSegments;
@@ -1682,6 +1707,7 @@ function performWork(request) {
   } finally {
     ReactCurrentDispatcher.current = prevDispatcher;
     setCurrentCache(prevCache);
+    resetHooksForRequest();
   }
 }
 
@@ -1815,9 +1841,20 @@ function createDrainHandler(destination, request) {
   };
 }
 
-function renderToPipeableStream(model, options, context) {
-  var request = createRequest(model, {}, // Manifest, not used
-  options ? options.onError : undefined, context);
+function renderToPipeableStream(model, options) {
+  var request = createRequest( // Wrap root in a dummy element that simply adds a flag
+  // to the current dispatcher to check later in the proxies.
+  assign({}, model, {
+    $$typeof: Symbol.for('react.element'),
+    props: {
+      children: model
+    },
+    type: function () {
+      __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentDispatcher.current.isRsc = true;
+      return model;
+    }
+  }), {}, // Manifest, not used
+  options ? options.onError : undefined, options ? options.context : undefined, options ? options.identifierPrefix : undefined);
   var hasStartedFlowing = false;
   startWork(request);
   return {

package/client.d.ts

@@ -1 +0,0 @@
-export * from './dist/esnext/client';

package/client.js

@@ -1 +0,0 @@
-export * from './dist/esnext/client';

package/config.d.ts

@@ -1 +0,0 @@
-export * from './dist/esnext/config';

package/config.js

@@ -1 +0,0 @@
-export * from './dist/esnext/config';

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/components/DevTools.client.d.ts

@@ -1 +0,0 @@
-export default function DevTools(): JSX.Element | null;

package/dist/esnext/components/DevTools.client.js

@@ -1,129 +0,0 @@
-import React, { useEffect, useState, useCallback } from 'react';
-export default function DevTools() {
-    const [warnings, setWarnings] = useState(null);
-    const [open, setOpen] = useState(false);
-    const [activePanel, setActivePanel] = useState('warnings');
-    const toggleOpen = useCallback(() => setOpen((state) => !state), []);
-    const [hasMounted, setHasMounted] = React.useState(false);
-    useEffect(() => {
-        setHasMounted(true);
-        if (import.meta.hot) {
-            import.meta.hot.on('hydrogen', ({ type, data }) => {
-                if (type === 'warn') {
-                    setWarnings((state) => [...(state || []), data]);
-                }
-            });
-        }
-    }, []);
-    const perfData = performance.getEntriesByType('navigation');
-    const entry = perfData[0];
-    let activePanelContent = null;
-    switch (activePanel) {
-        case 'warnings': {
-            const warningsMarkup = warnings
-                ? warnings.map((war, i) => React.createElement("li", { key: war + i }, war)) // eslint-disable-line react/no-array-index-key
-                : null;
-            activePanelContent = (React.createElement(React.Fragment, null,
-                React.createElement(PanelHeading, null, "Overfetched graphQL fields"),
-                React.createElement("ul", { style: {
-                        fontFamily: 'monospace',
-                        paddingTop: '1em',
-                        fontSize: '0.9em',
-                    } }, warningsMarkup)));
-            break;
-        }
-        case 'network':
-            activePanelContent = (React.createElement(React.Fragment, null,
-                React.createElement(PanelHeading, null, "Metrics"),
-                React.createElement("ul", { style: {
-                        fontFamily: 'monospace',
-                        paddingTop: '1em',
-                        fontSize: '0.9em',
-                    } }, Object.entries(entry.toJSON())
-                    .filter(([key]) => ['duration', 'domInteractive'].includes(key))
-                    .map(([key, value]) => (React.createElement("li", { key: key },
-                    React.createElement("strong", null, key),
-                    " ",
-                    (value / 1000).toFixed(2),
-                    "s"))))));
-            break;
-    }
-    const buttonText = (React.createElement("svg", { style: {
-            height: '3em',
-            width: '3em',
-        }, width: "131", height: "130", viewBox: "0 0 131 130", fill: "none", xmlns: "http://www.w3.org/2000/svg" },
-        React.createElement("path", { d: "M64.9548 106.281L27.1377 86.1894L40.0714 79.3723L54.6329 87.1049L66.851 80.6638L52.2895 72.9313L65.2231 66.0979L103.04 86.1894L90.1065 93.0064L76.35 85.6989L64.114 92.1563L77.8884 99.4638L64.9548 106.281Z", fill: "white" }),
-        React.createElement("path", { fillRule: "evenodd", clipRule: "evenodd", d: "M65.2247 25L105.178 46.2267L90.105 54.1716L76.3488 46.8642L66.2525 52.1924L80.028 59.5005L64.9532 67.446L25 46.2196L40.0734 38.2748L54.6349 46.0073L64.713 40.6944L50.1533 32.9628L65.2247 25ZM54.4262 32.9673L68.9896 40.7008L54.6315 48.27L40.0699 40.5374L29.276 46.2267L64.9569 65.1833L75.7495 59.4947L61.9761 52.1878L76.3518 44.6012L90.1087 51.9088L100.902 46.2196L65.2221 27.2634L54.4262 32.9673Z", fill: "white" })));
-    if (import.meta.env.DEV && hasMounted) {
-        return (React.createElement("div", { id: "hydrogen-dev-tools", style: {
-                position: 'fixed',
-                right: open ? 0 : '2em',
-                left: open ? 0 : '2em',
-                bottom: open ? 0 : '-2em',
-                borderRadius: open ? 0 : '2em',
-                top: '100%',
-                zIndex: 10000,
-                display: 'flex',
-                flexDirection: 'column',
-                overflow: 'hidden',
-                height: open ? '75%' : '4em',
-                transform: open ? 'translateY(-100%)' : 'translateY(-5em)',
-            } },
-            React.createElement("button", { style: {
-                    position: 'absolute',
-                    top: '0.35em',
-                    right: '1em',
-                    overflow: 'hidden',
-                    zIndex: 10,
-                }, onClick: toggleOpen }, buttonText),
-            React.createElement("div", { style: {
-                    overflow: 'scroll',
-                    color: 'white',
-                    height: '100%',
-                    padding: '2em',
-                    background: 'rgba(0, 0, 0, 0.95)',
-                    borderRadius: open ? 0 : '2em',
-                } },
-                React.createElement("div", { style: {
-                        position: 'absolute',
-                        padding: '1.2em 2em',
-                        top: 0,
-                        left: '-0.5em',
-                        right: 0,
-                        background: 'rgba(0, 0, 0, 0.95)',
-                        borderRadius: open ? 0 : '2em',
-                        display: 'flex',
-                        alignItems: 'center',
-                    } },
-                    warnings && warnings.length > 0 && (React.createElement("button", { onClick: () => {
-                            setOpen(true);
-                            setActivePanel('warnings');
-                        }, style: {
-                            margin: '0 0.5em',
-                            textDecoration: open && activePanel === 'warnings' ? 'underline' : 'none',
-                        } },
-                        "Warnings",
-                        ' ',
-                        warnings && (React.createElement("strong", { style: {
-                                borderRadius: '2em',
-                                padding: '.25em 0.5em',
-                                background: 'white',
-                                margin: '0 0.25em',
-                                color: 'black',
-                                textAlign: 'center',
-                            } }, warnings.length)))),
-                    React.createElement("button", { onClick: () => {
-                            setOpen(true);
-                            setActivePanel('network');
-                        }, disabled: activePanel === 'network', style: {
-                            margin: '0 0.5em',
-                            textDecoration: open && activePanel === 'network' ? 'underline' : 'none',
-                        } }, "Network")),
-                React.createElement("div", { style: { paddingTop: '2em' } }, activePanelContent))));
-    }
-    return null;
-}
-const PanelHeading = ({ children }) => (React.createElement("h1", { style: {
-        paddingTop: '1em',
-        fontWeight: 'bold',
-    } }, children));

package/dist/esnext/foundation/Analytics/ServerAnalyticsRoute.server.d.ts

@@ -1,2 +0,0 @@
-import type { ServerAnalyticsConnector } from '../../types';
-export declare function ServerAnalyticsRoute(request: Request, serverAnalyticsConnectors?: Array<ServerAnalyticsConnector>): Response;

package/dist/esnext/foundation/Analytics/connectors/PerformanceMetrics/ServerAnalyticsConnector.server.d.ts

@@ -1 +0,0 @@
-export declare function request(requestUrl: string, requestHeader: Headers, data?: any, contentType?: string): void;