react-server-dom-webpack 19.2.0-canary-5d87cd22-20250704 → 19.2.0-canary-befc1246-20250708

package/cjs/react-server-dom-webpack-server.edge.production.js

@@ -789,7 +789,9 @@ function serializeThenable(request, task, thenable) {
       if (12 === request.status)
         return (
           request.abortableTasks.delete(newTask),
-          abortTask(newTask, request, request.fatalError),
+          (task = request.fatalError),
+          abortTask(newTask),
+          finishAbortedTask(newTask, request, task),
           newTask.id
         );
       "string" !== typeof thenable.status &&
@@ -1296,7 +1298,7 @@ function outlineModel(request, value) {
 function serializeTypedArray(request, tag, typedArray) {
   request.pendingChunks++;
   var bufferId = request.nextChunkId++;
-  emitTypedArrayChunk(request, bufferId, tag, typedArray);
+  emitTypedArrayChunk(request, bufferId, tag, typedArray, !1);
   return serializeByValueID(bufferId);
 }
 function serializeBlob(request, blob) {
@@ -1543,7 +1545,7 @@ function renderModelDestructive(
       return (
         request.pendingChunks++,
         (task = request.nextChunkId++),
-        emitTextChunk(request, task, value),
+        emitTextChunk(request, task, value, !1),
         serializeByValueID(task)
       );
     request = "$" === value[0] ? "$" + value : value;
@@ -1679,61 +1681,61 @@ function emitModelChunk(request, id, json) {
   id = stringToChunk(id);
   request.completedRegularChunks.push(id);
 }
-function emitTypedArrayChunk(request, id, tag, typedArray) {
-  request.pendingChunks++;
-  var buffer = new Uint8Array(
+function emitTypedArrayChunk(request, id, tag, typedArray, debug) {
+  debug ? request.pendingDebugChunks++ : request.pendingChunks++;
+  debug = new Uint8Array(
     typedArray.buffer,
     typedArray.byteOffset,
     typedArray.byteLength
   );
-  typedArray = 2048 < typedArray.byteLength ? buffer.slice() : buffer;
-  buffer = typedArray.byteLength;
-  id = id.toString(16) + ":" + tag + buffer.toString(16) + ",";
+  typedArray = 2048 < typedArray.byteLength ? debug.slice() : debug;
+  debug = typedArray.byteLength;
+  id = id.toString(16) + ":" + tag + debug.toString(16) + ",";
   id = stringToChunk(id);
   request.completedRegularChunks.push(id, typedArray);
 }
-function emitTextChunk(request, id, text) {
+function emitTextChunk(request, id, text, debug) {
   if (null === byteLengthOfChunk)
     throw Error(
       "Existence of byteLengthOfChunk should have already been checked. This is a bug in React."
     );
-  request.pendingChunks++;
+  debug ? request.pendingDebugChunks++ : request.pendingChunks++;
   text = stringToChunk(text);
-  var binaryLength = text.byteLength;
-  id = id.toString(16) + ":T" + binaryLength.toString(16) + ",";
+  debug = text.byteLength;
+  id = id.toString(16) + ":T" + debug.toString(16) + ",";
   id = stringToChunk(id);
   request.completedRegularChunks.push(id, text);
 }
 function emitChunk(request, task, value) {
   var id = task.id;
   "string" === typeof value && null !== byteLengthOfChunk
-    ? emitTextChunk(request, id, value)
+    ? emitTextChunk(request, id, value, !1)
     : value instanceof ArrayBuffer
-      ? emitTypedArrayChunk(request, id, "A", new Uint8Array(value))
+      ? emitTypedArrayChunk(request, id, "A", new Uint8Array(value), !1)
       : value instanceof Int8Array
-        ? emitTypedArrayChunk(request, id, "O", value)
+        ? emitTypedArrayChunk(request, id, "O", value, !1)
         : value instanceof Uint8Array
-          ? emitTypedArrayChunk(request, id, "o", value)
+          ? emitTypedArrayChunk(request, id, "o", value, !1)
           : value instanceof Uint8ClampedArray
-            ? emitTypedArrayChunk(request, id, "U", value)
+            ? emitTypedArrayChunk(request, id, "U", value, !1)
             : value instanceof Int16Array
-              ? emitTypedArrayChunk(request, id, "S", value)
+              ? emitTypedArrayChunk(request, id, "S", value, !1)
               : value instanceof Uint16Array
-                ? emitTypedArrayChunk(request, id, "s", value)
+                ? emitTypedArrayChunk(request, id, "s", value, !1)
                 : value instanceof Int32Array
-                  ? emitTypedArrayChunk(request, id, "L", value)
+                  ? emitTypedArrayChunk(request, id, "L", value, !1)
                   : value instanceof Uint32Array
-                    ? emitTypedArrayChunk(request, id, "l", value)
+                    ? emitTypedArrayChunk(request, id, "l", value, !1)
                     : value instanceof Float32Array
-                      ? emitTypedArrayChunk(request, id, "G", value)
+                      ? emitTypedArrayChunk(request, id, "G", value, !1)
                       : value instanceof Float64Array
-                        ? emitTypedArrayChunk(request, id, "g", value)
+                        ? emitTypedArrayChunk(request, id, "g", value, !1)
                         : value instanceof BigInt64Array
-                          ? emitTypedArrayChunk(request, id, "M", value)
+                          ? emitTypedArrayChunk(request, id, "M", value, !1)
                           : value instanceof BigUint64Array
-                            ? emitTypedArrayChunk(request, id, "m", value)
+                            ? emitTypedArrayChunk(request, id, "m", value, !1)
                             : value instanceof DataView
-                              ? emitTypedArrayChunk(request, id, "V", value)
+                              ? emitTypedArrayChunk(request, id, "V", value, !1)
                               : ((value = stringify(value, task.toJSON)),
                                 emitModelChunk(request, task.id, value));
 }
@@ -1772,11 +1774,13 @@ function retryTask(request, task) {
       request.abortableTasks.delete(task);
       callOnAllReadyIfReady(request);
     } catch (thrownValue) {
-      if (12 === request.status)
-        request.abortableTasks.delete(task),
-          (task.status = 0),
-          abortTask(task, request, request.fatalError);
-      else {
+      if (12 === request.status) {
+        request.abortableTasks.delete(task);
+        task.status = 0;
+        var errorId = request.fatalError;
+        abortTask(task);
+        finishAbortedTask(task, request, errorId);
+      } else {
         var x =
           thrownValue === SuspenseException
             ? getSuspendedThenable()
@@ -1825,10 +1829,12 @@ function performWork(request) {
       (currentRequest = prevRequest);
   }
 }
-function abortTask(task, request, errorId) {
-  5 !== task.status &&
-    ((task.status = 3),
-    (errorId = serializeByValueID(errorId)),
+function abortTask(task) {
+  0 === task.status && (task.status = 3);
+}
+function finishAbortedTask(task, request, errorId) {
+  3 === task.status &&
+    ((errorId = serializeByValueID(errorId)),
     (task = encodeReferenceChunk(request, task.id, errorId)),
     request.completedErrorChunks.push(task));
 }
@@ -1918,39 +1924,56 @@ function startFlowing(request, destination) {
     }
   }
 }
-function abort(request, reason) {
+function finishAbort(request, abortedTasks, errorId) {
   try {
-    11 >= request.status &&
-      ((request.status = 12),
-      request.cacheController.abort(reason),
-      callOnAllReadyIfReady(request));
-    var abortableTasks = request.abortableTasks;
-    if (0 < abortableTasks.size) {
-      var error =
-          void 0 === reason
-            ? Error("The render was aborted by the server without a reason.")
-            : "object" === typeof reason &&
-                null !== reason &&
-                "function" === typeof reason.then
-              ? Error("The render was aborted by the server with a promise.")
-              : reason,
-        digest = logRecoverableError(request, error, null),
-        errorId = request.nextChunkId++;
-      request.fatalError = errorId;
-      request.pendingChunks++;
-      emitErrorChunk(request, errorId, digest, error, !1);
-      abortableTasks.forEach(function (task) {
-        return abortTask(task, request, errorId);
-      });
-      abortableTasks.clear();
-      callOnAllReadyIfReady(request);
-    }
+    abortedTasks.forEach(function (task) {
+      return finishAbortedTask(task, request, errorId);
+    });
+    var onAllReady = request.onAllReady;
+    onAllReady();
     null !== request.destination &&
       flushCompletedChunks(request, request.destination);
-  } catch (error$24) {
-    logRecoverableError(request, error$24, null), fatalError(request, error$24);
+  } catch (error) {
+    logRecoverableError(request, error, null), fatalError(request, error);
   }
 }
+function abort(request, reason) {
+  if (!(11 < request.status))
+    try {
+      request.status = 12;
+      request.cacheController.abort(reason);
+      var abortableTasks = request.abortableTasks;
+      if (0 < abortableTasks.size) {
+        var error =
+            void 0 === reason
+              ? Error("The render was aborted by the server without a reason.")
+              : "object" === typeof reason &&
+                  null !== reason &&
+                  "function" === typeof reason.then
+                ? Error("The render was aborted by the server with a promise.")
+                : reason,
+          digest = logRecoverableError(request, error, null),
+          errorId = request.nextChunkId++;
+        request.fatalError = errorId;
+        request.pendingChunks++;
+        emitErrorChunk(request, errorId, digest, error, !1);
+        abortableTasks.forEach(function (task) {
+          return abortTask(task, request, errorId);
+        });
+        setTimeout(function () {
+          return finishAbort(request, abortableTasks, errorId);
+        }, 0);
+      } else {
+        var onAllReady = request.onAllReady;
+        onAllReady();
+        null !== request.destination &&
+          flushCompletedChunks(request, request.destination);
+      }
+    } catch (error$24) {
+      logRecoverableError(request, error$24, null),
+        fatalError(request, error$24);
+    }
+}
 function resolveServerReference(bundlerConfig, id) {
   var name = "",
     resolvedModuleData = bundlerConfig[id];

package/cjs/react-server-dom-webpack-server.node.development.js

@@ -680,9 +680,9 @@
             suffixIdx = url.lastIndexOf("?");
           -1 < envIdx &&
             -1 < suffixIdx &&
-            (url = url.slice(envIdx + 1, suffixIdx));
+            (url = decodeURI(url.slice(envIdx + 1, suffixIdx)));
         }
-        request(url, functionName) &&
+        request(url, functionName, callsite[2], callsite[3]) &&
           ((callsite = callsite.slice(0)),
           (callsite[1] = url),
           filteredStack.push(callsite));
@@ -705,7 +705,7 @@
               request,
               parseStackTrace(Error("react-stack-top-frame"), 1)
             );
-            request.pendingChunks++;
+            request.pendingDebugChunks++;
             var owner = resolveOwner(),
               args = Array.from(arguments);
             a: {
@@ -736,9 +736,13 @@
             null != owner && outlineComponentInfo(request, owner);
             format = [methodName, stack, owner, env];
             format.push.apply(format, args);
-            args = serializeDebugModel(request, 500, format);
+            args = serializeDebugModel(
+              request,
+              (null === request.deferredDebugObjects ? 500 : 10) + stack.length,
+              format
+            );
             "[" !== args[0] &&
-              (args = serializeDebugModel(request, 500, [
+              (args = serializeDebugModel(request, 10 + stack.length, [
                 methodName,
                 stack,
                 owner,
@@ -867,6 +871,7 @@
         void 0 === onPostpone ? defaultPostponeHandler : onPostpone;
       this.onAllReady = onAllReady;
       this.onFatalError = onFatalError;
+      this.pendingDebugChunks = 0;
       this.completedDebugChunks = [];
       this.environmentName =
         void 0 === environmentName
@@ -952,7 +957,7 @@
       return store ? store : null;
     }
     function serializeDebugThenable(request, counter, thenable) {
-      request.pendingChunks++;
+      request.pendingDebugChunks++;
       var id = request.nextChunkId++,
         ref = "$@" + id.toString(16);
       request.writtenDebugObjects.set(thenable, ref);
@@ -1025,7 +1030,9 @@
           if (request.status === ABORTING)
             return (
               request.abortableTasks.delete(newTask),
-              abortTask(newTask, request, request.fatalError),
+              (task = request.fatalError),
+              abortTask(newTask),
+              finishAbortedTask(newTask, request, task),
               newTask.id
             );
           "string" !== typeof thenable.status &&
@@ -1351,7 +1358,7 @@
           var componentDebugID = task.id;
           componentDebugInfo = Component.displayName || Component.name || "";
           var componentEnv = (0, request.environmentName)();
-          request.pendingChunks++;
+          request.pendingDebugChunks++;
           componentDebugInfo = {
             name: componentDebugInfo,
             env: componentEnv,
@@ -1751,7 +1758,7 @@
     function serializeDeferredObject(request, value) {
       var deferredDebugObjects = request.deferredDebugObjects;
       return null !== deferredDebugObjects
-        ? (request.pendingChunks++,
+        ? (request.pendingDebugChunks++,
           (request = request.nextChunkId++),
           deferredDebugObjects.existing.set(value, request),
           deferredDebugObjects.retained.set(request, value),
@@ -1830,7 +1837,7 @@
           request.bundlerConfig,
           clientReference
         );
-        request.pendingChunks++;
+        request.pendingDebugChunks++;
         var importId = request.nextChunkId++;
         emitImportChunk(request, importId, clientReferenceMetadata, !0);
         return parent[0] === REACT_ELEMENT_TYPE && "1" === parentPropertyName
@@ -1838,7 +1845,7 @@
           : serializeByValueID(importId);
       } catch (x) {
         return (
-          request.pendingChunks++,
+          request.pendingDebugChunks++,
           (parent = request.nextChunkId++),
           (parentPropertyName = logRecoverableError(request, x, null)),
           emitErrorChunk(request, parent, parentPropertyName, x, !0),
@@ -1917,7 +1924,7 @@
       return serializeByValueID(bufferId);
     }
     function serializeDebugTypedArray(request, tag, typedArray) {
-      request.pendingChunks++;
+      request.pendingDebugChunks++;
       var bufferId = request.nextChunkId++;
       emitTypedArrayChunk(request, bufferId, tag, typedArray, !0);
       return serializeByValueID(bufferId);
@@ -1943,8 +1950,9 @@
         reader.cancel(reason).then(noop, noop);
       }
       var model = [blob.type],
-        reader = blob.stream().getReader(),
-        id = request.nextChunkId++;
+        reader = blob.stream().getReader();
+      request.pendingDebugChunks++;
+      var id = request.nextChunkId++;
       reader.read().then(progress).catch(error);
       return "$B" + id.toString(16);
     }
@@ -2517,7 +2525,7 @@
       }
     }
     function emitTypedArrayChunk(request, id, tag, typedArray, debug) {
-      request.pendingChunks++;
+      debug ? request.pendingDebugChunks++ : request.pendingChunks++;
       typedArray = new Uint8Array(
         typedArray.buffer,
         typedArray.byteOffset,
@@ -2534,7 +2542,7 @@
         throw Error(
           "Existence of byteLengthOfChunk should have already been checked. This is a bug in React."
         );
-      request.pendingChunks++;
+      debug ? request.pendingDebugChunks++ : request.pendingChunks++;
       var binaryLength = byteLengthOfChunk(text);
       id = id.toString(16) + ":T" + binaryLength.toString(16) + ",";
       debug
@@ -2771,7 +2779,7 @@
           if (0 >= counter.objectLimit)
             return serializeDeferredObject(request, value);
           counter.objectLimit--;
-          request.pendingChunks++;
+          request.pendingDebugChunks++;
           counter = request.nextChunkId++;
           emitTextChunk(request, counter, value, !0);
           return serializeByValueID(counter);
@@ -2799,7 +2807,7 @@
         ref = counter.get(value);
         if (void 0 !== ref) return ref;
         key = "$E(" + (Function.prototype.toString.call(value) + ")");
-        request.pendingChunks++;
+        request.pendingDebugChunks++;
         ref = request.nextChunkId++;
         key = encodeReferenceChunk(request, ref, key);
         request.completedDebugChunks.push(key);
@@ -2891,7 +2899,7 @@
     }
     function outlineDebugModel(request, counter, model) {
       var id = request.nextChunkId++;
-      request.pendingChunks++;
+      request.pendingDebugChunks++;
       emitOutlinedDebugModelChunk(request, id, counter, model);
       return id;
     }
@@ -2902,7 +2910,7 @@
         if ("number" !== typeof info.time)
           if ("string" === typeof info.name)
             outlineComponentInfo(request$jscomp$1, info),
-              request$jscomp$1.pendingChunks++,
+              request$jscomp$1.pendingDebugChunks++,
               emitDebugChunk(request$jscomp$1, task, info);
           else if (info.awaited) {
             var ioInfo = info.awaited;
@@ -2910,7 +2918,7 @@
               var request = request$jscomp$1,
                 ioInfo$jscomp$0 = ioInfo;
               if (!request.writtenObjects.has(ioInfo$jscomp$0)) {
-                request.pendingChunks++;
+                request.pendingDebugChunks++;
                 var id = request.nextChunkId++,
                   owner = ioInfo$jscomp$0.owner;
                 null != owner && outlineComponentInfo(request, owner);
@@ -2960,11 +2968,11 @@
               null != info.env && (ioInfo.env = info.env);
               null != info.owner && (ioInfo.owner = info.owner);
               null != request && (ioInfo.stack = request);
-              request$jscomp$1.pendingChunks++;
+              request$jscomp$1.pendingDebugChunks++;
               emitDebugChunk(request$jscomp$1, task, ioInfo);
             }
           } else
-            request$jscomp$1.pendingChunks++,
+            request$jscomp$1.pendingDebugChunks++,
               emitDebugChunk(request$jscomp$1, task, info);
       }
     }
@@ -3054,7 +3062,7 @@
           task.implicitSlot = !1;
           var currentEnv = (0, request.environmentName)();
           currentEnv !== task.environmentName &&
-            (request.pendingChunks++,
+            (request.pendingDebugChunks++,
             emitDebugChunk(request, task.id, { env: currentEnv }));
           if ("object" === typeof resolvedModel && null !== resolvedModel)
             request.writtenObjects.set(
@@ -3071,11 +3079,13 @@
           request.abortableTasks.delete(task);
           callOnAllReadyIfReady(request);
         } catch (thrownValue) {
-          if (request.status === ABORTING)
-            request.abortableTasks.delete(task),
-              (task.status = 0),
-              abortTask(task, request, request.fatalError);
-          else {
+          if (request.status === ABORTING) {
+            request.abortableTasks.delete(task);
+            task.status = 0;
+            var errorId = request.fatalError;
+            abortTask(task);
+            finishAbortedTask(task, request, errorId);
+          } else {
             var x =
               thrownValue === SuspenseException
                 ? getSuspendedThenable()
@@ -3128,9 +3138,11 @@
           (currentRequest = prevRequest);
       }
     }
-    function abortTask(task, request, errorId) {
-      if (5 !== task.status) {
-        task.status = 3;
+    function abortTask(task) {
+      0 === task.status && (task.status = 3);
+    }
+    function finishAbortedTask(task, request, errorId) {
+      if (3 === task.status) {
         var model = task.model;
         "object" === typeof model &&
           null !== model &&
@@ -3171,7 +3183,7 @@
         var debugChunks = request.completedDebugChunks;
         for (i = 0; i < debugChunks.length; i++)
           if (
-            (request.pendingChunks--,
+            (request.pendingDebugChunks--,
             !writeChunkAndReturn(destination, debugChunks[i]))
           ) {
             request.destination = null;
@@ -3212,6 +3224,7 @@
       }
       "function" === typeof destination.flush && destination.flush();
       0 === request.pendingChunks &&
+        0 === request.pendingDebugChunks &&
         (request.status < ABORTING &&
           request.cacheController.abort(
             Error(
@@ -3258,44 +3271,60 @@
         }
       }
     }
-    function abort(request, reason) {
+    function finishAbort(request, abortedTasks, errorId) {
       try {
-        11 >= request.status &&
-          ((request.status = ABORTING),
-          request.cacheController.abort(reason),
-          callOnAllReadyIfReady(request));
-        var abortableTasks = request.abortableTasks;
-        if (0 < abortableTasks.size) {
-          var error =
-              void 0 === reason
-                ? Error(
-                    "The render was aborted by the server without a reason."
-                  )
-                : "object" === typeof reason &&
-                    null !== reason &&
-                    "function" === typeof reason.then
-                  ? Error(
-                      "The render was aborted by the server with a promise."
-                    )
-                  : reason,
-            digest = logRecoverableError(request, error, null),
-            _errorId2 = request.nextChunkId++;
-          request.fatalError = _errorId2;
-          request.pendingChunks++;
-          emitErrorChunk(request, _errorId2, digest, error, !1);
-          abortableTasks.forEach(function (task) {
-            return abortTask(task, request, _errorId2);
-          });
-          abortableTasks.clear();
-          callOnAllReadyIfReady(request);
-        }
+        abortedTasks.forEach(function (task) {
+          return finishAbortedTask(task, request, errorId);
+        });
+        var onAllReady = request.onAllReady;
+        onAllReady();
         null !== request.destination &&
           flushCompletedChunks(request, request.destination);
-      } catch (error$2) {
-        logRecoverableError(request, error$2, null),
-          fatalError(request, error$2);
+      } catch (error) {
+        logRecoverableError(request, error, null), fatalError(request, error);
       }
     }
+    function abort(request, reason) {
+      if (!(11 < request.status))
+        try {
+          request.status = ABORTING;
+          request.cacheController.abort(reason);
+          var abortableTasks = request.abortableTasks;
+          if (0 < abortableTasks.size) {
+            var error =
+                void 0 === reason
+                  ? Error(
+                      "The render was aborted by the server without a reason."
+                    )
+                  : "object" === typeof reason &&
+                      null !== reason &&
+                      "function" === typeof reason.then
+                    ? Error(
+                        "The render was aborted by the server with a promise."
+                      )
+                    : reason,
+              digest = logRecoverableError(request, error, null),
+              _errorId2 = request.nextChunkId++;
+            request.fatalError = _errorId2;
+            request.pendingChunks++;
+            emitErrorChunk(request, _errorId2, digest, error, !1);
+            abortableTasks.forEach(function (task) {
+              return abortTask(task, request, _errorId2);
+            });
+            setImmediate(function () {
+              return finishAbort(request, abortableTasks, _errorId2);
+            });
+          } else {
+            var onAllReady = request.onAllReady;
+            onAllReady();
+            null !== request.destination &&
+              flushCompletedChunks(request, request.destination);
+          }
+        } catch (error$2) {
+          logRecoverableError(request, error$2, null),
+            fatalError(request, error$2);
+        }
+    }
     function fromHex(str) {
       return parseInt(str, 16);
     }
@@ -3313,7 +3342,7 @@
             var id = message[command],
               retainedValue = deferredDebugObjects.retained.get(id);
             void 0 !== retainedValue &&
-              (request.pendingChunks--,
+              (request.pendingDebugChunks--,
               deferredDebugObjects.retained.delete(id),
               deferredDebugObjects.existing.delete(retainedValue),
               enqueueFlush(request));
@@ -3324,7 +3353,9 @@
             (id = message[command]),
               (retainedValue = deferredDebugObjects.retained.get(id)),
               void 0 !== retainedValue &&
-                (emitOutlinedDebugModelChunk(
+                (deferredDebugObjects.retained.delete(id),
+                deferredDebugObjects.existing.delete(retainedValue),
+                emitOutlinedDebugModelChunk(
                   request,
                   id,
                   { objectLimit: 10 },
@@ -3345,7 +3376,7 @@
           "resolveDebugMessage/closeDebugChannel should not be called for a Request that wasn't kept alive. This is a bug in React."
         );
       deferredDebugObjects.retained.forEach(function (value, id) {
-        request.pendingChunks--;
+        request.pendingDebugChunks--;
         deferredDebugObjects.retained.delete(id);
         deferredDebugObjects.existing.delete(value);
       });
@@ -4821,12 +4852,12 @@
             "React doesn't accept base64 encoded file uploads because we don't expect form data passed from a browser to ever encode data that way. If that's the wrong assumption, we can easily fix it."
           );
         pendingFiles++;
-        var JSCompiler_object_inline_chunks_207 = [];
+        var JSCompiler_object_inline_chunks_214 = [];
         value.on("data", function (chunk) {
-          JSCompiler_object_inline_chunks_207.push(chunk);
+          JSCompiler_object_inline_chunks_214.push(chunk);
         });
         value.on("end", function () {
-          var blob = new Blob(JSCompiler_object_inline_chunks_207, {
+          var blob = new Blob(JSCompiler_object_inline_chunks_214, {
             type: mimeType
           });
           response._formData.append(name, blob, filename);