@cedarjs/vite 5.0.2-rc.5 → 6.0.0-canary.2619

package/dist/cjs/rsc/rscWebSocketServer.js

@@ -0,0 +1,56 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var rscWebSocketServer_exports = {};
+__export(rscWebSocketServer_exports, {
+  createWebSocketServer: () => createWebSocketServer
+});
+module.exports = __toCommonJS(rscWebSocketServer_exports);
+var import_ws = __toESM(require("ws"), 1);
+function createWebSocketServer() {
+  const wsServer = new import_ws.WebSocketServer({ port: 18998 });
+  wsServer.on("connection", (ws) => {
+    console.log("A new client connected.");
+    ws.on("message", (data) => {
+      const message = data.toString();
+      console.log("Received message:", message);
+      wsServer.clients.forEach((client) => {
+        if (client.readyState === import_ws.default.OPEN) {
+          client.send(message);
+        }
+      });
+    });
+    ws.on("close", () => {
+      console.log("A client disconnected.");
+    });
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createWebSocketServer
+});

package/dist/cjs/rsc/utils.js

@@ -0,0 +1,56 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var utils_exports = {};
+__export(utils_exports, {
+  importRscReact: () => importRscReact,
+  importRsdwServer: () => importRsdwServer
+});
+module.exports = __toCommonJS(utils_exports);
+async function importRscReact() {
+  if (globalThis.__cedarjs__vite_rsc_runtime) {
+    const reactMod = await globalThis.__cedarjs__vite_rsc_runtime.import("react");
+    return reactMod.default;
+  }
+  return import("react");
+}
+async function importRsdwServer() {
+  if (globalThis.__cedarjs__vite_rsc_runtime) {
+    const rsdwServerMod = await globalThis.__cedarjs__vite_rsc_runtime.import(
+      "react-server-dom-webpack/server.edge"
+    );
+    return rsdwServerMod.default;
+  } else {
+    return import("react-server-dom-webpack/server.edge");
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  importRscReact,
+  importRsdwServer
+});

package/dist/cjs/runFeServer.js

@@ -38,13 +38,13 @@ var import_server = require("@whatwg-node/server");
 var import_dotenv_defaults = require("dotenv-defaults");
 var import_express = __toESM(require("express"), 1);
 var import_http_proxy_middleware = require("http-proxy-middleware");
-var import_ws = __toESM(require("ws"), 1);
 var import_project_config = require("@cedarjs/project-config");
 var import_rscCss = require("@cedarjs/router/rscCss");
 var import_server_store = require("@cedarjs/server-store");
 var import_registerFwGlobalsAndShims = require("./lib/registerFwGlobalsAndShims.js");
 var import_invokeMiddleware = require("./middleware/invokeMiddleware.js");
 var import_register = require("./middleware/register.js");
+var import_rscWebSocketServer = require("./rsc/rscWebSocketServer.js");
 var import_createReactStreamingHandler = require("./streaming/createReactStreamingHandler.js");
 var import_utils = require("./utils.js");
 (0, import_dotenv_defaults.config)({
@@ -60,7 +60,7 @@ async function runFeServer() {
   (0, import_registerFwGlobalsAndShims.registerFwGlobalsAndShims)();
   if (rscEnabled) {
     const { setClientEntries } = await import("./rsc/rscRenderer.js");
-    createWebSocketServer();
+    (0, import_rscWebSocketServer.createWebSocketServer)();
     try {
       await setClientEntries();
     } catch (e) {
@@ -119,7 +119,7 @@ async function runFeServer() {
     const { createRscRequestHandler } = await import("./rsc/rscRequestHandler.js");
     app.use(
       "/rw-rsc",
-      createRscRequestHandler({
+      await createRscRequestHandler({
         getMiddlewareRouter: async () => middlewareRouter
       })
     );
@@ -139,25 +139,6 @@ async function runFeServer() {
     `Started production FE server on http://localhost:${rwConfig.web.port}`
   );
 }
-function createWebSocketServer() {
-  const wsServer = new import_ws.WebSocketServer({ port: 18998 });
-  wsServer.on("connection", (ws) => {
-    console.log("A new client connected.");
-    ws.on("message", (data) => {
-      const message = data.toString();
-      console.log("runFeServer.ts: Received message:");
-      console.log(message.slice(0, 120) + "...");
-      wsServer.clients.forEach((client) => {
-        if (client.readyState === import_ws.default.OPEN) {
-          client.send(message);
-        }
-      });
-    });
-    ws.on("close", () => {
-      console.log("A client disconnected.");
-    });
-  });
-}
 runFeServer();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/streaming/createReactStreamingHandler.js

@@ -50,10 +50,10 @@ const createReactStreamingHandler = async ({
   clientEntryPath,
   getStylesheetLinks,
   getMiddlewareRouter
-}, viteDevServer) => {
+}, viteSsrDevServer) => {
   const rwPaths = (0, import_project_config.getPaths)();
   const rwConfig = (0, import_project_config.getConfig)();
-  const isProd = !viteDevServer;
+  const isProd = !viteSsrDevServer;
   const middlewareRouter = await getMiddlewareRouter();
   let entryServerImport;
   let fallbackDocumentImport;
@@ -97,7 +97,7 @@ const createReactStreamingHandler = async ({
           route: currentRoute,
           cssPaths: cssLinks,
           params: matchedMw?.params,
-          viteDevServer
+          viteSsrDevServer
         }
       );
       if (mwResponse.isRedirect() || mwResponse.body) {
@@ -116,8 +116,8 @@ const createReactStreamingHandler = async ({
       });
     }
     if (!isProd) {
-      entryServerImport = await (0, import_utils.ssrLoadEntryServer)(viteDevServer);
-      fallbackDocumentImport = await viteDevServer.ssrLoadModule(
+      entryServerImport = await (0, import_utils.ssrLoadEntryServer)(viteSsrDevServer);
+      fallbackDocumentImport = await viteSsrDevServer.ssrLoadModule(
         rwPaths.web.document
       );
     }
@@ -134,10 +134,12 @@ const createReactStreamingHandler = async ({
         req,
         parsedParams
       },
-      viteDevServer
+      viteSsrDevServer
     });
     metaTags = routeHookOutput.meta;
-    const jsBundles = [viteDevServer ? clientEntryPath : "/" + clientEntryPath];
+    const jsBundles = [
+      viteSsrDevServer ? clientEntryPath : "/" + clientEntryPath
+    ];
     if (currentRoute.bundle) {
       jsBundles.push("/" + currentRoute.bundle);
     }
@@ -157,12 +159,13 @@ const createReactStreamingHandler = async ({
       {
         waitForAllReady: isSeoCrawler,
         onError: (err) => {
-          if (!isProd && viteDevServer) {
-            viteDevServer.ssrFixStacktrace(err);
+          if (!isProd && viteSsrDevServer) {
+            viteSsrDevServer.ssrFixStacktrace(err);
           }
           console.error(err);
         }
-      }
+      },
+      viteSsrDevServer
     );
     return reactResponse;
   };

package/dist/cjs/streaming/streamHelpers.js

@@ -28,7 +28,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var streamHelpers_exports = {};
 __export(streamHelpers_exports, {
-  importModule: () => importModule,
   reactRenderToStreamResponse: () => reactRenderToStreamResponse
 });
 module.exports = __toCommonJS(streamHelpers_exports);
@@ -62,7 +61,7 @@ globalThis.__webpack_require__ ||= (id) => {
   return globalThis.__rw_module_cache__.get(id)
 };
 `;
-async function reactRenderToStreamResponse(mwRes, renderOptions, streamOptions) {
+async function reactRenderToStreamResponse(mwRes, renderOptions, streamOptions, viteDevServer) {
   const { waitForAllReady = false } = streamOptions;
   const {
     ServerEntry,
@@ -84,13 +83,13 @@ async function reactRenderToStreamResponse(mwRes, renderOptions, streamOptions)
     meta: metaTags
   });
   const rscEnabled = (0, import_project_config.getConfig)().experimental?.rsc?.enabled;
-  const { createElement } = rscEnabled ? await importModule("__cedarjs__react") : await import("react");
+  const { createElement } = rscEnabled ? await importModule("__cedarjs__react", !!viteDevServer) : await import("react");
   const {
     createInjector,
     ServerHtmlProvider,
     ServerInjectedHtml
-  } = rscEnabled ? await importModule("__cedarjs__server_inject") : await import("@cedarjs/web/serverInject");
-  const { renderToString } = rscEnabled ? await importModule("rd-server") : await import("react-dom/server");
+  } = rscEnabled ? await importModule("__cedarjs__server_inject", !!viteDevServer) : await import("@cedarjs/web/serverInject");
+  const { renderToString } = rscEnabled ? await importModule("rd-server", !!viteDevServer) : await import("react-dom/server");
   const { injectionState, injectToPage } = createInjector();
   const bufferTransform = (0, import_bufferedTransform.createBufferedTransformStream)();
   const serverInjectionTransform = (0, import_serverInjectionTransform.createServerInjectionTransform)({
@@ -105,8 +104,8 @@ async function reactRenderToStreamResponse(mwRes, renderOptions, streamOptions)
     controller.abort();
   }, 1e4);
   const timeoutTransform = (0, import_cancelTimeoutTransform.createTimeoutTransform)(timeoutHandle);
-  const { ServerAuthProvider } = rscEnabled ? await importModule("__cedarjs__server_auth_provider") : await import("@cedarjs/auth/dist/AuthProvider/ServerAuthProvider.js");
-  const { LocationProvider } = rscEnabled ? await importModule("__cedarjs__location") : await import("@cedarjs/router/location");
+  const { ServerAuthProvider } = rscEnabled ? await importModule("__cedarjs__server_auth_provider", !!viteDevServer) : await import("@cedarjs/auth/dist/AuthProvider/ServerAuthProvider.js");
+  const { LocationProvider } = rscEnabled ? await importModule("__cedarjs__location", !!viteDevServer) : await import("@cedarjs/router/location");
   const renderRoot = (url) => {
     return createElement(
       ServerAuthProvider,
@@ -138,7 +137,7 @@ async function reactRenderToStreamResponse(mwRes, renderOptions, streamOptions)
     ),
     bootstrapModules: jsBundles
   };
-  const { renderToReadableStream } = rscEnabled ? await importModule("rd-server") : await import("react-dom/server.edge");
+  const { renderToReadableStream } = rscEnabled ? await importModule("rd-server", !!viteDevServer) : await import("react-dom/server.edge");
   try {
     let didErrorOutsideShell = false;
     const renderToStreamOptions = {
@@ -197,34 +196,52 @@ function applyStreamTransforms(reactStream, transformsToApply) {
   }
   return outputStream;
 }
-async function importModule(mod) {
-  const distSsr = (0, import_project_config.getPaths)().web.distSsr;
-  const rdServerPath = (0, import_utils.makeFilePath)(import_node_path.default.join(distSsr, "rd-server.mjs"));
-  const reactPath = (0, import_utils.makeFilePath)(import_node_path.default.join(distSsr, "__cedarjs__react.mjs"));
-  const locationPath = (0, import_utils.makeFilePath)(
-    import_node_path.default.join(distSsr, "__cedarjs__location.mjs")
-  );
-  const ServerAuthProviderPath = (0, import_utils.makeFilePath)(
-    import_node_path.default.join(distSsr, "__cedarjs__server_auth_provider.mjs")
-  );
-  const ServerInjectPath = (0, import_utils.makeFilePath)(
-    import_node_path.default.join(distSsr, "__cedarjs__server_inject.mjs")
-  );
-  if (mod === "rd-server") {
-    return (await import(rdServerPath)).default;
-  } else if (mod === "__cedarjs__react") {
-    return (await import(reactPath)).default;
-  } else if (mod === "__cedarjs__location") {
-    return await import(locationPath);
-  } else if (mod === "__cedarjs__server_auth_provider") {
-    return await import(ServerAuthProviderPath);
-  } else if (mod === "__cedarjs__server_inject") {
-    return await import(ServerInjectPath);
+async function importModule(mod, isDev) {
+  if (isDev) {
+    if (mod === "rd-server") {
+      const loadedMod = await import("react-dom/server.edge");
+      return loadedMod.default;
+    } else if (mod === "__cedarjs__react") {
+      const loadedMod = await import("react");
+      return loadedMod.default;
+    } else if (mod === "__cedarjs__location") {
+      const loadedMod = await import("@cedarjs/router/location");
+      return loadedMod;
+    } else if (mod === "__cedarjs__server_auth_provider") {
+      const loadedMod = await import("@cedarjs/auth/dist/AuthProvider/ServerAuthProvider.js");
+      return loadedMod;
+    } else if (mod === "__cedarjs__server_inject") {
+      const loadedMod = await import("@cedarjs/web/serverInject");
+      return loadedMod;
+    }
+  } else {
+    const distSsr = (0, import_project_config.getPaths)().web.distSsr;
+    const rdServerPath = (0, import_utils.makeFilePath)(import_node_path.default.join(distSsr, "rd-server.mjs"));
+    const reactPath = (0, import_utils.makeFilePath)(import_node_path.default.join(distSsr, "__cedarjs__react.mjs"));
+    const locationPath = (0, import_utils.makeFilePath)(
+      import_node_path.default.join(distSsr, "__cedarjs__location.mjs")
+    );
+    const serverAuthProviderPath = (0, import_utils.makeFilePath)(
+      import_node_path.default.join(distSsr, "__cedarjs__server_auth_provider.mjs")
+    );
+    const serverInjectPath = (0, import_utils.makeFilePath)(
+      import_node_path.default.join(distSsr, "__cedarjs__server_inject.mjs")
+    );
+    if (mod === "rd-server") {
+      return (await import(rdServerPath)).default;
+    } else if (mod === "__cedarjs__react") {
+      return (await import(reactPath)).default;
+    } else if (mod === "__cedarjs__location") {
+      return await import(locationPath);
+    } else if (mod === "__cedarjs__server_auth_provider") {
+      return await import(serverAuthProviderPath);
+    } else if (mod === "__cedarjs__server_inject") {
+      return await import(serverInjectPath);
+    }
   }
   throw new Error("Unknown module " + mod);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  importModule,
   reactRenderToStreamResponse
 });

package/dist/cjs/streaming/triggerRouteHooks.js

@@ -55,11 +55,11 @@ const defaultRouteHookOutput = {
 const loadAndRunRouteHooks = async ({
   paths = [],
   reqMeta,
-  viteDevServer,
+  viteSsrDevServer,
   previousOutput = defaultRouteHookOutput
 }) => {
   const loadModule = async (path) => {
-    return viteDevServer ? viteDevServer.ssrLoadModule(path) : import(path);
+    return viteSsrDevServer ? viteSsrDevServer.ssrLoadModule(path) : import(path);
   };
   let currentRouteHooks;
   let rhOutput = defaultRouteHookOutput;
@@ -79,7 +79,7 @@ const loadAndRunRouteHooks = async ({
         paths,
         reqMeta,
         previousOutput: rhOutput,
-        viteDevServer
+        viteSsrDevServer
       });
     } else {
       return rhOutput;