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

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

@@ -782,15 +782,13 @@ function wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners) {
       rejectListeners && rejectChunk(rejectListeners, chunk.reason);
   }
 }
-function triggerErrorOnChunk(chunk, error) {
-  if ("pending" !== chunk.status && "blocked" !== chunk.status)
-    chunk.reason.error(error);
-  else {
-    var listeners = chunk.reason;
-    chunk.status = "rejected";
-    chunk.reason = error;
-    null !== listeners && rejectChunk(listeners, error);
-  }
+function triggerErrorOnChunk(response, chunk, error) {
+  "pending" !== chunk.status && "blocked" !== chunk.status
+    ? chunk.reason.error(error)
+    : ((response = chunk.reason),
+      (chunk.status = "rejected"),
+      (chunk.reason = error),
+      null !== response && rejectChunk(response, error));
 }
 function createResolvedIteratorResultChunk(response, value, done) {
   return new ReactPromise(
@@ -819,15 +817,15 @@ function resolveModelChunk(response, chunk, value) {
       wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners));
   }
 }
-function resolveModuleChunk(chunk, value) {
+function resolveModuleChunk(response, chunk, value) {
   if ("pending" === chunk.status || "blocked" === chunk.status) {
-    var resolveListeners = chunk.value,
-      rejectListeners = chunk.reason;
+    response = chunk.value;
+    var rejectListeners = chunk.reason;
     chunk.status = "resolved_module";
     chunk.value = value;
-    null !== resolveListeners &&
+    null !== response &&
       (initializeModuleChunk(chunk),
-      wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners));
+      wakeChunkIfInitialized(chunk, response, rejectListeners));
   }
 }
 var initializingHandler = null;
@@ -871,11 +869,12 @@ function initializeModuleChunk(chunk) {
     (chunk.status = "rejected"), (chunk.reason = error);
   }
 }
-function reportGlobalError(response, error) {
-  response._closed = !0;
-  response._closedReason = error;
-  response._chunks.forEach(function (chunk) {
-    "pending" === chunk.status && triggerErrorOnChunk(chunk, error);
+function reportGlobalError(weakResponse, error) {
+  weakResponse._closed = !0;
+  weakResponse._closedReason = error;
+  weakResponse._chunks.forEach(function (chunk) {
+    "pending" === chunk.status &&
+      triggerErrorOnChunk(weakResponse, chunk, error);
   });
 }
 function createLazyChunkWrapper(chunk) {
@@ -966,14 +965,15 @@ function fulfillReference(reference, value) {
       null !== parentObject && wakeChunk(parentObject, handler.value)));
 }
 function rejectReference(reference, error) {
-  reference = reference.handler;
-  reference.errored ||
-    ((reference.errored = !0),
-    (reference.value = error),
-    (reference = reference.chunk),
-    null !== reference &&
-      "blocked" === reference.status &&
-      triggerErrorOnChunk(reference, error));
+  var handler = reference.handler;
+  reference = reference.response;
+  handler.errored ||
+    ((handler.errored = !0),
+    (handler.value = error),
+    (handler = handler.chunk),
+    null !== handler &&
+      "blocked" === handler.status &&
+      triggerErrorOnChunk(reference, handler, error));
 }
 function waitForReference(
   referencedChunk,
@@ -1090,7 +1090,7 @@ function loadServerReference(response, metaData, parentObject, key) {
         var chunk = handler.chunk;
         null !== chunk &&
           "blocked" === chunk.status &&
-          triggerErrorOnChunk(chunk, error);
+          triggerErrorOnChunk(response, chunk, error);
       }
     }
   );
@@ -1365,24 +1365,24 @@ function resolveModule(response, id, model) {
     model[1],
     response._nonce
   );
-  if ((response = preloadModule(clientReference))) {
+  if ((model = preloadModule(clientReference))) {
     if (chunk) {
       var blockedChunk = chunk;
       blockedChunk.status = "blocked";
     } else
       (blockedChunk = new ReactPromise("blocked", null, null)),
         chunks.set(id, blockedChunk);
-    response.then(
+    model.then(
       function () {
-        return resolveModuleChunk(blockedChunk, clientReference);
+        return resolveModuleChunk(response, blockedChunk, clientReference);
       },
       function (error) {
-        return triggerErrorOnChunk(blockedChunk, error);
+        return triggerErrorOnChunk(response, blockedChunk, error);
       }
     );
   } else
     chunk
-      ? resolveModuleChunk(chunk, clientReference)
+      ? resolveModuleChunk(response, chunk, clientReference)
       : chunks.set(
           id,
           new ReactPromise("resolved_module", clientReference, null)
@@ -1572,7 +1572,7 @@ function startAsyncIterable(response, id, iterator) {
           nextWriteIndex < buffer.length;
 
         )
-          triggerErrorOnChunk(buffer[nextWriteIndex++], error);
+          triggerErrorOnChunk(response, buffer[nextWriteIndex++], error);
       }
     }
   );
@@ -1723,10 +1723,11 @@ function processFullStringRow(response, id, tag, row) {
       tag = JSON.parse(row);
       row = resolveErrorProd();
       row.digest = tag.digest;
-      response = response._chunks;
-      (tag = response.get(id))
-        ? triggerErrorOnChunk(tag, row)
-        : response.set(id, new ReactPromise("rejected", null, row));
+      tag = response._chunks;
+      var chunk = tag.get(id);
+      chunk
+        ? triggerErrorOnChunk(response, chunk, row)
+        : tag.set(id, new ReactPromise("rejected", null, row));
       break;
     case 84:
       response = response._chunks;
@@ -1754,26 +1755,25 @@ function processFullStringRow(response, id, tag, row) {
       startAsyncIterable(response, id, !0);
       break;
     case 67:
-      (id = response._chunks.get(id)) &&
-        "fulfilled" === id.status &&
-        id.reason.close("" === row ? '"$undefined"' : row);
+      (response = response._chunks.get(id)) &&
+        "fulfilled" === response.status &&
+        response.reason.close("" === row ? '"$undefined"' : row);
       break;
     default:
-      tag = response._chunks;
-      var chunk = tag.get(id);
-      chunk
-        ? resolveModelChunk(response, chunk, row)
-        : tag.set(id, new ReactPromise("resolved_model", row, response));
+      (tag = response._chunks),
+        (chunk = tag.get(id))
+          ? resolveModelChunk(response, chunk, row)
+          : tag.set(id, new ReactPromise("resolved_model", row, response));
   }
 }
-function processBinaryChunk(response, chunk) {
+function processBinaryChunk(weakResponse, chunk) {
   for (
     var i = 0,
-      rowState = response._rowState,
-      rowID = response._rowID,
-      rowTag = response._rowTag,
-      rowLength = response._rowLength,
-      buffer = response._buffer,
+      rowState = weakResponse._rowState,
+      rowID = weakResponse._rowID,
+      rowTag = weakResponse._rowTag,
+      rowLength = weakResponse._rowLength,
+      buffer = weakResponse._buffer,
       chunkLength = chunk.length;
     i < chunkLength;
 
@@ -1827,7 +1827,7 @@ function processBinaryChunk(response, chunk) {
     var offset = chunk.byteOffset + i;
     if (-1 < lastIdx)
       (rowLength = new Uint8Array(chunk.buffer, offset, lastIdx - i)),
-        processFullBinaryRow(response, rowID, rowTag, buffer, rowLength),
+        processFullBinaryRow(weakResponse, rowID, rowTag, buffer, rowLength),
         (i = lastIdx),
         3 === rowState && i++,
         (rowLength = rowID = rowTag = rowState = 0),
@@ -1839,10 +1839,10 @@ function processBinaryChunk(response, chunk) {
       break;
     }
   }
-  response._rowState = rowState;
-  response._rowID = rowID;
-  response._rowTag = rowTag;
-  response._rowLength = rowLength;
+  weakResponse._rowState = rowState;
+  weakResponse._rowID = rowID;
+  weakResponse._rowTag = rowTag;
+  weakResponse._rowLength = rowLength;
 }
 function createFromJSONCallback(response) {
   return function (key, value) {
@@ -1879,8 +1879,8 @@ function createFromJSONCallback(response) {
     return value;
   };
 }
-function close(response) {
-  reportGlobalError(response, Error("Connection closed."));
+function close(weakResponse) {
+  reportGlobalError(weakResponse, Error("Connection closed."));
 }
 function noServerCall$1() {
   throw Error(

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

@@ -649,9 +649,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));
@@ -674,7 +674,7 @@
               request,
               parseStackTrace(Error("react-stack-top-frame"), 1)
             );
-            request.pendingChunks++;
+            request.pendingDebugChunks++;
             var owner = resolveOwner(),
               args = Array.from(arguments);
             a: {
@@ -705,9 +705,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,
@@ -837,6 +841,7 @@
         void 0 === onPostpone ? defaultPostponeHandler : onPostpone;
       this.onAllReady = onAllReady;
       this.onFatalError = onFatalError;
+      this.pendingDebugChunks = 0;
       this.completedDebugChunks = [];
       this.environmentName =
         void 0 === environmentName
@@ -920,7 +925,7 @@
       return currentRequest ? currentRequest : null;
     }
     function serializeDebugThenable(request, counter, thenable) {
-      request.pendingChunks++;
+      request.pendingDebugChunks++;
       var id = request.nextChunkId++,
         ref = "$@" + id.toString(16);
       request.writtenDebugObjects.set(thenable, ref);
@@ -993,7 +998,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 &&
@@ -1320,7 +1327,7 @@
           var componentDebugID = task.id;
           componentDebugInfo = Component.displayName || Component.name || "";
           var componentEnv = (0, request.environmentName)();
-          request.pendingChunks++;
+          request.pendingDebugChunks++;
           componentDebugInfo = {
             name: componentDebugInfo,
             env: componentEnv,
@@ -1694,7 +1701,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),
@@ -1774,7 +1781,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
@@ -1782,7 +1789,7 @@
           : serializeByValueID(importId);
       } catch (x) {
         return (
-          request.pendingChunks++,
+          request.pendingDebugChunks++,
           (parent = request.nextChunkId++),
           (parentPropertyName = logRecoverableError(request, x, null)),
           emitErrorChunk(request, parent, parentPropertyName, x, !0),
@@ -1861,7 +1868,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);
@@ -1887,8 +1894,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);
     }
@@ -2464,7 +2472,7 @@
       }
     }
     function emitTypedArrayChunk(request, id, tag, typedArray, debug) {
-      request.pendingChunks++;
+      debug ? request.pendingDebugChunks++ : request.pendingChunks++;
       var buffer = new Uint8Array(
         typedArray.buffer,
         typedArray.byteOffset,
@@ -2483,7 +2491,7 @@
         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) + ",";
@@ -2722,7 +2730,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);
@@ -2750,7 +2758,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);
@@ -2843,7 +2851,7 @@
     }
     function outlineDebugModel(request, counter, model) {
       var id = request.nextChunkId++;
-      request.pendingChunks++;
+      request.pendingDebugChunks++;
       emitOutlinedDebugModelChunk(request, id, counter, model);
       return id;
     }
@@ -2854,7 +2862,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;
@@ -2862,7 +2870,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);
@@ -2913,11 +2921,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);
       }
     }
@@ -3002,7 +3010,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(
@@ -3018,11 +3026,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()
@@ -3075,9 +3085,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 &&
@@ -3117,7 +3129,7 @@
         var debugChunks = request.completedDebugChunks;
         for (i = 0; i < debugChunks.length; i++)
           if (
-            (request.pendingChunks--,
+            (request.pendingDebugChunks--,
             !writeChunkAndReturn(destination, debugChunks[i]))
           ) {
             request.destination = null;
@@ -3158,6 +3170,7 @@
             (writtenBytes = 0));
       }
       0 === request.pendingChunks &&
+        0 === request.pendingDebugChunks &&
         (request.status < ABORTING &&
           request.cacheController.abort(
             Error(
@@ -3205,44 +3218,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);
+            });
+            scheduleWork(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);
     }
@@ -3253,7 +3282,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);
       });
@@ -4037,7 +4066,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));
@@ -4048,7 +4077,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 },