@wular/pnext 0.1.6 → 0.1.8

package/src/runtime/load.ts

@@ -0,0 +1,170 @@
+/**
+ * Server module loading as the request path sees it. A release answers from its compiled artifacts;
+ * only a dev or build compile loads the compiler side (`./modules`, `./loader`), on demand, so a
+ * production server never parses it.
+ */
+import type { CompatAliasTarget, ResolvedConfig } from '../config'
+import { setBasePathPrefix, setDefaultPrefetchMode, setTrailingSlashUrls } from '../routing/href'
+import type { DevServerModuleOptions } from './modules'
+import { productionRelease, releaseModuleHref } from './production'
+
+let modules: Promise<typeof import('./modules')> | undefined
+let loader: Promise<typeof import('./loader')> | undefined
+const compiler = () => (modules ??= import('./modules'))
+
+export type ServerBundleTarget =
+  CompatAliasTarget | 'edge' | 'pages-api' | 'pages-api-edge' | 'pages' | 'pages-edge'
+
+export function serverBundleTargetForRuntime(runtime: string | undefined): ServerBundleTarget {
+  return runtime === 'edge' || runtime === 'experimental-edge' ? 'edge' : 'server'
+}
+
+export function pagesApiBundleTargetForRuntime(runtime: string | undefined): ServerBundleTarget {
+  return runtime === 'edge' || runtime === 'experimental-edge' ? 'pages-api-edge' : 'pages-api'
+}
+
+/** The href state server-rendered links read: trailing slashes, basePath, the prefetch default. */
+export function applyServerHrefConfig(config: ResolvedConfig) {
+  setTrailingSlashUrls(Boolean(config.trailingSlash))
+  setBasePathPrefix(typeof config.basePath === 'string' ? config.basePath : '')
+  setDefaultPrefetchMode(config.prefetch)
+}
+
+/** A release only sets the href state; a compile also registers the loader's Bun plugins. */
+export async function registerServerRuntime(config: ResolvedConfig, sourceFiles: string[] = []) {
+  if (productionRelease(config)) return applyServerHrefConfig(config)
+  ;(await (loader ??= import('./loader'))).registerServerRuntime(config, sourceFiles)
+}
+
+export async function devServerModuleHref(
+  config: ResolvedConfig,
+  file: string,
+  version?: string,
+  options: DevServerModuleOptions = {},
+) {
+  const served = productionRelease(config)
+  if (served) return releaseModuleHref(served, 'server', options.conditionTarget ?? 'server', file)
+  return (await compiler()).devServerModuleHref(config, file, version, options)
+}
+
+export async function devClientModuleHref(
+  config: ResolvedConfig,
+  file: string,
+  version?: string,
+  serverTarget?: ServerBundleTarget,
+) {
+  const served = productionRelease(config)
+  if (served) return releaseModuleHref(served, 'client', serverTarget ?? 'server', file)
+  return (await compiler()).devClientModuleHref(config, file, version, serverTarget)
+}
+
+export async function importDevModule<T>(href: string, options?: { warm?: boolean }): Promise<T> {
+  return (await compiler()).importDevModule<T>(href, options)
+}
+
+let releaseCompile = false
+
+/** Whether this process is compiling a production release. */
+export function isReleaseCompile() {
+  return releaseCompile
+}
+
+/** The flag alone; `setReleaseCompile` in ./modules also resets the compile caches. */
+export function setReleaseCompileFlag(enabled: boolean) {
+  releaseCompile = enabled
+}
+
+// B4/B5: extra esbuild resolve conditions layered onto the server (RSC) vendor
+// bundle. Core always applies `react-server` (the server graph IS the RSC
+// layer). Compat can add `next-js` (only when cacheComponents is on) via the
+// setter. Kept as a module-level seam so core carries no static edge into
+// compat's config reader.
+let extraServerBundleConditions: (target: ServerBundleTarget) => string[] = () => []
+
+/** Install compat-driven extra vendor-bundle conditions (B5 `next-js`). */
+export function setServerBundleConditions(
+  factory: ((target: ServerBundleTarget) => string[]) | undefined,
+): void {
+  extraServerBundleConditions = factory ?? (() => [])
+}
+
+export function serverBundleExtraConditions(target: ServerBundleTarget): string[] {
+  return extraServerBundleConditions(target)
+}
+
+let preplanDrain: (() => Promise<void>) | undefined
+
+/** Installed by the vendor pipeline when it loads; before that no build can be pending. */
+export function setPreplanDrain(drain: () => Promise<void>) {
+  preplanDrain = drain
+}
+
+/** Settle every pre-planned vendor build before anything evaluates. */
+export async function drainPreplanBuilds() {
+  await preplanDrain?.()
+}
+
+let moduleGraphFailure: Error | undefined
+
+export function clearModuleGraphFailure(): void {
+  moduleGraphFailure = undefined
+}
+
+/**
+ * Fail a build even when its renderer converted a module-resolution exception
+ * into a 500 response. Rendering may recover from user-code errors, but a
+ * missing content-addressed artifact means the build output itself is broken.
+ */
+export function throwIfModuleGraphFailed(): void {
+  if (moduleGraphFailure !== undefined) throw moduleGraphFailure
+}
+
+export function noteModuleGraphFailure(error: unknown): void {
+  moduleGraphFailure ??= error instanceof Error ? error : new Error(String(error))
+}
+
+function isCompiledModuleResolutionError(error: unknown, href: string): boolean {
+  const message = error instanceof Error ? error.message : String(error)
+  if (!message.includes('Cannot find module')) return false
+  return (
+    href.includes('/cache/server/') ||
+    /[/\\]cache[/\\]server[/\\]/.test(message) ||
+    message.includes('/cache/server/')
+  )
+}
+
+// A module that throws while evaluating stays failed in Bun's registry for the process lifetime, and
+// re-importing it surfaces downstream symptoms (a missing bundle entry, TDZ on an export) instead of
+// the original error. Record the first failure per compiled href and re-throw THAT on every later
+// request. Compiled hrefs are content-addressed, so a save that fixes the module yields a new href
+// and the entry is never consulted again.
+const moduleEvalErrors = new Map<string, unknown>()
+
+/** Re-throw `href`'s recorded first evaluation error, if any. */
+export function throwIfModuleEvalFailed(href: string): void {
+  if (moduleEvalErrors.has(href)) throw moduleEvalErrors.get(href)
+}
+
+/** Drop `href`'s recorded failure when it is still `error`. */
+export function forgetModuleEvalError(href: string, error: unknown): void {
+  if (moduleEvalErrors.get(href) === error) moduleEvalErrors.delete(href)
+}
+
+/**
+ * Import a compiled module, re-throwing its first evaluation error on later imports.
+ *
+ * Production needs this as much as dev: a re-import resolves with a half-evaluated namespace whose
+ * `export const` bindings are still in TDZ, so the render's next read (`module.metadata`) throws
+ * `Cannot access 'metadata' before initialization` and that replaces the real error in the response.
+ * Prod hrefs are content-addressed too, so the entry keys the same way dev's does.
+ */
+export async function importModuleOnce<T>(href: string): Promise<T> {
+  throwIfModuleEvalFailed(href)
+  try {
+    return (await import(href)) as T
+  } catch (error) {
+    if (isCompiledModuleResolutionError(error, href)) noteModuleGraphFailure(error)
+    moduleEvalErrors.set(href, error)
+    throw error
+  }
+}

package/src/runtime/loader.ts

@@ -6,9 +6,10 @@
  * imports them; this module never imports from `./vendor-build`.
  */
 
+import { hasModuleDirective } from '../utils/directive'
 import { createHash } from 'node:crypto'
 import { createRequire } from 'node:module'
-import { existsSync, realpathSync } from 'node:fs'
+import { existsSync, readFileSync, realpathSync, statSync, writeFileSync } from 'node:fs'
 import { mkdir, readFile, stat, writeFile } from 'node:fs/promises'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
@@ -33,6 +34,7 @@ import {
   pnextAliases,
   type CompatAliasTarget,
   type ResolvedConfig,
+  outCachePath,
 } from '../config'
 import {
   rewriteDynamicCallTargets,
@@ -41,40 +43,29 @@ import {
 } from '../resolve/dynamic'
 import { cacheRoot } from './module-cache'
 import { frameworkFingerprint } from './fingerprint'
+import { prebundledFile } from './prebundle'
 import { readNodeModuleBundle, writeNodeModuleBundle } from '../dev/restart/node-modules'
-import { setBasePathPrefix, setDefaultPrefetchMode, setTrailingSlashUrls } from '../routing/href'
 import { resolveExternalLoadTarget, resolveImport, workspacePackageRoots } from '../resolve/imports'
 import { escapeRegex } from '../utils/code'
 import { traceEnabled } from '../utils/trace-flags'
 import { writeFileAtomic } from '../utils/fs'
+import { productionRelease } from './production'
+import {
+  applyServerHrefConfig,
+  isReleaseCompile,
+  serverBundleExtraConditions,
+  type ServerBundleTarget,
+} from './load'
+
+export {
+  pagesApiBundleTargetForRuntime,
+  serverBundleTargetForRuntime,
+  setServerBundleConditions,
+  type ServerBundleTarget,
+} from './load'
 
 const require = createRequire(import.meta.url)
 
-// B4/B5: extra esbuild resolve conditions layered onto the server (RSC) vendor
-// bundle. Core always applies `react-server` (the server graph IS the RSC
-// layer). Compat can add `next-js` (only when cacheComponents is on) via the
-// setter. Kept as a module-level seam so core carries no static edge into
-// compat's config reader.
-export type ServerBundleTarget =
-  CompatAliasTarget | 'edge' | 'pages-api' | 'pages-api-edge' | 'pages' | 'pages-edge'
-
-let extraServerBundleConditions: (target: ServerBundleTarget) => string[] = () => []
-
-/** Install compat-driven extra vendor-bundle conditions (B5 `next-js`). */
-export function setServerBundleConditions(
-  factory: ((target: ServerBundleTarget) => string[]) | undefined,
-): void {
-  extraServerBundleConditions = factory ?? (() => [])
-}
-
-export function serverBundleTargetForRuntime(runtime: string | undefined): ServerBundleTarget {
-  return runtime === 'edge' || runtime === 'experimental-edge' ? 'edge' : 'server'
-}
-
-export function pagesApiBundleTargetForRuntime(runtime: string | undefined): ServerBundleTarget {
-  return runtime === 'edge' || runtime === 'experimental-edge' ? 'pages-api-edge' : 'pages-api'
-}
-
 /**
  * Pages-router PAGE SSR layer: Next compiles it in the server bundle with `node` (or
  * `edge-light`/`browser` for edge) export conditions but WITHOUT `react-server` - a pages page is
@@ -102,7 +93,7 @@ export function serverBundleConditions(target: ServerBundleTarget): string[] {
               : target === 'pages'
                 ? ['node', 'module', 'import']
                 : ['react-server', 'node', 'module', 'import']
-  return [...new Set([...extraServerBundleConditions(target), ...base])]
+  return [...new Set([...serverBundleExtraConditions(target), ...base])]
 }
 
 export function serverBundleRequireConditions(target: ServerBundleTarget): string[] {
@@ -120,7 +111,7 @@ export function serverBundleRequireConditions(target: ServerBundleTarget): strin
               : target === 'pages'
                 ? ['node', 'module', 'require']
                 : ['react-server', 'node', 'module', 'require']
-  return [...new Set([...extraServerBundleConditions(target), ...base])]
+  return [...new Set([...serverBundleExtraConditions(target), ...base])]
 }
 
 const runtimeConfigs = new Map<string, RuntimeConfig>()
@@ -167,14 +158,10 @@ interface TransformCacheEntry {
 }
 
 export function registerServerRuntime(config: ResolvedConfig, sourceFiles: string[] = []) {
-  // Server-rendered Links emit canonical (slashed) hrefs under trailingSlash.
-  setTrailingSlashUrls(Boolean(config.trailingSlash))
-  // File-convention metadata asset hrefs (og-image, manifest) carry the
-  // basePath prefix; core render reads it through the href seam.
-  setBasePathPrefix(typeof config.basePath === 'string' ? config.basePath : '')
-  // Server-rendered Links bake the configured default into `data-prefetch`.
-  setDefaultPrefetchMode(config.prefetch)
-  if (typeof Bun === 'undefined') return
+  applyServerHrefConfig(config)
+  // A release imports compiled artifacts natively: no resolve or transform plugins.
+  if (typeof Bun === 'undefined' || productionRelease(config)) return
+  nativeStoreFor(config)
   const sourceRoots = [...new Set(sourceFiles.map(file => sourceRootForFile(config, file)))].sort()
   const signature = sourceRoots.join('\0')
   let registered = registeredSignatures.get(config)
@@ -189,7 +176,8 @@ export function registerServerRuntime(config: ResolvedConfig, sourceFiles: strin
   const roots = [
     ...rootPaths(config.root),
     ...rootPaths(config.appPath),
-    ...rootPaths(path.join(config.outPath, 'cache', 'server')),
+    // A release build evaluates its compiled artifacts as the release will: natively.
+    ...(isReleaseCompile() ? [] : rootPaths(path.join(outCachePath(config.outPath), 'server'))),
     // The pnext src root, so the framework's own source transforms too.
     ...rootPaths(path.join(import.meta.dirname, '..')),
     ...sourceRoots.flatMap(rootPaths),
@@ -286,7 +274,7 @@ function registerResolvePlugin() {
         const runtime = runtimeConfigForFile(args.importer)
         const resolved = runtime?.aliases.get(args.path) ?? firstAliasForSpecifier(args.path)
         const target = resolved ? serverRequireAlias(args.path, resolved, args.kind) : undefined
-        if (target) return { path: target }
+        if (target) return { path: prebundledFile(target) }
         const message = (runtime ?? firstRuntimeConfig())?.missingImportError(args.path)
         if (message) throw new Error(message)
         return undefined
@@ -302,7 +290,7 @@ function registerResolvePlugin() {
             target: 'server',
           })
         if (!target) return undefined
-        return { path: target }
+        return { path: prebundledFile(target) }
       })
     },
   })
@@ -368,15 +356,201 @@ function registerNodeModulesLoadPlugin() {
           filter:
             /\/node_modules\/.*(?:\.mjs|\.esm\.js|\/(?:es|esm|dist\/esm|build\/modern)\/.*\.js)$/,
         },
-        async ({ path: file }) => {
-          const code = await transformNodeModuleSource(file)
-          return { contents: code, loader: 'js' }
+        ({ path: file }) => {
+          if (isRecordedNativeFile(file) || nodeModuleGraphLoadsAsIs(file)) {
+            return { contents: takeNodeModuleSource(file), loader: 'js' }
+          }
+          return transformNodeModuleSource(file).then(code => ({ contents: code, loader: 'js' }))
         },
       )
     },
   })
 }
 
+const nodeModuleImportScanner = new Bun.Transpiler({ loader: 'js' })
+
+/**
+ * Whether a node_modules ESM file loads exactly as written: one module per file, as Node loads it.
+ * Bundling it with its relative imports inlined gave every entry file of a package its own copy of
+ * the files they share, and of their module state. Only an aliased import, a directive, a non-JS
+ * import or a configured `define` still needs the bundle.
+ */
+export function nodeModuleSourceLoadsAsIs(source: string) {
+  return nodeModuleRelativeImports(source) !== undefined
+}
+
+/** The relative specifiers of a file that loads as-is, or undefined when it needs the bundle. */
+function nodeModuleRelativeImports(source: string) {
+  if (serverDefineOptions().define || source.includes('use cache')) return undefined
+  if (hasModuleDirective(source, 'use client') || hasModuleDirective(source, 'use server')) {
+    return undefined
+  }
+  try {
+    const relative: string[] = []
+    for (const { path: specifier } of nodeModuleImportScanner.scanImports(source)) {
+      if (specifier.startsWith('.') || specifier.startsWith('/')) {
+        if (!/(?:\.[cm]?js|\.json|\/[^./]+)$/.test(specifier)) return undefined
+        if (specifier.startsWith('.')) relative.push(specifier)
+      } else if (aliasSpecifierFilter.test(specifier) || firstAliasForSpecifier(specifier)) {
+        return undefined
+      }
+    }
+    return relative
+  } catch {
+    return undefined
+  }
+}
+
+/**
+ * Files the server's native verdict (vendor-build) proved load as-is. Recorded with the build, so a
+ * started server answers from this set instead of re-scanning every file of every native package.
+ */
+const nativeNodeModuleFiles = new Map<string, string>()
+const nativeNodeModuleStores = new Map<
+  string,
+  { config: ResolvedConfig; files: Map<string, string> }
+>()
+let nativeStoreFlushArmed = false
+
+// Not keyed on pnext's fingerprint: a started server never computes it, and walking pnext's tree for
+// it cost more than the scans this store saves. Bump the version when the as-is rule changes.
+const NATIVE_STORE_VERSION = 1
+const nativeNodeModuleStore = (config: ResolvedConfig) =>
+  path.join(cacheRoot(config.outPath), 'native-files.json')
+
+/** A file's stat signature: a reinstalled package must be scanned again. */
+export function statSignature(file: string) {
+  try {
+    const { mtimeMs, size } = statSync(file)
+    return `${mtimeMs}:${size}`
+  } catch {
+    return undefined
+  }
+}
+
+function nativeStoreFor(config: ResolvedConfig) {
+  let stored = nativeNodeModuleStores.get(config.outPath)?.files
+  if (!stored) {
+    stored = new Map()
+    nativeNodeModuleStores.set(config.outPath, { config, files: stored })
+    for (const [file, signature] of Object.entries(readNativeStore(config))) {
+      stored.set(file, signature)
+      nativeNodeModuleFiles.set(path.resolve(config.workspaceRoot, file), signature)
+    }
+  }
+  return stored
+}
+
+function readNativeStore(config: ResolvedConfig): Record<string, string> {
+  try {
+    const store = JSON.parse(readFileSync(nativeNodeModuleStore(config), 'utf8')) as {
+      version: number
+      files: Record<string, string>
+    }
+    return store.version === NATIVE_STORE_VERSION ? store.files : {}
+  } catch {
+    // No store yet: the plugin scans until the verdicts are recorded.
+    return {}
+  }
+}
+
+function isRecordedNativeFile(file: string) {
+  const signature = nativeNodeModuleFiles.get(file)
+  return signature !== undefined && signature === statSignature(file)
+}
+
+export function recordNativeNodeModuleFiles(config: ResolvedConfig, files: Iterable<string>) {
+  const stored = nativeStoreFor(config)
+  let added = false
+  for (const file of files) {
+    if (nativeNodeModuleFiles.has(file)) continue
+    const signature = statSignature(file)
+    if (!signature) continue
+    nativeNodeModuleFiles.set(file, signature)
+    stored.set(path.relative(config.workspaceRoot, file), signature)
+    added = true
+  }
+  if (!added || nativeStoreFlushArmed) return
+  nativeStoreFlushArmed = true
+  // Written once, at exit: a build records hundreds of native entries.
+  process.once('exit', () => {
+    for (const { config: owner, files } of nativeNodeModuleStores.values()) {
+      try {
+        // Another process (a build's warm child) may have written since this one loaded.
+        for (const [file, signature] of Object.entries(readNativeStore(owner))) {
+          if (!files.has(file)) files.set(file, signature)
+        }
+        writeFileSync(
+          nativeNodeModuleStore(owner),
+          JSON.stringify({ version: NATIVE_STORE_VERSION, files: Object.fromEntries(files) }),
+        )
+      } catch {
+        // A missing store only costs the scan.
+      }
+    }
+  })
+}
+
+/** Per file: its source and relative imports when it loads as-is, or null. Sources are dropped once loaded. */
+const nodeModuleScans = new Map<string, { source?: string; imports: string[] } | null>()
+const nodeModuleGraphVerdicts = new Map<string, boolean>()
+
+function nodeModuleScan(file: string) {
+  let scan = nodeModuleScans.get(file)
+  if (scan === undefined) {
+    try {
+      const source = readFileSync(file, 'utf8')
+      const relative = nodeModuleRelativeImports(source)
+      const dir = path.dirname(file)
+      scan = relative
+        ? {
+            source,
+            imports: relative.map(specifier =>
+              /\.[cm]?js$/.test(specifier)
+                ? path.resolve(dir, specifier)
+                : Bun.resolveSync(specifier, dir),
+            ),
+          }
+        : null
+    } catch {
+      scan = null
+    }
+    nodeModuleScans.set(file, scan)
+  }
+  return scan
+}
+
+/**
+ * Whether `file` and everything it reaches by relative import load as-is. A raw file importing one
+ * that is bundled would meet a second, inlined copy of the files that bundle shares with it.
+ */
+function nodeModuleGraphLoadsAsIs(file: string) {
+  const known = nodeModuleGraphVerdicts.get(file)
+  if (known !== undefined) return known
+  const seen = new Set<string>()
+  const stack = [file]
+  let verdict = true
+  while (stack.length > 0 && verdict) {
+    const next = stack.pop()!
+    if (seen.has(next) || nodeModuleGraphVerdicts.get(next) === true) continue
+    seen.add(next)
+    const scan = nodeModuleScan(next)
+    if (!scan) verdict = false
+    else stack.push(...scan.imports)
+  }
+  if (verdict) for (const covered of seen) nodeModuleGraphVerdicts.set(covered, true)
+  else nodeModuleGraphVerdicts.set(file, false)
+  return verdict
+}
+
+/** The source Bun loads for an as-is file, read once. */
+function takeNodeModuleSource(file: string) {
+  const scan = nodeModuleScans.get(file)
+  const source = scan?.source ?? readFileSync(file, 'utf8')
+  if (scan) scan.source = undefined
+  return source
+}
+
 function runtimeConfigForFile(file: string | undefined) {
   if (!file) return undefined
   const key = path.resolve(file)
@@ -968,7 +1142,7 @@ async function staticImageModuleSource(config: ResolvedConfig | undefined, file:
   const source = compat ?? coreStaticAssetModule(sourcePath, bytes, emit)
   if (config) {
     for (const asset of emitted) {
-      const target = path.join(config.outPath, 'public', ...asset.relative.split('/'))
+      const target = path.join(config.outPath, 'static', ...asset.relative.split('/'))
       await mkdir(path.dirname(target), { recursive: true })
       if (!existsSync(target)) await Bun.write(target, asset.bytes)
     }

package/src/runtime/module-cache.ts

@@ -17,6 +17,7 @@ import { fileURLToPath } from 'node:url'
 import type { ResolvedConfig } from '../config'
 import { writeFileAtomic } from '../utils/fs'
 import { traceEnabled } from '../utils/trace-flags'
+import { outCachePath } from '../out-paths'
 
 /**
  * Kill switch for the request-head trims: the naming walk's synchronous source
@@ -205,7 +206,7 @@ export function devModuleCache(
 }
 
 export function cacheRoot(outPath: string) {
-  return path.join(outPath, 'cache', 'server')
+  return path.join(outCachePath(outPath), 'server')
 }
 
 function createDevModuleCache(
@@ -706,6 +707,19 @@ interface IndexFile {
 /** Bumped whenever a record's shape changes; an older index is simply ignored. */
 const INDEX_VERSION = 4
 
+/** The persisted compile graph: each source's local import targets, absolute. */
+export function compiledSourceGraph(outPath: string, workspaceRoot: string) {
+  const graph = new Map<string, string[]>()
+  const parsed = readIndexFile(path.join(cacheRoot(outPath), 'graph.json'))
+  for (const [source, entry] of Object.entries(parsed?.files ?? {})) {
+    graph.set(
+      absoluteSourcePath(source, workspaceRoot),
+      entry[3].map(file => absoluteSourcePath(file, workspaceRoot)),
+    )
+  }
+  return graph
+}
+
 function readIndexFile(file: string): IndexFile | undefined {
   try {
     return JSON.parse(readFileSync(file, 'utf8')) as IndexFile