@vitejs/plugin-rsc 0.5.5 → 0.5.7

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

@@ -138,7 +138,14 @@ function bind() {
   }
   return newFn;
 }
-var PROMISE_PROTOTYPE = Promise.prototype,
+var serverReferenceToString = {
+    value: function () {
+      return "function () { [omitted code] }";
+    },
+    configurable: !0,
+    writable: !0
+  },
+  PROMISE_PROTOTYPE = Promise.prototype,
   deepProxyHandlers = {
     get: function (target, name) {
       switch (name) {
@@ -1751,7 +1758,7 @@ function renderModelDestructive(
         (task = request.writtenServerReferences),
         (parentPropertyName = task.get(value)),
         void 0 !== parentPropertyName
-          ? (request = "$F" + parentPropertyName.toString(16))
+          ? (request = "$h" + parentPropertyName.toString(16))
           : ((parentPropertyName = value.$$bound),
             (parentPropertyName =
               null === parentPropertyName
@@ -1763,7 +1770,7 @@ function renderModelDestructive(
               0
             )),
             task.set(value, request),
-            (request = "$F" + request.toString(16))),
+            (request = "$h" + request.toString(16))),
         request
       );
     if (
@@ -2284,7 +2291,24 @@ ReactPromise.prototype.then = function (resolve, reject) {
   }
   switch (this.status) {
     case "fulfilled":
-      "function" === typeof resolve && resolve(this.value);
+      if ("function" === typeof resolve) {
+        for (
+          var inspectedValue = this.value, cycleProtection = 0;
+          inspectedValue instanceof ReactPromise;
+
+        ) {
+          cycleProtection++;
+          if (inspectedValue === this || 1e3 < cycleProtection) {
+            "function" === typeof reject &&
+              reject(Error("Cannot have cyclic thenables."));
+            return;
+          }
+          if ("fulfilled" === inspectedValue.status)
+            inspectedValue = inspectedValue.value;
+          else break;
+        }
+        resolve(this.value);
+      }
       break;
     case "pending":
     case "blocked":
@@ -2436,7 +2460,7 @@ function resolveIteratorResultChunk(response, chunk, value, done) {
 }
 function loadServerReference$1(response, metaData, parentObject, key) {
   var id = metaData.id;
-  if ("string" !== typeof id) return null;
+  if ("string" !== typeof id || "then" === key) return null;
   var serverReference = resolveServerReference(response._bundlerConfig, id);
   id = metaData.bound;
   var promise = preloadModule(serverReference);
@@ -2474,6 +2498,7 @@ function loadServerReference$1(response, metaData, parentObject, key) {
           ((promiseValue = resolvedValue.value),
           (resolvedValue.status = "fulfilled"),
           (resolvedValue.value = handler.value),
+          (resolvedValue.reason = null),
           null !== promiseValue &&
             wakeChunk(response, promiseValue, handler.value)));
     },
@@ -2565,6 +2590,7 @@ function initializeModelChunk(chunk) {
     }
     chunk.status = "fulfilled";
     chunk.value = value;
+    chunk.reason = null;
   } catch (error) {
     (chunk.status = "rejected"), (chunk.reason = error);
   } finally {
@@ -2575,7 +2601,11 @@ function reportGlobalError(response, error) {
   response._closed = !0;
   response._closedReason = error;
   response._chunks.forEach(function (chunk) {
-    "pending" === chunk.status && triggerErrorOnChunk(response, chunk, error);
+    "pending" === chunk.status
+      ? triggerErrorOnChunk(response, chunk, error)
+      : "fulfilled" === chunk.status &&
+        null !== chunk.reason &&
+        chunk.reason.error(error);
   });
 }
 function getChunk(response, id) {
@@ -2593,58 +2623,39 @@ function getChunk(response, id) {
   return chunk;
 }
 function fulfillReference(response, reference, value) {
-  for (
-    var handler = reference.handler,
-      parentObject = reference.parentObject,
-      key = reference.key,
-      map = reference.map,
-      path = reference.path,
-      i = 1;
-    i < path.length;
-    i++
-  ) {
-    for (; value instanceof ReactPromise; ) {
-      switch (value.status) {
-        case "resolved_model":
-          initializeModelChunk(value);
-      }
-      switch (value.status) {
-        case "fulfilled":
-          value = value.value;
-          continue;
-        case "blocked":
-        case "pending":
-          path.splice(0, i - 1);
-          null === value.value
-            ? (value.value = [reference])
-            : value.value.push(reference);
-          null === value.reason
-            ? (value.reason = [reference])
-            : value.reason.push(reference);
-          return;
-        default:
-          rejectReference(response, reference.handler, value.reason);
-          return;
-      }
+  var handler = reference.handler,
+    parentObject = reference.parentObject,
+    key = reference.key,
+    map = reference.map,
+    path = reference.path;
+  try {
+    for (var i = 1; i < path.length; i++) {
+      var name = path[i];
+      if (
+        "object" !== typeof value ||
+        !hasOwnProperty.call(value, name) ||
+        value instanceof Promise
+      )
+        throw Error("Invalid reference.");
+      value = value[name];
     }
-    var name = path[i];
-    "object" === typeof value &&
-      hasOwnProperty.call(value, name) &&
-      (value = value[name]);
+    var mappedValue = map(response, value, parentObject, key);
+    parentObject[key] = mappedValue;
+    "" === key && null === handler.value && (handler.value = mappedValue);
+  } catch (error) {
+    rejectReference(response, reference.handler, error);
+    return;
   }
-  reference = map(response, value, parentObject, key);
-  parentObject[key] = reference;
-  "" === key && null === handler.value && (handler.value = reference);
   handler.deps--;
   0 === handler.deps &&
-    ((parentObject = handler.chunk),
-    null !== parentObject &&
-      "blocked" === parentObject.status &&
-      ((key = parentObject.value),
-      (parentObject.status = "fulfilled"),
-      (parentObject.value = handler.value),
-      (parentObject.reason = handler.reason),
-      null !== key && wakeChunk(response, key, handler.value)));
+    ((reference = handler.chunk),
+    null !== reference &&
+      "blocked" === reference.status &&
+      ((value = reference.value),
+      (reference.status = "fulfilled"),
+      (reference.value = handler.value),
+      (reference.reason = handler.reason),
+      null !== value && wakeChunk(response, value, handler.value)));
 }
 function rejectReference(response, handler, error) {
   handler.errored ||
@@ -2656,33 +2667,6 @@ function rejectReference(response, handler, error) {
       "blocked" === handler.status &&
       triggerErrorOnChunk(response, handler, error));
 }
-function waitForReference(
-  referencedChunk,
-  parentObject,
-  key,
-  response,
-  map,
-  path
-) {
-  initializingHandler
-    ? ((response = initializingHandler), response.deps++)
-    : (response = initializingHandler =
-        { chunk: null, value: null, reason: null, deps: 1, errored: !1 });
-  parentObject = {
-    handler: response,
-    parentObject: parentObject,
-    key: key,
-    map: map,
-    path: path
-  };
-  null === referencedChunk.value
-    ? (referencedChunk.value = [parentObject])
-    : referencedChunk.value.push(parentObject);
-  null === referencedChunk.reason
-    ? (referencedChunk.reason = [parentObject])
-    : referencedChunk.reason.push(parentObject);
-  return null;
-}
 function getOutlinedModel(response, reference, parentObject, key, map) {
   reference = reference.split(":");
   var id = parseInt(reference[0], 16);
@@ -2693,53 +2677,40 @@ function getOutlinedModel(response, reference, parentObject, key, map) {
   }
   switch (id.status) {
     case "fulfilled":
-      var value = id.value;
-      for (id = 1; id < reference.length; id++) {
-        for (; value instanceof ReactPromise; ) {
-          switch (value.status) {
-            case "resolved_model":
-              initializeModelChunk(value);
-          }
-          switch (value.status) {
-            case "fulfilled":
-              value = value.value;
-              break;
-            case "blocked":
-            case "pending":
-              return waitForReference(
-                value,
-                parentObject,
-                key,
-                response,
-                map,
-                reference.slice(id - 1)
-              );
-            default:
-              return (
-                initializingHandler
-                  ? ((initializingHandler.errored = !0),
-                    (initializingHandler.value = null),
-                    (initializingHandler.reason = value.reason))
-                  : (initializingHandler = {
-                      chunk: null,
-                      value: null,
-                      reason: value.reason,
-                      deps: 0,
-                      errored: !0
-                    }),
-                null
-              );
-          }
-        }
-        var name = reference[id];
-        "object" === typeof value &&
-          hasOwnProperty.call(value, name) &&
-          (value = value[name]);
+      id = id.value;
+      for (var i = 1; i < reference.length; i++) {
+        var name = reference[i];
+        if (
+          "object" !== typeof id ||
+          !hasOwnProperty.call(id, name) ||
+          id instanceof Promise
+        )
+          throw Error("Invalid reference.");
+        id = id[name];
       }
-      return map(response, value, parentObject, key);
+      return map(response, id, parentObject, key);
     case "pending":
     case "blocked":
-      return waitForReference(id, parentObject, key, response, map, reference);
+      return (
+        initializingHandler
+          ? ((response = initializingHandler), response.deps++)
+          : (response = initializingHandler =
+              { chunk: null, value: null, reason: null, deps: 1, errored: !1 }),
+        (parentObject = {
+          handler: response,
+          parentObject: parentObject,
+          key: key,
+          map: map,
+          path: reference
+        }),
+        null === id.value
+          ? (id.value = [parentObject])
+          : id.value.push(parentObject),
+        null === id.reason
+          ? (id.reason = [parentObject])
+          : id.reason.push(parentObject),
+        null
+      );
     default:
       return (
         initializingHandler
@@ -2766,8 +2737,8 @@ function createSet(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 parseTypedArray(
   response,
@@ -2778,9 +2749,10 @@ function parseTypedArray(
   parentKey
 ) {
   reference = parseInt(reference.slice(2), 16);
-  reference = response._formData
-    .get(response._prefix + reference)
-    .arrayBuffer();
+  bytesPerElement = response._prefix + reference;
+  if (response._chunks.has(reference))
+    throw Error("Already initialized typed array.");
+  reference = response._formData.get(bytesPerElement).arrayBuffer();
   if (initializingHandler) {
     var handler = initializingHandler;
     handler.deps++;
@@ -2806,6 +2778,7 @@ function parseTypedArray(
         var resolveListeners = buffer.value;
         buffer.status = "fulfilled";
         buffer.value = handler.value;
+        buffer.reason = null;
         null !== resolveListeners &&
           wakeChunk(response, resolveListeners, handler.value);
       }
@@ -2838,7 +2811,10 @@ function resolveStream(response, id, stream, controller) {
 }
 function parseReadableStream(response, reference, type) {
   reference = parseInt(reference.slice(2), 16);
-  var controller = null;
+  if (response._chunks.has(reference))
+    throw Error("Already initialized stream.");
+  var controller = null,
+    closed = !1;
   type = new ReadableStream({
     type: type,
     start: function (c) {
@@ -2881,24 +2857,27 @@ function parseReadableStream(response, reference, type) {
       }
     },
     close: function () {
-      if (null === previousBlockedChunk) controller.close();
-      else {
-        var blockedChunk = previousBlockedChunk;
-        previousBlockedChunk = null;
-        blockedChunk.then(function () {
-          return controller.close();
-        });
-      }
+      if (!closed)
+        if (((closed = !0), null === previousBlockedChunk)) controller.close();
+        else {
+          var blockedChunk = previousBlockedChunk;
+          previousBlockedChunk = null;
+          blockedChunk.then(function () {
+            return controller.close();
+          });
+        }
     },
     error: function (error) {
-      if (null === previousBlockedChunk) controller.error(error);
-      else {
-        var blockedChunk = previousBlockedChunk;
-        previousBlockedChunk = null;
-        blockedChunk.then(function () {
-          return controller.error(error);
-        });
-      }
+      if (!closed)
+        if (((closed = !0), null === previousBlockedChunk))
+          controller.error(error);
+        else {
+          var blockedChunk = previousBlockedChunk;
+          previousBlockedChunk = null;
+          blockedChunk.then(function () {
+            return controller.error(error);
+          });
+        }
     }
   });
   return type;
@@ -2913,6 +2892,8 @@ function createIterator(next) {
 }
 function parseAsyncIterable(response, reference, iterator) {
   reference = parseInt(reference.slice(2), 16);
+  if (response._chunks.has(reference))
+    throw Error("Already initialized stream.");
   var buffer = [],
     closed = !1,
     nextWriteIndex = 0,
@@ -2956,36 +2937,46 @@ function parseAsyncIterable(response, reference, iterator) {
       nextWriteIndex++;
     },
     close: function (value) {
-      closed = !0;
-      nextWriteIndex === buffer.length
-        ? (buffer[nextWriteIndex] = createResolvedIteratorResultChunk(
+      if (!closed)
+        for (
+          closed = !0,
+            nextWriteIndex === buffer.length
+              ? (buffer[nextWriteIndex] = createResolvedIteratorResultChunk(
+                  response,
+                  value,
+                  !0
+                ))
+              : resolveIteratorResultChunk(
+                  response,
+                  buffer[nextWriteIndex],
+                  value,
+                  !0
+                ),
+            nextWriteIndex++;
+          nextWriteIndex < buffer.length;
+
+        )
+          resolveIteratorResultChunk(
             response,
-            value,
-            !0
-          ))
-        : resolveIteratorResultChunk(
-            response,
-            buffer[nextWriteIndex],
-            value,
+            buffer[nextWriteIndex++],
+            '"$undefined"',
             !0
           );
-      for (nextWriteIndex++; nextWriteIndex < buffer.length; )
-        resolveIteratorResultChunk(
-          response,
-          buffer[nextWriteIndex++],
-          '"$undefined"',
-          !0
-        );
     },
     error: function (error) {
-      closed = !0;
-      for (
-        nextWriteIndex === buffer.length &&
-        (buffer[nextWriteIndex] = new ReactPromise("pending", null, null));
-        nextWriteIndex < buffer.length;
+      if (!closed)
+        for (
+          closed = !0,
+            nextWriteIndex === buffer.length &&
+              (buffer[nextWriteIndex] = new ReactPromise(
+                "pending",
+                null,
+                null
+              ));
+          nextWriteIndex < buffer.length;
 
-      )
-        triggerErrorOnChunk(response, buffer[nextWriteIndex++], error);
+        )
+          triggerErrorOnChunk(response, buffer[nextWriteIndex++], error);
     }
   });
   return iterator;
@@ -2997,7 +2988,7 @@ function parseModelString(response, obj, key, value, reference) {
         return value.slice(1);
       case "@":
         return (obj = parseInt(value.slice(2), 16)), getChunk(response, obj);
-      case "F":
+      case "h":
         return (
           (value = value.slice(2)),
           getOutlinedModel(response, value, obj, key, loadServerReference$1)
@@ -3308,13 +3299,13 @@ exports.decodeReplyFromBusboy = function (busboyStream, webpackMap, options) {
       );
     else {
       pendingFiles++;
-      var JSCompiler_object_inline_chunks_281 = [];
+      var JSCompiler_object_inline_chunks_291 = [];
       value.on("data", function (chunk) {
-        JSCompiler_object_inline_chunks_281.push(chunk);
+        JSCompiler_object_inline_chunks_291.push(chunk);
       });
       value.on("end", function () {
         try {
-          var blob = new Blob(JSCompiler_object_inline_chunks_281, {
+          var blob = new Blob(JSCompiler_object_inline_chunks_291, {
             type: mimeType
           });
           response._formData.append(name, blob, filename);
@@ -3443,7 +3434,8 @@ exports.registerServerReference = function (reference, id, exportName) {
       configurable: !0
     },
     $$bound: { value: null, configurable: !0 },
-    bind: { value: bind, configurable: !0 }
+    bind: { value: bind, configurable: !0 },
+    toString: serverReferenceToString
   });
 };
 exports.renderToPipeableStream = function (model, webpackMap, options) {

package/dist/vendor/react-server-dom/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-server-dom-webpack",
   "description": "React Server Components bindings for DOM using Webpack. This is intended to be integrated into meta-frameworks. It is not intended to be imported directly.",
-  "version": "19.2.1",
+  "version": "19.2.3",
   "keywords": [
     "react"
   ],
@@ -17,17 +17,14 @@
     "client.browser.js",
     "client.edge.js",
     "client.node.js",
-    "client.node.unbundled.js",
     "server.js",
     "server.browser.js",
     "server.edge.js",
     "server.node.js",
-    "server.node.unbundled.js",
     "static.js",
     "static.browser.js",
     "static.edge.js",
     "static.node.js",
-    "static.node.unbundled.js",
     "node-register.js",
     "cjs/",
     "esm/"
@@ -39,10 +36,7 @@
       "workerd": "./client.edge.js",
       "deno": "./client.edge.js",
       "worker": "./client.edge.js",
-      "node": {
-        "webpack": "./client.node.js",
-        "default": "./client.node.unbundled.js"
-      },
+      "node": "./client.node.js",
       "edge-light": "./client.edge.js",
       "browser": "./client.browser.js",
       "default": "./client.browser.js"
@@ -50,15 +44,11 @@
     "./client.browser": "./client.browser.js",
     "./client.edge": "./client.edge.js",
     "./client.node": "./client.node.js",
-    "./client.node.unbundled": "./client.node.unbundled.js",
     "./server": {
       "react-server": {
         "workerd": "./server.edge.js",
         "deno": "./server.browser.js",
-        "node": {
-          "webpack": "./server.node.js",
-          "default": "./server.node.unbundled.js"
-        },
+        "node": "./server.node.js",
         "edge-light": "./server.edge.js",
         "browser": "./server.browser.js"
       },
@@ -67,15 +57,11 @@
     "./server.browser": "./server.browser.js",
     "./server.edge": "./server.edge.js",
     "./server.node": "./server.node.js",
-    "./server.node.unbundled": "./server.node.unbundled.js",
     "./static": {
       "react-server": {
         "workerd": "./static.edge.js",
         "deno": "./static.browser.js",
-        "node": {
-          "webpack": "./static.node.js",
-          "default": "./static.node.unbundled.js"
-        },
+        "node": "./static.node.js",
         "edge-light": "./static.edge.js",
         "browser": "./static.browser.js"
       },
@@ -84,7 +70,6 @@
     "./static.browser": "./static.browser.js",
     "./static.edge": "./static.edge.js",
     "./static.node": "./static.node.js",
-    "./static.node.unbundled": "./static.node.unbundled.js",
     "./node-loader": "./esm/react-server-dom-webpack-node-loader.production.js",
     "./node-register": "./node-register.js",
     "./package.json": "./package.json"
@@ -99,8 +84,8 @@
     "node": ">=0.10.0"
   },
   "peerDependencies": {
-    "react": "^19.2.1",
-    "react-dom": "^19.2.1",
+    "react": "^19.2.3",
+    "react-dom": "^19.2.3",
     "webpack": "^5.59.0"
   },
   "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-rsc",
-  "version": "0.5.5",
+  "version": "0.5.7",
   "description": "React Server Components (RSC) support for Vite.",
   "keywords": [
     "vite",
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@remix-run/node-fetch-server": "^0.12.0",
-    "es-module-lexer": "^1.7.0",
+    "es-module-lexer": "^2.0.0",
     "estree-walker": "^3.0.3",
     "magic-string": "^0.30.21",
     "periscopic": "^4.0.2",
@@ -59,11 +59,11 @@
     "@vitejs/plugin-react": "workspace:*",
     "@vitejs/test-dep-cjs-and-esm": "./test-dep/cjs-and-esm",
     "picocolors": "^1.1.1",
-    "react": "^19.2.1",
-    "react-dom": "^19.2.1",
-    "react-server-dom-webpack": "^19.2.1",
+    "react": "^19.2.3",
+    "react-dom": "^19.2.3",
+    "react-server-dom-webpack": "^19.2.3",
     "tinyexec": "^1.0.2",
-    "tsdown": "^0.16.8"
+    "tsdown": "^0.17.1"
   },
   "peerDependencies": {
     "react": "*",