react-server-dom-webpack 19.3.0 → 19.3.1

package/cjs/react-server-dom-webpack-client.browser.development.js

@@ -384,11 +384,8 @@
           entry.done
             ? ((entry = nextPartId++),
               data.append(formFieldPrefix + entry, new Blob(buffer)),
-              data.append(
-                formFieldPrefix + streamId,
-                '"$o' + entry.toString(16) + '"'
-              ),
-              data.append(formFieldPrefix + streamId, "C"),
+              data.append(streamPrefix, '"$o' + entry.toString(16) + '"'),
+              data.append(streamPrefix, "C"),
               pendingParts--,
               0 === pendingParts && resolve(data))
             : (buffer.push(entry.value),
@@ -398,20 +395,21 @@
         var data = formData;
         pendingParts++;
         var streamId = nextPartId++,
-          buffer = [];
+          buffer = [],
+          streamPrefix = formFieldPrefix + "S" + streamId;
         reader.read(new Uint8Array(1024)).then(progress, reject);
         return "$r" + streamId.toString(16);
       }
       function serializeReader(reader) {
         function progress(entry) {
           if (entry.done)
-            data.append(formFieldPrefix + streamId, "C"),
+            data.append(streamPrefix, "C"),
               pendingParts--,
               0 === pendingParts && resolve(data);
           else
             try {
               var partJSON = JSON.stringify(entry.value, resolveToJSON);
-              data.append(formFieldPrefix + streamId, partJSON);
+              data.append(streamPrefix, partJSON);
               reader.read().then(progress, reject);
             } catch (x) {
               reject(x);
@@ -420,7 +418,8 @@
         null === formData && (formData = new FormData());
         var data = formData;
         pendingParts++;
-        var streamId = nextPartId++;
+        var streamId = nextPartId++,
+          streamPrefix = formFieldPrefix + "S" + streamId;
         reader.read().then(progress, reject);
         return "$R" + streamId.toString(16);
       }
@@ -435,12 +434,11 @@
       function serializeAsyncIterable(iterable, iterator) {
         function progress(entry) {
           if (entry.done) {
-            if (void 0 === entry.value)
-              data.append(formFieldPrefix + streamId, "C");
+            if (void 0 === entry.value) data.append(streamPrefix, "C");
             else
               try {
                 var partJSON = JSON.stringify(entry.value, resolveToJSON);
-                data.append(formFieldPrefix + streamId, "C" + partJSON);
+                data.append(streamPrefix, "C" + partJSON);
               } catch (x) {
                 reject(x);
                 return;
@@ -450,10 +448,10 @@
           } else
             try {
               var _partJSON = JSON.stringify(entry.value, resolveToJSON);
-              data.append(formFieldPrefix + streamId, _partJSON);
+              data.append(streamPrefix, _partJSON);
               iterator.next().then(progress, reject);
-            } catch (x$0) {
-              reject(x$0);
+            } catch (x$3) {
+              reject(x$3);
             }
         }
         null === formData && (formData = new FormData());
@@ -461,6 +459,7 @@
         pendingParts++;
         var streamId = nextPartId++;
         iterable = iterable === iterator;
+        var streamPrefix = formFieldPrefix + "S" + streamId;
         iterator.next().then(progress, reject);
         return "$" + (iterable ? "x" : "X") + streamId.toString(16);
       }
@@ -1746,15 +1745,21 @@
       }
     }
     function createResolvedModelChunk(response, value) {
-      return new ReactPromise("resolved_model", value, response);
+      var $jscomp$compprop0 = {};
+      return new ReactPromise(
+        "resolved_model",
+        value,
+        (($jscomp$compprop0[RESPONSE_SYMBOL] = response), $jscomp$compprop0)
+      );
     }
     function createResolvedIteratorResultChunk(response, value, done) {
+      var $jscomp$compprop1 = {};
       return new ReactPromise(
         "resolved_model",
         (done ? '{"done":true,"value":' : '{"done":false,"value":') +
           value +
           "}",
-        response
+        (($jscomp$compprop1[RESPONSE_SYMBOL] = response), $jscomp$compprop1)
       );
     }
     function resolveIteratorResultChunk(response, chunk, value, done) {
@@ -1775,7 +1780,8 @@
           rejectListeners = chunk.reason;
         chunk.status = "resolved_model";
         chunk.value = value;
-        chunk.reason = response;
+        value = {};
+        chunk.reason = ((value[RESPONSE_SYMBOL] = response), value);
         null !== resolveListeners &&
           (initializeModelChunk(chunk),
           wakeChunkIfInitialized(
@@ -1938,7 +1944,7 @@
         prevChunk = initializingChunk;
       initializingHandler = null;
       var resolvedModel = chunk.value,
-        response = chunk.reason;
+        response = chunk.reason[RESPONSE_SYMBOL];
       chunk.status = "blocked";
       chunk.value = null;
       chunk.reason = null;
@@ -2359,6 +2365,9 @@
       return null;
     }
     function loadServerReference(response, metaData, parentObject, key) {
+      if ("then" === key) return null;
+      var id = metaData.id;
+      if ("string" !== typeof id) return null;
       if (!response._serverReferenceConfig)
         return createBoundServerReference(
           metaData,
@@ -2368,17 +2377,18 @@
         );
       var serverReference = resolveServerReference(
           response._serverReferenceConfig,
-          metaData.id
+          id
         ),
-        promise = preloadModule(serverReference);
-      if (promise)
-        metaData.bound && (promise = Promise.all([promise, metaData.bound]));
-      else if (metaData.bound) promise = Promise.resolve(metaData.bound);
+        bound = metaData.bound;
+      if ((metaData = preloadModule(serverReference)))
+        bound instanceof ReactPromise &&
+          (metaData = Promise.all([metaData, bound]));
+      else if (bound instanceof ReactPromise) metaData = Promise.resolve(bound);
       else
         return (
-          (promise = requireModule(serverReference)),
-          registerBoundServerReference(promise, metaData.id, metaData.bound),
-          promise
+          (metaData = requireModule(serverReference)),
+          registerBoundServerReference(metaData, id, bound),
+          metaData
         );
       if (initializingHandler) {
         var handler = initializingHandler;
@@ -2392,19 +2402,21 @@
           deps: 1,
           errored: !1
         };
-      promise.then(
+      metaData.then(
         function () {
           var resolvedValue = requireModule(serverReference);
-          if (metaData.bound) {
-            var boundArgs = metaData.bound.value.slice(0);
-            boundArgs.unshift(null);
-            resolvedValue = resolvedValue.bind.apply(resolvedValue, boundArgs);
+          if (bound) {
+            var promiseValue = bound.value;
+            promiseValue = isArrayImpl(promiseValue)
+              ? promiseValue.slice(0)
+              : [];
+            promiseValue.unshift(null);
+            resolvedValue = resolvedValue.bind.apply(
+              resolvedValue,
+              promiseValue
+            );
           }
-          registerBoundServerReference(
-            resolvedValue,
-            metaData.id,
-            metaData.bound
-          );
+          registerBoundServerReference(resolvedValue, id, bound);
           "__proto__" !== key && (parentObject[key] = resolvedValue);
           "" === key &&
             null === handler.value &&
@@ -2415,12 +2427,12 @@
             null !== handler.value &&
             handler.value.$$typeof === REACT_ELEMENT_TYPE
           )
-            switch (((boundArgs = handler.value), key)) {
+            switch (((promiseValue = handler.value), key)) {
               case "3":
-                boundArgs.props = resolvedValue;
+                promiseValue.props = resolvedValue;
                 break;
               case "4":
-                boundArgs._owner = resolvedValue;
+                promiseValue._owner = resolvedValue;
             }
           handler.deps--;
           initializeChunkIfUnblocked(response, handler);
@@ -2703,8 +2715,8 @@
     function extractIterator(response, model) {
       return model[Symbol.iterator]();
     }
-    function createModel(response, model) {
-      return model;
+    function createModel(response, model, parentObject, key) {
+      return "then" === key && "function" === typeof model ? null : model;
     }
     function getInferredFunctionApproximate(code) {
       code = code.startsWith("Object.defineProperty(")
@@ -5157,7 +5169,8 @@
         React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE ||
         ReactSharedInteralsServer,
       ObjectPrototype = Object.prototype,
-      ArrayPrototype = Array.prototype;
+      ArrayPrototype = Array.prototype,
+      RESPONSE_SYMBOL = Symbol();
     ReactPromise.prototype = Object.create(Promise.prototype);
     Object.defineProperty(ReactPromise.prototype, "then", {
       writable: !0,
@@ -5325,10 +5338,10 @@
       return hook.checkDCE ? !0 : !1;
     })({
       bundleType: 1,
-      version: "19.3.0",
+      version: "19.3.1",
       rendererPackageName: "react-server-dom-webpack",
       currentDispatcherRef: ReactSharedInternals,
-      reconcilerVersion: "19.3.0",
+      reconcilerVersion: "19.3.1",
       getCurrentComponentInfo: function () {
         return currentOwnerInDEV;
       }

package/cjs/react-server-dom-webpack-client.browser.production.js

@@ -200,11 +200,8 @@ function processReply(
       entry.done
         ? ((entry = nextPartId++),
           data.append(formFieldPrefix + entry, new Blob(buffer)),
-          data.append(
-            formFieldPrefix + streamId,
-            '"$o' + entry.toString(16) + '"'
-          ),
-          data.append(formFieldPrefix + streamId, "C"),
+          data.append(streamPrefix, '"$o' + entry.toString(16) + '"'),
+          data.append(streamPrefix, "C"),
           pendingParts--,
           0 === pendingParts && resolve(data))
         : (buffer.push(entry.value),
@@ -214,20 +211,21 @@ function processReply(
     var data = formData;
     pendingParts++;
     var streamId = nextPartId++,
-      buffer = [];
+      buffer = [],
+      streamPrefix = formFieldPrefix + "S" + streamId;
     reader.read(new Uint8Array(1024)).then(progress, reject);
     return "$r" + streamId.toString(16);
   }
   function serializeReader(reader) {
     function progress(entry) {
       if (entry.done)
-        data.append(formFieldPrefix + streamId, "C"),
+        data.append(streamPrefix, "C"),
           pendingParts--,
           0 === pendingParts && resolve(data);
       else
         try {
           var partJSON = JSON.stringify(entry.value, resolveToJSON);
-          data.append(formFieldPrefix + streamId, partJSON);
+          data.append(streamPrefix, partJSON);
           reader.read().then(progress, reject);
         } catch (x) {
           reject(x);
@@ -236,7 +234,8 @@ function processReply(
     null === formData && (formData = new FormData());
     var data = formData;
     pendingParts++;
-    var streamId = nextPartId++;
+    var streamId = nextPartId++,
+      streamPrefix = formFieldPrefix + "S" + streamId;
     reader.read().then(progress, reject);
     return "$R" + streamId.toString(16);
   }
@@ -251,12 +250,11 @@ function processReply(
   function serializeAsyncIterable(iterable, iterator) {
     function progress(entry) {
       if (entry.done) {
-        if (void 0 === entry.value)
-          data.append(formFieldPrefix + streamId, "C");
+        if (void 0 === entry.value) data.append(streamPrefix, "C");
         else
           try {
             var partJSON = JSON.stringify(entry.value, resolveToJSON);
-            data.append(formFieldPrefix + streamId, "C" + partJSON);
+            data.append(streamPrefix, "C" + partJSON);
           } catch (x) {
             reject(x);
             return;
@@ -265,11 +263,11 @@ function processReply(
         0 === pendingParts && resolve(data);
       } else
         try {
-          var partJSON$21 = JSON.stringify(entry.value, resolveToJSON);
-          data.append(formFieldPrefix + streamId, partJSON$21);
+          var partJSON$24 = JSON.stringify(entry.value, resolveToJSON);
+          data.append(streamPrefix, partJSON$24);
           iterator.next().then(progress, reject);
-        } catch (x$22) {
-          reject(x$22);
+        } catch (x$25) {
+          reject(x$25);
         }
     }
     null === formData && (formData = new FormData());
@@ -277,6 +275,7 @@ function processReply(
     pendingParts++;
     var streamId = nextPartId++;
     iterable = iterable === iterator;
+    var streamPrefix = formFieldPrefix + "S" + streamId;
     iterator.next().then(progress, reject);
     return "$" + (iterable ? "x" : "X") + streamId.toString(16);
   }
@@ -314,20 +313,20 @@ function processReply(
               "function" === typeof x.then
             ) {
               pendingParts++;
-              var lazyId$23 = nextPartId++;
+              var lazyId$26 = nextPartId++;
               parentReference = function () {
                 try {
-                  var partJSON$24 = serializeModel(value, lazyId$23),
-                    data$25 = formData;
-                  data$25.append(formFieldPrefix + lazyId$23, partJSON$24);
+                  var partJSON$27 = serializeModel(value, lazyId$26),
+                    data$28 = formData;
+                  data$28.append(formFieldPrefix + lazyId$26, partJSON$27);
                   pendingParts--;
-                  0 === pendingParts && resolve(data$25);
+                  0 === pendingParts && resolve(data$28);
                 } catch (reason) {
                   reject(reason);
                 }
               };
               x.then(parentReference, parentReference);
-              return "$" + lazyId$23.toString(16);
+              return "$" + lazyId$26.toString(16);
             }
             reject(x);
             return null;
@@ -348,12 +347,12 @@ function processReply(
         value.then(function (partValue) {
           try {
             var previousReference = writtenObjects.get(partValue);
-            var partJSON$27 =
+            var partJSON$30 =
               void 0 !== previousReference
                 ? JSON.stringify(previousReference)
                 : serializeModel(partValue, promiseId);
             partValue = formData;
-            partValue.append(formFieldPrefix + promiseId, partJSON$27);
+            partValue.append(formFieldPrefix + promiseId, partJSON$30);
             pendingParts--;
             0 === pendingParts && resolve(partValue);
           } catch (reason) {
@@ -376,11 +375,11 @@ function processReply(
       if (isArrayImpl(value)) return value;
       if (value instanceof FormData) {
         null === formData && (formData = new FormData());
-        var data$31 = formData;
+        var data$34 = formData;
         key = nextPartId++;
         var prefix = formFieldPrefix + "_" + key + "_";
         value.forEach(function (originalValue, originalKey) {
-          data$31.append(prefix + originalKey, originalValue);
+          data$34.append(prefix + originalKey, originalValue);
         });
         return "$K" + key.toString(16);
       }
@@ -568,7 +567,8 @@ function createBoundServerReference(metaData, callServer) {
   return action;
 }
 var ObjectPrototype = Object.prototype,
-  ArrayPrototype = Array.prototype;
+  ArrayPrototype = Array.prototype,
+  RESPONSE_SYMBOL = Symbol();
 function ReactPromise(status, value, reason) {
   this.status = status;
   this.value = value;
@@ -732,11 +732,20 @@ function triggerErrorOnChunk(response, chunk, error) {
     null !== listeners && rejectChunk(response, listeners, error);
   }
 }
+function createResolvedModelChunk(response, value) {
+  var $jscomp$compprop0 = {};
+  return new ReactPromise(
+    "resolved_model",
+    value,
+    (($jscomp$compprop0[RESPONSE_SYMBOL] = response), $jscomp$compprop0)
+  );
+}
 function createResolvedIteratorResultChunk(response, value, done) {
+  var $jscomp$compprop1 = {};
   return new ReactPromise(
     "resolved_model",
     (done ? '{"done":true,"value":' : '{"done":false,"value":') + value + "}",
-    response
+    (($jscomp$compprop1[RESPONSE_SYMBOL] = response), $jscomp$compprop1)
   );
 }
 function resolveIteratorResultChunk(response, chunk, value, done) {
@@ -754,7 +763,8 @@ function resolveModelChunk(response, chunk, value) {
       rejectListeners = chunk.reason;
     chunk.status = "resolved_model";
     chunk.value = value;
-    chunk.reason = response;
+    value = {};
+    chunk.reason = ((value[RESPONSE_SYMBOL] = response), value);
     null !== resolveListeners &&
       (initializeModelChunk(chunk),
       wakeChunkIfInitialized(
@@ -791,7 +801,7 @@ function initializeModelChunk(chunk) {
   var prevHandler = initializingHandler;
   initializingHandler = null;
   var resolvedModel = chunk.value,
-    response = chunk.reason;
+    response = chunk.reason[RESPONSE_SYMBOL];
   chunk.status = "blocked";
   chunk.value = null;
   chunk.reason = null;
@@ -975,19 +985,19 @@ function fulfillReference(response, reference, value) {
       value.$$typeof === REACT_LAZY_TYPE;
 
     ) {
-      var referencedChunk$45 = value._payload;
-      if (referencedChunk$45 === handler.chunk) value = handler.value;
+      var referencedChunk$48 = value._payload;
+      if (referencedChunk$48 === handler.chunk) value = handler.value;
       else {
-        switch (referencedChunk$45.status) {
+        switch (referencedChunk$48.status) {
           case "resolved_model":
-            initializeModelChunk(referencedChunk$45);
+            initializeModelChunk(referencedChunk$48);
             break;
           case "resolved_module":
-            initializeModuleChunk(referencedChunk$45);
+            initializeModuleChunk(referencedChunk$48);
         }
-        switch (referencedChunk$45.status) {
+        switch (referencedChunk$48.status) {
           case "fulfilled":
-            value = referencedChunk$45.value;
+            value = referencedChunk$48.value;
             continue;
         }
         break;
@@ -1060,21 +1070,25 @@ function waitForReference(
   return null;
 }
 function loadServerReference(response, metaData, parentObject, key) {
+  if ("then" === key) return null;
+  var id = metaData.id;
+  if ("string" !== typeof id) return null;
   if (!response._serverReferenceConfig)
     return createBoundServerReference(metaData, response._callServer);
   var serverReference = resolveServerReference(
       response._serverReferenceConfig,
-      metaData.id
+      id
     ),
-    promise = preloadModule(serverReference);
-  if (promise)
-    metaData.bound && (promise = Promise.all([promise, metaData.bound]));
-  else if (metaData.bound) promise = Promise.resolve(metaData.bound);
+    bound = metaData.bound;
+  if ((metaData = preloadModule(serverReference)))
+    bound instanceof ReactPromise &&
+      (metaData = Promise.all([metaData, bound]));
+  else if (bound instanceof ReactPromise) metaData = Promise.resolve(bound);
   else
     return (
-      (promise = requireModule(serverReference)),
-      registerBoundServerReference(promise, metaData.id, metaData.bound),
-      promise
+      (metaData = requireModule(serverReference)),
+      registerBoundServerReference(metaData, id, bound),
+      metaData
     );
   if (initializingHandler) {
     var handler = initializingHandler;
@@ -1088,15 +1102,16 @@ function loadServerReference(response, metaData, parentObject, key) {
       deps: 1,
       errored: !1
     };
-  promise.then(
+  metaData.then(
     function () {
       var resolvedValue = requireModule(serverReference);
-      if (metaData.bound) {
-        var boundArgs = metaData.bound.value.slice(0);
-        boundArgs.unshift(null);
-        resolvedValue = resolvedValue.bind.apply(resolvedValue, boundArgs);
+      if (bound) {
+        var promiseValue = bound.value;
+        promiseValue = isArrayImpl(promiseValue) ? promiseValue.slice(0) : [];
+        promiseValue.unshift(null);
+        resolvedValue = resolvedValue.bind.apply(resolvedValue, promiseValue);
       }
-      registerBoundServerReference(resolvedValue, metaData.id, metaData.bound);
+      registerBoundServerReference(resolvedValue, id, bound);
       "__proto__" !== key && (parentObject[key] = resolvedValue);
       "" === key && null === handler.value && (handler.value = resolvedValue);
       if (
@@ -1105,9 +1120,9 @@ function loadServerReference(response, metaData, parentObject, key) {
         null !== handler.value &&
         handler.value.$$typeof === REACT_ELEMENT_TYPE
       )
-        switch (((boundArgs = handler.value), key)) {
+        switch (((promiseValue = handler.value), key)) {
           case "3":
-            boundArgs.props = resolvedValue;
+            promiseValue.props = resolvedValue;
         }
       handler.deps--;
       initializeChunkIfUnblocked(response, handler);
@@ -1296,8 +1311,8 @@ function createFormData(response, model) {
 function extractIterator(response, model) {
   return model[Symbol.iterator]();
 }
-function createModel(response, model) {
-  return model;
+function createModel(response, model, parentObject, key) {
+  return "then" === key && "function" === typeof model ? null : model;
 }
 function parseModelString(response, parentObject, key, value) {
   if ("$" === value[0]) {
@@ -1501,7 +1516,7 @@ function startReadableStream(response, id, type) {
     },
     enqueueModel: function (json) {
       if (null === previousBlockedChunk) {
-        var chunk = new ReactPromise("resolved_model", json, response);
+        var chunk = createResolvedModelChunk(response, json);
         initializeModelChunk(chunk);
         "fulfilled" === chunk.status
           ? controller.enqueue(chunk.value)
@@ -1516,8 +1531,8 @@ function startReadableStream(response, id, type) {
             (previousBlockedChunk = chunk));
       } else {
         chunk = previousBlockedChunk;
-        var chunk$57 = new ReactPromise("pending", null, null);
-        chunk$57.then(
+        var chunk$60 = new ReactPromise("pending", null, null);
+        chunk$60.then(
           function (v) {
             return controller.enqueue(v);
           },
@@ -1525,10 +1540,10 @@ function startReadableStream(response, id, type) {
             return controller.error(e);
           }
         );
-        previousBlockedChunk = chunk$57;
+        previousBlockedChunk = chunk$60;
         chunk.then(function () {
-          previousBlockedChunk === chunk$57 && (previousBlockedChunk = null);
-          resolveModelChunk(response, chunk$57, json);
+          previousBlockedChunk === chunk$60 && (previousBlockedChunk = null);
+          resolveModelChunk(response, chunk$60, json);
         });
       }
     },
@@ -1684,8 +1699,8 @@ function mergeBuffer(buffer, lastChunk) {
   for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++)
     byteLength += buffer[i].byteLength;
   byteLength = new Uint8Array(byteLength);
-  for (var i$58 = (i = 0); i$58 < l; i$58++) {
-    var chunk = buffer[i$58];
+  for (var i$61 = (i = 0); i$61 < l; i$61++) {
+    var chunk = buffer[i$61];
     byteLength.set(chunk, i);
     i += chunk.byteLength;
   }
@@ -1855,7 +1870,7 @@ function processFullBinaryRow(response, streamState, id, tag, buffer, chunk) {
       (tag = response._chunks),
         (chunk = tag.get(id))
           ? resolveModelChunk(response, chunk, buffer)
-          : ((response = new ReactPromise("resolved_model", buffer, response)),
+          : ((response = createResolvedModelChunk(response, buffer)),
             tag.set(id, response));
   }
 }