@webtypen/webframez-react 0.0.29 → 0.0.30

package/dist/http.cjs

@@ -42,7 +42,7 @@ var import_node_path = __toESM(require("node:path"), 1);
 var import_node_stream = require("node:stream");
 var import_node_module = require("node:module");
 var import_server = require("react-server-dom-webpack/server");
-var import_client = require("react-server-dom-webpack/client.node");
+var reactServerDomClientNode = __toESM(require("react-server-dom-webpack/client.node"), 1);
 function defaultOnError(err) {
   console.error("[webframez-react] RSC render error", err);
 }
@@ -746,8 +746,8 @@ function createInitialHtmlErrorMarkup(message) {
 var INITIAL_HTML_WORKER_SCRIPT = `
 const path = require("node:path");
 const Module = require("node:module");
-const { Writable } = require("node:stream");
-const { createFromReadableStream } = require("react-server-dom-webpack/client.node");
+const { Readable, Writable } = require("node:stream");
+const reactServerDomClientNode = require("react-server-dom-webpack/client.node");
 
 const originalResolveFilename = Module._resolveFilename;
 const rootParent = {
@@ -865,14 +865,34 @@ function createReadableStreamFromString(value) {
   });
 }
 
+async function decodeFlightPayloadFromString(flightData, moduleMap) {
+  const serverConsumerManifest = {
+    moduleMap: moduleMap || {},
+    serverModuleMap: null,
+    moduleLoading: null
+  };
+
+  if (typeof reactServerDomClientNode.createFromNodeStream === "function") {
+    return await reactServerDomClientNode.createFromNodeStream(
+      Readable.from([flightData]),
+      serverConsumerManifest
+    );
+  }
+
+  if (typeof reactServerDomClientNode.createFromReadableStream === "function") {
+    return await reactServerDomClientNode.createFromReadableStream(
+      createReadableStreamFromString(flightData),
+      { serverConsumerManifest }
+    );
+  }
+
+  throw new Error(
+    "react-server-dom-webpack/client.node does not provide createFromNodeStream or createFromReadableStream."
+  );
+}
+
 async function renderHtmlFromFlightData(flightData, moduleMap) {
-  const payload = await createFromReadableStream(createReadableStreamFromString(flightData), {
-    serverConsumerManifest: {
-      moduleMap: moduleMap || {},
-      serverModuleMap: null,
-      moduleLoading: null
-    }
-  });
+  const payload = await decodeFlightPayloadFromString(flightData, moduleMap);
 
   const model =
     payload && typeof payload === "object" && "model" in payload

package/dist/http.js

@@ -14,10 +14,10 @@ import { spawn } from "node:child_process";
 
 // src/server.ts
 import path from "node:path";
-import { Writable } from "node:stream";
+import { Readable, Writable } from "node:stream";
 import { createRequire } from "node:module";
 import { renderToPipeableStream } from "react-server-dom-webpack/server";
-import { createFromReadableStream } from "react-server-dom-webpack/client.node";
+import * as reactServerDomClientNode from "react-server-dom-webpack/client.node";
 function defaultOnError(err) {
   console.error("[webframez-react] RSC render error", err);
 }
@@ -721,8 +721,8 @@ function createInitialHtmlErrorMarkup(message) {
 var INITIAL_HTML_WORKER_SCRIPT = `
 const path = require("node:path");
 const Module = require("node:module");
-const { Writable } = require("node:stream");
-const { createFromReadableStream } = require("react-server-dom-webpack/client.node");
+const { Readable, Writable } = require("node:stream");
+const reactServerDomClientNode = require("react-server-dom-webpack/client.node");
 
 const originalResolveFilename = Module._resolveFilename;
 const rootParent = {
@@ -840,14 +840,34 @@ function createReadableStreamFromString(value) {
   });
 }
 
+async function decodeFlightPayloadFromString(flightData, moduleMap) {
+  const serverConsumerManifest = {
+    moduleMap: moduleMap || {},
+    serverModuleMap: null,
+    moduleLoading: null
+  };
+
+  if (typeof reactServerDomClientNode.createFromNodeStream === "function") {
+    return await reactServerDomClientNode.createFromNodeStream(
+      Readable.from([flightData]),
+      serverConsumerManifest
+    );
+  }
+
+  if (typeof reactServerDomClientNode.createFromReadableStream === "function") {
+    return await reactServerDomClientNode.createFromReadableStream(
+      createReadableStreamFromString(flightData),
+      { serverConsumerManifest }
+    );
+  }
+
+  throw new Error(
+    "react-server-dom-webpack/client.node does not provide createFromNodeStream or createFromReadableStream."
+  );
+}
+
 async function renderHtmlFromFlightData(flightData, moduleMap) {
-  const payload = await createFromReadableStream(createReadableStreamFromString(flightData), {
-    serverConsumerManifest: {
-      moduleMap: moduleMap || {},
-      serverModuleMap: null,
-      moduleLoading: null
-    }
-  });
+  const payload = await decodeFlightPayloadFromString(flightData, moduleMap);
 
   const model =
     payload && typeof payload === "object" && "model" in payload

package/dist/index.cjs

@@ -47,7 +47,7 @@ var import_node_path = __toESM(require("node:path"), 1);
 var import_node_stream = require("node:stream");
 var import_node_module = require("node:module");
 var import_server = require("react-server-dom-webpack/server");
-var import_client = require("react-server-dom-webpack/client.node");
+var reactServerDomClientNode = __toESM(require("react-server-dom-webpack/client.node"), 1);
 function defaultOnError(err) {
   console.error("[webframez-react] RSC render error", err);
 }
@@ -783,8 +783,8 @@ function createInitialHtmlErrorMarkup(message) {
 var INITIAL_HTML_WORKER_SCRIPT = `
 const path = require("node:path");
 const Module = require("node:module");
-const { Writable } = require("node:stream");
-const { createFromReadableStream } = require("react-server-dom-webpack/client.node");
+const { Readable, Writable } = require("node:stream");
+const reactServerDomClientNode = require("react-server-dom-webpack/client.node");
 
 const originalResolveFilename = Module._resolveFilename;
 const rootParent = {
@@ -902,14 +902,34 @@ function createReadableStreamFromString(value) {
   });
 }
 
+async function decodeFlightPayloadFromString(flightData, moduleMap) {
+  const serverConsumerManifest = {
+    moduleMap: moduleMap || {},
+    serverModuleMap: null,
+    moduleLoading: null
+  };
+
+  if (typeof reactServerDomClientNode.createFromNodeStream === "function") {
+    return await reactServerDomClientNode.createFromNodeStream(
+      Readable.from([flightData]),
+      serverConsumerManifest
+    );
+  }
+
+  if (typeof reactServerDomClientNode.createFromReadableStream === "function") {
+    return await reactServerDomClientNode.createFromReadableStream(
+      createReadableStreamFromString(flightData),
+      { serverConsumerManifest }
+    );
+  }
+
+  throw new Error(
+    "react-server-dom-webpack/client.node does not provide createFromNodeStream or createFromReadableStream."
+  );
+}
+
 async function renderHtmlFromFlightData(flightData, moduleMap) {
-  const payload = await createFromReadableStream(createReadableStreamFromString(flightData), {
-    serverConsumerManifest: {
-      moduleMap: moduleMap || {},
-      serverModuleMap: null,
-      moduleLoading: null
-    }
-  });
+  const payload = await decodeFlightPayloadFromString(flightData, moduleMap);
 
   const model =
     payload && typeof payload === "object" && "model" in payload

package/dist/index.js

@@ -8,10 +8,10 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 
 // src/server.ts
 import path from "node:path";
-import { Writable } from "node:stream";
+import { Readable, Writable } from "node:stream";
 import { createRequire } from "node:module";
 import { renderToPipeableStream } from "react-server-dom-webpack/server";
-import { createFromReadableStream } from "react-server-dom-webpack/client.node";
+import * as reactServerDomClientNode from "react-server-dom-webpack/client.node";
 function defaultOnError(err) {
   console.error("[webframez-react] RSC render error", err);
 }
@@ -747,8 +747,8 @@ function createInitialHtmlErrorMarkup(message) {
 var INITIAL_HTML_WORKER_SCRIPT = `
 const path = require("node:path");
 const Module = require("node:module");
-const { Writable } = require("node:stream");
-const { createFromReadableStream } = require("react-server-dom-webpack/client.node");
+const { Readable, Writable } = require("node:stream");
+const reactServerDomClientNode = require("react-server-dom-webpack/client.node");
 
 const originalResolveFilename = Module._resolveFilename;
 const rootParent = {
@@ -866,14 +866,34 @@ function createReadableStreamFromString(value) {
   });
 }
 
+async function decodeFlightPayloadFromString(flightData, moduleMap) {
+  const serverConsumerManifest = {
+    moduleMap: moduleMap || {},
+    serverModuleMap: null,
+    moduleLoading: null
+  };
+
+  if (typeof reactServerDomClientNode.createFromNodeStream === "function") {
+    return await reactServerDomClientNode.createFromNodeStream(
+      Readable.from([flightData]),
+      serverConsumerManifest
+    );
+  }
+
+  if (typeof reactServerDomClientNode.createFromReadableStream === "function") {
+    return await reactServerDomClientNode.createFromReadableStream(
+      createReadableStreamFromString(flightData),
+      { serverConsumerManifest }
+    );
+  }
+
+  throw new Error(
+    "react-server-dom-webpack/client.node does not provide createFromNodeStream or createFromReadableStream."
+  );
+}
+
 async function renderHtmlFromFlightData(flightData, moduleMap) {
-  const payload = await createFromReadableStream(createReadableStreamFromString(flightData), {
-    serverConsumerManifest: {
-      moduleMap: moduleMap || {},
-      serverModuleMap: null,
-      moduleLoading: null
-    }
-  });
+  const payload = await decodeFlightPayloadFromString(flightData, moduleMap);
 
   const model =
     payload && typeof payload === "object" && "model" in payload

package/dist/webframez-core.cjs

@@ -45,7 +45,7 @@ var import_node_path = __toESM(require("node:path"), 1);
 var import_node_stream = require("node:stream");
 var import_node_module = require("node:module");
 var import_server = require("react-server-dom-webpack/server");
-var import_client = require("react-server-dom-webpack/client.node");
+var reactServerDomClientNode = __toESM(require("react-server-dom-webpack/client.node"), 1);
 function defaultOnError(err) {
   console.error("[webframez-react] RSC render error", err);
 }
@@ -749,8 +749,8 @@ function createInitialHtmlErrorMarkup(message) {
 var INITIAL_HTML_WORKER_SCRIPT = `
 const path = require("node:path");
 const Module = require("node:module");
-const { Writable } = require("node:stream");
-const { createFromReadableStream } = require("react-server-dom-webpack/client.node");
+const { Readable, Writable } = require("node:stream");
+const reactServerDomClientNode = require("react-server-dom-webpack/client.node");
 
 const originalResolveFilename = Module._resolveFilename;
 const rootParent = {
@@ -868,14 +868,34 @@ function createReadableStreamFromString(value) {
   });
 }
 
+async function decodeFlightPayloadFromString(flightData, moduleMap) {
+  const serverConsumerManifest = {
+    moduleMap: moduleMap || {},
+    serverModuleMap: null,
+    moduleLoading: null
+  };
+
+  if (typeof reactServerDomClientNode.createFromNodeStream === "function") {
+    return await reactServerDomClientNode.createFromNodeStream(
+      Readable.from([flightData]),
+      serverConsumerManifest
+    );
+  }
+
+  if (typeof reactServerDomClientNode.createFromReadableStream === "function") {
+    return await reactServerDomClientNode.createFromReadableStream(
+      createReadableStreamFromString(flightData),
+      { serverConsumerManifest }
+    );
+  }
+
+  throw new Error(
+    "react-server-dom-webpack/client.node does not provide createFromNodeStream or createFromReadableStream."
+  );
+}
+
 async function renderHtmlFromFlightData(flightData, moduleMap) {
-  const payload = await createFromReadableStream(createReadableStreamFromString(flightData), {
-    serverConsumerManifest: {
-      moduleMap: moduleMap || {},
-      serverModuleMap: null,
-      moduleLoading: null
-    }
-  });
+  const payload = await decodeFlightPayloadFromString(flightData, moduleMap);
 
   const model =
     payload && typeof payload === "object" && "model" in payload

package/dist/webframez-core.js

@@ -14,10 +14,10 @@ import { spawn } from "node:child_process";
 
 // src/server.ts
 import path from "node:path";
-import { Writable } from "node:stream";
+import { Readable, Writable } from "node:stream";
 import { createRequire } from "node:module";
 import { renderToPipeableStream } from "react-server-dom-webpack/server";
-import { createFromReadableStream } from "react-server-dom-webpack/client.node";
+import * as reactServerDomClientNode from "react-server-dom-webpack/client.node";
 function defaultOnError(err) {
   console.error("[webframez-react] RSC render error", err);
 }
@@ -721,8 +721,8 @@ function createInitialHtmlErrorMarkup(message) {
 var INITIAL_HTML_WORKER_SCRIPT = `
 const path = require("node:path");
 const Module = require("node:module");
-const { Writable } = require("node:stream");
-const { createFromReadableStream } = require("react-server-dom-webpack/client.node");
+const { Readable, Writable } = require("node:stream");
+const reactServerDomClientNode = require("react-server-dom-webpack/client.node");
 
 const originalResolveFilename = Module._resolveFilename;
 const rootParent = {
@@ -840,14 +840,34 @@ function createReadableStreamFromString(value) {
   });
 }
 
+async function decodeFlightPayloadFromString(flightData, moduleMap) {
+  const serverConsumerManifest = {
+    moduleMap: moduleMap || {},
+    serverModuleMap: null,
+    moduleLoading: null
+  };
+
+  if (typeof reactServerDomClientNode.createFromNodeStream === "function") {
+    return await reactServerDomClientNode.createFromNodeStream(
+      Readable.from([flightData]),
+      serverConsumerManifest
+    );
+  }
+
+  if (typeof reactServerDomClientNode.createFromReadableStream === "function") {
+    return await reactServerDomClientNode.createFromReadableStream(
+      createReadableStreamFromString(flightData),
+      { serverConsumerManifest }
+    );
+  }
+
+  throw new Error(
+    "react-server-dom-webpack/client.node does not provide createFromNodeStream or createFromReadableStream."
+  );
+}
+
 async function renderHtmlFromFlightData(flightData, moduleMap) {
-  const payload = await createFromReadableStream(createReadableStreamFromString(flightData), {
-    serverConsumerManifest: {
-      moduleMap: moduleMap || {},
-      serverModuleMap: null,
-      moduleLoading: null
-    }
-  });
+  const payload = await decodeFlightPayloadFromString(flightData, moduleMap);
 
   const model =
     payload && typeof payload === "object" && "model" in payload

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webtypen/webframez-react",
-  "version": "0.0.29",
+  "version": "0.0.30",
   "description": "TypeScript React RSC addition for @webtypen/webframez-core",
   "homepage": "https://webtypen.de/",
   "author": {