@shopify/hydrogen 1.2.0 → 1.3.2

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

@@ -162,6 +162,11 @@ function processModelChunk(request, id, model) {
   var row = serializeRowHeader('J', id) + json + '\n';
   return stringToChunk(row);
 }
+function processReferenceChunk(request, id, reference) {
+  var json = stringify(reference);
+  var row = serializeRowHeader('J', id) + json + '\n';
+  return stringToChunk(row);
+}
 function processModuleChunk(request, id, moduleMetaData) {
   var json = stringify(moduleMetaData);
   var row = serializeRowHeader('M', id) + json + '\n';
@@ -504,6 +509,7 @@ var startInlineScript = stringToPrecomputedChunk('<script>');
 var endInlineScript = stringToPrecomputedChunk('</script>');
 var startScriptSrc = stringToPrecomputedChunk('<script src="');
 var startModuleSrc = stringToPrecomputedChunk('<script type="module" src="');
+var scriptIntegirty = stringToPrecomputedChunk('" integrity="');
 var endAsyncScript = stringToPrecomputedChunk('" async=""></script>');
 
 var textSeparator = stringToPrecomputedChunk('<!-- -->');
@@ -981,6 +987,10 @@ function getOrCreateServerContext(globalName) {
   return ContextRegistry[globalName];
 }
 
+var PENDING = 0;
+var COMPLETED = 1;
+var ABORTED = 3;
+var ERRORED = 4;
 var ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher;
 
 function defaultErrorHandler(error) {
@@ -991,7 +1001,8 @@ var OPEN = 0;
 var CLOSING = 1;
 var CLOSED = 2;
 function createRequest(model, bundlerConfig, onError, context, identifierPrefix) {
-  var pingedSegments = [];
+  var abortSet = new Set();
+  var pingedTasks = [];
   var request = {
     status: OPEN,
     fatalError: null,
@@ -1000,7 +1011,8 @@ function createRequest(model, bundlerConfig, onError, context, identifierPrefix)
     cache: new Map(),
     nextChunkId: 0,
     pendingChunks: 0,
-    pingedSegments: pingedSegments,
+    abortableTasks: abortSet,
+    pingedTasks: pingedTasks,
     completedModuleChunks: [],
     completedJSONChunks: [],
     completedErrorChunks: [],
@@ -1016,8 +1028,8 @@ function createRequest(model, bundlerConfig, onError, context, identifierPrefix)
   };
   request.pendingChunks++;
   var rootContext = createRootContext(context);
-  var rootSegment = createSegment(request, model, rootContext);
-  pingedSegments.push(rootSegment);
+  var rootTask = createTask(request, model, rootContext, abortSet);
+  pingedTasks.push(rootTask);
   return request;
 }
 
@@ -1115,28 +1127,30 @@ function attemptResolveElement(type, key, ref, props) {
   throw new Error("Unsupported server component type: " + describeValueForErrorMessage(type));
 }
 
-function pingSegment(request, segment) {
-  var pingedSegments = request.pingedSegments;
-  pingedSegments.push(segment);
+function pingTask(request, task) {
+  var pingedTasks = request.pingedTasks;
+  pingedTasks.push(task);
 
-  if (pingedSegments.length === 1) {
+  if (pingedTasks.length === 1) {
     scheduleWork(function () {
       return performWork(request);
     });
   }
 }
 
-function createSegment(request, model, context) {
+function createTask(request, model, context, abortSet) {
   var id = request.nextChunkId++;
-  var segment = {
+  var task = {
     id: id,
+    status: PENDING,
     model: model,
     context: context,
     ping: function () {
-      return pingSegment(request, segment);
+      return pingTask(request, task);
     }
   };
-  return segment;
+  abortSet.add(task);
+  return task;
 }
 
 function serializeByValueID(id) {
@@ -1371,12 +1385,12 @@ function resolveModelToJSON(request, parent, key, value) {
       }
     } catch (x) {
       if (typeof x === 'object' && x !== null && typeof x.then === 'function') {
-        // Something suspended, we'll need to create a new segment and resolve it later.
+        // Something suspended, we'll need to create a new task and resolve it later.
         request.pendingChunks++;
-        var newSegment = createSegment(request, value, getActiveContext());
-        var ping = newSegment.ping;
+        var newTask = createTask(request, value, getActiveContext(), request.abortableTasks);
+        var ping = newTask.ping;
         x.then(ping, ping);
-        return serializeByRefID(newSegment.id);
+        return serializeByRefID(newTask.id);
       } else {
         logRecoverableError(request, x); // Something errored. We'll still send everything we have up until this point.
         // We'll replace this element with a lazy reference that throws on the client
@@ -1584,34 +1598,43 @@ function emitProviderChunk(request, id, contextName) {
   request.completedJSONChunks.push(processedChunk);
 }
 
-function retrySegment(request, segment) {
-  switchContext(segment.context);
+function retryTask(request, task) {
+  if (task.status !== PENDING) {
+    // We completed this by other means before we had a chance to retry it.
+    return;
+  }
+
+  switchContext(task.context);
 
   try {
-    var _value3 = segment.model;
+    var _value3 = task.model;
 
     while (typeof _value3 === 'object' && _value3 !== null && _value3.$$typeof === REACT_ELEMENT_TYPE) {
       // TODO: Concatenate keys of parents onto children.
       var element = _value3; // Attempt to render the server component.
-      // Doing this here lets us reuse this same segment if the next component
+      // Doing this here lets us reuse this same task if the next component
       // also suspends.
 
-      segment.model = _value3;
+      task.model = _value3;
       _value3 = attemptResolveElement(element.type, element.key, element.ref, element.props);
     }
 
-    var processedChunk = processModelChunk(request, segment.id, _value3);
+    var processedChunk = processModelChunk(request, task.id, _value3);
     request.completedJSONChunks.push(processedChunk);
+    request.abortableTasks.delete(task);
+    task.status = COMPLETED;
   } catch (x) {
     if (typeof x === 'object' && x !== null && typeof x.then === 'function') {
       // Something suspended again, let's pick it back up later.
-      var ping = segment.ping;
+      var ping = task.ping;
       x.then(ping, ping);
       return;
     } else {
+      request.abortableTasks.delete(task);
+      task.status = ERRORED;
       logRecoverableError(request, x); // This errored, we need to serialize this error to the
 
-      emitErrorChunk(request, segment.id, x);
+      emitErrorChunk(request, task.id, x);
     }
   }
 }
@@ -1624,12 +1647,12 @@ function performWork(request) {
   prepareToUseHooksForRequest(request);
 
   try {
-    var pingedSegments = request.pingedSegments;
-    request.pingedSegments = [];
+    var pingedTasks = request.pingedTasks;
+    request.pingedTasks = [];
 
-    for (var i = 0; i < pingedSegments.length; i++) {
-      var segment = pingedSegments[i];
-      retrySegment(request, segment);
+    for (var i = 0; i < pingedTasks.length; i++) {
+      var task = pingedTasks[i];
+      retryTask(request, task);
     }
 
     if (request.destination !== null) {
@@ -1645,6 +1668,15 @@ function performWork(request) {
   }
 }
 
+function abortTask(task, request, errorId) {
+  task.status = ABORTED; // Instead of emitting an error per task.id, we emit a model that only
+  // has a single value referencing the error.
+
+  var ref = serializeByValueID(errorId);
+  var processedChunk = processReferenceChunk(request, task.id, ref);
+  request.completedJSONChunks.push(processedChunk);
+}
+
 function flushCompletedChunks(request, destination) {
   beginWriting();
 
@@ -1744,6 +1776,34 @@ function startFlowing(request, destination) {
     logRecoverableError(request, error);
     fatalError(request, error);
   }
+} // This is called to early terminate a request. It creates an error at all pending tasks.
+
+function abort(request, reason) {
+  try {
+    var abortableTasks = request.abortableTasks;
+
+    if (abortableTasks.size > 0) {
+      // We have tasks to abort. We'll emit one error row and then emit a reference
+      // to that row from every row that's still remaining.
+      var _error = reason === undefined ? new Error('The render was aborted by the server without a reason.') : reason;
+
+      logRecoverableError(request, _error);
+      request.pendingChunks++;
+      var errorId = request.nextChunkId++;
+      emitErrorChunk(request, errorId, _error);
+      abortableTasks.forEach(function (task) {
+        return abortTask(task, request, errorId);
+      });
+      abortableTasks.clear();
+    }
+
+    if (request.destination !== null) {
+      flushCompletedChunks(request, request.destination);
+    }
+  } catch (error) {
+    logRecoverableError(request, error);
+    fatalError(request, error);
+  }
 }
 
 function importServerContexts(contexts) {
@@ -1781,6 +1841,22 @@ function renderToReadableStream(model, options) {
     }
   }), {}, // Manifest, not used
   options ? options.onError : undefined, options ? options.context : undefined, options ? options.identifierPrefix : undefined);
+
+  if (options && options.signal) {
+    var signal = options.signal;
+
+    if (signal.aborted) {
+      abort(request, signal.reason);
+    } else {
+      var listener = function () {
+        abort(request, signal.reason);
+        signal.removeEventListener('abort', listener);
+      };
+
+      signal.addEventListener('abort', listener);
+    }
+  }
+
   var stream = new ReadableStream({
     type: 'bytes',
     start: function (controller) {

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

@@ -228,6 +228,11 @@ function processModelChunk(request, id, model) {
   var row = serializeRowHeader('J', id) + json + '\n';
   return stringToChunk(row);
 }
+function processReferenceChunk(request, id, reference) {
+  var json = stringify(reference);
+  var row = serializeRowHeader('J', id) + json + '\n';
+  return stringToChunk(row);
+}
 function processModuleChunk(request, id, moduleMetaData) {
   var json = stringify(moduleMetaData);
   var row = serializeRowHeader('M', id) + json + '\n';
@@ -570,6 +575,7 @@ var startInlineScript = stringToPrecomputedChunk('<script>');
 var endInlineScript = stringToPrecomputedChunk('</script>');
 var startScriptSrc = stringToPrecomputedChunk('<script src="');
 var startModuleSrc = stringToPrecomputedChunk('<script type="module" src="');
+var scriptIntegirty = stringToPrecomputedChunk('" integrity="');
 var endAsyncScript = stringToPrecomputedChunk('" async=""></script>');
 
 var textSeparator = stringToPrecomputedChunk('<!-- -->');
@@ -1047,6 +1053,10 @@ function getOrCreateServerContext(globalName) {
   return ContextRegistry[globalName];
 }
 
+var PENDING = 0;
+var COMPLETED = 1;
+var ABORTED = 3;
+var ERRORED = 4;
 var ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher;
 
 function defaultErrorHandler(error) {
@@ -1057,7 +1067,8 @@ var OPEN = 0;
 var CLOSING = 1;
 var CLOSED = 2;
 function createRequest(model, bundlerConfig, onError, context, identifierPrefix) {
-  var pingedSegments = [];
+  var abortSet = new Set();
+  var pingedTasks = [];
   var request = {
     status: OPEN,
     fatalError: null,
@@ -1066,7 +1077,8 @@ function createRequest(model, bundlerConfig, onError, context, identifierPrefix)
     cache: new Map(),
     nextChunkId: 0,
     pendingChunks: 0,
-    pingedSegments: pingedSegments,
+    abortableTasks: abortSet,
+    pingedTasks: pingedTasks,
     completedModuleChunks: [],
     completedJSONChunks: [],
     completedErrorChunks: [],
@@ -1082,8 +1094,8 @@ function createRequest(model, bundlerConfig, onError, context, identifierPrefix)
   };
   request.pendingChunks++;
   var rootContext = createRootContext(context);
-  var rootSegment = createSegment(request, model, rootContext);
-  pingedSegments.push(rootSegment);
+  var rootTask = createTask(request, model, rootContext, abortSet);
+  pingedTasks.push(rootTask);
   return request;
 }
 
@@ -1181,28 +1193,30 @@ function attemptResolveElement(type, key, ref, props) {
   throw new Error("Unsupported server component type: " + describeValueForErrorMessage(type));
 }
 
-function pingSegment(request, segment) {
-  var pingedSegments = request.pingedSegments;
-  pingedSegments.push(segment);
+function pingTask(request, task) {
+  var pingedTasks = request.pingedTasks;
+  pingedTasks.push(task);
 
-  if (pingedSegments.length === 1) {
+  if (pingedTasks.length === 1) {
     scheduleWork(function () {
       return performWork(request);
     });
   }
 }
 
-function createSegment(request, model, context) {
+function createTask(request, model, context, abortSet) {
   var id = request.nextChunkId++;
-  var segment = {
+  var task = {
     id: id,
+    status: PENDING,
     model: model,
     context: context,
     ping: function () {
-      return pingSegment(request, segment);
+      return pingTask(request, task);
     }
   };
-  return segment;
+  abortSet.add(task);
+  return task;
 }
 
 function serializeByValueID(id) {
@@ -1437,12 +1451,12 @@ function resolveModelToJSON(request, parent, key, value) {
       }
     } catch (x) {
       if (typeof x === 'object' && x !== null && typeof x.then === 'function') {
-        // Something suspended, we'll need to create a new segment and resolve it later.
+        // Something suspended, we'll need to create a new task and resolve it later.
         request.pendingChunks++;
-        var newSegment = createSegment(request, value, getActiveContext());
-        var ping = newSegment.ping;
+        var newTask = createTask(request, value, getActiveContext(), request.abortableTasks);
+        var ping = newTask.ping;
         x.then(ping, ping);
-        return serializeByRefID(newSegment.id);
+        return serializeByRefID(newTask.id);
       } else {
         logRecoverableError(request, x); // Something errored. We'll still send everything we have up until this point.
         // We'll replace this element with a lazy reference that throws on the client
@@ -1650,34 +1664,43 @@ function emitProviderChunk(request, id, contextName) {
   request.completedJSONChunks.push(processedChunk);
 }
 
-function retrySegment(request, segment) {
-  switchContext(segment.context);
+function retryTask(request, task) {
+  if (task.status !== PENDING) {
+    // We completed this by other means before we had a chance to retry it.
+    return;
+  }
+
+  switchContext(task.context);
 
   try {
-    var _value3 = segment.model;
+    var _value3 = task.model;
 
     while (typeof _value3 === 'object' && _value3 !== null && _value3.$$typeof === REACT_ELEMENT_TYPE) {
       // TODO: Concatenate keys of parents onto children.
       var element = _value3; // Attempt to render the server component.
-      // Doing this here lets us reuse this same segment if the next component
+      // Doing this here lets us reuse this same task if the next component
       // also suspends.
 
-      segment.model = _value3;
+      task.model = _value3;
       _value3 = attemptResolveElement(element.type, element.key, element.ref, element.props);
     }
 
-    var processedChunk = processModelChunk(request, segment.id, _value3);
+    var processedChunk = processModelChunk(request, task.id, _value3);
     request.completedJSONChunks.push(processedChunk);
+    request.abortableTasks.delete(task);
+    task.status = COMPLETED;
   } catch (x) {
     if (typeof x === 'object' && x !== null && typeof x.then === 'function') {
       // Something suspended again, let's pick it back up later.
-      var ping = segment.ping;
+      var ping = task.ping;
       x.then(ping, ping);
       return;
     } else {
+      request.abortableTasks.delete(task);
+      task.status = ERRORED;
       logRecoverableError(request, x); // This errored, we need to serialize this error to the
 
-      emitErrorChunk(request, segment.id, x);
+      emitErrorChunk(request, task.id, x);
     }
   }
 }
@@ -1690,12 +1713,12 @@ function performWork(request) {
   prepareToUseHooksForRequest(request);
 
   try {
-    var pingedSegments = request.pingedSegments;
-    request.pingedSegments = [];
+    var pingedTasks = request.pingedTasks;
+    request.pingedTasks = [];
 
-    for (var i = 0; i < pingedSegments.length; i++) {
-      var segment = pingedSegments[i];
-      retrySegment(request, segment);
+    for (var i = 0; i < pingedTasks.length; i++) {
+      var task = pingedTasks[i];
+      retryTask(request, task);
     }
 
     if (request.destination !== null) {
@@ -1711,6 +1734,15 @@ function performWork(request) {
   }
 }
 
+function abortTask(task, request, errorId) {
+  task.status = ABORTED; // Instead of emitting an error per task.id, we emit a model that only
+  // has a single value referencing the error.
+
+  var ref = serializeByValueID(errorId);
+  var processedChunk = processReferenceChunk(request, task.id, ref);
+  request.completedJSONChunks.push(processedChunk);
+}
+
 function flushCompletedChunks(request, destination) {
   beginWriting();
 
@@ -1812,6 +1844,34 @@ function startFlowing(request, destination) {
     logRecoverableError(request, error);
     fatalError(request, error);
   }
+} // This is called to early terminate a request. It creates an error at all pending tasks.
+
+function abort(request, reason) {
+  try {
+    var abortableTasks = request.abortableTasks;
+
+    if (abortableTasks.size > 0) {
+      // We have tasks to abort. We'll emit one error row and then emit a reference
+      // to that row from every row that's still remaining.
+      var _error = reason === undefined ? new Error('The render was aborted by the server without a reason.') : reason;
+
+      logRecoverableError(request, _error);
+      request.pendingChunks++;
+      var errorId = request.nextChunkId++;
+      emitErrorChunk(request, errorId, _error);
+      abortableTasks.forEach(function (task) {
+        return abortTask(task, request, errorId);
+      });
+      abortableTasks.clear();
+    }
+
+    if (request.destination !== null) {
+      flushCompletedChunks(request, request.destination);
+    }
+  } catch (error) {
+    logRecoverableError(request, error);
+    fatalError(request, error);
+  }
 }
 
 function importServerContexts(contexts) {
@@ -1867,6 +1927,9 @@ function renderToPipeableStream(model, options) {
       startFlowing(request, destination);
       destination.on('drain', createDrainHandler(destination, request));
       return destination;
+    },
+    abort: function (reason) {
+      abort(request, reason);
     }
   };
 }

package/vendor/react-server-dom-vite/package.json

@@ -54,8 +54,8 @@
     "node": ">=0.10.0"
   },
   "peerDependencies": {
-    "react": "^17.0.0",
-    "vite": "^2.7.1"
+    "react": "^18.0.0",
+    "vite": "^2.7.1 || ^3.0.7"
   },
   "dependencies": {
     "es-module-lexer": "^0.9.3",

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

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

package/dist/esnext/framework/plugins/vite-plugin-purge-query-cache.js

@@ -1,11 +0,0 @@
-import Crypto from 'crypto';
-export default () => {
-    const buildCacheId = Crypto.randomBytes(8).toString('hex').slice(0, 8);
-    return {
-        name: 'vite-plugin-purge-query-cache',
-        enforce: 'pre',
-        transform(code) {
-            return code.replace('__QUERY_CACHE_ID__', buildCacheId);
-        },
-    };
-};

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

@@ -1,9 +0,0 @@
-import { type Plugin } from 'vite';
-/**
- * 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-purge-query-cache.js

@@ -1,16 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const crypto_1 = __importDefault(require("crypto"));
-exports.default = () => {
-    const buildCacheId = crypto_1.default.randomBytes(8).toString('hex').slice(0, 8);
-    return {
-        name: 'vite-plugin-purge-query-cache',
-        enforce: 'pre',
-        transform(code) {
-            return code.replace('__QUERY_CACHE_ID__', buildCacheId);
-        },
-    };
-};