@cedarjs/router 6.0.0-canary.2851 → 6.0.0-rc.221

package/dist/rsc/RscCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RscCache.d.ts","sourceRoot":"","sources":["../../src/rsc/RscCache.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,QAAQ;IACvB,iBAAiB,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;IACvC,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B;AAED;;;;;;GAMG;AACH,qBAAa,QAAQ;IACnB,OAAO,CAAC,KAAK,CAAwC;IACrD,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,WAAW,CAAI;IAEvB,OAAO,CAAC,SAAS,CAAQ;;IAgDzB,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,SAAS;IAMhD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC;IA2B1C,OAAO,CAAC,eAAe;IAsBvB,OAAO,CAAC,qBAAqB;CAW9B"}
+{"version":3,"file":"RscCache.d.ts","sourceRoot":"","sources":["../../src/rsc/RscCache.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ;IACvB,iBAAiB,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;IACvC,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B;AAED;;;;;;GAMG;AACH,qBAAa,QAAQ;IACnB,OAAO,CAAC,KAAK,CAAwC;IACrD,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,WAAW,CAAI;IAEvB,OAAO,CAAC,SAAS,CAAQ;;IAgDzB,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,SAAS;IAMhD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC;IA2B1C,OAAO,CAAC,eAAe;IAsBvB,OAAO,CAAC,qBAAqB;CAW9B"}

package/dist/rsc/RscCache.js

@@ -1,13 +1,3 @@
-class DummyWS {
-  readyState = WebSocket?.OPEN;
-  addEventListener() {
-  }
-  send() {
-  }
-}
-if (typeof globalThis.WebSocket === "undefined") {
-  globalThis.WebSocket = DummyWS;
-}
 class RscCache {
   cache = /* @__PURE__ */ new Map();
   socket;
@@ -76,7 +66,7 @@ class RscCache {
     } else if (this.sendRetries >= 10) {
       console.error("Exhausted retries to send message to WebSocket server.");
     } else {
-      console.error("RscCache: WebSocket connection is closed.");
+      console.error("WebSocket connection is closed.");
     }
   }
   sendUpdateToWebSocket() {

package/dist/rsc/clientSsr.d.ts

@@ -1,9 +1,2 @@
-/**
- * Render the RW App's Routes.{tsx,jsx} component.
- * In production, this function will read the Routes component from the App's
- * dist directory.
- * During dev, this function will use Vite to load the Routes component from
- * the App's src directory.
- */
 export declare function renderRoutesSsr(pathname: string): Promise<any>;
 //# sourceMappingURL=clientSsr.d.ts.map

package/dist/rsc/clientSsr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clientSsr.d.ts","sourceRoot":"","sources":["../../src/rsc/clientSsr.ts"],"names":[],"mappings":"AA2FA;;;;;;GAMG;AACH,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,gBA0GrD"}
+{"version":3,"file":"clientSsr.d.ts","sourceRoot":"","sources":["../../src/rsc/clientSsr.ts"],"names":[],"mappings":"AAuEA,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,gBA2DrD"}

package/dist/rsc/clientSsr.js

@@ -1,29 +1,14 @@
 import path from "node:path";
-import { pathToFileURL } from "node:url";
 import { getPaths } from "@cedarjs/project-config";
 import { moduleMap } from "./ssrModuleMap.js";
-import { importRsdwClient, importReact, importRsdwServer } from "./utils.js";
+import { importRsdwClient, importRsdwServer, importReact } from "./utils.js";
 import { makeFilePath } from "./utils.js";
 async function getEntries() {
-  if (globalThis.__cedarjs__vite_ssr_runtime) {
-    return {
-      serverEntries: {
-        __cedarjs__Routes: "../../src/Routes.tsx"
-      },
-      ssrEntries: {}
-    };
-  }
   const entriesPath = getPaths().web.distRscEntries;
   const entries = await import(makeFilePath(entriesPath));
   return entries;
 }
 async function getRoutesComponent() {
-  if (globalThis.__cedarjs__vite_rsc_runtime) {
-    const routesMod = await globalThis.__cedarjs__vite_rsc_runtime.import(
-      getPaths().web.routes
-    );
-    return routesMod.default;
-  }
   const { serverEntries } = await getEntries();
   const entryPath = path.join(
     getPaths().web.distRsc,
@@ -73,52 +58,19 @@ async function renderRoutesSsr(pathname) {
       get(_target, encodedId) {
         console.log("Proxy get encodedId", encodedId);
         const [filePath, name] = encodedId.split("#");
-        const id = globalThis.__cedarjs__vite_ssr_runtime ? filePath : resolveClientEntryForProd(filePath, clientEntries);
+        const id = resolveClientEntryForProd(filePath, clientEntries);
         console.log("clientSsr.ts::Proxy id", id);
         return { id, chunks: [id], name, async: true };
       }
     }
   );
-  const serverModuleMap = new Proxy(
-    {},
-    {
-      get(_target, encodedId) {
-        console.log("serverModuleMap Proxy get encodedId", encodedId);
-        const [filePath, name] = encodedId.split("#");
-        const id = pathToFileURL(filePath).href;
-        console.log("serverModuleMap::Proxy id", id);
-        return { id, chunks: [id], name, async: true };
-      }
-    }
-  );
   const { createElement } = await importReact();
   const { renderToReadableStream } = await importRsdwServer();
   console.log("clientSsr.ts right before renderToReadableStream");
-  const originalStream = renderToReadableStream(
-    createElement(Routes),
-    bundlerConfig
-  );
-  const [streamForLogging, streamForRendering] = originalStream.tee();
-  (async () => {
-    const reader = streamForLogging.getReader();
-    const decoder = new TextDecoder();
-    let logContent = "";
-    while (true) {
-      const { done, value } = await reader.read();
-      if (done) {
-        break;
-      }
-      logContent += decoder.decode(value, { stream: true });
-    }
-    console.log("Stream content:", logContent);
-  })();
+  const stream = renderToReadableStream(createElement(Routes), bundlerConfig);
   const { createFromReadableStream } = await importRsdwClient();
-  const data = createFromReadableStream(streamForRendering, {
-    serverConsumerManifest: {
-      moduleMap,
-      serverModuleMap,
-      moduleLoading: null
-    }
+  const data = createFromReadableStream(stream, {
+    ssrManifest: { moduleMap, moduleLoading: null }
   });
   rscCache.set(pathname, data);
   return data;

package/dist/rsc/utils.d.ts

@@ -6,15 +6,15 @@ export declare function makeFilePath(path: string): string;
 /**
  * See vite/streamHelpers.ts.
  *
- * This function ensures we load the bundled version of React to prevent
+ * This function ensures we load the same version of rsdw_client to prevent
  * multiple instances of React
  */
 export declare function importReact(): Promise<any>;
 /**
  * See vite/streamHelpers.ts.
  *
- * This function ensures we load the same version of rsdw_client everywhere to
- * prevent multiple instances of React
+ * This function ensures we load the same version of rsdw_client to prevent
+ * multiple instances of React
  */
 export declare function importRsdwClient(): Promise<RSDWClientType>;
 export declare function importRsdwServer(): Promise<RSDWServerType>;

package/dist/rsc/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/rsc/utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AACvF,OAAO,KAAK,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AAIvF,KAAK,cAAc,GAAG,OAAO,gBAAgB,CAAA;AAC7C,KAAK,cAAc,GAAG,OAAO,gBAAgB,CAAA;AAE7C,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,UAExC;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,iBAUhC;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,cAAc,CAAC,CAYhE;AAED,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,cAAc,CAAC,CAmBhE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/rsc/utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AACvF,OAAO,KAAK,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AAIvF,KAAK,cAAc,GAAG,OAAO,gBAAgB,CAAA;AAC7C,KAAK,cAAc,GAAG,OAAO,gBAAgB,CAAA;AAE7C,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,UAExC;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,iBAKhC;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,cAAc,CAAC,CAOhE;AAED,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,cAAc,CAAC,CAWhE"}

package/dist/rsc/utils.js

@@ -5,19 +5,11 @@ function makeFilePath(path2) {
   return pathToFileURL(path2).href;
 }
 async function importReact() {
-  if (globalThis.__cedarjs__vite_ssr_runtime) {
-    const reactMod = await import("react");
-    return reactMod.default;
-  }
   const distSsr = getPaths().web.distSsr;
   const reactPath = makeFilePath(path.join(distSsr, "__cedarjs__react.mjs"));
   return (await import(reactPath)).default;
 }
 async function importRsdwClient() {
-  if (globalThis.__cedarjs__vite_ssr_runtime) {
-    const rsdwcMod = await import("react-server-dom-webpack/client.edge");
-    return rsdwcMod.default;
-  }
   const distSsr = getPaths().web.distSsr;
   const rsdwClientPath = makeFilePath(
     path.join(distSsr, "__cedarjs__rsdw-client.mjs")
@@ -25,18 +17,11 @@ async function importRsdwClient() {
   return (await import(rsdwClientPath)).default;
 }
 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 {
-    const dynamicImport = "";
-    return import(
-      /* @vite-ignore */
-      dynamicImport + "react-server-dom-webpack/server.edge"
-    );
-  }
+  const dynamicImport = "";
+  return import(
+    /* @vite-ignore */
+    dynamicImport + "react-server-dom-webpack/server.edge"
+  );
 }
 export {
   importReact,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/router",
-  "version": "6.0.0-canary.2851",
+  "version": "6.0.0-rc.221",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -52,17 +52,16 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/project-config": "6.0.0-canary.2851",
-    "@cedarjs/server-store": "6.0.0-canary.2851",
-    "react": "19.2.3",
-    "react-dom": "19.2.3",
-    "react-server-dom-webpack": "19.2.7",
+    "@cedarjs/project-config": "6.0.0-rc.221",
+    "@cedarjs/server-store": "6.0.0-rc.221",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "ts-toolbelt": "9.6.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.5",
-    "@cedarjs/auth": "6.0.0-canary.2851",
-    "@cedarjs/framework-tools": "6.0.0-canary.2851",
+    "@cedarjs/auth": "6.0.0-rc.221",
+    "@cedarjs/framework-tools": "6.0.0-rc.221",
     "@testing-library/jest-dom": "6.9.1",
     "@types/react": "^18.2.55",
     "@types/react-dom": "^18.2.19",
@@ -74,9 +73,9 @@
     "vitest": "4.1.10"
   },
   "peerDependencies": {
-    "@cedarjs/auth": "6.0.0-canary.2851",
-    "react": "19.2.3",
-    "react-dom": "19.2.3"
+    "@cedarjs/auth": "6.0.0-rc.221",
+    "react": "18.3.1",
+    "react-dom": "18.3.1"
   },
   "engines": {
     "node": ">=24"