react-server-dom-webpack 19.0.0-rc-d48603a5-20240813 → 19.0.0-rc-49496d49-20240814

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

@@ -698,8 +698,7 @@ function describeObjectForErrorMessage(objectOrArray, expandedName) {
       : "\n  " + str;
 }
 var ObjectPrototype = Object.prototype,
-  stringify = JSON.stringify,
-  AbortSigil = {};
+  stringify = JSON.stringify;
 function defaultErrorHandler(error) {
   console.error(error);
 }
@@ -774,6 +773,8 @@ function serializeThenable(request, task, thenable) {
       return (
         (task = logRecoverableError(request, thenable.reason, null)),
         emitErrorChunk(request, newTask.id, task),
+        (newTask.status = 4),
+        request.abortableTasks.delete(newTask),
         newTask.id
       );
     default:
@@ -805,9 +806,9 @@ function serializeThenable(request, task, thenable) {
       pingTask(request, newTask);
     },
     function (reason) {
-      newTask.status = 4;
       reason = logRecoverableError(request, reason, newTask);
       emitErrorChunk(request, newTask.id, reason);
+      newTask.status = 4;
       request.abortableTasks.delete(newTask);
       enqueueFlush(request);
     }
@@ -965,13 +966,22 @@ function createLazyWrapperAroundWakeable(wakeable) {
   }
   return { $$typeof: REACT_LAZY_TYPE, _payload: wakeable, _init: readThenable };
 }
+function voidHandler() {}
 function renderFunctionComponent(request, task, key, Component, props) {
   var prevThenableState = task.thenableState;
   task.thenableState = null;
   thenableIndexCounter = 0;
   thenableState = prevThenableState;
   Component = Component(props, void 0);
-  if (1 === request.status) throw AbortSigil;
+  if (1 === request.status)
+    throw (
+      ("object" === typeof Component &&
+        null !== Component &&
+        "function" === typeof Component.then &&
+        Component.$$typeof !== CLIENT_REFERENCE_TAG$1 &&
+        Component.then(voidHandler, voidHandler),
+      null)
+    );
   if (
     "object" === typeof Component &&
     null !== Component &&
@@ -1062,7 +1072,7 @@ function renderElement(request, task, type, key, ref, props) {
       case REACT_LAZY_TYPE:
         var init = type._init;
         type = init(type._payload);
-        if (1 === request.status) throw AbortSigil;
+        if (1 === request.status) throw null;
         return renderElement(request, task, type, key, ref, props);
       case REACT_FORWARD_REF_TYPE:
         return renderFunctionComponent(request, task, key, type.render, props);
@@ -1156,7 +1166,7 @@ function createTask(request, model, keyPath, implicitSlot, abortSet) {
               : serializeByValueID(JSCompiler_inline_result.id);
           }
         else
-          thrownValue === AbortSigil
+          1 === request.status
             ? ((task.status = 3),
               (prevKeyPath = request.fatalError),
               (JSCompiler_inline_result = parentPropertyName
@@ -1334,7 +1344,7 @@ function renderModelDestructive(
         task.thenableState = null;
         parentPropertyName = value._init;
         value = parentPropertyName(value._payload);
-        if (1 === request.status) throw AbortSigil;
+        if (1 === request.status) throw null;
         return renderModelDestructive(request, task, emptyRoot, "", value);
       case REACT_LEGACY_ELEMENT_TYPE:
         throw Error(
@@ -1714,7 +1724,7 @@ function retryTask(request, task) {
           var ping = task.ping;
           x.then(ping, ping);
         }
-      else if (x === AbortSigil) {
+      else if (1 === request.status) {
         request.abortableTasks.delete(task);
         task.status = 3;
         var model$19 = stringify(serializeByValueID(request.fatalError));
@@ -1810,7 +1820,7 @@ function enqueueFlush(request) {
 }
 function abort(request, reason) {
   try {
-    request.status = 1;
+    0 === request.status && (request.status = 1);
     var abortableTasks = request.abortableTasks;
     if (0 < abortableTasks.size) {
       request.pendingChunks++;

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

@@ -11,6 +11,7 @@
 "use strict";
 "production" !== process.env.NODE_ENV &&
   (function () {
+    function voidHandler() {}
     function _defineProperty(obj, key, value) {
       key in obj
         ? Object.defineProperty(obj, key, {
@@ -93,6 +94,9 @@
         ? Buffer.byteLength(chunk, "utf8")
         : chunk.byteLength;
     }
+    function isClientReference(reference) {
+      return reference.$$typeof === CLIENT_REFERENCE_TAG$1;
+    }
     function registerClientReferenceImpl(proxyImplementation, id, async) {
       return Object.defineProperties(proxyImplementation, {
         $$typeof: { value: CLIENT_REFERENCE_TAG$1 },
@@ -601,6 +605,8 @@
           task = thenable.reason;
           var digest = logRecoverableError(request, task, null);
           emitErrorChunk(request, newTask.id, digest, task);
+          newTask.status = 4;
+          request.abortableTasks.delete(newTask);
           return newTask.id;
         default:
           if (1 === request.status)
@@ -631,9 +637,9 @@
           pingTask(request, newTask);
         },
         function (reason) {
-          newTask.status = 4;
           var _digest = logRecoverableError(request, reason, newTask);
           emitErrorChunk(request, newTask.id, _digest, reason);
+          newTask.status = 4;
           request.abortableTasks.delete(newTask);
           enqueueFlush(request);
         }
@@ -841,23 +847,28 @@
         props,
         componentDebugInfo
       );
-      if (1 === request.status) throw AbortSigil;
+      if (1 === request.status)
+        throw (
+          ("object" !== typeof props ||
+            null === props ||
+            "function" !== typeof props.then ||
+            isClientReference(props) ||
+            props.then(voidHandler, voidHandler),
+          null)
+        );
       if (
         "object" === typeof props &&
         null !== props &&
-        props.$$typeof !== CLIENT_REFERENCE_TAG$1
+        !isClientReference(props)
       ) {
         if ("function" === typeof props.then) {
           prevThenableState = props;
-          prevThenableState.then(
-            function (resolvedValue) {
-              "object" === typeof resolvedValue &&
-                null !== resolvedValue &&
-                resolvedValue.$$typeof === REACT_ELEMENT_TYPE &&
-                (resolvedValue._store.validated = 1);
-            },
-            function () {}
-          );
+          prevThenableState.then(function (resolvedValue) {
+            "object" === typeof resolvedValue &&
+              null !== resolvedValue &&
+              resolvedValue.$$typeof === REACT_ELEMENT_TYPE &&
+              (resolvedValue._store.validated = 1);
+          }, voidHandler);
           if ("fulfilled" === prevThenableState.status)
             return prevThenableState.value;
           props = createLazyWrapperAroundWakeable(props);
@@ -983,48 +994,48 @@
         null !== props.children &&
         jsxChildrenParents.set(props.children, type);
       if (
-        "function" === typeof type &&
-        type.$$typeof !== CLIENT_REFERENCE_TAG$1 &&
-        type.$$typeof !== TEMPORARY_REFERENCE_TAG
-      )
-        return renderFunctionComponent(request, task, key, type, props);
-      if (type === REACT_FRAGMENT_TYPE && null === key)
-        return (
-          (type = task.implicitSlot),
-          null === task.keyPath && (task.implicitSlot = !0),
-          (props = renderModelDestructive(
-            request,
-            task,
-            emptyRoot,
-            "",
-            props.children
-          )),
-          (task.implicitSlot = type),
-          props
-        );
-      if (
-        null != type &&
-        "object" === typeof type &&
-        type.$$typeof !== CLIENT_REFERENCE_TAG$1
-      )
-        switch (type.$$typeof) {
-          case REACT_LAZY_TYPE:
-            type = callLazyInitInDEV(type);
-            if (1 === request.status) throw AbortSigil;
-            return renderElement(request, task, type, key, ref, props);
-          case REACT_FORWARD_REF_TYPE:
-            return renderFunctionComponent(
+        "function" !== typeof type ||
+        isClientReference(type) ||
+        type.$$typeof === TEMPORARY_REFERENCE_TAG
+      ) {
+        if (type === REACT_FRAGMENT_TYPE && null === key)
+          return (
+            (type = task.implicitSlot),
+            null === task.keyPath && (task.implicitSlot = !0),
+            (props = renderModelDestructive(
               request,
               task,
-              key,
-              type.render,
-              props
-            );
-          case REACT_MEMO_TYPE:
-            return renderElement(request, task, type.type, key, ref, props);
-          case REACT_ELEMENT_TYPE:
-            type._store.validated = 1;
-        }
+              emptyRoot,
+              "",
+              props.children
+            )),
+            (task.implicitSlot = type),
+            props
+          );
+        if (
+          null != type &&
+          "object" === typeof type &&
+          !isClientReference(type)
+        )
+          switch (type.$$typeof) {
+            case REACT_LAZY_TYPE:
+              type = callLazyInitInDEV(type);
+              if (1 === request.status) throw null;
+              return renderElement(request, task, type, key, ref, props);
+            case REACT_FORWARD_REF_TYPE:
+              return renderFunctionComponent(
+                request,
+                task,
+                key,
+                type.render,
+                props
+              );
+            case REACT_MEMO_TYPE:
+              return renderElement(request, task, type.type, key, ref, props);
+            case REACT_ELEMENT_TYPE:
+              type._store.validated = 1;
+          }
+      } else return renderFunctionComponent(request, task, key, type, props);
       request = key;
       key = task.keyPath;
       null === request
@@ -1320,7 +1331,7 @@
             ? serializeLazyID(request.id)
             : serializeByValueID(request.id);
         }
-        if (thrownValue === AbortSigil)
+        if (1 === request.status)
           return (
             (task.status = 3),
             (task = request.fatalError),
@@ -1389,7 +1400,7 @@
           case REACT_LAZY_TYPE:
             task.thenableState = null;
             elementReference = callLazyInitInDEV(value);
-            if (1 === request.status) throw AbortSigil;
+            if (1 === request.status) throw null;
             if ((_writtenObjects = value._debugInfo)) {
               if (null === debugID) return outlineTask(request, task);
               forwardDebugInfo(request, debugID, _writtenObjects);
@@ -1406,7 +1417,7 @@
               'A React Element from an older version of React was rendered. This is not supported. It can happen if:\n- Multiple copies of the "react" package is used.\n- A library pre-bundled an old copy of "react" or "react/jsx-runtime".\n- A compiler tries to "inline" JSX instead of using the runtime.'
             );
         }
-        if (value.$$typeof === CLIENT_REFERENCE_TAG$1)
+        if (isClientReference(value))
           return serializeClientReference(
             request,
             parent,
@@ -1561,7 +1572,7 @@
       if ("number" === typeof value) return serializeNumber(value);
       if ("undefined" === typeof value) return "$undefined";
       if ("function" === typeof value) {
-        if (value.$$typeof === CLIENT_REFERENCE_TAG$1)
+        if (isClientReference(value))
           return serializeClientReference(
             request,
             parent,
@@ -1797,7 +1808,7 @@
       var originalValue = parent[parentPropertyName];
       if (null === value) return null;
       if ("object" === typeof value) {
-        if (value.$$typeof === CLIENT_REFERENCE_TAG$1)
+        if (isClientReference(value))
           return serializeClientReference(
             request,
             parent,
@@ -1908,7 +1919,7 @@
       if ("number" === typeof value) return serializeNumber(value);
       if ("undefined" === typeof value) return "$undefined";
       if ("function" === typeof value)
-        return value.$$typeof === CLIENT_REFERENCE_TAG$1
+        return isClientReference(value)
           ? serializeClientReference(request, parent, parentPropertyName, value)
           : void 0 !== request.temporaryReferences &&
               ((request = request.temporaryReferences.get(value)),
@@ -2045,7 +2056,7 @@
               var ping = task.ping;
               x.then(ping, ping);
             }
-          else if (x === AbortSigil) {
+          else if (1 === request.status) {
             request.abortableTasks.delete(task);
             task.status = 3;
             var _model = stringify(serializeByValueID(request.fatalError));
@@ -2185,7 +2196,7 @@
     }
     function abort(request, reason) {
       try {
-        request.status = 1;
+        0 === request.status && (request.status = 1);
         var abortableTasks = request.abortableTasks;
         if (0 < abortableTasks.size) {
           request.pendingChunks++;
@@ -3309,7 +3320,7 @@
             }
             usable.$$typeof === REACT_CONTEXT_TYPE && unsupportedContext();
           }
-          if (usable.$$typeof === CLIENT_REFERENCE_TAG$1) {
+          if (isClientReference(usable)) {
             if (
               null != usable.value &&
               usable.value.$$typeof === REACT_CONTEXT_TYPE
@@ -3384,7 +3395,6 @@
       CLIENT_REFERENCE_TAG = Symbol.for("react.client.reference"),
       ObjectPrototype = Object.prototype,
       stringify = JSON.stringify,
-      AbortSigil = {},
       CLOSED = 3,
       currentRequest = null,
       debugID = null,

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

@@ -717,8 +717,7 @@ function describeObjectForErrorMessage(objectOrArray, expandedName) {
       : "\n  " + str;
 }
 var ObjectPrototype = Object.prototype,
-  stringify = JSON.stringify,
-  AbortSigil = {};
+  stringify = JSON.stringify;
 function defaultErrorHandler(error) {
   console.error(error);
 }
@@ -790,6 +789,8 @@ function serializeThenable(request, task, thenable) {
       return (
         (task = logRecoverableError(request, thenable.reason, null)),
         emitErrorChunk(request, newTask.id, task),
+        (newTask.status = 4),
+        request.abortableTasks.delete(newTask),
         newTask.id
       );
     default:
@@ -821,9 +822,9 @@ function serializeThenable(request, task, thenable) {
       pingTask(request, newTask);
     },
     function (reason) {
-      newTask.status = 4;
       reason = logRecoverableError(request, reason, newTask);
       emitErrorChunk(request, newTask.id, reason);
+      newTask.status = 4;
       request.abortableTasks.delete(newTask);
       enqueueFlush(request);
     }
@@ -980,13 +981,22 @@ function createLazyWrapperAroundWakeable(wakeable) {
   }
   return { $$typeof: REACT_LAZY_TYPE, _payload: wakeable, _init: readThenable };
 }
+function voidHandler() {}
 function renderFunctionComponent(request, task, key, Component, props) {
   var prevThenableState = task.thenableState;
   task.thenableState = null;
   thenableIndexCounter = 0;
   thenableState = prevThenableState;
   Component = Component(props, void 0);
-  if (1 === request.status) throw AbortSigil;
+  if (1 === request.status)
+    throw (
+      ("object" === typeof Component &&
+        null !== Component &&
+        "function" === typeof Component.then &&
+        Component.$$typeof !== CLIENT_REFERENCE_TAG$1 &&
+        Component.then(voidHandler, voidHandler),
+      null)
+    );
   if (
     "object" === typeof Component &&
     null !== Component &&
@@ -1077,7 +1087,7 @@ function renderElement(request, task, type, key, ref, props) {
       case REACT_LAZY_TYPE:
         var init = type._init;
         type = init(type._payload);
-        if (1 === request.status) throw AbortSigil;
+        if (1 === request.status) throw null;
         return renderElement(request, task, type, key, ref, props);
       case REACT_FORWARD_REF_TYPE:
         return renderFunctionComponent(request, task, key, type.render, props);
@@ -1171,7 +1181,7 @@ function createTask(request, model, keyPath, implicitSlot, abortSet) {
               : serializeByValueID(JSCompiler_inline_result.id);
           }
         else
-          thrownValue === AbortSigil
+          1 === request.status
             ? ((task.status = 3),
               (prevKeyPath = request.fatalError),
               (JSCompiler_inline_result = parentPropertyName
@@ -1347,7 +1357,7 @@ function renderModelDestructive(
         task.thenableState = null;
         parentPropertyName = value._init;
         value = parentPropertyName(value._payload);
-        if (1 === request.status) throw AbortSigil;
+        if (1 === request.status) throw null;
         return renderModelDestructive(request, task, emptyRoot, "", value);
       case REACT_LEGACY_ELEMENT_TYPE:
         throw Error(
@@ -1718,7 +1728,7 @@ function retryTask(request, task) {
           var ping = task.ping;
           x.then(ping, ping);
         }
-      else if (x === AbortSigil) {
+      else if (1 === request.status) {
         request.abortableTasks.delete(task);
         task.status = 3;
         var model$19 = stringify(serializeByValueID(request.fatalError));
@@ -1846,7 +1856,7 @@ function startFlowing(request, destination) {
 }
 function abort(request, reason) {
   try {
-    request.status = 1;
+    0 === request.status && (request.status = 1);
     var abortableTasks = request.abortableTasks;
     if (0 < abortableTasks.size) {
       request.pendingChunks++;