@cedarjs/vite 5.0.0 → 6.0.0-canary.2615

package/dist/cjs/plugins/vite-plugin-cedar-gqlorm-inject.js

@@ -0,0 +1,106 @@
+"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 vite_plugin_cedar_gqlorm_inject_exports = {};
+__export(vite_plugin_cedar_gqlorm_inject_exports, {
+  cedarGqlormInjectPlugin: () => cedarGqlormInjectPlugin
+});
+module.exports = __toCommonJS(vite_plugin_cedar_gqlorm_inject_exports);
+var import_node_fs = __toESM(require("node:fs"), 1);
+var import_node_path = __toESM(require("node:path"), 1);
+var import_project_config = require("@cedarjs/project-config");
+function cedarGqlormInjectPlugin() {
+  return {
+    name: "cedar-gqlorm-inject",
+    transform(code, id) {
+      if (!id.endsWith("/graphql.ts") && !id.endsWith("/graphql.js")) {
+        return null;
+      }
+      if (code.includes("__gqlorm_sdl__")) {
+        return null;
+      }
+      if (!code.includes("createGraphQLHandler")) {
+        return null;
+      }
+      let config;
+      try {
+        config = (0, import_project_config.getConfig)();
+      } catch {
+        return null;
+      }
+      if (!config.experimental?.gqlorm?.enabled) {
+        return null;
+      }
+      let paths;
+      try {
+        paths = (0, import_project_config.getPaths)();
+      } catch {
+        return null;
+      }
+      const backendPathWithoutExt = import_node_path.default.join(
+        paths.generated.base,
+        "gqlorm",
+        "backend"
+      );
+      if (!import_node_fs.default.existsSync(backendPathWithoutExt + ".ts")) {
+        return null;
+      }
+      const handlerPattern = /^export\s+const\s+(\w+)\s*=\s*createGraphQLHandler\s*\(/m;
+      const handlerMatch = handlerPattern.exec(code);
+      if (!handlerMatch) {
+        return null;
+      }
+      const handlerLineStart = code.lastIndexOf("\n", handlerMatch.index) + 1;
+      const relPath = (0, import_project_config.importStatementPath)(
+        import_node_path.default.relative(import_node_path.default.dirname(id), backendPathWithoutExt)
+      ) + ".ts";
+      const dbSrcPath = import_node_path.default.join(paths.api.src, "lib", "db");
+      const relDbPath = (0, import_project_config.importStatementPath)(import_node_path.default.relative(import_node_path.default.dirname(id), dbSrcPath)) + ".ts";
+      const importDb = `import { db as __gqlorm_db__ } from '${relDbPath}'`;
+      const importSdl = `import * as __gqlorm_sdl__ from '${relPath}'`;
+      const importsToAdd = `${importDb}
+${importSdl}
+`;
+      const sdlsMutation = `Object.assign(sdls, {
+    __gqlorm__: {
+      schema: __gqlorm_sdl__.schema,
+      resolvers: __gqlorm_sdl__.createGqlormResolvers(__gqlorm_db__),
+    },
+  })
+  `;
+      const transformed = importsToAdd + code.slice(0, handlerLineStart) + sdlsMutation + code.slice(handlerLineStart);
+      return {
+        code: transformed
+      };
+    }
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  cedarGqlormInjectPlugin
+});

package/dist/cjs/plugins/vite-plugin-cedar-graphql-options-extract.js

@@ -0,0 +1,113 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var vite_plugin_cedar_graphql_options_extract_exports = {};
+__export(vite_plugin_cedar_graphql_options_extract_exports, {
+  applyGraphqlOptionsExtract: () => applyGraphqlOptionsExtract,
+  cedarGraphqlOptionsExtractPlugin: () => cedarGraphqlOptionsExtractPlugin
+});
+module.exports = __toCommonJS(vite_plugin_cedar_graphql_options_extract_exports);
+var import_oxc_parser = require("oxc-parser");
+function cedarGraphqlOptionsExtractPlugin() {
+  return {
+    name: "cedar-graphql-options-extract",
+    transform(code, id) {
+      if (!id.endsWith("/graphql.ts") && !id.endsWith("/graphql.js")) {
+        return null;
+      }
+      if (!code.includes("createGraphQLHandler")) {
+        return null;
+      }
+      const transformed = applyGraphqlOptionsExtract(code);
+      if (!transformed || transformed === code) {
+        return null;
+      }
+      return {
+        code: transformed
+      };
+    }
+  };
+}
+function applyGraphqlOptionsExtract(code) {
+  if (code.includes("__cedar_graphqlOptions")) {
+    return null;
+  }
+  const { program } = (0, import_oxc_parser.parseSync)("graphql.ts", code, {
+    // lang is only a parse hint; 'ts' also parses JS (the graphql handler can
+    // be graphql.js in JS projects), so this is safe for both file types.
+    lang: "ts",
+    sourceType: "module"
+  });
+  const importNames = /* @__PURE__ */ new Set();
+  for (const node of program.body) {
+    if (node.type === "ImportDeclaration") {
+      if (node.source.value !== "@cedarjs/graphql-server") {
+        continue;
+      }
+      for (const specifier of node.specifiers) {
+        if (specifier.type === "ImportSpecifier" && specifier.imported.type === "Identifier" && specifier.imported.name === "createGraphQLHandler") {
+          importNames.add(specifier.local.name);
+        }
+      }
+    }
+  }
+  if (importNames.size === 0) {
+    return null;
+  }
+  const callExpressionPaths = [];
+  new import_oxc_parser.Visitor({
+    CallExpression(node) {
+      if (node.callee.type === "Identifier" && importNames.has(node.callee.name)) {
+        callExpressionPaths.push(node);
+      }
+    }
+  }).visit(program);
+  if (callExpressionPaths.length > 1) {
+    return null;
+  }
+  const callExpression = callExpressionPaths[0];
+  if (!callExpression) {
+    return null;
+  }
+  const options = callExpression.arguments[0];
+  if (!options) {
+    return null;
+  }
+  if (options.type !== "Identifier" && options.type !== "ObjectExpression" && options.type !== "CallExpression" && options.type !== "ConditionalExpression") {
+    return null;
+  }
+  const optionsStart = options.start;
+  const optionsEnd = options.end;
+  const lineStart = code.lastIndexOf("\n", callExpression.start) + 1;
+  const indentMatch = /^[ \t]*/.exec(code.slice(lineStart));
+  const indent = indentMatch ? indentMatch[0] : "";
+  const optionsConst = `${indent}export const __cedar_graphqlOptions = ${code.slice(
+    optionsStart,
+    optionsEnd
+  )}
+`;
+  const before = code.slice(0, lineStart);
+  const between = code.slice(lineStart, optionsStart);
+  const after = code.slice(optionsEnd);
+  return before + optionsConst + between + "__cedar_graphqlOptions" + after;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  applyGraphqlOptionsExtract,
+  cedarGraphqlOptionsExtractPlugin
+});

package/dist/cjs/plugins/vite-plugin-cedar-universal-deploy.js

@@ -329,7 +329,7 @@ async function generateFunctionModule(distPath) {
         const ctx = await buildCedarContext(request);
         // Wrap the handler in an AsyncLocalStorage run so the global
         // @cedarjs/context is available inside it (and isolated per request).
-        // Mirrors the GraphQL module above and the cedarContextWrappingPlugin
+        // Mirrors the GraphQL module above and the handlerAlsWrappingPlugin
         // used for non-UD builds.
         const { getAsyncStoreInstance } = await import(
           '@cedarjs/context/dist/store'

package/dist/cjs/plugins/{vite-plugin-cedar-context-wrapping.js → vite-plugin-handler-als-wrapping.js}

@@ -26,20 +26,20 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var vite_plugin_cedar_context_wrapping_exports = {};
-__export(vite_plugin_cedar_context_wrapping_exports, {
-  applyContextWrapping: () => applyContextWrapping,
-  cedarContextWrappingPlugin: () => cedarContextWrappingPlugin
+var vite_plugin_handler_als_wrapping_exports = {};
+__export(vite_plugin_handler_als_wrapping_exports, {
+  applyHandlerAlsWrapping: () => applyHandlerAlsWrapping,
+  handlerAlsWrappingPlugin: () => handlerAlsWrappingPlugin
 });
-module.exports = __toCommonJS(vite_plugin_cedar_context_wrapping_exports);
+module.exports = __toCommonJS(vite_plugin_handler_als_wrapping_exports);
 var import_node_path = __toESM(require("node:path"), 1);
 var import_vite = require("vite");
 var import_project_config = require("@cedarjs/project-config");
-function cedarContextWrappingPlugin({
+function handlerAlsWrappingPlugin({
   projectIsEsm = false
 } = {}) {
   return {
-    name: "cedar-context-wrapping",
+    name: "handler-als-wrapping",
     transform(code, id) {
       let paths;
       try {
@@ -51,12 +51,12 @@ function cedarContextWrappingPlugin({
       if (!(0, import_vite.normalizePath)(id).startsWith(functionsDir + "/")) {
         return null;
       }
-      const wrapped = applyContextWrapping(code, { projectIsEsm });
+      const wrapped = applyHandlerAlsWrapping(code, { projectIsEsm });
       return wrapped ? { code: wrapped, map: null } : null;
     }
   };
 }
-function applyContextWrapping(code, { projectIsEsm = false } = {}) {
+function applyHandlerAlsWrapping(code, { projectIsEsm = false } = {}) {
   const handlerRe = /^export\s+(?:const|let|var)\s+handler(?:[^=]|=>)*?=(?![>=])/m;
   const handlerMatch = handlerRe.exec(code);
   if (!handlerMatch) {
@@ -90,6 +90,6 @@ export const handler = ${isAsync ? "async " : ""}(__rw_event, __rw__context) =>
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  applyContextWrapping,
-  cedarContextWrappingPlugin
+  applyHandlerAlsWrapping,
+  handlerAlsWrappingPlugin
 });

package/dist/cjs/plugins/vite-plugin-rsc-ssr-router-import.js

@@ -44,8 +44,8 @@ function rscSsrRouterImport() {
   const routesFileId = (0, import_vite.normalizePath)((0, import_project_config.getPaths)().web.routes);
   return {
     name: "rsc-ssr-router-import",
-    transform: async function(code, id) {
-      if (id !== routesFileId) {
+    transform: async function(code, id, options) {
+      if (!options?.ssr || id !== routesFileId) {
         return null;
       }
       const ext = import_node_path.default.extname(id);

package/dist/cjs/plugins/vite-plugin-rsc-transform-server.js

@@ -41,6 +41,10 @@ function rscTransformUseServerPlugin(outDir, serverEntryFiles) {
       if (!code.includes("use server")) {
         return code;
       }
+      if (id.includes("node_modules/.vite") || id.includes("/react-server-dom-webpack/") || id.includes("/react-server-dom-webpack.server")) {
+        console.log("vite-plugin-rsc-transform-server.ts: Skipping", id);
+        return code;
+      }
       let mod;
       const isTypescript = id.endsWith(".ts") || id.endsWith(".tsx");
       try {

package/dist/cjs/rsc/rscRenderer.js

@@ -33,20 +33,28 @@ __export(rscRenderer_exports, {
 });
 module.exports = __toCommonJS(rscRenderer_exports);
 var import_node_path = __toESM(require("node:path"), 1);
-var import_react = require("react");
-var import_server = require("react-server-dom-webpack/server.edge");
 var import_project_config = require("@cedarjs/project-config");
 var import_entries = require("../lib/entries.js");
 var import_StatusError = require("../lib/StatusError.js");
+var import_utils = require("./utils.js");
 let absoluteClientEntries = {};
-function renderRscToStream(input) {
+async function renderRscToStream(input) {
   return input.rscId ? renderRsc(input) : executeRsa(input);
 }
 async function loadServerFile(filePath) {
   console.log("rscRenderer.ts loadServerFile filePath", filePath);
+  if (globalThis.__cedarjs__vite_rsc_runtime) {
+    const serverMod = await globalThis.__cedarjs__vite_rsc_runtime.import(filePath);
+    return serverMod.default ? serverMod.default : serverMod;
+  }
   return import(`file://${filePath}`);
 }
 const getRoutesComponent = async () => {
+  if (globalThis.__cedarjs__vite_rsc_runtime) {
+    const routesPath2 = (0, import_project_config.getPaths)().web.routes;
+    const routesMod = await globalThis.__cedarjs__vite_rsc_runtime.import(routesPath2);
+    return routesMod.default;
+  }
   const serverEntries = await (0, import_entries.getEntriesFromDist)();
   console.log("rscRenderer.ts serverEntries", serverEntries);
   const routesPath = import_node_path.default.join(
@@ -87,10 +95,12 @@ function getBundlerConfig() {
     {},
     {
       get(_target, encodedId) {
-        console.log("Proxy get encodedId", encodedId);
+        console.log("rscRenderer.ts Proxy get encodedId", encodedId);
         const [filePath, name] = encodedId.split("#");
+        console.log("filePath", filePath);
+        console.log("name", name);
         const filePathSlash = filePath.replaceAll("\\", "/");
-        const id = absoluteClientEntries[filePathSlash];
+        const id = globalThis.__cedarjs__vite_rsc_runtime ? filePath : absoluteClientEntries[filePathSlash];
         console.log("absoluteClientEntries", absoluteClientEntries);
         console.log("filePath", filePathSlash);
         if (!id) {
@@ -113,12 +123,14 @@ async function renderRsc(input) {
     throw new Error("Unexpected input. Missing rscId or props.");
   }
   console.log("renderRsc input", input);
+  const { createElement } = await (0, import_utils.importRscReact)();
+  const { renderToReadableStream } = await (0, import_utils.importRsdwServer)();
   const serverRoutes = await getRoutesComponent();
   const model = {
-    __cedarjs__Routes: (0, import_react.createElement)(serverRoutes)
+    __cedarjs__Routes: createElement(serverRoutes)
   };
   console.log("rscRenderer.ts renderRsc model", model);
-  return (0, import_server.renderToReadableStream)(model, getBundlerConfig());
+  return renderToReadableStream(model, getBundlerConfig());
 }
 function isSerializedFormData(data) {
   return !!data && data?.__formData__;
@@ -149,14 +161,16 @@ async function executeRsa(input) {
   console.log("rscRenderer.ts args", ...input.args);
   const data = await method(...input.args);
   console.log("rscRenderer.ts rsa return data", data);
+  const { createElement } = await (0, import_utils.importRscReact)();
+  const { renderToReadableStream } = await (0, import_utils.importRsdwServer)();
   const serverRoutes = await getRoutesComponent();
   console.log("rscRenderer.ts executeRsa serverRoutes", serverRoutes);
   const model = {
-    __cedarjs__Routes: (0, import_react.createElement)(serverRoutes),
+    __cedarjs__Routes: createElement(serverRoutes),
     __cedarjs__rsa_data: data
   };
   console.log("rscRenderer.ts executeRsa model", model);
-  return (0, import_server.renderToReadableStream)(model, getBundlerConfig());
+  return renderToReadableStream(model, getBundlerConfig());
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/rsc/rscRequestHandler.js

@@ -38,10 +38,10 @@ var import_busboy = __toESM(require("busboy"), 1);
 var import_react_server_dom_webpack_server = require("../bundled/react-server-dom-webpack.server.js");
 var import_StatusError = require("../lib/StatusError.js");
 var import_invokeMiddleware = require("../middleware/invokeMiddleware.js");
-var import_rscRenderer = require("./rscRenderer.js");
-var import_rscStudioHandlers = require("./rscStudioHandlers.js");
 const BASE_PATH = "/rw-rsc/";
-function createRscRequestHandler(options) {
+async function createRscRequestHandler(options) {
+  const { renderRscToStream } = await import("./rscRenderer.js");
+  const { sendRscFlightToStudio } = await import("./rscStudioHandlers.js");
   return async (req, res, next) => {
     console.log("BASE_PATH", BASE_PATH);
     console.log("req.originalUrl", req.originalUrl, "req.url", req.url);
@@ -56,7 +56,7 @@ function createRscRequestHandler(options) {
         matchedMw?.handler,
         {
           params: matchedMw?.params,
-          viteDevServer: options.viteDevServer
+          viteSsrDevServer: options.viteSsrDevServer
         }
       );
       const webRes = mwResponse.toResponse();
@@ -101,9 +101,9 @@ function createRscRequestHandler(options) {
         res.end(String(err));
       };
       try {
-        const readable = await (0, import_rscRenderer.renderRscToStream)({ rscId, rsaId, args });
+        const readable = await renderRscToStream({ rscId, rsaId, args });
         import_node_stream.Readable.fromWeb(readable).pipe(res);
-        await (0, import_rscStudioHandlers.sendRscFlightToStudio)({
+        await sendRscFlightToStudio({
           rscId,
           rsaId,
           args,

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;
   };