@cedarjs/vite 2.8.1-next.0 → 2.8.1-next.109

package/dist/cjs/lib/entries.js

@@ -27,8 +27,7 @@ var import_dist = require("@cedarjs/structure/dist/index.js");
 var import_utils = require("../utils.js");
 function getEntries() {
   const entries = {};
-  const rwProject = (0, import_dist.getProject)((0, import_project_config.getPaths)().base);
-  const routes = rwProject.getRouter().routes;
+  const routes = (0, import_dist.getProject)().getRouter().routes;
   const pages = routes.map((route) => route.page);
   for (const page of pages) {
     entries[page.constName] = (0, import_project_config.ensurePosixPath)((0, import_project_config.importStatementPath)(page.path));
@@ -37,8 +36,8 @@ function getEntries() {
   if (!serverEntry) {
     throw new Error("Server Entry file not found");
   }
-  entries["__rwjs__ServerEntry"] = serverEntry;
-  entries["__rwjs__Routes"] = (0, import_project_config.getPaths)().web.routes;
+  entries["__cedarjs__ServerEntry"] = serverEntry;
+  entries["__cedarjs__Routes"] = (0, import_project_config.getPaths)().web.routes;
   return entries;
 }
 async function getEntriesFromDist() {

package/dist/cjs/lib/registerFwGlobalsAndShims.js

@@ -21,7 +21,9 @@ __export(registerFwGlobalsAndShims_exports, {
   registerFwGlobalsAndShims: () => registerFwGlobalsAndShims
 });
 module.exports = __toCommonJS(registerFwGlobalsAndShims_exports);
+var import_node_module = require("node:module");
 var import_project_config = require("@cedarjs/project-config");
+const import_meta = {};
 const registerFwGlobalsAndShims = () => {
   registerFwGlobals();
   registerFwShims();
@@ -89,6 +91,7 @@ function registerFwShims() {
     console.log("registerFwShims require id", id);
     return globalThis.__rw_module_cache__.get(id);
   };
+  globalThis.__non_webpack_require__ ||= (0, import_node_module.createRequire)(import_meta.url);
 }
 function swapLocalhostFor127(hostString) {
   return hostString.replace("localhost", "127.0.0.1");

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

@@ -306,7 +306,7 @@ function babelPluginTransformServerAction({
                   if (!name) {
                     throw new Error("Server action must have a name");
                   }
-                  const uniqueName = `__rwjs__rsa${serverActionNodes.length}_${name}`;
+                  const uniqueName = `__cedarjs__rsa${serverActionNodes.length}_${name}`;
                   serverActionNode.id = t.identifier(uniqueName);
                   serverActionNodes.push(serverActionNode);
                   init.body.body[serverActionNodeIndex] = t.variableDeclaration(
@@ -350,7 +350,7 @@ function babelPluginTransformServerAction({
                 if (!name) {
                   throw new Error("Server action must have a name");
                 }
-                const uniqueName = `__rwjs__rsa${serverActionNodes.length}_${name}`;
+                const uniqueName = `__cedarjs__rsa${serverActionNodes.length}_${name}`;
                 serverActionNode.id = t.identifier(uniqueName);
                 serverActionNodes.push(serverActionNode);
                 body.body[serverActionNodeIndex] = t.variableDeclaration(

package/dist/cjs/rsc/rscBuildAnalyze.js

@@ -60,8 +60,10 @@ async function rscBuildAnalyze() {
       // it means we can skip analyzing them, which means faster build times.
       external: [
         "@prisma/client",
+        "@prisma/adapter-better-sqlite3",
         "@prisma/fetch-engine",
         "@prisma/internals",
+        "better-sqlite3",
         "@cedarjs/auth-dbauth-api",
         "@cedarjs/cookie-jar",
         "@cedarjs/server-store",

package/dist/cjs/rsc/rscBuildClient.js

@@ -51,7 +51,7 @@ async function rscBuildClient(clientEntryFiles) {
         input: {
           // @MARK: temporary hack to find the entry client so we can get the
           // index.css bundle but we don't actually want this on an rsc page!
-          __rwjs__client_entry: rwPaths.web.entryClient,
+          __cedarjs__client_entry: rwPaths.web.entryClient,
           // we need this, so that the output contains rsc-specific bundles
           // for the client-only components. They get loaded once the page is
           // rendered

package/dist/cjs/rsc/rscBuildEntriesFile.js

@@ -89,8 +89,8 @@ export const ssrEntries = ${JSON.stringify(ssrEntries, void 0, 2)};
   );
   const serverEntries = {};
   const entries = {
-    __rwjs__ServerEntry: (0, import_project_config.getPaths)().web.entryServer || "",
-    __rwjs__Routes: (0, import_project_config.getPaths)().web.routes
+    __cedarjs__ServerEntry: (0, import_project_config.getPaths)().web.entryServer || "",
+    __cedarjs__Routes: (0, import_project_config.getPaths)().web.routes
   };
   for (const [name, sourceFile] of Object.entries(entries)) {
     const buildOutputItem = serverBuildOutput.find((item) => {

package/dist/cjs/rsc/rscBuildForServer.js

@@ -62,8 +62,10 @@ async function rscBuildForServer(clientEntryFiles, serverEntryFiles, customModul
       // Server store has to be externalized, because it's a singleton (shared between FW and App)
       external: [
         "@prisma/client",
+        "@prisma/adapter-better-sqlite3",
         "@prisma/fetch-engine",
         "@prisma/internals",
+        "better-sqlite3",
         "@cedarjs/auth-dbauth-api",
         "@cedarjs/cookie-jar",
         "@cedarjs/server-store",

package/dist/cjs/rsc/rscBuildForSsr.js

@@ -67,8 +67,10 @@ async function rscBuildForSsr({
       noExternal: true,
       external: [
         "@prisma/client",
+        "@prisma/adapter-better-sqlite3",
         "@prisma/fetch-engine",
         "@prisma/internals",
+        "better-sqlite3",
         "@cedarjs/auth-dbauth-api",
         "@cedarjs/cookie-jar",
         "@cedarjs/server-store",
@@ -105,19 +107,19 @@ async function rscBuildForSsr({
           // index.css bundle but we don't actually want this on an rsc page!
           // TODO (RSC): Look into if we can remove this (and perhaps instead
           // use entry.server)
-          __rwjs__client_entry: rwPaths.web.entryClient,
+          __cedarjs__client_entry: rwPaths.web.entryClient,
           "entry.server": rwPaths.web.entryServer,
           // we need this, so that the output contains rsc-specific bundles
           // for the client-only components. They get loaded once the page is
           // rendered
           ...clientEntryFiles,
           // These import redirections are so that we don't bundle multiple versions of react
-          __rwjs__react: "react",
-          __rwjs__location: "@cedarjs/router/location",
-          __rwjs__server_auth_provider: "@cedarjs/auth/ServerAuthProvider",
-          __rwjs__server_inject: "@cedarjs/web/serverInject",
-          "__rwjs__rsdw-client": "react-server-dom-webpack/client.edge",
-          // TODO (RSC): add __rwjs__ prefix to the entry below
+          __cedarjs__react: "react",
+          __cedarjs__location: "@cedarjs/router/location",
+          __cedarjs__server_auth_provider: "@cedarjs/auth/ServerAuthProvider",
+          __cedarjs__server_inject: "@cedarjs/web/serverInject",
+          "__cedarjs__rsdw-client": "react-server-dom-webpack/client.edge",
+          // TODO (RSC): add __cedarjs__ prefix to the entry below
           "rd-server": "react-dom/server.edge",
           // We need the document for React's fallback
           Document: rwPaths.web.document
@@ -132,7 +134,7 @@ async function rscBuildForSsr({
           // is resolved
           hoistTransitiveImports: false,
           entryFileNames: (chunkInfo) => {
-            if (chunkInfo.name === "rd-server" || chunkInfo.name === "__rwjs__react" || chunkInfo.name === "__rwjs__location" || chunkInfo.name === "__rwjs__server_auth_provider" || chunkInfo.name === "__rwjs__server_inject" || chunkInfo.name === "__rwjs__rsdw-client" || chunkInfo.name === "entry.server" || chunkInfo.name === "Document") {
+            if (chunkInfo.name === "rd-server" || chunkInfo.name === "__cedarjs__react" || chunkInfo.name === "__cedarjs__location" || chunkInfo.name === "__cedarjs__server_auth_provider" || chunkInfo.name === "__cedarjs__server_inject" || chunkInfo.name === "__cedarjs__rsdw-client" || chunkInfo.name === "entry.server" || chunkInfo.name === "Document") {
               return "[name].mjs";
             }
             return "assets/[name]-[hash].mjs";

package/dist/cjs/rsc/rscRenderer.js

@@ -51,10 +51,10 @@ const getRoutesComponent = async () => {
   console.log("rscRenderer.ts serverEntries", serverEntries);
   const routesPath = import_node_path.default.join(
     (0, import_project_config.getPaths)().web.distRsc,
-    serverEntries["__rwjs__Routes"]
+    serverEntries["__cedarjs__Routes"]
   );
   if (!routesPath) {
-    throw new import_StatusError.StatusError("No entry found for __rwjs__Routes", 404);
+    throw new import_StatusError.StatusError("No entry found for __cedarjs__Routes", 404);
   }
   const routes = await loadServerFile(routesPath);
   return routes.default;
@@ -115,7 +115,7 @@ async function renderRsc(input) {
   console.log("renderRsc input", input);
   const serverRoutes = await getRoutesComponent();
   const model = {
-    __rwjs__Routes: (0, import_react.createElement)(serverRoutes)
+    __cedarjs__Routes: (0, import_react.createElement)(serverRoutes)
   };
   console.log("rscRenderer.ts renderRsc model", model);
   return (0, import_server.renderToReadableStream)(model, getBundlerConfig());
@@ -152,8 +152,8 @@ async function executeRsa(input) {
   const serverRoutes = await getRoutesComponent();
   console.log("rscRenderer.ts executeRsa serverRoutes", serverRoutes);
   const model = {
-    __rwjs__Routes: (0, import_react.createElement)(serverRoutes),
-    __rwjs__rsa_data: data
+    __cedarjs__Routes: (0, import_react.createElement)(serverRoutes),
+    __cedarjs__rsa_data: data
   };
   console.log("rscRenderer.ts executeRsa model", model);
   return (0, import_server.renderToReadableStream)(model, getBundlerConfig());

package/dist/cjs/streaming/streamHelpers.js

@@ -84,12 +84,12 @@ async function reactRenderToStreamResponse(mwRes, renderOptions, streamOptions)
     meta: metaTags
   });
   const rscEnabled = (0, import_project_config.getConfig)().experimental?.rsc?.enabled;
-  const { createElement } = rscEnabled ? await importModule("__rwjs__react") : await import("react");
+  const { createElement } = rscEnabled ? await importModule("__cedarjs__react") : await import("react");
   const {
     createInjector,
     ServerHtmlProvider,
     ServerInjectedHtml
-  } = rscEnabled ? await importModule("__rwjs__server_inject") : await import("@cedarjs/web/serverInject");
+  } = rscEnabled ? await importModule("__cedarjs__server_inject") : await import("@cedarjs/web/serverInject");
   const { renderToString } = rscEnabled ? await importModule("rd-server") : await import("react-dom/server");
   const { injectionState, injectToPage } = createInjector();
   const bufferTransform = (0, import_bufferedTransform.createBufferedTransformStream)();
@@ -105,8 +105,8 @@ async function reactRenderToStreamResponse(mwRes, renderOptions, streamOptions)
     controller.abort();
   }, 1e4);
   const timeoutTransform = (0, import_cancelTimeoutTransform.createTimeoutTransform)(timeoutHandle);
-  const { ServerAuthProvider } = rscEnabled ? await importModule("__rwjs__server_auth_provider") : await import("@cedarjs/auth/dist/AuthProvider/ServerAuthProvider.js");
-  const { LocationProvider } = rscEnabled ? await importModule("__rwjs__location") : await import("@cedarjs/router/location");
+  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 renderRoot = (url) => {
     return createElement(
       ServerAuthProvider,
@@ -200,23 +200,25 @@ function applyStreamTransforms(reactStream, transformsToApply) {
 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, "__rwjs__react.mjs"));
-  const locationPath = (0, import_utils.makeFilePath)(import_node_path.default.join(distSsr, "__rwjs__location.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, "__rwjs__server_auth_provider.mjs")
+    import_node_path.default.join(distSsr, "__cedarjs__server_auth_provider.mjs")
   );
   const ServerInjectPath = (0, import_utils.makeFilePath)(
-    import_node_path.default.join(distSsr, "__rwjs__server_inject.mjs")
+    import_node_path.default.join(distSsr, "__cedarjs__server_inject.mjs")
   );
   if (mod === "rd-server") {
     return (await import(rdServerPath)).default;
-  } else if (mod === "__rwjs__react") {
+  } else if (mod === "__cedarjs__react") {
     return (await import(reactPath)).default;
-  } else if (mod === "__rwjs__location") {
+  } else if (mod === "__cedarjs__location") {
     return await import(locationPath);
-  } else if (mod === "__rwjs__server_auth_provider") {
+  } else if (mod === "__cedarjs__server_auth_provider") {
     return await import(ServerAuthProviderPath);
-  } else if (mod === "__rwjs__server_inject") {
+  } else if (mod === "__cedarjs__server_inject") {
     return await import(ServerInjectPath);
   }
   throw new Error("Unknown module " + mod);

package/dist/cjs/utils.js

@@ -72,8 +72,8 @@ function convertExpressHeaders(expressDistinctHeaders) {
 const getFullUrl = (req, rscEnabled) => {
   const baseUrl = req.protocol + "://" + req.headers.host;
   const url = new URL(req.originalUrl || "", baseUrl);
-  const pathname = url.searchParams.get("__rwjs__pathname");
-  const search = url.searchParams.get("__rwjs__search");
+  const pathname = url.searchParams.get("__cedarjs__pathname");
+  const search = url.searchParams.get("__cedarjs__search");
   let pathnamePlusSearch = req.originalUrl;
   if (rscEnabled && pathname !== null && search !== null) {
     pathnamePlusSearch = pathname + "?" + search;

package/dist/lib/entries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entries.d.ts","sourceRoot":"","sources":["../../src/lib/entries.ts"],"names":[],"mappings":"AAWA,wBAAgB,UAAU,2BA0BzB;AAED,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAI1E"}
+{"version":3,"file":"entries.d.ts","sourceRoot":"","sources":["../../src/lib/entries.ts"],"names":[],"mappings":"AAWA,wBAAgB,UAAU,2BAyBzB;AAED,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAI1E"}

package/dist/lib/entries.js

@@ -7,8 +7,7 @@ import { getProject } from "@cedarjs/structure/dist/index.js";
 import { makeFilePath } from "../utils.js";
 function getEntries() {
   const entries = {};
-  const rwProject = getProject(getPaths().base);
-  const routes = rwProject.getRouter().routes;
+  const routes = getProject().getRouter().routes;
   const pages = routes.map((route) => route.page);
   for (const page of pages) {
     entries[page.constName] = ensurePosixPath(importStatementPath(page.path));
@@ -17,8 +16,8 @@ function getEntries() {
   if (!serverEntry) {
     throw new Error("Server Entry file not found");
   }
-  entries["__rwjs__ServerEntry"] = serverEntry;
-  entries["__rwjs__Routes"] = getPaths().web.routes;
+  entries["__cedarjs__ServerEntry"] = serverEntry;
+  entries["__cedarjs__Routes"] = getPaths().web.routes;
   return entries;
 }
 async function getEntriesFromDist() {

package/dist/lib/registerFwGlobalsAndShims.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registerFwGlobalsAndShims.d.ts","sourceRoot":"","sources":["../../src/lib/registerFwGlobalsAndShims.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AACH,eAAO,MAAM,yBAAyB,YAGrC,CAAA"}
+{"version":3,"file":"registerFwGlobalsAndShims.d.ts","sourceRoot":"","sources":["../../src/lib/registerFwGlobalsAndShims.ts"],"names":[],"mappings":"AAIA;;;;;;;;;GASG;AACH,eAAO,MAAM,yBAAyB,YAGrC,CAAA"}

package/dist/lib/registerFwGlobalsAndShims.js

@@ -1,3 +1,4 @@
+import { createRequire } from "node:module";
 import { getConfig, getEnvVarDefinitions } from "@cedarjs/project-config";
 const registerFwGlobalsAndShims = () => {
   registerFwGlobals();
@@ -66,6 +67,7 @@ function registerFwShims() {
     console.log("registerFwShims require id", id);
     return globalThis.__rw_module_cache__.get(id);
   };
+  globalThis.__non_webpack_require__ ||= createRequire(import.meta.url);
 }
 function swapLocalhostFor127(hostString) {
   return hostString.replace("localhost", "127.0.0.1");

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

@@ -273,7 +273,7 @@ function babelPluginTransformServerAction({
                   if (!name) {
                     throw new Error("Server action must have a name");
                   }
-                  const uniqueName = `__rwjs__rsa${serverActionNodes.length}_${name}`;
+                  const uniqueName = `__cedarjs__rsa${serverActionNodes.length}_${name}`;
                   serverActionNode.id = t.identifier(uniqueName);
                   serverActionNodes.push(serverActionNode);
                   init.body.body[serverActionNodeIndex] = t.variableDeclaration(
@@ -317,7 +317,7 @@ function babelPluginTransformServerAction({
                 if (!name) {
                   throw new Error("Server action must have a name");
                 }
-                const uniqueName = `__rwjs__rsa${serverActionNodes.length}_${name}`;
+                const uniqueName = `__cedarjs__rsa${serverActionNodes.length}_${name}`;
                 serverActionNode.id = t.identifier(uniqueName);
                 serverActionNodes.push(serverActionNode);
                 body.body[serverActionNodeIndex] = t.variableDeclaration(

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

@@ -1 +1 @@
-{"version":3,"file":"rscBuildAnalyze.d.ts","sourceRoot":"","sources":["../../src/rsc/rscBuildAnalyze.ts"],"names":[],"mappings":"AAQA;;;;;;GAMG;AACH,wBAAsB,eAAe;;;;;;;GAgGpC"}
+{"version":3,"file":"rscBuildAnalyze.d.ts","sourceRoot":"","sources":["../../src/rsc/rscBuildAnalyze.ts"],"names":[],"mappings":"AAQA;;;;;;GAMG;AACH,wBAAsB,eAAe;;;;;;;GAkGpC"}

package/dist/rsc/rscBuildAnalyze.js

@@ -37,8 +37,10 @@ async function rscBuildAnalyze() {
       // it means we can skip analyzing them, which means faster build times.
       external: [
         "@prisma/client",
+        "@prisma/adapter-better-sqlite3",
         "@prisma/fetch-engine",
         "@prisma/internals",
+        "better-sqlite3",
         "@cedarjs/auth-dbauth-api",
         "@cedarjs/cookie-jar",
         "@cedarjs/server-store",

package/dist/rsc/rscBuildClient.js

@@ -28,7 +28,7 @@ async function rscBuildClient(clientEntryFiles) {
         input: {
           // @MARK: temporary hack to find the entry client so we can get the
           // index.css bundle but we don't actually want this on an rsc page!
-          __rwjs__client_entry: rwPaths.web.entryClient,
+          __cedarjs__client_entry: rwPaths.web.entryClient,
           // we need this, so that the output contains rsc-specific bundles
           // for the client-only components. They get loaded once the page is
           // rendered

package/dist/rsc/rscBuildEntriesFile.js

@@ -56,8 +56,8 @@ export const ssrEntries = ${JSON.stringify(ssrEntries, void 0, 2)};
   );
   const serverEntries = {};
   const entries = {
-    __rwjs__ServerEntry: getPaths().web.entryServer || "",
-    __rwjs__Routes: getPaths().web.routes
+    __cedarjs__ServerEntry: getPaths().web.entryServer || "",
+    __cedarjs__Routes: getPaths().web.routes
   };
   for (const [name, sourceFile] of Object.entries(entries)) {
     const buildOutputItem = serverBuildOutput.find((item) => {

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

@@ -1 +1 @@
-{"version":3,"file":"rscBuildForServer.d.ts","sourceRoot":"","sources":["../../src/rsc/rscBuildForServer.ts"],"names":[],"mappings":"AAUA;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACxC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACxC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,+GAyItC"}
+{"version":3,"file":"rscBuildForServer.d.ts","sourceRoot":"","sources":["../../src/rsc/rscBuildForServer.ts"],"names":[],"mappings":"AAUA;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACxC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACxC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,+GA2ItC"}

package/dist/rsc/rscBuildForServer.js

@@ -39,8 +39,10 @@ async function rscBuildForServer(clientEntryFiles, serverEntryFiles, customModul
       // Server store has to be externalized, because it's a singleton (shared between FW and App)
       external: [
         "@prisma/client",
+        "@prisma/adapter-better-sqlite3",
         "@prisma/fetch-engine",
         "@prisma/internals",
+        "better-sqlite3",
         "@cedarjs/auth-dbauth-api",
         "@cedarjs/cookie-jar",
         "@cedarjs/server-store",

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

@@ -1 +1 @@
-{"version":3,"file":"rscBuildForSsr.d.ts","sourceRoot":"","sources":["../../src/rsc/rscBuildForSsr.ts"],"names":[],"mappings":"AAWA;;;GAGG;AACH,wBAAsB,cAAc,CAAC,EACnC,gBAAgB,EAChB,OAAe,GAChB,EAAE;IACD,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACxC,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,+GA2IA"}
+{"version":3,"file":"rscBuildForSsr.d.ts","sourceRoot":"","sources":["../../src/rsc/rscBuildForSsr.ts"],"names":[],"mappings":"AAWA;;;GAGG;AACH,wBAAsB,cAAc,CAAC,EACnC,gBAAgB,EAChB,OAAe,GAChB,EAAE;IACD,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACxC,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,+GA6IA"}

package/dist/rsc/rscBuildForSsr.js

@@ -34,8 +34,10 @@ async function rscBuildForSsr({
       noExternal: true,
       external: [
         "@prisma/client",
+        "@prisma/adapter-better-sqlite3",
         "@prisma/fetch-engine",
         "@prisma/internals",
+        "better-sqlite3",
         "@cedarjs/auth-dbauth-api",
         "@cedarjs/cookie-jar",
         "@cedarjs/server-store",
@@ -72,19 +74,19 @@ async function rscBuildForSsr({
           // index.css bundle but we don't actually want this on an rsc page!
           // TODO (RSC): Look into if we can remove this (and perhaps instead
           // use entry.server)
-          __rwjs__client_entry: rwPaths.web.entryClient,
+          __cedarjs__client_entry: rwPaths.web.entryClient,
           "entry.server": rwPaths.web.entryServer,
           // we need this, so that the output contains rsc-specific bundles
           // for the client-only components. They get loaded once the page is
           // rendered
           ...clientEntryFiles,
           // These import redirections are so that we don't bundle multiple versions of react
-          __rwjs__react: "react",
-          __rwjs__location: "@cedarjs/router/location",
-          __rwjs__server_auth_provider: "@cedarjs/auth/ServerAuthProvider",
-          __rwjs__server_inject: "@cedarjs/web/serverInject",
-          "__rwjs__rsdw-client": "react-server-dom-webpack/client.edge",
-          // TODO (RSC): add __rwjs__ prefix to the entry below
+          __cedarjs__react: "react",
+          __cedarjs__location: "@cedarjs/router/location",
+          __cedarjs__server_auth_provider: "@cedarjs/auth/ServerAuthProvider",
+          __cedarjs__server_inject: "@cedarjs/web/serverInject",
+          "__cedarjs__rsdw-client": "react-server-dom-webpack/client.edge",
+          // TODO (RSC): add __cedarjs__ prefix to the entry below
           "rd-server": "react-dom/server.edge",
           // We need the document for React's fallback
           Document: rwPaths.web.document
@@ -99,7 +101,7 @@ async function rscBuildForSsr({
           // is resolved
           hoistTransitiveImports: false,
           entryFileNames: (chunkInfo) => {
-            if (chunkInfo.name === "rd-server" || chunkInfo.name === "__rwjs__react" || chunkInfo.name === "__rwjs__location" || chunkInfo.name === "__rwjs__server_auth_provider" || chunkInfo.name === "__rwjs__server_inject" || chunkInfo.name === "__rwjs__rsdw-client" || chunkInfo.name === "entry.server" || chunkInfo.name === "Document") {
+            if (chunkInfo.name === "rd-server" || chunkInfo.name === "__cedarjs__react" || chunkInfo.name === "__cedarjs__location" || chunkInfo.name === "__cedarjs__server_auth_provider" || chunkInfo.name === "__cedarjs__server_inject" || chunkInfo.name === "__cedarjs__rsdw-client" || chunkInfo.name === "entry.server" || chunkInfo.name === "Document") {
               return "[name].mjs";
             }
             return "assets/[name]-[hash].mjs";

package/dist/rsc/rscRenderer.js

@@ -17,10 +17,10 @@ const getRoutesComponent = async () => {
   console.log("rscRenderer.ts serverEntries", serverEntries);
   const routesPath = path.join(
     getPaths().web.distRsc,
-    serverEntries["__rwjs__Routes"]
+    serverEntries["__cedarjs__Routes"]
   );
   if (!routesPath) {
-    throw new StatusError("No entry found for __rwjs__Routes", 404);
+    throw new StatusError("No entry found for __cedarjs__Routes", 404);
   }
   const routes = await loadServerFile(routesPath);
   return routes.default;
@@ -81,7 +81,7 @@ async function renderRsc(input) {
   console.log("renderRsc input", input);
   const serverRoutes = await getRoutesComponent();
   const model = {
-    __rwjs__Routes: createElement(serverRoutes)
+    __cedarjs__Routes: createElement(serverRoutes)
   };
   console.log("rscRenderer.ts renderRsc model", model);
   return renderToReadableStream(model, getBundlerConfig());
@@ -118,8 +118,8 @@ async function executeRsa(input) {
   const serverRoutes = await getRoutesComponent();
   console.log("rscRenderer.ts executeRsa serverRoutes", serverRoutes);
   const model = {
-    __rwjs__Routes: createElement(serverRoutes),
-    __rwjs__rsa_data: data
+    __cedarjs__Routes: createElement(serverRoutes),
+    __cedarjs__rsa_data: data
   };
   console.log("rscRenderer.ts executeRsa model", model);
   return renderToReadableStream(model, getBundlerConfig());

package/dist/streaming/streamHelpers.d.ts

@@ -18,6 +18,6 @@ interface StreamOptions {
     onError?: (err: Error) => void;
 }
 export declare function reactRenderToStreamResponse(mwRes: MiddlewareResponse, renderOptions: RenderToStreamArgs, streamOptions: StreamOptions): Promise<Response>;
-export declare function importModule(mod: 'rd-server' | '__rwjs__react' | '__rwjs__location' | '__rwjs__server_auth_provider' | '__rwjs__server_inject'): Promise<any>;
+export declare function importModule(mod: 'rd-server' | '__cedarjs__react' | '__cedarjs__location' | '__cedarjs__server_auth_provider' | '__cedarjs__server_inject'): Promise<any>;
 export {};
 //# sourceMappingURL=streamHelpers.d.ts.map

package/dist/streaming/streamHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"streamHelpers.d.ts","sourceRoot":"","sources":["../../src/streaming/streamHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAQ9B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uDAAuD,CAAA;AAI5F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AACjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAGjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAYlD,UAAU,kBAAkB;IAC1B,WAAW,EAAE,eAAe,CAAA;IAC5B,gBAAgB,EAAE,KAAK,CAAC,iBAAiB,CAAA;IACzC,UAAU,EAAE,GAAG,CAAA;IACf,QAAQ,EAAE,aAAa,EAAE,CAAA;IACzB,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,MAAM,EAAE,OAAO,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,SAAS,EAAE,eAAe,CAAA;CAC3B;AAED,UAAU,aAAa;IACrB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAA;CAC/B;AA2BD,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,kBAAkB,EACzB,aAAa,EAAE,kBAAkB,EACjC,aAAa,EAAE,aAAa,qBAgM7B;AA2BD,wBAAsB,YAAY,CAChC,GAAG,EACC,WAAW,GACX,eAAe,GACf,kBAAkB,GAClB,8BAA8B,GAC9B,uBAAuB,gBA2B5B"}
+{"version":3,"file":"streamHelpers.d.ts","sourceRoot":"","sources":["../../src/streaming/streamHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAQ9B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uDAAuD,CAAA;AAI5F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AACjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAGjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAYlD,UAAU,kBAAkB;IAC1B,WAAW,EAAE,eAAe,CAAA;IAC5B,gBAAgB,EAAE,KAAK,CAAC,iBAAiB,CAAA;IACzC,UAAU,EAAE,GAAG,CAAA;IACf,QAAQ,EAAE,aAAa,EAAE,CAAA;IACzB,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,MAAM,EAAE,OAAO,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,SAAS,EAAE,eAAe,CAAA;CAC3B;AAED,UAAU,aAAa;IACrB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAA;CAC/B;AA2BD,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,kBAAkB,EACzB,aAAa,EAAE,kBAAkB,EACjC,aAAa,EAAE,aAAa,qBAgM7B;AA2BD,wBAAsB,YAAY,CAChC,GAAG,EACC,WAAW,GACX,kBAAkB,GAClB,qBAAqB,GACrB,iCAAiC,GACjC,0BAA0B,gBA6B/B"}

package/dist/streaming/streamHelpers.js

@@ -49,12 +49,12 @@ async function reactRenderToStreamResponse(mwRes, renderOptions, streamOptions)
     meta: metaTags
   });
   const rscEnabled = getConfig().experimental?.rsc?.enabled;
-  const { createElement } = rscEnabled ? await importModule("__rwjs__react") : await import("react");
+  const { createElement } = rscEnabled ? await importModule("__cedarjs__react") : await import("react");
   const {
     createInjector,
     ServerHtmlProvider,
     ServerInjectedHtml
-  } = rscEnabled ? await importModule("__rwjs__server_inject") : await import("@cedarjs/web/serverInject");
+  } = rscEnabled ? await importModule("__cedarjs__server_inject") : await import("@cedarjs/web/serverInject");
   const { renderToString } = rscEnabled ? await importModule("rd-server") : await import("react-dom/server");
   const { injectionState, injectToPage } = createInjector();
   const bufferTransform = createBufferedTransformStream();
@@ -70,8 +70,8 @@ async function reactRenderToStreamResponse(mwRes, renderOptions, streamOptions)
     controller.abort();
   }, 1e4);
   const timeoutTransform = createTimeoutTransform(timeoutHandle);
-  const { ServerAuthProvider } = rscEnabled ? await importModule("__rwjs__server_auth_provider") : await import("@cedarjs/auth/dist/AuthProvider/ServerAuthProvider.js");
-  const { LocationProvider } = rscEnabled ? await importModule("__rwjs__location") : await import("@cedarjs/router/location");
+  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 renderRoot = (url) => {
     return createElement(
       ServerAuthProvider,
@@ -165,23 +165,25 @@ function applyStreamTransforms(reactStream, transformsToApply) {
 async function importModule(mod) {
   const distSsr = getPaths().web.distSsr;
   const rdServerPath = makeFilePath(path.join(distSsr, "rd-server.mjs"));
-  const reactPath = makeFilePath(path.join(distSsr, "__rwjs__react.mjs"));
-  const locationPath = makeFilePath(path.join(distSsr, "__rwjs__location.mjs"));
+  const reactPath = makeFilePath(path.join(distSsr, "__cedarjs__react.mjs"));
+  const locationPath = makeFilePath(
+    path.join(distSsr, "__cedarjs__location.mjs")
+  );
   const ServerAuthProviderPath = makeFilePath(
-    path.join(distSsr, "__rwjs__server_auth_provider.mjs")
+    path.join(distSsr, "__cedarjs__server_auth_provider.mjs")
   );
   const ServerInjectPath = makeFilePath(
-    path.join(distSsr, "__rwjs__server_inject.mjs")
+    path.join(distSsr, "__cedarjs__server_inject.mjs")
   );
   if (mod === "rd-server") {
     return (await import(rdServerPath)).default;
-  } else if (mod === "__rwjs__react") {
+  } else if (mod === "__cedarjs__react") {
     return (await import(reactPath)).default;
-  } else if (mod === "__rwjs__location") {
+  } else if (mod === "__cedarjs__location") {
     return await import(locationPath);
-  } else if (mod === "__rwjs__server_auth_provider") {
+  } else if (mod === "__cedarjs__server_auth_provider") {
     return await import(ServerAuthProviderPath);
-  } else if (mod === "__rwjs__server_inject") {
+  } else if (mod === "__cedarjs__server_inject") {
     return await import(ServerInjectPath);
   }
   throw new Error("Unknown module " + mod);

package/dist/utils.js

@@ -44,8 +44,8 @@ function convertExpressHeaders(expressDistinctHeaders) {
 const getFullUrl = (req, rscEnabled) => {
   const baseUrl = req.protocol + "://" + req.headers.host;
   const url = new URL(req.originalUrl || "", baseUrl);
-  const pathname = url.searchParams.get("__rwjs__pathname");
-  const search = url.searchParams.get("__rwjs__search");
+  const pathname = url.searchParams.get("__cedarjs__pathname");
+  const search = url.searchParams.get("__cedarjs__search");
   let pathnamePlusSearch = req.originalUrl;
   if (rscEnabled && pathname !== null && search !== null) {
     pathnamePlusSearch = pathname + "?" + search;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/vite",
-  "version": "2.8.1-next.0+f9966f3d1",
+  "version": "2.8.1-next.109+be993981d",
   "description": "Vite configuration package for CedarJS",
   "repository": {
     "type": "git",
@@ -60,18 +60,18 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@ast-grep/napi": "0.41.0",
+    "@ast-grep/napi": "0.42.0",
     "@babel/generator": "7.29.1",
-    "@babel/parser": "7.29.0",
+    "@babel/parser": "7.29.2",
     "@babel/traverse": "7.29.0",
-    "@cedarjs/auth": "2.8.1-next.0+f9966f3d1",
-    "@cedarjs/babel-config": "2.8.1-next.0+f9966f3d1",
-    "@cedarjs/cookie-jar": "2.8.1-next.0+f9966f3d1",
-    "@cedarjs/internal": "2.8.1-next.0+f9966f3d1",
-    "@cedarjs/project-config": "2.8.1-next.0+f9966f3d1",
-    "@cedarjs/server-store": "2.8.1-next.0+f9966f3d1",
-    "@cedarjs/testing": "2.8.1-next.0+f9966f3d1",
-    "@cedarjs/web": "2.8.1-next.0+f9966f3d1",
+    "@cedarjs/auth": "2.8.1-next.109+be993981d",
+    "@cedarjs/babel-config": "2.8.1-next.109+be993981d",
+    "@cedarjs/cookie-jar": "2.8.1-next.109+be993981d",
+    "@cedarjs/internal": "2.8.1-next.109+be993981d",
+    "@cedarjs/project-config": "2.8.1-next.109+be993981d",
+    "@cedarjs/server-store": "2.8.1-next.109+be993981d",
+    "@cedarjs/testing": "2.8.1-next.109+be993981d",
+    "@cedarjs/web": "2.8.1-next.109+be993981d",
     "@swc/core": "1.15.18",
     "@vitejs/plugin-react": "4.7.0",
     "@whatwg-node/fetch": "0.10.13",
@@ -80,18 +80,17 @@
     "buffer": "6.0.3",
     "busboy": "^1.6.0",
     "cookie": "1.1.1",
-    "core-js": "3.48.0",
     "dotenv-defaults": "5.0.2",
     "execa": "5.1.1",
     "express": "4.22.1",
     "find-my-way": "8.2.2",
     "http-proxy-middleware": "3.0.5",
-    "isbot": "5.1.35",
+    "isbot": "5.1.36",
     "react": "18.3.1",
     "react-server-dom-webpack": "19.2.4",
     "rimraf": "6.1.3",
     "vite": "5.4.21",
-    "vite-plugin-cjs-interop": "2.4.3",
+    "vite-plugin-cjs-interop": "2.4.4",
     "vite-plugin-node-polyfills": "0.25.0",
     "ws": "8.19.0",
     "yargs-parser": "21.1.1"
@@ -106,7 +105,7 @@
     "@types/yargs-parser": "21.0.3",
     "concurrently": "9.2.1",
     "glob": "11.1.0",
-    "memfs": "4.56.10",
+    "memfs": "4.56.11",
     "publint": "0.3.18",
     "rollup": "4.59.0",
     "tsx": "4.21.0",
@@ -116,5 +115,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f9966f3d17f1740c9a1eeb90b30f0e6bd2655914"
+  "gitHead": "be993981d7e162a83244009c3f7ab9270c6773f3"
 }