react-server-dom-webpack 19.0.0-rc-a26e3f403e-20240611 → 19.0.0-rc-dfd30974ab-20240613

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

@@ -539,7 +539,15 @@
       this.onPostpone =
         void 0 === onPostpone ? defaultPostponeHandler : onPostpone;
       this.environmentName =
-        void 0 === environmentName ? "Server" : environmentName;
+        void 0 === environmentName
+          ? function () {
+              return "Server";
+            }
+          : "function" !== typeof environmentName
+          ? function () {
+              return environmentName;
+            }
+          : environmentName;
       this.didWarnForKey = null;
       model = createTask(this, model, null, !1, abortSet);
       pingedTasks.push(model);
@@ -802,16 +810,14 @@
       if (null !== prevThenableState)
         owner = prevThenableState._componentDebugInfo;
       else {
-        var componentName = Component.displayName || Component.name || "";
+        var componentDebugID = debugID,
+          componentName = Component.displayName || Component.name || "",
+          componentEnv = request.environmentName();
         request.pendingChunks++;
-        var componentDebugID = debugID;
-        owner = {
-          name: componentName,
-          env: request.environmentName,
-          owner: owner
-        };
+        owner = { name: componentName, env: componentEnv, owner: owner };
         outlineModel(request, owner);
         emitDebugChunk(request, componentDebugID, owner);
+        task.environmentName = componentEnv;
       }
       prepareToUseHooksForComponent(prevThenableState, owner);
       props = callComponentInDEV(Component, props, owner);
@@ -1097,28 +1103,28 @@
                   ? serializeLazyID(JSCompiler_inline_result.id)
                   : serializeByValueID(JSCompiler_inline_result.id);
               }
-            else if (thrownValue === AbortSigil)
-              (originalValue.status = 3),
-                (originalValue = request.fatalError),
-                (JSCompiler_inline_result = parentPropertyName
-                  ? serializeLazyID(originalValue)
-                  : serializeByValueID(originalValue));
-            else if (
-              ((originalValue.keyPath = prevKeyPath),
-              (originalValue.implicitSlot = prevImplicitSlot),
-              parentPropertyName)
-            )
-              request.pendingChunks++,
-                (originalValue = request.nextChunkId++),
-                (prevKeyPath = logRecoverableError(request, value)),
-                emitErrorChunk(request, originalValue, prevKeyPath, value),
-                (JSCompiler_inline_result = serializeLazyID(originalValue));
-            else throw value;
+            else
+              thrownValue === AbortSigil
+                ? ((originalValue.status = 3),
+                  (originalValue = request.fatalError),
+                  (JSCompiler_inline_result = parentPropertyName
+                    ? serializeLazyID(originalValue)
+                    : serializeByValueID(originalValue)))
+                : ((originalValue.keyPath = prevKeyPath),
+                  (originalValue.implicitSlot = prevImplicitSlot),
+                  request.pendingChunks++,
+                  (originalValue = request.nextChunkId++),
+                  (prevKeyPath = logRecoverableError(request, value)),
+                  emitErrorChunk(request, originalValue, prevKeyPath, value),
+                  (JSCompiler_inline_result = parentPropertyName
+                    ? serializeLazyID(originalValue)
+                    : serializeByValueID(originalValue)));
           }
           return JSCompiler_inline_result;
         },
         thenableState: null
       };
+      task.environmentName = request.environmentName();
       abortSet.add(task);
       return task;
     }
@@ -1272,7 +1278,8 @@
       if ("object" === typeof value) {
         switch (value.$$typeof) {
           case REACT_ELEMENT_TYPE:
-            var _writtenObjects = request.writtenObjects;
+            var elementReference = null,
+              _writtenObjects = request.writtenObjects;
             if (null === task.keyPath && !task.implicitSlot) {
               var _existingReference = _writtenObjects.get(value);
               if (void 0 !== _existingReference)
@@ -1282,10 +1289,8 @@
                 -1 === parentPropertyName.indexOf(":") &&
                   ((parent = _writtenObjects.get(parent)),
                   void 0 !== parent &&
-                    _writtenObjects.set(
-                      value,
-                      parent + ":" + parentPropertyName
-                    ));
+                    ((elementReference = parent + ":" + parentPropertyName),
+                    _writtenObjects.set(value, elementReference)));
             }
             if ((parentPropertyName = value._debugInfo)) {
               if (null === debugID) return outlineTask(request, task);
@@ -1293,7 +1298,7 @@
             }
             parentPropertyName = value.props;
             parent = parentPropertyName.ref;
-            return renderElement(
+            value = renderElement(
               request,
               task,
               value.type,
@@ -1302,6 +1307,12 @@
               parentPropertyName,
               value._owner
             );
+            "object" === typeof value &&
+              null !== value &&
+              null !== elementReference &&
+              (_writtenObjects.has(value) ||
+                _writtenObjects.set(value, elementReference));
+            return value;
           case REACT_LAZY_TYPE:
             task.thenableState = null;
             parentPropertyName = callLazyInitInDEV(value);
@@ -1331,46 +1342,49 @@
           );
         if (
           void 0 !== request.temporaryReferences &&
-          ((_writtenObjects = request.temporaryReferences.get(value)),
-          void 0 !== _writtenObjects)
+          ((elementReference = request.temporaryReferences.get(value)),
+          void 0 !== elementReference)
         )
-          return "$T" + _writtenObjects;
-        _writtenObjects = request.writtenObjects;
-        _existingReference = _writtenObjects.get(value);
+          return "$T" + elementReference;
+        elementReference = request.writtenObjects;
+        _writtenObjects = elementReference.get(value);
         if ("function" === typeof value.then) {
-          if (void 0 !== _existingReference) {
+          if (void 0 !== _writtenObjects) {
             if (null !== task.keyPath || task.implicitSlot)
               return (
                 "$@" + serializeThenable(request, task, value).toString(16)
               );
             if (modelRoot === value) modelRoot = null;
-            else return _existingReference;
+            else return _writtenObjects;
           }
           request = "$@" + serializeThenable(request, task, value).toString(16);
-          _writtenObjects.set(value, request);
+          elementReference.set(value, request);
           return request;
         }
-        if (void 0 !== _existingReference)
+        if (void 0 !== _writtenObjects)
           if (modelRoot === value) modelRoot = null;
-          else return _existingReference;
+          else return _writtenObjects;
         else if (
           -1 === parentPropertyName.indexOf(":") &&
-          ((_existingReference = _writtenObjects.get(parent)),
-          void 0 !== _existingReference)
+          ((_writtenObjects = elementReference.get(parent)),
+          void 0 !== _writtenObjects)
         ) {
-          var propertyName = parentPropertyName;
+          _existingReference = parentPropertyName;
           if (isArrayImpl(parent) && parent[0] === REACT_ELEMENT_TYPE)
             switch (parentPropertyName) {
               case "1":
-                propertyName = "type";
+                _existingReference = "type";
                 break;
               case "2":
-                propertyName = "key";
+                _existingReference = "key";
                 break;
               case "3":
-                propertyName = "props";
+                _existingReference = "props";
             }
-          _writtenObjects.set(value, _existingReference + ":" + propertyName);
+          elementReference.set(
+            value,
+            _writtenObjects + ":" + _existingReference
+          );
         }
         if (isArrayImpl(value)) return renderFragment(request, task, value);
         if (value instanceof Map) return serializeMap(request, value);
@@ -1405,9 +1419,9 @@
           return serializeTypedArray(request, "V", value);
         if ("function" === typeof Blob && value instanceof Blob)
           return serializeBlob(request, value);
-        if ((_writtenObjects = getIteratorFn(value)))
+        if ((elementReference = getIteratorFn(value)))
           return (
-            (parentPropertyName = _writtenObjects.call(value)),
+            (parentPropertyName = elementReference.call(value)),
             parentPropertyName === value
               ? "$i" +
                 outlineModel(request, Array.from(parentPropertyName)).toString(
@@ -1420,8 +1434,8 @@
           value instanceof ReadableStream
         )
           return serializeReadableStream(request, task, value);
-        _writtenObjects = value[ASYNC_ITERATOR];
-        if ("function" === typeof _writtenObjects)
+        elementReference = value[ASYNC_ITERATOR];
+        if ("function" === typeof elementReference)
           return (
             null !== task.keyPath
               ? ((value = [
@@ -1432,7 +1446,7 @@
                   null
                 ]),
                 (value = task.implicitSlot ? [value] : value))
-              : ((parentPropertyName = _writtenObjects.call(value)),
+              : ((parentPropertyName = elementReference.call(value)),
                 (value = serializeAsyncIterable(
                   request,
                   task,
@@ -1449,6 +1463,16 @@
           throw Error(
             "Only plain objects, and a few built-ins, can be passed to Client Components from Server Components. Classes or null prototypes are not supported."
           );
+        if (
+          "object" === typeof value.task &&
+          null !== value.task &&
+          "function" === typeof value.task.run &&
+          "string" === typeof value.name &&
+          "string" === typeof value.env &&
+          void 0 !== value.owner &&
+          "undefined" === typeof value.stack
+        )
+          return { name: value.name, env: value.env, owner: value.owner };
         if ("Object" !== objectName(value))
           error$jscomp$0(
             "Only plain objects can be passed to Client Components from Server Components. %s objects are not supported.%s",
@@ -1460,14 +1484,14 @@
             request = Object.getOwnPropertyNames(value);
             for (task = 0; task < request.length; task++)
               if (
-                ((_writtenObjects = Object.getOwnPropertyDescriptor(
+                ((elementReference = Object.getOwnPropertyDescriptor(
                   value,
                   request[task]
                 )),
-                !_writtenObjects ||
-                  (!_writtenObjects.enumerable &&
+                !elementReference ||
+                  (!elementReference.enumerable &&
                     (("key" !== request[task] && "ref" !== request[task]) ||
-                      "function" !== typeof _writtenObjects.get)))
+                      "function" !== typeof elementReference.get)))
               ) {
                 request = !1;
                 break a;
@@ -1564,11 +1588,11 @@
       }
       if ("symbol" === typeof value) {
         task = request.writtenSymbols;
-        _writtenObjects = task.get(value);
-        if (void 0 !== _writtenObjects)
-          return serializeByValueID(_writtenObjects);
-        _writtenObjects = value.description;
-        if (Symbol.for(_writtenObjects) !== value)
+        elementReference = task.get(value);
+        if (void 0 !== elementReference)
+          return serializeByValueID(elementReference);
+        elementReference = value.description;
+        if (Symbol.for(elementReference) !== value)
           throw Error(
             "Only global symbols received from Symbol.for(...) can be passed to Client Components. The symbol Symbol.for(" +
               (value.description + ") cannot be found among global symbols.") +
@@ -1579,7 +1603,7 @@
         parent = encodeReferenceChunk(
           request,
           parentPropertyName,
-          "$S" + _writtenObjects
+          "$S" + elementReference
         );
         request.completedImportChunks.push(parent);
         task.set(value, parentPropertyName);
@@ -1821,7 +1845,10 @@
     }
     function forwardDebugInfo(request, id, debugInfo) {
       for (var i = 0; i < debugInfo.length; i++)
-        request.pendingChunks++, emitDebugChunk(request, id, debugInfo[i]);
+        request.pendingChunks++,
+          "string" === typeof debugInfo[i].name &&
+            outlineModel(request, debugInfo[i]),
+          emitDebugChunk(request, id, debugInfo[i]);
     }
     function emitChunk(request, task, value) {
       var id = task.id;
@@ -1874,14 +1901,20 @@
           modelRoot = resolvedModel;
           task.keyPath = null;
           task.implicitSlot = !1;
-          if ("object" === typeof resolvedModel && null !== resolvedModel)
+          if ("object" === typeof resolvedModel && null !== resolvedModel) {
             request.writtenObjects.set(
               resolvedModel,
               serializeByValueID(task.id)
-            ),
-              emitChunk(request, task, resolvedModel);
-          else {
-            var json = stringify(resolvedModel);
+            );
+            var currentEnv = request.environmentName();
+            currentEnv !== task.environmentName &&
+              emitDebugChunk(request, task.id, { env: currentEnv });
+            emitChunk(request, task, resolvedModel);
+          } else {
+            var json = stringify(resolvedModel),
+              _currentEnv = request.environmentName();
+            _currentEnv !== task.environmentName &&
+              emitDebugChunk(request, task.id, { env: _currentEnv });
             emitModelChunk(request, task.id, json);
           }
           request.abortableTasks.delete(task);

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

@@ -1165,23 +1165,22 @@ function createTask(request, model, keyPath, implicitSlot, abortSet) {
               ? "$L" + JSCompiler_inline_result.id.toString(16)
               : serializeByValueID(JSCompiler_inline_result.id);
           }
-        else if (thrownValue === AbortSigil)
-          (task.status = 3),
-            (prevKeyPath = request.fatalError),
-            (JSCompiler_inline_result = parentPropertyName
-              ? "$L" + prevKeyPath.toString(16)
-              : serializeByValueID(prevKeyPath));
-        else if (
-          ((task.keyPath = prevKeyPath),
-          (task.implicitSlot = prevImplicitSlot),
-          parentPropertyName)
-        )
-          request.pendingChunks++,
-            (prevKeyPath = request.nextChunkId++),
-            (prevImplicitSlot = logRecoverableError(request, value)),
-            emitErrorChunk(request, prevKeyPath, prevImplicitSlot),
-            (JSCompiler_inline_result = "$L" + prevKeyPath.toString(16));
-        else throw value;
+        else
+          thrownValue === AbortSigil
+            ? ((task.status = 3),
+              (prevKeyPath = request.fatalError),
+              (JSCompiler_inline_result = parentPropertyName
+                ? "$L" + prevKeyPath.toString(16)
+                : serializeByValueID(prevKeyPath)))
+            : ((task.keyPath = prevKeyPath),
+              (task.implicitSlot = prevImplicitSlot),
+              request.pendingChunks++,
+              (prevKeyPath = request.nextChunkId++),
+              (prevImplicitSlot = logRecoverableError(request, value)),
+              emitErrorChunk(request, prevKeyPath, prevImplicitSlot),
+              (JSCompiler_inline_result = parentPropertyName
+                ? "$L" + prevKeyPath.toString(16)
+                : serializeByValueID(prevKeyPath)));
       }
       return JSCompiler_inline_result;
     },
@@ -1309,7 +1308,8 @@ function renderModelDestructive(
   if ("object" === typeof value) {
     switch (value.$$typeof) {
       case REACT_ELEMENT_TYPE:
-        var writtenObjects = request.writtenObjects;
+        var elementReference = null,
+          writtenObjects = request.writtenObjects;
         if (null === task.keyPath && !task.implicitSlot) {
           var existingReference = writtenObjects.get(value);
           if (void 0 !== existingReference)
@@ -1319,11 +1319,12 @@ function renderModelDestructive(
             -1 === parentPropertyName.indexOf(":") &&
               ((parent = writtenObjects.get(parent)),
               void 0 !== parent &&
-                writtenObjects.set(value, parent + ":" + parentPropertyName));
+                ((elementReference = parent + ":" + parentPropertyName),
+                writtenObjects.set(value, elementReference)));
         }
         parentPropertyName = value.props;
         parent = parentPropertyName.ref;
-        return renderElement(
+        request = renderElement(
           request,
           task,
           value.type,
@@ -1331,6 +1332,12 @@ function renderModelDestructive(
           void 0 !== parent ? parent : null,
           parentPropertyName
         );
+        "object" === typeof request &&
+          null !== request &&
+          null !== elementReference &&
+          (writtenObjects.has(request) ||
+            writtenObjects.set(request, elementReference));
+        return request;
       case REACT_LAZY_TYPE:
         task.thenableState = null;
         parentPropertyName = value._init;
@@ -1351,44 +1358,44 @@ function renderModelDestructive(
       );
     if (
       void 0 !== request.temporaryReferences &&
-      ((writtenObjects = request.temporaryReferences.get(value)),
-      void 0 !== writtenObjects)
+      ((elementReference = request.temporaryReferences.get(value)),
+      void 0 !== elementReference)
     )
-      return "$T" + writtenObjects;
-    writtenObjects = request.writtenObjects;
-    existingReference = writtenObjects.get(value);
+      return "$T" + elementReference;
+    elementReference = request.writtenObjects;
+    writtenObjects = elementReference.get(value);
     if ("function" === typeof value.then) {
-      if (void 0 !== existingReference) {
+      if (void 0 !== writtenObjects) {
         if (null !== task.keyPath || task.implicitSlot)
           return "$@" + serializeThenable(request, task, value).toString(16);
         if (modelRoot === value) modelRoot = null;
-        else return existingReference;
+        else return writtenObjects;
       }
       request = "$@" + serializeThenable(request, task, value).toString(16);
-      writtenObjects.set(value, request);
+      elementReference.set(value, request);
       return request;
     }
-    if (void 0 !== existingReference)
+    if (void 0 !== writtenObjects)
       if (modelRoot === value) modelRoot = null;
-      else return existingReference;
+      else return writtenObjects;
     else if (
       -1 === parentPropertyName.indexOf(":") &&
-      ((existingReference = writtenObjects.get(parent)),
-      void 0 !== existingReference)
+      ((writtenObjects = elementReference.get(parent)),
+      void 0 !== writtenObjects)
     ) {
-      var propertyName = parentPropertyName;
+      existingReference = parentPropertyName;
       if (isArrayImpl(parent) && parent[0] === REACT_ELEMENT_TYPE)
         switch (parentPropertyName) {
           case "1":
-            propertyName = "type";
+            existingReference = "type";
             break;
           case "2":
-            propertyName = "key";
+            existingReference = "key";
             break;
           case "3":
-            propertyName = "props";
+            existingReference = "props";
         }
-      writtenObjects.set(value, existingReference + ":" + propertyName);
+      elementReference.set(value, writtenObjects + ":" + existingReference);
     }
     if (isArrayImpl(value)) return renderFragment(request, task, value);
     if (value instanceof Map)
@@ -1550,10 +1557,11 @@ function renderModelDestructive(
   }
   if ("symbol" === typeof value) {
     task = request.writtenSymbols;
-    writtenObjects = task.get(value);
-    if (void 0 !== writtenObjects) return serializeByValueID(writtenObjects);
-    writtenObjects = value.description;
-    if (Symbol.for(writtenObjects) !== value)
+    elementReference = task.get(value);
+    if (void 0 !== elementReference)
+      return serializeByValueID(elementReference);
+    elementReference = value.description;
+    if (Symbol.for(elementReference) !== value)
       throw Error(
         "Only global symbols received from Symbol.for(...) can be passed to Client Components. The symbol Symbol.for(" +
           (value.description + ") cannot be found among global symbols.") +
@@ -1564,7 +1572,7 @@ function renderModelDestructive(
     parent = encodeReferenceChunk(
       request,
       parentPropertyName,
-      "$S" + writtenObjects
+      "$S" + elementReference
     );
     request.completedImportChunks.push(parent);
     task.set(value, parentPropertyName);