npm - @jasonshimmy/vite-plugin-cer-app - Versions diffs - 0.1.1 → 0.1.2 - Mend

@jasonshimmy/vite-plugin-cer-app 0.1.1 → 0.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (109) hide show

package/CHANGELOG.md +4 -0
package/commits.txt +1 -1
package/dist/cli/commands/generate.d.ts.map +1 -1
package/dist/cli/commands/generate.js +2 -0
package/dist/cli/commands/generate.js.map +1 -1
package/dist/cli/commands/preview.d.ts.map +1 -1
package/dist/cli/commands/preview.js +21 -2
package/dist/cli/commands/preview.js.map +1 -1
package/dist/cli/index.js +1 -1
package/dist/cli/index.js.map +1 -1
package/dist/plugin/build-ssg.d.ts.map +1 -1
package/dist/plugin/build-ssg.js +10 -21
package/dist/plugin/build-ssg.js.map +1 -1
package/dist/plugin/build-ssr.d.ts.map +1 -1
package/dist/plugin/build-ssr.js +150 -27
package/dist/plugin/build-ssr.js.map +1 -1
package/dist/plugin/virtual/routes.d.ts.map +1 -1
package/dist/plugin/virtual/routes.js +11 -1
package/dist/plugin/virtual/routes.js.map +1 -1
package/dist/runtime/app-template.d.ts +1 -1
package/dist/runtime/app-template.d.ts.map +1 -1
package/dist/runtime/app-template.js +6 -0
package/dist/runtime/app-template.js.map +1 -1
package/dist/runtime/composables/use-page-data.d.ts +15 -6
package/dist/runtime/composables/use-page-data.d.ts.map +1 -1
package/dist/runtime/composables/use-page-data.js +30 -9
package/dist/runtime/composables/use-page-data.js.map +1 -1
package/dist/runtime/entry-server-template.d.ts +1 -1
package/dist/runtime/entry-server-template.d.ts.map +1 -1
package/dist/runtime/entry-server-template.js +137 -16
package/dist/runtime/entry-server-template.js.map +1 -1
package/docs/data-loading.md +7 -6
package/docs/getting-started.md +1 -1
package/docs/rendering-modes.md +1 -1
package/docs/server-api.md +9 -0
package/package.json +1 -1
package/src/__tests__/index.test.ts +21 -0
package/src/__tests__/plugin/build-ssg.test.ts +265 -0
package/src/__tests__/plugin/build-ssr.test.ts +180 -0
package/src/__tests__/plugin/cer-app-plugin.test.ts +409 -0
package/src/__tests__/plugin/dts-generator.test.ts +246 -0
package/src/__tests__/plugin/resolve-config.test.ts +158 -0
package/src/__tests__/plugin/virtual/error.test.ts +71 -0
package/src/__tests__/plugin/virtual/loading.test.ts +72 -0
package/src/__tests__/plugin/virtual/server-middleware.test.ts +102 -0
package/src/__tests__/runtime/use-page-data.test.ts +81 -5
package/src/__tests__/types/config.test.ts +23 -0
package/src/cli/commands/generate.ts +2 -0
package/src/cli/commands/preview.ts +21 -2
package/src/cli/index.ts +1 -1
package/src/plugin/build-ssg.ts +9 -22
package/src/plugin/build-ssr.ts +149 -27
package/src/plugin/virtual/routes.ts +12 -1
package/src/runtime/app-template.ts +6 -0
package/src/runtime/composables/use-page-data.ts +31 -9
package/src/runtime/entry-server-template.ts +137 -16
package/tsconfig.build.json +1 -1
package/dist/__tests__/plugin/path-utils.test.d.ts +0 -2
package/dist/__tests__/plugin/path-utils.test.d.ts.map +0 -1
package/dist/__tests__/plugin/path-utils.test.js +0 -305
package/dist/__tests__/plugin/path-utils.test.js.map +0 -1
package/dist/__tests__/plugin/scanner.test.d.ts +0 -2
package/dist/__tests__/plugin/scanner.test.d.ts.map +0 -1
package/dist/__tests__/plugin/scanner.test.js +0 -143
package/dist/__tests__/plugin/scanner.test.js.map +0 -1
package/dist/__tests__/plugin/transforms/auto-import.test.d.ts +0 -2
package/dist/__tests__/plugin/transforms/auto-import.test.d.ts.map +0 -1
package/dist/__tests__/plugin/transforms/auto-import.test.js +0 -151
package/dist/__tests__/plugin/transforms/auto-import.test.js.map +0 -1
package/dist/__tests__/plugin/transforms/head-inject.test.d.ts +0 -2
package/dist/__tests__/plugin/transforms/head-inject.test.d.ts.map +0 -1
package/dist/__tests__/plugin/transforms/head-inject.test.js +0 -151
package/dist/__tests__/plugin/transforms/head-inject.test.js.map +0 -1
package/dist/__tests__/plugin/virtual/components.test.d.ts +0 -2
package/dist/__tests__/plugin/virtual/components.test.d.ts.map +0 -1
package/dist/__tests__/plugin/virtual/components.test.js +0 -47
package/dist/__tests__/plugin/virtual/components.test.js.map +0 -1
package/dist/__tests__/plugin/virtual/composables.test.d.ts +0 -2
package/dist/__tests__/plugin/virtual/composables.test.d.ts.map +0 -1
package/dist/__tests__/plugin/virtual/composables.test.js +0 -48
package/dist/__tests__/plugin/virtual/composables.test.js.map +0 -1
package/dist/__tests__/plugin/virtual/layouts.test.d.ts +0 -2
package/dist/__tests__/plugin/virtual/layouts.test.d.ts.map +0 -1
package/dist/__tests__/plugin/virtual/layouts.test.js +0 -59
package/dist/__tests__/plugin/virtual/layouts.test.js.map +0 -1
package/dist/__tests__/plugin/virtual/middleware.test.d.ts +0 -2
package/dist/__tests__/plugin/virtual/middleware.test.d.ts.map +0 -1
package/dist/__tests__/plugin/virtual/middleware.test.js +0 -58
package/dist/__tests__/plugin/virtual/middleware.test.js.map +0 -1
package/dist/__tests__/plugin/virtual/plugins.test.d.ts +0 -2
package/dist/__tests__/plugin/virtual/plugins.test.d.ts.map +0 -1
package/dist/__tests__/plugin/virtual/plugins.test.js +0 -73
package/dist/__tests__/plugin/virtual/plugins.test.js.map +0 -1
package/dist/__tests__/plugin/virtual/routes.test.d.ts +0 -2
package/dist/__tests__/plugin/virtual/routes.test.d.ts.map +0 -1
package/dist/__tests__/plugin/virtual/routes.test.js +0 -167
package/dist/__tests__/plugin/virtual/routes.test.js.map +0 -1
package/dist/__tests__/plugin/virtual/server-api.test.d.ts +0 -2
package/dist/__tests__/plugin/virtual/server-api.test.d.ts.map +0 -1
package/dist/__tests__/plugin/virtual/server-api.test.js +0 -72
package/dist/__tests__/plugin/virtual/server-api.test.js.map +0 -1
package/dist/__tests__/runtime/use-head.test.d.ts +0 -2
package/dist/__tests__/runtime/use-head.test.d.ts.map +0 -1
package/dist/__tests__/runtime/use-head.test.js +0 -202
package/dist/__tests__/runtime/use-head.test.js.map +0 -1
package/dist/__tests__/runtime/use-page-data.test.d.ts +0 -2
package/dist/__tests__/runtime/use-page-data.test.d.ts.map +0 -1
package/dist/__tests__/runtime/use-page-data.test.js +0 -41
package/dist/__tests__/runtime/use-page-data.test.js.map +0 -1

package/src/plugin/build-ssr.ts CHANGED Viewed

@@ -3,66 +3,189 @@ import { join, resolve } from 'pathe'
 import { existsSync } from 'node:fs'
 import type { ResolvedCerConfig } from './dev-server.js'
+/**
+ * Resolves the client build entry point for an SSR/SSG build.
+ *
+ * Priority order:
+ * 1. `index.html` at the project root — preferred because Vite writes a
+ *    processed `index.html` to `dist/client/` with correct asset references,
+ *    which `renderPath` then uses as the shell template for SSG pages.
+ * 2. `app/entry-client.ts` — fallback for projects that handle HTML injection
+ *    themselves (e.g. a custom Express server).
+ * 3. `app/app.ts` — last resort (same bundle, no DSD hydration preamble).
+ */
+function resolveClientEntry(config: ResolvedCerConfig): string {
+  const indexHtml = resolve(config.root, 'index.html')
+  if (existsSync(indexHtml)) return indexHtml
+  const entryClient = resolve(config.srcDir, 'entry-client.ts')
+  if (existsSync(entryClient)) return entryClient
+  return resolve(config.srcDir, 'app.ts')
+}
 /**
  * The server entry template that wires all virtual modules together and
  * exports a request handler for Node.js (Express-compatible).
  */
-function generateServerEntryCode(config: ResolvedCerConfig): string {
+function generateServerEntryCode(): string {
   return `// AUTO-GENERATED server entry by @jasonshimmy/vite-plugin-cer-app
+import { readFileSync, existsSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
 import 'virtual:cer-components'
 import routes from 'virtual:cer-routes'
 import layouts from 'virtual:cer-layouts'
 import plugins from 'virtual:cer-plugins'
 import apiRoutes from 'virtual:cer-server-api'
-import { html, registerBuiltinComponents } from '@jasonshimmy/custom-elements-runtime'
+import { registerBuiltinComponents } from '@jasonshimmy/custom-elements-runtime'
+import { registerEntityMap, renderToStringWithJITCSSDSD, DSD_POLYFILL_SCRIPT } from '@jasonshimmy/custom-elements-runtime/ssr'
+import entitiesJson from '@jasonshimmy/custom-elements-runtime/entities.json'
 import { initRouter } from '@jasonshimmy/custom-elements-runtime/router'
-import { createStreamingSSRHandler } from '@jasonshimmy/custom-elements-runtime/ssr-middleware'
 registerBuiltinComponents()
-// Per-request VNode factory: initialize a fresh router at the request URL,
-// resolve the active layout from the matched route's meta, wrap the router-view
-// in that layout element, and call the route's data loader so the result is
-// serialized as window.__CER_DATA__ for client-side hydration.
+// Pre-load the full HTML entity map so named entities like &mdash; decode
+// correctly during SSR. Without this the bundled runtime falls back to a
+// minimal set (&lt;, &gt;, &amp; …) and re-escapes everything else.
+registerEntityMap(entitiesJson)
+// Load the Vite-built client index.html (dist/client/index.html) so every SSR
+// response includes the client-side scripts needed for hydration and routing.
+// The server bundle lives at dist/server/server.js, so ../client resolves correctly.
+const _clientTemplatePath = join(dirname(fileURLToPath(import.meta.url)), '../client/index.html')
+const _clientTemplate = existsSync(_clientTemplatePath)
+  ? readFileSync(_clientTemplatePath, 'utf-8')
+  : null
+// Merge the SSR rendered body with the Vite client shell so the final page
+// contains both pre-rendered DSD content and the client bundle scripts.
+function _mergeWithClientTemplate(ssrHtml, clientTemplate) {
+  const headTag = '<head>', headCloseTag = '</head>'
+  const bodyTag = '<body>', bodyCloseTag = '</body>'
+  const headStart = ssrHtml.indexOf(headTag)
+  const headEnd   = ssrHtml.indexOf(headCloseTag)
+  const bodyStart = ssrHtml.indexOf(bodyTag)
+  const bodyEnd   = ssrHtml.lastIndexOf(bodyCloseTag)
+  const ssrHead = headStart >= 0 && headEnd > headStart
+    ? ssrHtml.slice(headStart + headTag.length, headEnd).trim() : ''
+  const ssrBody = bodyStart >= 0 && bodyEnd > bodyStart
+    ? ssrHtml.slice(bodyStart + bodyTag.length, bodyEnd).trim() : ssrHtml
+  // Hoist <style> elements from the SSR body into the document <head> so
+  // JIT CSS rules are applied before the layout paints.
+  const headParts = ssrHead ? [ssrHead] : []
+  let ssrBodyContent = ssrBody
+  let pos = 0
+  while (pos < ssrBodyContent.length) {
+    const styleOpen  = ssrBodyContent.indexOf('<style', pos)
+    if (styleOpen < 0) break
+    const styleClose = ssrBodyContent.indexOf('</style>', styleOpen)
+    if (styleClose < 0) break
+    headParts.push(ssrBodyContent.slice(styleOpen, styleClose + 8))
+    ssrBodyContent = ssrBodyContent.slice(0, styleOpen) + ssrBodyContent.slice(styleClose + 8)
+    pos = styleOpen
+  }
+  ssrBodyContent = ssrBodyContent.trim()
+  // Inject the pre-rendered layout+page as light DOM of the app mount element
+  // so it is visible before JS boots, then the client router takes over.
+  let merged = clientTemplate
+  if (merged.includes('<cer-layout-view></cer-layout-view>')) {
+    merged = merged.replace('<cer-layout-view></cer-layout-view>',
+      '<cer-layout-view>' + ssrBodyContent + '</cer-layout-view>')
+  } else if (merged.includes('<div id="app"></div>')) {
+    merged = merged.replace('<div id="app"></div>',
+      '<div id="app">' + ssrBodyContent + '</div>')
+  }
+  const headAdditions = headParts.filter(Boolean).join('\\n')
+  if (headAdditions) merged = merged.replace('</head>', headAdditions + '\\n</head>')
+  return merged
+}
+// Per-request async setup: initialize a fresh router, resolve the matched
+// route and layout, pre-load the page module, and call the data loader.
+// Returns the vnode tree, router, head additions, and the raw loader data.
 //
-// createStreamingSSRHandler threads the router through each component's SSR
-// context so concurrent renders never share state.
-const vnodeFactory = async (req) => {
+// loaderData is returned (not set on globalThis) so the handler can assign it
+// synchronously right before renderToStringWithJITCSS — guaranteeing that
+// concurrent renders (SSG concurrency > 1) never race on a shared global.
+const _prepareRequest = async (req) => {
   const router = initRouter({ routes, initialUrl: req.url ?? '/' })
   const current = router.getCurrent()
   const { route, params } = router.matchRoute(current.path)
   const layoutName = route?.meta?.layout ?? 'default'
   const layoutTag = layouts[layoutName]
-  const inner = html\`<router-view></router-view>\`
-  const vnode = layoutTag
-    ? { tag: layoutTag, props: {}, children: [inner] }
-    : inner
-  // Call the route's data loader (if present) and serialize for client hydration.
+  // Pre-load the page module so we can embed the component tag directly.
+  // This avoids the async router-view (which injects content via script tags
+  // and breaks Declarative Shadow DOM on initial parse).
+  let pageVnode = { tag: 'div', props: {}, children: [] }
   let head
+  let loaderData = null
   if (route?.load) {
     try {
       const mod = await route.load()
+      const pageTag = mod.default
+      if (pageTag) {
+        pageVnode = { tag: pageTag, props: { attrs: { ...params } }, children: [] }
+      }
       if (typeof mod.loader === 'function') {
         const query = current.query ?? {}
         const data = await mod.loader({ params, query, req })
         if (data !== undefined && data !== null) {
+          loaderData = data
           head = \`<script>window.__CER_DATA__ = \${JSON.stringify(data)}</script>\`
         }
       }
     } catch {
-      // Loader errors are non-fatal during SSR; the client will refetch.
+      // Non-fatal: loader errors fall back to an empty page; client will refetch.
     }
   }
-  return { vnode, router, head }
+  const vnode = layoutTag
+    ? { tag: layoutTag, props: {}, children: [pageVnode] }
+    : pageVnode
+  return { vnode, router, head, loaderData }
 }
-export const handler = createStreamingSSRHandler(vnodeFactory, {
-  render: {
-    dsd: ${config.ssr.dsd},
-  },
-})
+export const handler = async (req, res) => {
+  const { vnode, router, head, loaderData } = await _prepareRequest(req)
+  // Set loader data on globalThis synchronously before the render so
+  // usePageData() can read it. Because renderToStringWithJITCSSDSD is entirely
+  // synchronous and JavaScript is single-threaded, no concurrent request can
+  // overwrite __CER_DATA__ between this assignment and the read inside setup().
+  if (loaderData !== null) {
+    ;(globalThis).__CER_DATA__ = loaderData
+  }
+  // dsdPolyfill: false — we inject the polyfill manually after merging so it
+  // lands at the end of <body>, not inside <cer-layout-view> light DOM where
+  // scripts may not execute.
+  const { htmlWithStyles } = renderToStringWithJITCSSDSD(vnode, {
+    dsdPolyfill: false,
+    router,
+  })
+  // Clear immediately after the synchronous render so the value never leaks
+  // to the next request on this same server process.
+  delete (globalThis).__CER_DATA__
+  // Wrap the rendered body in a full HTML document and inject the head additions
+  // (loader data script, useHead() tags, JIT styles). No polyfill in body yet.
+  const ssrHtml = \`<!DOCTYPE html><html><head>\${head ?? ''}</head><body>\${htmlWithStyles}</body></html>\`
+  let finalHtml = _clientTemplate
+    ? _mergeWithClientTemplate(ssrHtml, _clientTemplate)
+    : ssrHtml
+  // Inject DSD polyfill at end of <body>, outside <cer-layout-view>, so the
+  // browser runs it after parsing the declarative shadow roots.
+  finalHtml = finalHtml.includes('</body>')
+    ? finalHtml.replace('</body>', DSD_POLYFILL_SCRIPT + '</body>')
+    : finalHtml + DSD_POLYFILL_SCRIPT
+  res.setHeader('Content-Type', 'text/html; charset=utf-8')
+  res.end(finalHtml)
+}
 export { apiRoutes, plugins, layouts }
 export default handler
@@ -82,10 +205,9 @@ export async function buildSSR(
   const clientOutDir = join(config.root, 'dist/client')
   const serverOutDir = join(config.root, 'dist/server')
-  // Determine client entry — prefer entry-client.ts, fall back to app.ts
-  const clientEntry = existsSync(resolve(config.srcDir, 'entry-client.ts'))
-    ? resolve(config.srcDir, 'entry-client.ts')
-    : resolve(config.srcDir, 'app.ts')
+  // Resolve the client entry — index.html is preferred so Vite writes a
+  // processed index.html to dist/client/ for use as the SSG shell template.
+  const clientEntry = resolveClientEntry(config)
   // Build the client bundle
   console.log('[cer-app] Building client bundle...')
@@ -103,7 +225,7 @@ export async function buildSSR(
   })
   // Generate server entry source inline via a virtual plugin
-  const serverEntryCode = generateServerEntryCode(config)
+  const serverEntryCode = generateServerEntryCode()
   const VIRTUAL_SERVER_ENTRY = 'virtual:cer-server-entry'
   const RESOLVED_SERVER_ENTRY = '\0virtual:cer-server-entry'

package/src/plugin/virtual/routes.ts CHANGED Viewed

@@ -60,7 +60,7 @@ export async function generateRoutesCode(pagesDir: string): Promise<string> {
     return `// AUTO-GENERATED by @jasonshimmy/vite-plugin-cer-app\nconst routes = []\nexport default routes\n`
   }
-  const entries = files.map((f) => {
+  const rawEntries = files.map((f) => {
     const entry = buildRouteEntry(f, pagesDir)
     // 404.ts convention: treat as catch-all not-found route
     if (basename(f) === '404.ts') {
@@ -68,6 +68,17 @@ export async function generateRoutesCode(pagesDir: string): Promise<string> {
     }
     return entry
   })
+  // Deduplicate by routePath — keep the first occurrence after sorting to
+  // avoid "Duplicate route path detected" warnings (e.g. when both 404.ts
+  // and [...all].ts resolve to the same /:all* catch-all route).
+  const seen = new Set<string>()
+  const entries = rawEntries.filter((e) => {
+    if (seen.has(e.routePath)) return false
+    seen.add(e.routePath)
+    return true
+  })
   const sorted = sortRoutes(entries)
   // Read each file's source once to extract static metadata (middleware + layout)

package/src/runtime/app-template.ts CHANGED Viewed

@@ -135,6 +135,12 @@ for (const plugin of plugins) {
 if (typeof window !== 'undefined') {
   await router.replace(window.location.pathname + window.location.search + window.location.hash)
+  // Clear SSR loader data after the initial navigation so that subsequent
+  // client-side navigations don't accidentally reuse it. We wait until after
+  // router.replace() so both the pre-rendered element (upgraded during
+  // component registration) and the new element from router.replace() can
+  // both call usePageData() and receive the hydration data.
+  delete (globalThis as any).__CER_DATA__
   createDOMJITCSS().mount()
 }

package/src/runtime/composables/use-page-data.ts CHANGED Viewed

@@ -1,13 +1,22 @@
 /**
  * usePageData — reads SSR-injected loader data for the current page.
  *
- * During SSR/SSG the server calls the matched route's `loader()` function,
- * serializes the result as `window.__CER_DATA__`, and injects it into the
- * HTML `<head>`. On client hydration this composable reads that payload so
- * the page component can skip the initial data fetch.
+ * During SSR/SSG the server calls the matched route's `loader()` function
+ * and makes the result available in two ways:
  *
- * The data is cleared after the first call so subsequent client-side
- * navigations don't accidentally serve stale SSR data.
+ * 1. **Server render pass** — the data is stored in a per-request
+ *    `AsyncLocalStorage` context (set via `_cerDataStore.enterWith(data)`
+ *    in the entry-server template). `usePageData()` reads this store so the
+ *    component renders with real data in the initial SSR/SSG HTML.
+ *
+ * 2. **Client hydration** — the server also serializes the data as
+ *    `window.__CER_DATA__` in the page `<head>`. The client entry captures
+ *    this into `globalThis.__CER_DATA__` before the app boots. On first
+ *    component instantiation `usePageData()` returns that value so the client
+ *    starts with the correct state without an extra network round-trip.
+ *
+ * The client-side value is cleared after the first read so subsequent
+ * client-side navigations don't accidentally reuse stale SSR data.
  *
  * @returns The serialized loader result, or `null` if no SSR data is present.
  *
@@ -29,11 +38,24 @@
  * ```
  */
 export function usePageData<T = unknown>(): T | null {
-  // Works in both SSR (globalThis) and browser (window) contexts.
   const g = globalThis as Record<string, unknown>
+  // Server-side: read from the per-request AsyncLocalStorage context.
+  // __CER_DATA_STORE__ is set by the entry-server template and is only present
+  // in Node.js, so this branch is tree-shaken out of the client bundle.
+  const store = g['__CER_DATA_STORE__'] as { getStore(): unknown } | undefined
+  if (store) {
+    const ssrData = store.getStore() as T | null | undefined
+    if (ssrData !== undefined && ssrData !== null) return ssrData
+  }
+  // Client-side: read from window.__CER_DATA__ captured by the client entry.
+  // Do NOT clear here — the data is cleared by app-template.ts after the
+  // initial router.replace() completes. This ensures both the pre-rendered
+  // element (upgraded during component registration) and the new element
+  // created by router.replace() can both access the SSR data without a
+  // race where the first read consumes it before the second can use it.
   const data = g['__CER_DATA__'] as T | undefined
   if (data === undefined || data === null) return null
-  // Clear so that subsequent client navigations don't reuse stale SSR data.
-  delete g['__CER_DATA__']
   return data
 }

package/src/runtime/entry-server-template.ts CHANGED Viewed

@@ -6,26 +6,97 @@
  * Express/Fastify/Node http.
  */
 export const ENTRY_SERVER_TEMPLATE = `// Server-side entry — AUTO-GENERATED by @jasonshimmy/vite-plugin-cer-app
+import { readFileSync, existsSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { AsyncLocalStorage } from 'node:async_hooks'
 import 'virtual:cer-components'
 import routes from 'virtual:cer-routes'
 import layouts from 'virtual:cer-layouts'
 import plugins from 'virtual:cer-plugins'
 import apiRoutes from 'virtual:cer-server-api'
-import { html, registerBuiltinComponents } from '@jasonshimmy/custom-elements-runtime'
+import { registerBuiltinComponents } from '@jasonshimmy/custom-elements-runtime'
+import { registerEntityMap, DSD_POLYFILL_SCRIPT } from '@jasonshimmy/custom-elements-runtime/ssr'
+import entitiesJson from '@jasonshimmy/custom-elements-runtime/entities.json'
 import { initRouter } from '@jasonshimmy/custom-elements-runtime/router'
-import { createStreamingSSRHandler } from '@jasonshimmy/custom-elements-runtime/ssr-middleware'
+import { createSSRHandler } from '@jasonshimmy/custom-elements-runtime/ssr-middleware'
 registerBuiltinComponents()
+// Pre-load the full HTML entity map so named entities like &mdash; decode
+// correctly during SSR. Without this the bundled runtime falls back to a
+// minimal set (&lt;, &gt;, &amp; …) and re-escapes everything else.
+registerEntityMap(entitiesJson)
+// Async-local storage for request-scoped SSR loader data.
+// Using AsyncLocalStorage ensures concurrent SSR renders (e.g. SSG with
+// concurrency > 1) never see each other's data — each request's async chain
+// carries its own store value, so usePageData() is always race-condition-free.
+const _cerDataStore = new AsyncLocalStorage()
+// Expose the store so the usePageData() composable can read it server-side.
+;(globalThis).__CER_DATA_STORE__ = _cerDataStore
+// Load the Vite-built client index.html (dist/client/index.html) so every SSR
+// response includes the client-side scripts needed for hydration and routing.
+// The server bundle lives at dist/server/server.js, so ../client resolves correctly.
+const _clientTemplatePath = join(dirname(fileURLToPath(import.meta.url)), '../client/index.html')
+const _clientTemplate = existsSync(_clientTemplatePath)
+  ? readFileSync(_clientTemplatePath, 'utf-8')
+  : null
+// Merge the SSR handler's full HTML document with the Vite client shell so the
+// final page contains both pre-rendered DSD content and the client bundle scripts.
+function _mergeWithClientTemplate(ssrHtml, clientTemplate) {
+  const headTag = '<head>', headCloseTag = '</head>'
+  const bodyTag = '<body>', bodyCloseTag = '</body>'
+  const headStart = ssrHtml.indexOf(headTag)
+  const headEnd   = ssrHtml.indexOf(headCloseTag)
+  const bodyStart = ssrHtml.indexOf(bodyTag)
+  const bodyEnd   = ssrHtml.lastIndexOf(bodyCloseTag)
+  const ssrHead = headStart >= 0 && headEnd > headStart
+    ? ssrHtml.slice(headStart + headTag.length, headEnd).trim() : ''
+  const ssrBody = bodyStart >= 0 && bodyEnd > bodyStart
+    ? ssrHtml.slice(bodyStart + bodyTag.length, bodyEnd).trim() : ssrHtml
+  // Hoist <style> elements from the SSR body into the document <head> so
+  // JIT CSS rules are applied before the layout paints.
+  const headParts = ssrHead ? [ssrHead] : []
+  let ssrBodyContent = ssrBody
+  let pos = 0
+  while (pos < ssrBodyContent.length) {
+    const styleOpen  = ssrBodyContent.indexOf('<style', pos)
+    if (styleOpen < 0) break
+    const styleClose = ssrBodyContent.indexOf('</style>', styleOpen)
+    if (styleClose < 0) break
+    headParts.push(ssrBodyContent.slice(styleOpen, styleClose + 8))
+    ssrBodyContent = ssrBodyContent.slice(0, styleOpen) + ssrBodyContent.slice(styleClose + 8)
+    pos = styleOpen
+  }
+  ssrBodyContent = ssrBodyContent.trim()
+  // Inject the pre-rendered layout+page as light DOM of the app mount element
+  // so it is visible before JS boots, then the client router takes over.
+  let merged = clientTemplate
+  if (merged.includes('<cer-layout-view></cer-layout-view>')) {
+    merged = merged.replace('<cer-layout-view></cer-layout-view>',
+      '<cer-layout-view>' + ssrBodyContent + '</cer-layout-view>')
+  } else if (merged.includes('<div id="app"></div>')) {
+    merged = merged.replace('<div id="app"></div>',
+      '<div id="app">' + ssrBodyContent + '</div>')
+  }
+  const headAdditions = headParts.filter(Boolean).join('\\n')
+  if (headAdditions) merged = merged.replace('</head>', headAdditions + '\\n</head>')
+  return merged
+}
 /**
  * Per-request VNode factory — initializes a fresh router at the request URL,
- * resolves the active layout from the matched route's meta, calls the matched
- * route's data loader (if any), and injects the serialized result into the
- * document head as window.__CER_DATA__ for client-side hydration.
+ * resolves the active layout from the matched route's meta, pre-loads the
+ * matched page component (bypassing the async router-view so DSD renders
+ * synchronously), calls the route's data loader (if any), and injects the
+ * serialized result into the document head as window.__CER_DATA__ for
+ * client-side hydration.
  *
  * createStreamingSSRHandler threads the router through each component's SSR
- * context so router-view reads from the per-request instance instead of the
- * shared activeRouterProxy singleton. This makes concurrent SSR requests safe.
+ * context so concurrent renders never share state.
  */
 const vnodeFactory = async (req) => {
   const router = initRouter({ routes, initialUrl: req.url ?? '/' })
@@ -33,38 +104,88 @@ const vnodeFactory = async (req) => {
   const { route, params } = router.matchRoute(current.path)
   const layoutName = route?.meta?.layout ?? 'default'
   const layoutTag = layouts[layoutName]
-  const inner = html\`<router-view></router-view>\`
-  const vnode = layoutTag
-    ? { tag: layoutTag, props: {}, children: [inner] }
-    : inner
-  // Call the route's data loader (if present) and serialize for client hydration.
+  // Pre-load the page module so we can embed the component tag directly.
+  // This avoids the async router-view (which injects content via script tags
+  // and breaks Declarative Shadow DOM on initial parse).
+  let pageVnode = { tag: 'div', props: {}, children: [] }
   let head
   if (route?.load) {
     try {
       const mod = await route.load()
+      const pageTag = mod.default
+      if (pageTag) {
+        pageVnode = { tag: pageTag, props: { attrs: { ...params } }, children: [] }
+      }
       if (typeof mod.loader === 'function') {
         const query = current.query ?? {}
         const data = await mod.loader({ params, query, req })
         if (data !== undefined && data !== null) {
+          // Make data available to usePageData() during the SSR render pass.
+          // enterWith() scopes the value to the current async context so
+          // concurrent renders (SSG concurrency > 1) never share data.
+          _cerDataStore.enterWith(data)
           head = \`<script>window.__CER_DATA__ = \${JSON.stringify(data)}</script>\`
         }
       }
     } catch {
-      // Loader errors are non-fatal during SSR; the client will refetch.
+      // Non-fatal: loader errors fall back to an empty page; client will refetch.
     }
   }
+  const vnode = layoutTag
+    ? { tag: layoutTag, props: {}, children: [pageVnode] }
+    : pageVnode
   return { vnode, router, head }
 }
+// Capture the raw SSR handler and wrap it to merge the response with the
+// Vite client template before sending — this injects the JS/CSS asset bundles
+// so the browser can hydrate and enable client-side routing.
+const _rawHandler = createSSRHandler(vnodeFactory, {
+  render: { dsd: true, dsdPolyfill: false },
+})
 /**
  * The main request handler.
  * Compatible with Express, Fastify, and Node's raw http.createServer.
+ *
+ * Each request is run inside a fresh _cerDataStore.run() context so that
+ * concurrent renders (e.g. SSG with concurrency > 1) get isolated stores.
+ * vnodeFactory calls _cerDataStore.enterWith(loaderData) from within this
+ * context, making the data visible to usePageData() during SSR rendering
+ * without any global-state races.
  */
-export const handler = createStreamingSSRHandler(vnodeFactory, {
-  render: { dsd: true },
-})
+export const handler = async (req, res) => {
+  if (!_clientTemplate) {
+    // No client template — run handler normally, then inject DSD polyfill.
+    let _html = ''
+    await _cerDataStore.run(null, async () => {
+      await _rawHandler(req, { setHeader: () => {}, end: (body) => { _html = body } })
+    })
+    // Inject DSD polyfill at end of <body>, outside any custom element light DOM.
+    const _final = _html.includes('</body>')
+      ? _html.replace('</body>', DSD_POLYFILL_SCRIPT + '</body>')
+      : _html + DSD_POLYFILL_SCRIPT
+    res.setHeader('Content-Type', 'text/html; charset=utf-8')
+    return res.end(_final)
+  }
+  let _capturedHtml = ''
+  // Wrap _rawHandler in an isolated async-local-storage context so that
+  // vnodeFactory's enterWith() call is scoped to this request only.
+  await _cerDataStore.run(null, async () => {
+    // Omit write() to force the non-streaming collect-then-end code path.
+    await _rawHandler(req, { setHeader: () => {}, end: (body) => { _capturedHtml = body } })
+  })
+  let _merged = _mergeWithClientTemplate(_capturedHtml, _clientTemplate)
+  // Inject DSD polyfill at end of <body>, outside <cer-layout-view> light DOM.
+  _merged = _merged.includes('</body>')
+    ? _merged.replace('</body>', DSD_POLYFILL_SCRIPT + '</body>')
+    : _merged + DSD_POLYFILL_SCRIPT
+  res.setHeader('Content-Type', 'text/html; charset=utf-8')
+  res.end(_merged)
+}
 export { apiRoutes, plugins, layouts, routes }
 export default handler

package/tsconfig.build.json CHANGED Viewed

@@ -6,5 +6,5 @@
     "outDir": "dist",
     "rootDir": "src"
   },
-  "exclude": ["node_modules", "dist", "src/cli/create/templates"]
+  "exclude": ["node_modules", "dist", "src/cli/create/templates", "src/__tests__"]
 }

package/dist/__tests__/plugin/path-utils.test.d.ts DELETED Viewed

	@@ -1,2 +0,0 @@
1	- export {};
2	- //# sourceMappingURL=path-utils.test.d.ts.map

package/dist/__tests__/plugin/path-utils.test.d.ts.map DELETED Viewed

	@@ -1 +0,0 @@
1	- {"version":3,"file":"path-utils.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/plugin/path-utils.test.ts"],"names":[],"mappings":""}