chore: internal renaming to __cedarjs__ (#1390)

Tobbe · web-flow · commit 7c725d87a927 · 2026-03-17T22:50:58.000Z
diff --git a/packages/router/src/rsc/RscCache.ts b/packages/router/src/rsc/RscCache.ts
@@ -11,8 +11,8 @@ if (typeof globalThis.WebSocket === 'undefined') {
 }
 
 export interface RscModel {
-  __rwjs__Routes: [React.ReactElement]
-  __rwjs__rsa_data?: unknown
+  __cedarjs__Routes: [React.ReactElement]
+  __cedarjs__rsa_data?: unknown
 }
 
 /**
diff --git a/packages/router/src/rsc/RscRoutes.tsx b/packages/router/src/rsc/RscRoutes.tsx
@@ -56,16 +56,16 @@ async function rsaFetch(
 }
 
 function rscFetch(serializedLocation: string) {
-  const rscId = '__rwjs__Routes'
+  const rscId = '__cedarjs__Routes'
 
   return fetch(BASE_PATH + rscId + '?' + serializedLocation, {
     headers: { 'rw-rsc': '1' },
   })
 }
 
 type SerializedLocation =
-  | `__rwjs__pathname=${string}&__rwjs__search=${string}`
-  | `__rwjs__pathname=${string}&__rwjs__search=${string}::${string}`
+  | `__cedarjs__pathname=${string}&__cedarjs__search=${string}`
+  | `__cedarjs__pathname=${string}&__cedarjs__search=${string}::${string}`
 
 function rscFetchRoutes(serializedLocation: SerializedLocation) {
   console.log(
@@ -114,7 +114,7 @@ function rscFetchRoutes(serializedLocation: SerializedLocation) {
 
       const model = await modelPromise
 
-      return model.__rwjs__rsa_data
+      return model.__cedarjs__rsa_data
     },
   }
 
@@ -133,7 +133,7 @@ interface Props {
 }
 
 export const RscRoutes = ({ pathname, search }: Props) => {
-  const serializedLocation: SerializedLocation = `__rwjs__pathname=${pathname}&__rwjs__search=${search}`
+  const serializedLocation: SerializedLocation = `__cedarjs__pathname=${pathname}&__cedarjs__search=${search}`
   const [currentRscCacheKey, setCurrentRscCacheKey] = useState(() => {
     console.log('RscRoutes :: useState initial value')
     // Calling rscFetchRoutes here to prime the cache
@@ -165,5 +165,5 @@ export const RscRoutes = ({ pathname, search }: Props) => {
     throw new Error('Missing RSC cache entry for ' + currentRscCacheKey)
   }
 
-  return use(rscModelPromise).__rwjs__Routes[0]
+  return use(rscModelPromise).__cedarjs__Routes[0]
 }
diff --git a/packages/router/src/rsc/clientSsr.ts b/packages/router/src/rsc/clientSsr.ts
@@ -11,7 +11,7 @@ async function getEntries() {
   if (globalThis.__cedarjs__vite_ssr_runtime) {
     return {
       serverEntries: {
-        __rwjs__Routes: '../../src/Routes.tsx',
+        __cedarjs__Routes: '../../src/Routes.tsx',
       },
       ssrEntries: {},
     }
@@ -36,7 +36,7 @@ async function getRoutesComponent(): Promise<React.FunctionComponent> {
   const { serverEntries } = await getEntries()
   const entryPath = path.join(
     getPaths().web.distRsc,
-    serverEntries['__rwjs__Routes'],
+    serverEntries['__cedarjs__Routes'],
   )
   console.log('getRoutesComponent entryPath', entryPath)
   const routesModule = await import(makeFilePath(entryPath))
diff --git a/packages/router/src/rsc/utils.ts b/packages/router/src/rsc/utils.ts
@@ -26,7 +26,7 @@ export async function importReact() {
   }
 
   const distSsr = getPaths().web.distSsr
-  const reactPath = makeFilePath(path.join(distSsr, '__rwjs__react.mjs'))
+  const reactPath = makeFilePath(path.join(distSsr, '__cedarjs__react.mjs'))
 
   return (await import(reactPath)).default
 }
@@ -45,7 +45,7 @@ export async function importRsdwClient(): Promise<RSDWClientType> {
 
   const distSsr = getPaths().web.distSsr
   const rsdwClientPath = makeFilePath(
-    path.join(distSsr, '__rwjs__rsdw-client.mjs'),
+    path.join(distSsr, '__cedarjs__rsdw-client.mjs'),
   )
 
   return (await import(rsdwClientPath)).default
diff --git a/packages/testing/global.d.ts b/packages/testing/global.d.ts
@@ -40,7 +40,7 @@ declare global {
   var mockGraphQLMutation: typeof mockGqlMutation
   var mockGraphQLQuery: typeof mockGqlQuery
 
-  var __RWJS__TEST_IMPORTS: {
+  var __CEDARJS__TEST_IMPORTS: {
     apiSrcPath: string
     tearDownCachePath: string
   }
diff --git a/packages/testing/src/config/jest/api/jest-preset.ts b/packages/testing/src/config/jest/api/jest-preset.ts
@@ -17,15 +17,15 @@ const config: Config = {
   runner: path.join(__dirname, '../jest-serial-runner.js'),
   testEnvironment: path.join(__dirname, './RedwoodApiJestEnv.js'),
   globals: {
-    __RWJS__TEST_IMPORTS: {
+    __CEDARJS__TEST_IMPORTS: {
       apiSrcPath: rwjsPaths.api.src,
       tearDownCachePath: path.join(
         rwjsPaths.generated.base,
         'scenarioTeardown.json',
       ),
     },
   },
-  sandboxInjectedGlobals: ['__RWJS__TEST_IMPORTS'],
+  sandboxInjectedGlobals: ['__CEDARJS__TEST_IMPORTS'],
   displayName: {
     color: 'redBright',
     name: 'api',
diff --git a/packages/testing/src/config/jest/api/jest.setup.ts b/packages/testing/src/config/jest/api/jest.setup.ts
@@ -15,7 +15,7 @@ import { defineScenario } from '../../../api/scenario.js'
 // testing time
 // The key is to reduce the amount of imports in this file, because the
 // require.cache is not shared between each test context
-const { apiSrcPath, tearDownCachePath } = global.__RWJS__TEST_IMPORTS
+const { apiSrcPath, tearDownCachePath } = global.__CEDARJS__TEST_IMPORTS
 
 interface ScenarioData {
   [model: string]: {
diff --git a/packages/vite/ambient.d.ts b/packages/vite/ambient.d.ts
@@ -26,8 +26,8 @@ declare global {
   var __REDWOOD__PRERENDER_PAGES: any
   var __cedarjs__vite_ssr_runtime: ViteRuntime | undefined
   var __cedarjs__vite_rsc_runtime: ViteRuntime | undefined
-  var __rwjs__client_references: Set<string> | undefined
-  var __rwjs__server_references: Set<string> | undefined
+  var __cedarjs__client_references: Set<string> | undefined
+  var __cedarjs__server_references: Set<string> | undefined
 
   var __REDWOOD__HELMET_CONTEXT: { helmet?: HelmetServerState }
 
diff --git a/packages/vite/src/__tests__/utils.test.ts b/packages/vite/src/__tests__/utils.test.ts
@@ -30,9 +30,9 @@ describe('getFullUrl', () => {
 
     it("reads pathname and search parameters from the request's searchParams if they're available", () => {
       const req = mockExpressRequest(
-        '/rw-rsc/__rwjs__Routes?__rwjs__pathname=' +
+        '/rw-rsc/__cedarjs__Routes?__cedarjs__pathname=' +
           encodeURIComponent('/cux/cuux') +
-          '&__rwjs__search=' +
+          '&__cedarjs__search=' +
           encodeURIComponent('extra=corge'),
       )
 
diff --git a/packages/vite/src/devFeServer.ts b/packages/vite/src/devFeServer.ts
@@ -185,8 +185,8 @@ async function createServer() {
 
   globalThis.__cedarjs__vite_ssr_runtime =
     await createViteRuntime(viteSsrDevServer)
-  globalThis.__rwjs__client_references = new Set<string>()
-  globalThis.__rwjs__server_references = new Set<string>()
+  globalThis.__cedarjs__client_references = new Set<string>()
+  globalThis.__cedarjs__server_references = new Set<string>()
 
   // const clientEntryFileSet = new Set<string>()
   // const serverEntryFileSet = new Set<string>()
@@ -296,7 +296,7 @@ async function createServer() {
 
           // TODO (RSC): We need to make sure this `id` always matches what
           // vite uses
-          globalThis.__rwjs__client_references?.delete(id)
+          globalThis.__cedarjs__client_references?.delete(id)
 
           // If `code` doesn't start with "use client" or 'use client' we can
           // skip this file
@@ -309,7 +309,7 @@ async function createServer() {
               'adding client reference',
             id,
           )
-          globalThis.__rwjs__client_references?.add(id)
+          globalThis.__cedarjs__client_references?.add(id)
 
           // TODO (RSC): Proper AST parsing would be more robust than simple
           // regex matching. But this is a quick and dirty way to get started
diff --git a/packages/vite/src/lib/entries.ts b/packages/vite/src/lib/entries.ts
@@ -24,14 +24,14 @@ export function getEntries() {
     entries[page.constName] = ensurePosixPath(importStatementPath(page.path))
   }
 
-  // Add the ServerEntry entry, noting we use the "__rwjs__" prefix to avoid
+  // Add the ServerEntry entry, noting we use the "__cedarjs__" prefix to avoid
   // any potential conflicts with user-defined entries
   const serverEntry = getPaths().web.entryServer
   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
 }
diff --git a/packages/vite/src/plugins/__tests__/vite-plugin-rsc-transform-server.function-scope.test.ts b/packages/vite/src/plugins/__tests__/vite-plugin-rsc-transform-server.function-scope.test.ts
@@ -621,19 +621,19 @@ describe('rscTransformUseServerPlugin function scoped "use server"', () => {
       expect(output).toMatchInlineSnapshot(`
         "import fs from 'node:fs';
         export default async function MyComponent() {
-          const formAction = __rwjs__rsa0_formAction;
+          const formAction = __cedarjs__rsa0_formAction;
           return <form action={formAction}>
                       <input type="number" name="delay" />
                       <button type="submit">Submit</button>
                     </form>;
         }
         import { registerServerReference } from "react-server-dom-webpack/server";
-        export async function __rwjs__rsa0_formAction(formData: FormData) {
+        export async function __cedarjs__rsa0_formAction(formData: FormData) {
           'use server';
 
           await fs.promises.writeFile('settings.json', \`{ "delay": \${formData.get('delay')} }\`);
         }
-        registerServerReference(__rwjs__rsa0_formAction, "some/dist/path/assets/rsa-Component.tsx-0.mjs", "__rwjs__rsa0_formAction");"
+        registerServerReference(__cedarjs__rsa0_formAction, "some/dist/path/assets/rsa-Component.tsx-0.mjs", "__cedarjs__rsa0_formAction");"
       `)
     })
 
diff --git a/packages/vite/src/plugins/vite-plugin-rsc-transform-server.ts b/packages/vite/src/plugins/vite-plugin-rsc-transform-server.ts
@@ -405,7 +405,7 @@ function babelPluginTransformServerAction({
                     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)
 
@@ -464,7 +464,7 @@ function babelPluginTransformServerAction({
                   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)
 
diff --git a/packages/vite/src/rsc/rscBuildClient.ts b/packages/vite/src/rsc/rscBuildClient.ts
@@ -44,7 +44,7 @@ export async function rscBuildClient(clientEntryFiles: Record<string, string>) {
         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
diff --git a/packages/vite/src/rsc/rscBuildEntriesFile.ts b/packages/vite/src/rsc/rscBuildEntriesFile.ts
@@ -99,8 +99,8 @@ export async function rscBuildEntriesMappings(
   // Server component names to RSC server asset mapping
   const serverEntries: Record<string, string> = {}
   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) => {
diff --git a/packages/vite/src/rsc/rscBuildForSsr.ts b/packages/vite/src/rsc/rscBuildForSsr.ts
@@ -88,19 +88,19 @@ export 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,
@@ -117,11 +117,11 @@ export async function rscBuildForSsr({
           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 === '__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'
             ) {
diff --git a/packages/vite/src/rsc/rscRenderer.ts b/packages/vite/src/rsc/rscRenderer.ts
@@ -49,11 +49,11 @@ const getRoutesComponent: any = async () => {
 
   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)
@@ -128,8 +128,8 @@ function getBundlerConfig() {
 }
 
 interface RscModel {
-  __rwjs__Routes: React.ReactElement
-  __rwjs__rsa_data?: unknown
+  __cedarjs__Routes: React.ReactElement
+  __cedarjs__rsa_data?: unknown
 }
 
 async function renderRsc(input: RenderInput): Promise<ReadableStream> {
@@ -153,7 +153,7 @@ async function renderRsc(input: RenderInput): Promise<ReadableStream> {
   const { renderToReadableStream } = await importRsdwServer()
   const serverRoutes = await getRoutesComponent()
   const model: RscModel = {
-    __rwjs__Routes: createElement(serverRoutes),
+    __cedarjs__Routes: createElement(serverRoutes),
   }
 
   console.log('rscRenderer.ts renderRsc model', model)
@@ -218,8 +218,8 @@ async function executeRsa(input: RenderInput): Promise<ReadableStream> {
   const serverRoutes = await getRoutesComponent()
   console.log('rscRenderer.ts executeRsa serverRoutes', serverRoutes)
   const model: RscModel = {
-    __rwjs__Routes: createElement(serverRoutes),
-    __rwjs__rsa_data: data,
+    __cedarjs__Routes: createElement(serverRoutes),
+    __cedarjs__rsa_data: data,
   }
   console.log('rscRenderer.ts executeRsa model', model)
 
diff --git a/packages/vite/src/streaming/streamHelpers.ts b/packages/vite/src/streaming/streamHelpers.ts
diff --git a/packages/vite/src/utils.ts b/packages/vite/src/utils.ts

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ if (typeof globalThis.WebSocket === 'undefined') {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`export interface RscModel {`
`14`		`- __rwjs__Routes: [React.ReactElement]`
`15`		`- __rwjs__rsa_data?: unknown`
	`14`	`+ __cedarjs__Routes: [React.ReactElement]`
	`15`	`+ __cedarjs__rsa_data?: unknown`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -56,16 +56,16 @@ async function rsaFetch(`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`function rscFetch(serializedLocation: string) {`
`59`		`- const rscId = '__rwjs__Routes'`
	`59`	`+ const rscId = '__cedarjs__Routes'`
`60`	`60`
`61`	`61`	`return fetch(BASE_PATH + rscId + '?' + serializedLocation, {`
`62`	`62`	`headers: { 'rw-rsc': '1' },`
`63`	`63`	`})`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`type SerializedLocation =`
`67`		- \| `__rwjs__pathname=${string}&__rwjs__search=${string}`
`68`		- \| `__rwjs__pathname=${string}&__rwjs__search=${string}::${string}`
	`67`	+ \| `__cedarjs__pathname=${string}&__cedarjs__search=${string}`
	`68`	+ \| `__cedarjs__pathname=${string}&__cedarjs__search=${string}::${string}`
`69`	`69`
`70`	`70`	`function rscFetchRoutes(serializedLocation: SerializedLocation) {`
`71`	`71`	`console.log(`
`@@ -114,7 +114,7 @@ function rscFetchRoutes(serializedLocation: SerializedLocation) {`
`114`	`114`
`115`	`115`	`const model = await modelPromise`
`116`	`116`
`117`		`- return model.__rwjs__rsa_data`
	`117`	`+ return model.__cedarjs__rsa_data`
`118`	`118`	`},`
`119`	`119`	`}`
`120`	`120`
`@@ -133,7 +133,7 @@ interface Props {`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`export const RscRoutes = ({ pathname, search }: Props) => {`
`136`		- const serializedLocation: SerializedLocation = `__rwjs__pathname=${pathname}&__rwjs__search=${search}`
	`136`	+ const serializedLocation: SerializedLocation = `__cedarjs__pathname=${pathname}&__cedarjs__search=${search}`
`137`	`137`	`const [currentRscCacheKey, setCurrentRscCacheKey] = useState(() => {`
`138`	`138`	`console.log('RscRoutes :: useState initial value')`
`139`	`139`	`// Calling rscFetchRoutes here to prime the cache`
`@@ -165,5 +165,5 @@ export const RscRoutes = ({ pathname, search }: Props) => {`
`165`	`165`	`throw new Error('Missing RSC cache entry for ' + currentRscCacheKey)`
`166`	`166`	`}`
`167`	`167`
`168`		`- return use(rscModelPromise).__rwjs__Routes[0]`
	`168`	`+ return use(rscModelPromise).__cedarjs__Routes[0]`
`169`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ export async function importReact() {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`const distSsr = getPaths().web.distSsr`
`29`		`- const reactPath = makeFilePath(path.join(distSsr, '__rwjs__react.mjs'))`
	`29`	`+ const reactPath = makeFilePath(path.join(distSsr, '__cedarjs__react.mjs'))`
`30`	`30`
`31`	`31`	`return (await import(reactPath)).default`
`32`	`32`	`}`
`@@ -45,7 +45,7 @@ export async function importRsdwClient(): Promise<RSDWClientType> {`
`45`	`45`
`46`	`46`	`const distSsr = getPaths().web.distSsr`
`47`	`47`	`const rsdwClientPath = makeFilePath(`
`48`		`- path.join(distSsr, '__rwjs__rsdw-client.mjs'),`
	`48`	`+ path.join(distSsr, '__cedarjs__rsdw-client.mjs'),`
`49`	`49`	`)`
`50`	`50`
`51`	`51`	`return (await import(rsdwClientPath)).default`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ declare global {`
`40`	`40`	`var mockGraphQLMutation: typeof mockGqlMutation`
`41`	`41`	`var mockGraphQLQuery: typeof mockGqlQuery`
`42`	`42`
`43`		`- var __RWJS__TEST_IMPORTS: {`
	`43`	`+ var __CEDARJS__TEST_IMPORTS: {`
`44`	`44`	`apiSrcPath: string`
`45`	`45`	`tearDownCachePath: string`
`46`	`46`	`}`