@timber-js/app 0.2.0-alpha.191 → 0.2.0-alpha.194

package/src/fonts/dev-middleware.ts

@@ -13,8 +13,8 @@
 import type { ViteDevServer } from 'vite';
 import { readFileSync, existsSync } from 'node:fs';
 import { resolve, normalize } from 'node:path';
-import type { FontPipeline } from './pipeline.js';
-import { fontOutputBasename, fontUrlPrefix } from './paths.js';
+import type { FontPipeline } from './pipeline.ts';
+import { fontOutputBasename, fontUrlPrefix } from './paths.ts';
 
 const FONT_MIME_TYPES: Record<string, string> = {
   woff2: 'font/woff2',

package/src/fonts/google.ts

@@ -18,8 +18,8 @@
 import { createHash } from 'node:crypto';
 import { readFile, writeFile, mkdir, stat } from 'node:fs/promises';
 import { join } from 'node:path';
-import type { ExtractedFont, FontFaceDescriptor } from './types.js';
-import { fontUrlPrefix } from './paths.js';
+import type { ExtractedFont, FontFaceDescriptor } from './types.ts';
+import { fontUrlPrefix } from './paths.ts';
 
 /**
  * Extract a recognizable error code (ETIMEDOUT, ENOTFOUND, etc.) from a

package/src/fonts/local.ts

@@ -14,10 +14,10 @@
  */
 
 import { resolve, dirname, extname } from 'node:path';
-import type { LocalFontConfig, LocalFontSrc, FontFaceDescriptor, ExtractedFont } from './types.js';
-import { buildFontStack } from './fallbacks.js';
-import { extractLocalFontConfigAst } from './ast.js';
-import { fontOutputBasename, fontUrlPrefix } from './paths.js';
+import type { LocalFontConfig, LocalFontSrc, FontFaceDescriptor, ExtractedFont } from './types.ts';
+import { buildFontStack } from './fallbacks.ts';
+import { extractLocalFontConfigAst } from './ast.ts';
+import { fontOutputBasename, fontUrlPrefix } from './paths.ts';
 
 /**
  * Infer the font format from a file extension.

package/src/fonts/pipeline.ts

@@ -28,14 +28,14 @@
 
 import { readFileSync, existsSync } from 'node:fs';
 import { resolve, normalize } from 'node:path';
-import type { ExtractedFont, FontEntry, FontFaceDescriptor } from './types.js';
-import type { CachedFont } from './google.js';
-import { contentHash } from './google.js';
-import { generateVariableClass, generateFontFamilyClass, generateFontFaces } from './css.js';
-import { generateFallbackCss } from './fallbacks.js';
-import { generateLocalFontFaces } from './local.js';
-import { hashedFontBasename, fontUrlPrefix } from './paths.js';
-import { VirtualFontCssIdMap } from './virtual-modules.js';
+import type { ExtractedFont, FontEntry, FontFaceDescriptor } from './types.ts';
+import type { CachedFont } from './google.ts';
+import { contentHash } from './google.ts';
+import { generateVariableClass, generateFontFamilyClass, generateFontFaces } from './css.ts';
+import { generateFallbackCss } from './fallbacks.ts';
+import { generateLocalFontFaces } from './local.ts';
+import { hashedFontBasename, fontUrlPrefix } from './paths.ts';
+import { VirtualFontCssIdMap } from './virtual-modules.ts';
 
 export class FontPipeline {
   /**

package/src/fonts/transform.ts

@@ -14,17 +14,17 @@
  */
 
 import MagicString from 'magic-string';
-import type { ExtractedFont, GoogleFontConfig } from './types.js';
-import { buildFontStack } from './fallbacks.js';
-import { processLocalFont } from './local.js';
+import type { ExtractedFont, GoogleFontConfig } from './types.ts';
+import { buildFontStack } from './fallbacks.ts';
+import { processLocalFont } from './local.ts';
 import {
   extractFontConfigAst,
   detectDynamicFontCallAst,
   findFontCallSites,
   extractGoogleFontConfigFromNode,
   extractLocalFontConfigFromNode,
-} from './ast.js';
-import type { FontPipeline } from './pipeline.js';
+} from './ast.ts';
+import type { FontPipeline } from './pipeline.ts';
 
 /**
  * Convert a font family name to a scoped class name.

package/src/fonts/types.ts

@@ -9,7 +9,7 @@
 
 // `CachedFont` lives in `google.ts`. Importing it here is type-only so
 // there is no runtime dependency cycle — TypeScript erases the import.
-import type { CachedFont } from './google.js';
+import type { CachedFont } from './google.ts';
 
 /** Configuration passed to a Google font function (e.g. `Inter({ ... })`). */
 export interface GoogleFontConfig {

package/src/fonts/virtual-modules.ts

@@ -30,7 +30,7 @@
  */
 
 import { createHash } from 'node:crypto';
-import type { ExtractedFont } from './types.js';
+import type { ExtractedFont } from './types.ts';
 
 export const VIRTUAL_GOOGLE = '@timber/fonts/google';
 export const VIRTUAL_LOCAL = '@timber/fonts/local';

package/src/index.ts

@@ -15,34 +15,43 @@ import { createLogger } from 'vite';
 import { join, relative, resolve } from 'node:path';
 import { createRequire } from 'node:module';
 import react, { reactCompilerPreset } from '@vitejs/plugin-react';
-import { timberContent } from './plugins/content';
-import { timberDevServer } from './plugins/dev-server';
-import { timberEntries } from './plugins/entries';
-import { timberMdx } from './plugins/mdx';
-import { timberRouting } from './plugins/routing';
-import { timberShims } from './plugins/shims';
-import { timberFonts } from './plugins/fonts';
-import { timberStaticBuild } from './plugins/static-build';
-import { timberBuildManifest } from './plugins/build-manifest';
-import { timberDevLogs, originalConsole, wrapLoggerWithOriginalConsole } from './dev-tools/logs';
-import { resolveForwardConsole } from './dev-tools/browser-logs';
-import { timberReactProd } from './plugins/react-prod';
-import { timberChunks } from './plugins/chunks';
-import { clientChunkGroup } from './plugins/client-chunks';
-import { timberServerBundle } from './plugins/server-bundle';
-import { timberCacheTransform } from './plugins/cache';
-import { timberRequestDep } from './plugins/request-dep/index.js';
-import { timberPrebuilt } from './plugins/prebuilt';
-import { timberPrerenderSugar } from './plugins/prerender-sugar';
-import { timberCloudflareWasm } from './plugins/cloudflare-wasm';
-import { timberAdapterBuild } from './plugins/adapter-build';
-import { timberBuildReport } from './plugins/build-report';
-import { createNoopTimer } from './utils/startup-timer';
-import { resolveEncryptionKeyExpression, shouldEnableEncryption } from './server/action-encryption';
-import { createHoldingServer } from './dev-tools/holding-server.js';
-import { resolveStartPort, startDevServerPort } from './server/port-resolution.js';
-import type { TimberUserConfig } from './config-types.js';
-import type { PluginContext, TimberPluginApi } from './plugin-context.js';
+import { timberContent } from './plugins/content.ts';
+import { timberDevServer } from './plugins/dev-server.ts';
+import { timberEntries } from './plugins/entries.ts';
+import { timberMdx } from './plugins/mdx.ts';
+import { timberRouting } from './plugins/routing.ts';
+import { timberShims } from './plugins/shims.ts';
+import { timberFonts } from './plugins/fonts.ts';
+import { timberStaticBuild } from './plugins/static-build.ts';
+import { timberBuildManifest } from './plugins/build-manifest.ts';
+import { timberDevLogs, originalConsole, wrapLoggerWithOriginalConsole } from './dev-tools/logs.ts';
+import { resolveForwardConsole } from './dev-tools/browser-logs.ts';
+import { timberReactProd } from './plugins/react-prod.ts';
+import { timberChunks } from './plugins/chunks.ts';
+import { clientChunkGroup } from './plugins/client-chunks.ts';
+import { timberServerBundle } from './plugins/server-bundle.ts';
+import { timberCacheTransform } from './plugins/cache.ts';
+import { timberRequestDep } from './plugins/request-dep/index.ts';
+import { timberPrebuilt } from './plugins/prebuilt.ts';
+import { timberPrerenderSugar } from './plugins/prerender-sugar.ts';
+import { timberCloudflareWasm } from './plugins/cloudflare-wasm.ts';
+import { timberAdapterBuild } from './plugins/adapter-build.ts';
+import { timberBuildReport } from './plugins/build-report.ts';
+import { createNoopTimer } from './utils/startup-timer.ts';
+import {
+  validateConfig,
+  formatConfigErrors,
+  checkPeerDependencies,
+  formatMissingPeers,
+} from './config-validation.ts';
+import {
+  resolveEncryptionKeyExpression,
+  shouldEnableEncryption,
+} from './server/action-encryption.ts';
+import { createHoldingServer } from './dev-tools/holding-server.ts';
+import { resolveStartPort, startDevServerPort } from './server/port-resolution.ts';
+import type { TimberUserConfig } from './config-types.ts';
+import type { PluginContext, TimberPluginApi } from './plugin-context.ts';
 import {
   createPluginContext,
   loadTimberConfigFile,
@@ -50,11 +59,11 @@ import {
   resolveAppDir,
   resolveClientJavascript,
   resolveBuildDir,
-} from './plugin-context.js';
+} from './plugin-context.ts';
 
 // ── Public API ────────────────────────────────────────────────────────────
 
-export type { TimberUserConfig } from './config-types.js';
+export type { TimberUserConfig } from './config-types.ts';
 
 // Metadata route handler types — re-exported so user-authored metadata
 // route files (sitemap.ts, robots.ts, manifest.ts, icon.tsx, etc.) can
@@ -62,7 +71,7 @@ export type { TimberUserConfig } from './config-types.js';
 // The canonical location for these types is '@timber-js/app/server'; this
 // root re-export is a convenience for typed metadata route handlers.
 // See design/16-metadata.md §"Metadata Routes".
-export type { Metadata, MetadataRoute, MetadataHandler, MetadataResult } from './server/types.js';
+export type { Metadata, MetadataRoute, MetadataHandler, MetadataResult } from './server/types.ts';
 
 /**
  * Route map interface — augmented by the generated timber-routes.d.ts.
@@ -338,7 +347,12 @@ export function timber(config?: TimberUserConfig): PluginOption[] {
       // See design/21-dev-server.md §"Default Port and Auto-Bump".
       let resolvedDevPort: number | null = null;
       let resolvedDevPortExplicit = false;
-      if (command === 'serve' && !isPreview) {
+      // Middleware-mode embeddings (the analyze crawl, custom servers)
+      // never bind a port, and the dev-server plugin's listen() handoff
+      // that closes the holding server never runs — starting it would
+      // occupy the default port for the embedding's lifetime.
+      const isMiddlewareMode = Boolean(userConfig.server?.middlewareMode);
+      if (command === 'serve' && !isPreview && !isMiddlewareMode) {
         ctx.holdingServer = createHoldingServer();
         const holdingRef = ctx.holdingServer;
         const result = await startDevServerPort({
@@ -513,11 +527,6 @@ export function timber(config?: TimberUserConfig): PluginOption[] {
       // Validate config and check peer dependencies at startup.
       // Errors are logged to stderr but don't block startup — Vite may
       // still work partially, and the errors guide the user to fix things.
-      /* eslint-disable no-var-requires -- sync require for startup validation */
-      const { validateConfig, formatConfigErrors, checkPeerDependencies, formatMissingPeers } =
-        require('./config-validation.js') as typeof import('./config-validation.js');
-      /* eslint-enable no-var-requires */
-
       const configErrors = validateConfig(ctx.config);
       if (configErrors.length > 0) {
         process.stderr.write(`${formatConfigErrors(configErrors)}\n\n`);

package/src/params/codec-registry.ts

@@ -12,7 +12,7 @@
  * Design doc: design/41-global-params.md §"Link Component"
  */
 
-import type { Codec } from '../codec.js';
+import type { Codec } from '../codec.ts';
 
 let _codecs: Record<string, Codec<unknown>> | null = null;
 

package/src/params/define-schema.ts

@@ -8,8 +8,8 @@
  * Design doc: design/41-global-params.md
  */
 
-import type { Codec, CatchAllCodec, OptionalCatchAllCodec } from '../codec.js';
-import type { StandardSchemaV1 } from '../schema-bridge.js';
+import type { Codec, CatchAllCodec, OptionalCatchAllCodec } from '../codec.ts';
+import type { StandardSchemaV1 } from '../schema-bridge.ts';
 
 // ---------------------------------------------------------------------------
 // Types

package/src/params/index.ts

@@ -5,13 +5,13 @@
 //
 // See design/41-global-params.md
 
-export { defineSchema } from './define-schema.js';
+export { defineSchema } from './define-schema.ts';
 export type {
   InferCodecType,
   SchemaConfig,
   SegmentParamCodec,
   ValidDynamicSegmentKeys,
   ValidDynamicSegmentKeysRegistry,
-} from './define-schema.js';
-export { resolveSchemaCodecs, toBracketKey } from './resolve-schema.js';
-export { setLinkCodecs, getLinkCodec } from './codec-registry.js';
+} from './define-schema.ts';
+export { resolveSchemaCodecs, toBracketKey } from './resolve-schema.ts';
+export { setLinkCodecs, getLinkCodec } from './codec-registry.ts';

package/src/params/resolve-schema.ts

@@ -9,8 +9,8 @@
  * Design doc: design/41-global-params.md §Pipeline Integration
  */
 
-import type { Codec } from '../codec.js';
-import { isCodec, resolveCodecOrSchema } from '../schema-bridge.js';
+import type { Codec } from '../codec.ts';
+import { isCodec, resolveCodecOrSchema } from '../schema-bridge.ts';
 
 /**
  * Reconstruct the bracket key for a segment from its type and param name.

package/src/plugin-context.ts

@@ -12,18 +12,18 @@ import { existsSync } from 'node:fs';
 import { join, resolve } from 'node:path';
 import { createRequire } from 'node:module';
 import { parseAst } from 'vite';
-import type { RouteTree } from './routing/types';
-import type { BuildManifest } from './server/build-manifest';
-import type { CaptureSummary } from './server/prebuilt-builder';
-import type { StartupTimer } from './utils/startup-timer';
-import { createStartupTimer } from './utils/startup-timer';
-import type { TimberUserConfig, ClientJavascriptConfig } from './config-types.js';
-import type { RscManifest } from './plugins/static-build.js';
-import type { HoldingServer } from './dev-tools/holding-server.js';
-import type { ProgramNode } from './plugins/callsite-ast.js';
+import type { RouteTree } from './routing/types.ts';
+import type { BuildManifest } from './server/build-manifest.ts';
+import type { CaptureSummary } from './server/prebuilt-builder.ts';
+import type { StartupTimer } from './utils/startup-timer.ts';
+import { createStartupTimer } from './utils/startup-timer.ts';
+import type { TimberUserConfig, ClientJavascriptConfig } from './config-types.ts';
+import type { RscManifest } from './plugins/static-build.ts';
+import type { HoldingServer } from './dev-tools/holding-server.ts';
+import type { ProgramNode } from './plugins/callsite-ast.ts';
 
 // Re-export for sub-plugin convenience — they import from plugin-context.ts
-export type { TimberUserConfig, ClientJavascriptConfig } from './config-types.js';
+export type { TimberUserConfig, ClientJavascriptConfig } from './config-types.ts';
 
 // ── Client JavaScript config ─────────────────────────────────────────────
 

package/src/plugins/adapter-build.ts

@@ -17,11 +17,11 @@ import type { Plugin } from 'vite';
 import { join } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { readFile, writeFile } from 'node:fs/promises';
-import type { PluginContext } from '../plugin-context.js';
-import type { TimberPlatformAdapter, TimberConfig } from '../adapters/types.js';
-import type { BuildManifest } from '../server/build-manifest.js';
-import { swallow } from '../server/logger.js';
-import { normalizeBasePath } from '../shared/base-path.js';
+import type { PluginContext } from '../plugin-context.ts';
+import type { TimberPlatformAdapter, TimberConfig } from '../adapters/types.ts';
+import type { BuildManifest } from '../server/build-manifest.ts';
+import { swallow } from '../server/logger.ts';
+import { normalizeBasePath } from '../shared/base-path.ts';
 
 export function timberAdapterBuild(ctx: PluginContext): Plugin {
   return {

package/src/plugins/build-manifest.ts

@@ -19,10 +19,10 @@
 import { randomUUID, createHash } from 'node:crypto';
 import { readFileSync } from 'node:fs';
 import type { Plugin, ResolvedConfig } from 'vite';
-import type { PluginContext } from '../plugin-context.js';
-import { EMPTY_BUILD_MANIFEST, type BuildManifest } from '../server/build-manifest.js';
-import type { SegmentNode, RouteFile } from '../routing/types.js';
-import { isDynamicMetadataExtension } from '../server/metadata-routes.js';
+import type { PluginContext } from '../plugin-context.ts';
+import { EMPTY_BUILD_MANIFEST, type BuildManifest } from '../server/build-manifest.ts';
+import type { SegmentNode, RouteFile } from '../routing/types.ts';
+import { isDynamicMetadataExtension } from '../server/metadata-routes.ts';
 
 // Rollup types used by generateBundle hook — imported from vite which re-exports them.
 // We define minimal interfaces here to avoid a direct 'rollup' dependency.

package/src/plugins/build-report.ts

@@ -17,12 +17,12 @@ import { readFileSync } from 'node:fs';
 import { join, relative } from 'node:path';
 import { gzipSync } from 'node:zlib';
 import type { Plugin, Logger } from 'vite';
-import type { PluginContext } from '../plugin-context.js';
-import type { SegmentNode, RouteTree } from '../routing/types.js';
-import type { CaptureSummary } from '../server/prebuilt-builder.js';
-import type { PrebuiltManifest } from '../server/prebuilt/payload-source.js';
-import { collectLeafRoutes } from '../routing/walkers.js';
-import { formatSize } from '../utils/format.js';
+import type { PluginContext } from '../plugin-context.ts';
+import type { SegmentNode, RouteTree } from '../routing/types.ts';
+import type { CaptureSummary } from '../server/prebuilt-builder.ts';
+import type { PrebuiltManifest } from '../server/prebuilt/payload-source.ts';
+import { collectLeafRoutes } from '../routing/walkers.ts';
+import { formatSize } from '../utils/format.ts';
 
 // ─── Public types ─────────────────────────────────────────────────────────
 

package/src/plugins/cache.ts

@@ -56,14 +56,14 @@
 import { relative } from 'node:path';
 import MagicString from 'magic-string';
 import type { Plugin } from 'vite';
-import type { PluginContext } from '../plugin-context.js';
+import type { PluginContext } from '../plugin-context.ts';
 import {
   CACHE_MODULE_SOURCES,
   collectShadowRanges,
   findCallSites,
   findImportBindings,
   generateStableCallsiteId,
-} from './callsite-ast.js';
+} from './callsite-ast.ts';
 import type {
   CallExpressionNode,
   IdentifierNode,
@@ -72,7 +72,7 @@ import type {
   PositionedNode,
   ProgramNode,
   ShadowRange,
-} from './callsite-ast.js';
+} from './callsite-ast.ts';
 
 /**
  * Is this callee a `cache.data(...)` call? Matches two forms:

package/src/plugins/callsite-ast.ts

@@ -10,7 +10,7 @@
  * See TIM-997, TIM-1053, design/06-caching.md §"Cache Key Security".
  */
 
-import { fnv1aHash } from '../cache/fast-hash.js';
+import { fnv1aHash } from '../cache/fast-hash.ts';
 
 /** Module specifiers whose bindings the transforms track. */
 export const CACHE_MODULE_SOURCES = new Set(['@timber-js/app/cache', 'timber/cache']);

package/src/plugins/callsite-jsx.ts

@@ -11,8 +11,8 @@
  * See design/44-render-at-build-time.md §Props Derivation at Build Time.
  */
 
-import type { PluginContext } from '../plugin-context.js';
-import type { IdentifierNode, PositionedNode, ProgramNode } from './callsite-ast.js';
+import type { PluginContext } from '../plugin-context.ts';
+import type { IdentifierNode, PositionedNode, ProgramNode } from './callsite-ast.ts';
 
 interface JSXElementNode extends PositionedNode {
   type: 'JSXElement';

package/src/plugins/chunks.ts

@@ -22,7 +22,7 @@
  */
 
 import type { Plugin, Rollup } from 'vite';
-import type { PluginContext } from '../plugin-context';
+import type { PluginContext } from '../plugin-context.ts';
 
 /**
  * Check if a module is part of the timber framework runtime.

package/src/plugins/cloudflare-wasm.ts

@@ -20,7 +20,7 @@ import { basename, resolve, dirname } from 'node:path';
 import { createHash } from 'node:crypto';
 import { copyFile, mkdir, readFile } from 'node:fs/promises';
 import type { Plugin, ResolvedConfig } from 'vite';
-import type { PluginContext } from '../plugin-context.js';
+import type { PluginContext } from '../plugin-context.ts';
 
 function isCloudflareAdapter(ctx: PluginContext): boolean {
   const adapter = ctx.config.adapter as { name?: string } | undefined;

package/src/plugins/content.ts

@@ -11,7 +11,7 @@
 import type { Plugin } from 'vite';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
-import type { PluginContext } from '../plugin-context.js';
+import type { PluginContext } from '../plugin-context.ts';
 
 const CONFIG_FILE_NAMES = [
   'content-collections.ts',
@@ -127,6 +127,10 @@ export function timberContent(ctx: PluginContext): Plugin {
     },
 
     async configureServer(server) {
+      // The analyze crawl child must not start content-collections'
+      // file watcher — it outlives server.close() and holds the
+      // process open (the child relies on process.exit to clean up).
+      if (process.env.TIMBER_ANALYZE === '1') return;
       if (!innerPlugin) return;
       if (typeof innerPlugin.configureServer === 'function') {
         await (innerPlugin.configureServer as (...args: unknown[]) => unknown).call(this, server);