vocs 2.0.13 → 2.0.15

package/src/waku/internal/vite-plugins.ts

@@ -44,6 +44,27 @@ export function buildId(): Plugin {
   }
 }
 
+/**
+ * Keeps `react-server-dom-webpack` bundled in the server environments so Waku's rsdw
+ * patch can redirect it to plugin-rsc's vendored build. npm and bun auto-install the
+ * peer, which would otherwise load natively with `react` missing the `react-server`
+ * condition and crash the dev server.
+ */
+export function rsdwNoExternal(): Plugin {
+  const rsdw = 'react-server-dom-webpack'
+  return {
+    name: 'vocs:rsdw-no-external',
+    config() {
+      return {
+        environments: {
+          rsc: { resolve: { noExternal: [rsdw] } },
+          ssr: { resolve: { noExternal: [rsdw] } },
+        },
+      }
+    },
+  }
+}
+
 /**
  * Builds a script to preview the build output.
  */
@@ -98,124 +119,6 @@ await import('./serve-node.js');
   }
 }
 
-const wakuDefineRouterRegex = /[/\\]waku[/\\]dist[/\\]router[/\\]define-router\.js(?:\?.*)?$/
-const wakuRouterClientRegex = /[/\\]waku[/\\]dist[/\\]router[/\\]client\.js(?:\?.*)?$/
-const wakuMinimalClientRegex = /[/\\]waku[/\\]dist[/\\]minimal[/\\]client\.js(?:\?.*)?$/
-
-// TODO: Remove these Waku prefetch patches once https://github.com/wakujs/waku/issues/2099 is fixed.
-const wakuRouterPrefetchCodeRegex =
-  /Object\.entries\(path2moduleIds\)\.forEach\(\(\[path,\s*ids\]\)=>\{\s*path2idxs\[path\]\s*=\s*ids\.map\(\(id\)=>ids\.indexOf\(id\)\);\s*\}\);/
-
-const wakuRouterHmrRefetchCode = `        const refetchRoute = ()=>{
-            staticPathSetRef.current.clear();
-            cachedIdSetRef.current.clear();
-            const rscPath = encodeRoutePath(route.path);
-            const rscParams = createRscParams(route.query);
-            // eslint-disable-next-line @typescript-eslint/no-floating-promises
-            refetch(rscPath, rscParams);
-        };`
-const wakuRouterHmrRefetchPatchedCode = `        const refetchRoute = ()=>{
-            staticPathSetRef.current.clear();
-            cachedIdSetRef.current.clear();
-            const rscPath = encodeRoutePath(route.path);
-            const rscParams = createRscParams(route.query);
-            const hmrRefetchEnhancer = (fetchFn)=>(input, init = {})=>{
-                init.cache = 'no-store';
-                return fetchFn(input, init);
-            };
-            delete globalThis.__WAKU_PREFETCHED__?.[rscPath];
-            // eslint-disable-next-line @typescript-eslint/no-floating-promises
-            refetch(rscPath, rscParams, (store)=>withEnhanceFetchFn(hmrRefetchEnhancer)(store));
-        };`
-
-const wakuClientPrefetchKeysCode = `const KEY_RESPONSE = 'r';
-const KEY_CLOSE = 'x';`
-const wakuClientPrefetchKeysPatchedCode = `const KEY_RESPONSE = 'r';
-const KEY_ELEMENTS = 'e';
-const KEY_CLOSE = 'x';`
-
-const wakuClientPrefetchElementsCode = `    if (prefetchOnly) {
-        prefetched[rscPath] = {
-            [KEY_RESPONSE]: responsePromise,
-            [KEY_CLIENT_PREFETCHED]: true,
-            [KEY_RSC_PARAMS]: rscParams,
-            [KEY_TEMPORARY_REFERENCES]: temporaryReferences
-        };
-        return undefined;
-    }
-    const elements = createFromFetch(checkStatus(responsePromise), {
-        callServer: (funcId, args)=>unstable_callServerRsc(funcId, args, ()=>fetchRscStore),
-        debugChannel: debug?.debugChannel,
-        temporaryReferences
-    });`
-const wakuClientPrefetchElementsPatchedCode = `    const createElements = ()=>createFromFetch(checkStatus(responsePromise), {
-        callServer: (funcId, args)=>unstable_callServerRsc(funcId, args, ()=>fetchRscStore),
-        debugChannel: debug?.debugChannel,
-        temporaryReferences
-    });
-    if (prefetchOnly) {
-        const elements = createElements();
-        Promise.resolve(elements).catch(()=>{});
-        prefetched[rscPath] = {
-            [KEY_RESPONSE]: responsePromise,
-            [KEY_ELEMENTS]: elements,
-            [KEY_CLIENT_PREFETCHED]: true,
-            [KEY_RSC_PARAMS]: rscParams,
-            [KEY_TEMPORARY_REFERENCES]: temporaryReferences
-        };
-        return undefined;
-    }
-    const elements = prefetchedEntry?.[KEY_ELEMENTS] || createElements();`
-
-export function patchRouterPrefetchCode(code: string, id: string) {
-  if (!wakuDefineRouterRegex.test(id)) return
-  const patched = code.replace(
-    wakuRouterPrefetchCodeRegex,
-    `Object.entries(path2moduleIds).forEach(([path, pathIds])=>{
-        path2idxs[path] = pathIds.map((id)=>ids.indexOf(id));
-    });`,
-  )
-  if (patched === code) return
-  return patched
-}
-
-export function patchRouterHmrRefetchCode(code: string, id: string) {
-  if (!wakuRouterClientRegex.test(id)) return
-  const patched = code.replace(wakuRouterHmrRefetchCode, wakuRouterHmrRefetchPatchedCode)
-  if (patched === code) return
-  return patched
-}
-
-export function patchClientRscPrefetchCode(code: string, id: string) {
-  if (!wakuMinimalClientRegex.test(id)) return
-  if (!code.includes(wakuClientPrefetchKeysCode) || !code.includes(wakuClientPrefetchElementsCode))
-    return
-  const patched = code
-    .replace(wakuClientPrefetchKeysCode, wakuClientPrefetchKeysPatchedCode)
-    .replace(wakuClientPrefetchElementsCode, wakuClientPrefetchElementsPatchedCode)
-  return patched
-}
-
-export function patchWakuPrefetchCode(code: string, id: string) {
-  return (
-    patchRouterPrefetchCode(code, id) ??
-    patchRouterHmrRefetchCode(code, id) ??
-    patchClientRscPrefetchCode(code, id)
-  )
-}
-
-export function patchRouterPrefetch(): Plugin {
-  return {
-    name: 'vocs:patch-router-prefetch',
-    enforce: 'pre',
-    transform(code, id) {
-      const patched = patchWakuPrefetchCode(code, id)
-      if (!patched) return null
-      return { code: patched, map: null }
-    },
-  }
-}
-
 export function mdxHmr(): Plugin {
   const virtualModuleId = 'virtual:vocs/mdx-hmr'
   const resolvedVirtualModuleId = `\0${virtualModuleId}`

package/src/waku/vite.ts

@@ -35,6 +35,7 @@ export async function vocs(options: vocs.Options = {}): Promise<PluginOption[]>
 
   return [
     vocs_core(),
+    Plugins.rsdwNoExternal(),
     Plugins.allowServer(),
     PluginRsc({
       serverHandler: false,
@@ -50,7 +51,6 @@ export async function vocs(options: vocs.Options = {}): Promise<PluginOption[]>
     Plugins.adapterAlias(wakuConfig),
     Plugins.notFound(),
     Plugins.patchRsdw(),
-    Plugins.patchRouterPrefetch(),
     Plugins.buildMetadata(wakuConfig),
     Plugins.staticBuild(wakuConfig),
     Plugins.privateDir(wakuConfig),

package/src/waku/internal/vite-plugins.test.ts

@@ -1,118 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import {
-  patchClientRscPrefetchCode,
-  patchRouterHmrRefetchCode,
-  patchRouterPrefetchCode,
-} from './vite-plugins.js'
-
-describe('patchRouterPrefetchCode', () => {
-  it('maps route module ids through the global module id list', () => {
-    const code = `
-const getRouterPrefetchCode = (path2moduleIds)=>{
-    const moduleIdSet = new Set();
-    Object.values(path2moduleIds).forEach((ids)=>ids.forEach((id)=>moduleIdSet.add(id)));
-    const ids = Array.from(moduleIdSet);
-    const path2idxs = {};
-    Object.entries(path2moduleIds).forEach(([path, ids])=>{
-        path2idxs[path] = ids.map((id)=>ids.indexOf(id));
-    });
-    return \`
-globalThis.__WAKU_ROUTER_PREFETCH__ = (path, callback) => {
-  const ids = \${JSON.stringify(ids)};
-  const path2idxs = \${JSON.stringify(path2idxs)};
-  const key = Object.keys(path2idxs).find((key) => new RegExp(key).test(path));
-  for (const idx of path2idxs[key] || []) {
-    callback(ids[idx]);
-  }
-};
-\`;
-};`
-
-    const patched = patchRouterPrefetchCode(
-      code,
-      '/repo/node_modules/waku/dist/router/define-router.js',
-    )
-
-    expect(patched).toContain('pathIds.map((id)=>ids.indexOf(id))')
-  })
-
-  it('ignores other modules', () => {
-    expect(patchRouterPrefetchCode('', '/repo/node_modules/waku/dist/router/client.js')).toBe(
-      undefined,
-    )
-  })
-})
-
-describe('patchClientRscPrefetchCode', () => {
-  it('decodes and reuses prefetched RSC elements', () => {
-    const code = `
-const KEY_RESPONSE = 'r';
-const KEY_CLOSE = 'x';
-const fetchRscInternal = (fetchRscStore, rscPath, rscParams, prefetchOnly)=>{
-    const responsePromise = prefetchedEntry ? prefetchedEntry[KEY_RESPONSE] : fetchFn(url);
-    if (prefetchOnly) {
-        prefetched[rscPath] = {
-            [KEY_RESPONSE]: responsePromise,
-            [KEY_CLIENT_PREFETCHED]: true,
-            [KEY_RSC_PARAMS]: rscParams,
-            [KEY_TEMPORARY_REFERENCES]: temporaryReferences
-        };
-        return undefined;
-    }
-    const elements = createFromFetch(checkStatus(responsePromise), {
-        callServer: (funcId, args)=>unstable_callServerRsc(funcId, args, ()=>fetchRscStore),
-        debugChannel: debug?.debugChannel,
-        temporaryReferences
-    });
-};`
-
-    const patched = patchClientRscPrefetchCode(
-      code,
-      '/repo/node_modules/waku/dist/minimal/client.js',
-    )
-
-    expect(patched).toContain("const KEY_ELEMENTS = 'e';")
-    expect(patched).toContain('const createElements = ()=>createFromFetch')
-    expect(patched).toContain('Promise.resolve(elements).catch(()=>{});')
-    expect(patched).toContain('[KEY_ELEMENTS]: elements')
-    expect(patched).toContain(
-      'const elements = prefetchedEntry?.[KEY_ELEMENTS] || createElements();',
-    )
-  })
-
-  it('ignores other modules', () => {
-    expect(patchClientRscPrefetchCode('', '/repo/node_modules/waku/dist/router/client.js')).toBe(
-      undefined,
-    )
-  })
-})
-
-describe('patchRouterHmrRefetchCode', () => {
-  it('bypasses prefetched and browser-cached RSC data during route HMR', () => {
-    const code = `
-const InnerRouter = ()=>{
-    if (import.meta.hot) {
-        const refetchRoute = ()=>{
-            staticPathSetRef.current.clear();
-            cachedIdSetRef.current.clear();
-            const rscPath = encodeRoutePath(route.path);
-            const rscParams = createRscParams(route.query);
-            // eslint-disable-next-line @typescript-eslint/no-floating-promises
-            refetch(rscPath, rscParams);
-        };
-    }
-}`
-
-    const patched = patchRouterHmrRefetchCode(code, '/repo/node_modules/waku/dist/router/client.js')
-
-    expect(patched).toContain("init.cache = 'no-store';")
-    expect(patched).toContain('delete globalThis.__WAKU_PREFETCHED__?.[rscPath];')
-    expect(patched).toContain('withEnhanceFetchFn(hmrRefetchEnhancer)')
-  })
-
-  it('ignores other modules', () => {
-    expect(
-      patchRouterHmrRefetchCode('', '/repo/node_modules/waku/dist/router/define-router.js'),
-    ).toBe(undefined)
-  })
-})