veryfront 0.1.367 → 0.1.369

package/src/src/rendering/script-page-handling.ts

@@ -314,7 +314,7 @@ async function transpileWithEsbuild(
   modulePath: string,
   resolveDir: string,
 ): Promise<string> {
-  const { build } = await import("esbuild");
+  const { build } = await import("../extensions/bundler.js");
   const loader = getEsbuildLoader(modulePath);
 
   const result = await build({

package/src/src/routing/api/module-loader/esbuild-plugin.ts

@@ -7,7 +7,7 @@ import {
   type LockfileManager,
   serverLogger,
 } from "../../../utils/index.js";
-import type { Message, Plugin } from "esbuild";
+import type { Message, Plugin } from "../../../extensions/bundler.js";
 
 const logger = serverLogger.component("api");
 

package/src/src/routing/api/module-loader/loader.ts

@@ -1,6 +1,6 @@
 import * as dntShim from "../../../../_dnt.shims.js";
 import { serverLogger } from "../../../utils/index.js";
-import type { BuildResult, Plugin } from "esbuild";
+import type { BuildResult, Plugin } from "../../../extensions/bundler.js";
 import type { RuntimeAdapter } from "../../../platform/adapters/base.js";
 import type { VeryfrontConfig } from "../../../config/index.js";
 import { createHTTPPlugin } from "./esbuild-plugin.js";
@@ -328,7 +328,7 @@ function loadAndTranspileModule(
         userExternals.push(name, `${name}/*`);
       }
 
-      const { build } = await import("esbuild");
+      const { build } = await import("../../../extensions/bundler.js");
 
       // Many npm packages use CJS require() for Node built-ins (e.g. require('fs')).
       // When esbuild bundles CJS into ESM output, these become __require() shims that

package/src/src/server/bootstrap.ts

@@ -5,6 +5,8 @@ import { clearConfigCache, getConfig } from "../config/index.js";
 import { type ExtensionLoader, orchestrateExtensions, tryResolve } from "../extensions/index.js";
 import { AIProviderRegistryName } from "../extensions/interfaces/index.js";
 import { createAIProviderRegistry } from "../extensions/registries/ai-provider-registry.js";
+import { MISSING_EXTENSION_ERROR } from "../extensions/errors.js";
+import { getRecommendation } from "../extensions/recommendations.js";
 import type { TracingExporter } from "../extensions/interfaces/tracing-exporter.js";
 import {
   setGlobalActiveSpanAccessor,
@@ -68,6 +70,30 @@ export interface BootstrapResult {
  * Wire the `TracingExporter` contract (if registered) into the core shim.
  * Must be called after `orchestrateExtensions()` completes.
  */
+/**
+ * Fail-fast: ensure the `Bundler` contract has been registered. Core depends
+ * on it for every JS/TS transform path. `ModuleLexer` is checked too, but
+ * only as a warning (dev-only paths can degrade).
+ */
+function assertRequiredContracts(): void {
+  if (!tryResolve("Bundler")) {
+    const recommendation = getRecommendation("Bundler");
+    throw MISSING_EXTENSION_ERROR.create({
+      message: `Missing extension for contract "Bundler"${
+        recommendation ? `. Recommended: ${recommendation}` : ""
+      }`,
+      detail: recommendation ? `Install it with: deno add ${recommendation}` : undefined,
+    });
+  }
+  if (!tryResolve("ModuleLexer")) {
+    bootstrapLog.warn(
+      `[bootstrap] no ModuleLexer extension registered — dev-server import rewriting will fail. Recommended: ${
+        getRecommendation("ModuleLexer") ?? "@veryfront/ext-esbuild"
+      }`,
+    );
+  }
+}
+
 function wireTracingShim(): void {
   const tracing = tryResolve<TracingExporter>("TracingExporter");
   if (tracing) {
@@ -203,6 +229,7 @@ export async function bootstrap(
       primeContracts: { [AIProviderRegistryName]: createAIProviderRegistry() },
     });
     wireTracingShim();
+    assertRequiredContracts();
     return {
       adapter,
       config,
@@ -245,6 +272,7 @@ export async function bootstrap(
       primeContracts: { [AIProviderRegistryName]: createAIProviderRegistry() },
     });
     wireTracingShim();
+    assertRequiredContracts();
     return {
       adapter,
       config,
@@ -311,6 +339,7 @@ export async function bootstrap(
     fsDispose,
   );
   wireTracingShim();
+  assertRequiredContracts();
 
   return {
     adapter: enhancedAdapter,

package/src/src/server/dev-server/middleware.ts

@@ -139,7 +139,7 @@ async function loadMiddlewareFromVirtualFS(
   const source = typeof content === "string" ? content : new TextDecoder().decode(content);
   const loader = getEsbuildLoader(middlewarePath);
 
-  const { build } = await import("esbuild");
+  const { build } = await import("../../extensions/bundler.js");
   const result = await build({
     bundle: false,
     write: false,

package/src/src/server/handlers/dev/files/esbuild-plugins.ts

@@ -1,4 +1,4 @@
-import type { OnLoadArgs, OnResolveArgs, Plugin, PluginBuild } from "esbuild";
+import type { OnLoadArgs, OnResolveArgs, Plugin, PluginBuild } from "../../../../extensions/bundler.js";
 import { NETWORK_ERROR } from "../../../../errors/index.js";
 // Direct import from base.ts to avoid circular dependency through barrel
 import type { RuntimeAdapter } from "../../../../platform/adapters/base.js";

package/src/src/server/handlers/studio/bridge-modules.handler.ts

@@ -59,7 +59,7 @@ async function bundleBridge(): Promise<{ js: string; etag: string }> {
   const entryPoint = `${BRIDGE_DIR}bridge-coordinator.ts`;
   const source = await dntShim.Deno.readTextFile(entryPoint);
 
-  const { build } = await import("esbuild");
+  const { build } = await import("../../../extensions/bundler.js");
   const { outputFiles } = await build({
     bundle: true,
     write: false,

package/src/src/server/services/rsc/endpoints/script-handlers.ts

@@ -19,18 +19,18 @@ async function buildOrServeScript(
   adapter: RuntimeAdapter,
   path: string,
   fallbackBundle: string,
-  esbuildOptions: Omit<import("esbuild").BuildOptions, "stdin"> & {
-    stdin: import("esbuild").StdinOptions;
+  esbuildOptions: Omit<import("../../../../extensions/bundler.js").BuildOptions, "stdin"> & {
+    stdin: import("../../../../extensions/bundler.js").StdinOptions;
   },
 ): Promise<Response> {
   // If a pre-built bundle was injected at compile time, serve it directly
   if (fallbackBundle) return jsResponse(fallbackBundle);
 
-  let esbuild: typeof import("esbuild") | null = null;
+  let esbuild: typeof import("../../../../extensions/bundler.js") | null = null;
 
   try {
     const src = await adapter.fs.readFile(path);
-    esbuild = await import("esbuild");
+    esbuild = await import("../../../../extensions/bundler.js");
     const result = await esbuild.build({
       ...esbuildOptions,
       stdin: { ...esbuildOptions.stdin, contents: src },

package/src/src/server/services/rsc/orchestrators/hydrator-handler.ts

@@ -32,7 +32,7 @@ export class HydratorHandler {
   }
 
   private async bundleHydrator(filePath: string): Promise<string> {
-    const { build, stop } = await import("esbuild");
+    const { build, stop } = await import("../../../../extensions/bundler.js");
 
     try {
       const source = await this.readHydratorFile(filePath);

package/src/src/server/shared/browser-module-bundler.ts

@@ -23,7 +23,7 @@ export function bundleBrowserModule(
   return withSpan(
     "server.browser-module.bundle",
     async () => {
-      const { build } = await import("esbuild");
+      const { build } = await import("../../extensions/bundler.js");
       const src = await options.adapter.fs.readFile(absPath);
       const importMapJson = await buildImportMapJson({
         projectDir: options.projectDir,

package/src/src/testing/bdd.ts

@@ -12,6 +12,7 @@ import "../../_dnt.polyfills.js";
 import * as dntShim from "../../_dnt.shims.js";
 
 
+import "./init.js";
 import { isBun, isDeno } from "../platform/compat/runtime.js";
 import { getEnvOverlayStorage } from "../platform/compat/process.js";
 

package/src/src/testing/init.ts

@@ -12,6 +12,9 @@
 import * as dntShim from "../../_dnt.shims.js";
 
 
+import { EsbuildBundler, EsModuleLexer } from "../../extensions/ext-esbuild/src/index.js";
+import { register as registerContract } from "../extensions/contracts.js";
+
 const g = dntShim.dntGlobalThis as Record<string, unknown>;
 
 g.__vfDisableLruInterval = true;
@@ -19,3 +22,9 @@ g.__vfTestEnv = true;
 g.__vfTestEnvMask = {
   prefixes: ["VERYFRONT_", "OTEL_", "OAUTH_", "GITHUB_", "OPENAI_", "ANTHROPIC_", "GOOGLE_"],
 };
+
+// Tests don't run the extension orchestrator; prime the Bundler + ModuleLexer
+// contracts here so transforms that depend on them (lexer.ts, parse-cache.ts,
+// the platform/compat/esbuild shim, and bundler call-sites) work in tests.
+registerContract("Bundler", new EsbuildBundler());
+registerContract("ModuleLexer", new EsModuleLexer());

package/src/src/transforms/esm/http-bundler.ts

@@ -8,7 +8,7 @@ import * as dntShim from "../../../_dnt.shims.js";
 
 
 import { rendererLogger as logger } from "../../utils/index.js";
-import type { Plugin } from "esbuild";
+import type { Plugin } from "../../extensions/bundler.js";
 import { replaceSpecifiers } from "./lexer.js";
 import { DEFAULT_REACT_VERSION, getReactUrls } from "./package-registry.js";
 import {

package/src/src/transforms/esm/lexer.ts

@@ -1,5 +1,8 @@
 import { logger as baseLogger } from "../../utils/index.js";
-import { init, parse } from "es-module-lexer";
+import { resolve as resolveContract } from "../../extensions/contracts.js";
+import type { ImportSpecifier, ModuleLexer } from "../../extensions/interfaces/module-lexer.js";
+
+export type { ImportSpecifier };
 
 const logger = baseLogger.component("es-module-lexer");
 
@@ -37,32 +40,21 @@ function unmaskHttpUrls(code: string, urlMap: Map<string, string>): string {
   return result;
 }
 
+function getLexer(): ModuleLexer {
+  return resolveContract<ModuleLexer>("ModuleLexer");
+}
+
 export async function initLexer(): Promise<void> {
   if (initPromise) {
     await initPromise;
     return;
   }
 
-  // es-module-lexer@1.5 exports init as a Promise (not a function) in ESM build
-  // but some typings expect a function. Handle both to avoid type errors.
-  const anyInit = init as unknown;
-  initPromise = typeof anyInit === "function"
-    ? (anyInit as () => Promise<void>)()
-    : (anyInit as Promise<void>);
-
+  const lexer = getLexer();
+  initPromise = lexer.init ? lexer.init() : Promise.resolve();
   await initPromise;
 }
 
-export type ImportSpecifier = {
-  n: string | undefined; // The module specifier (e.g., "react")
-  s: number; // Start of module specifier
-  e: number; // End of module specifier
-  ss: number; // Start of import statement
-  se: number; // End of import statement
-  d: number; // > -1 if dynamic import
-  a: number; // import attribute index
-};
-
 function logParseError(error: unknown, code: string): void {
   const errorMsg = error instanceof Error ? error.message : String(error);
   const match = errorMsg.match(/@:(\d+):(\d+)/);
@@ -93,7 +85,7 @@ export async function parseImports(code: string): Promise<readonly ImportSpecifi
 
   let imports: readonly ImportSpecifier[];
   try {
-    [imports] = parse(masked);
+    imports = getLexer().parse(masked);
   } catch (error) {
     logParseError(error, masked);
     throw error;
@@ -120,7 +112,7 @@ export async function replaceSpecifiers(
   await initLexer();
 
   const { masked, urlMap } = maskHttpUrls(code);
-  const [imports] = parse(masked);
+  const imports = getLexer().parse(masked);
 
   let result = masked;
 
@@ -165,7 +157,7 @@ export async function rewriteImports(
   await initLexer();
 
   const { masked, urlMap } = maskHttpUrls(code);
-  const [imports] = parse(masked);
+  const imports = getLexer().parse(masked);
 
   let result = masked;
 

package/src/src/transforms/esm/transform-utils.ts

@@ -1,4 +1,4 @@
-import type { Loader } from "esbuild";
+import type { Loader } from "../../extensions/bundler.js";
 import { shortHash } from "../../utils/hash-utils.js";
 
 /**

package/src/src/transforms/import-rewriter/parse-cache.ts

@@ -5,21 +5,24 @@
  * This eliminates redundant parsing that happened with the fragmented system.
  */
 
-import { init, parse } from "es-module-lexer";
+import { resolve as resolveContract } from "../../extensions/contracts.js";
+import type { ModuleLexer } from "../../extensions/interfaces/module-lexer.js";
 import type { ImportSpecifierInfo } from "./types.js";
 import type { ImportSpecifier } from "../esm/lexer.js";
 
 let initPromise: Promise<void> | null = null;
 
+function getLexer(): ModuleLexer {
+  return resolveContract<ModuleLexer>("ModuleLexer");
+}
+
 /**
- * Initialize es-module-lexer (must be called before parsing).
+ * Initialize the ModuleLexer (must be called before parsing).
  */
 export async function initLexer(): Promise<void> {
   if (!initPromise) {
-    const anyInit = init as unknown;
-    initPromise = typeof anyInit === "function"
-      ? (anyInit as () => Promise<void>)()
-      : (anyInit as Promise<void>);
+    const lexer = getLexer();
+    initPromise = lexer.init ? lexer.init() : Promise.resolve();
   }
 
   await initPromise;
@@ -81,7 +84,7 @@ export async function parseAllImports(code: string): Promise<ParsedImports> {
   await initLexer();
 
   const { masked, urlMap } = maskHttpUrls(code);
-  const [rawImports] = parse(masked);
+  const rawImports = getLexer().parse(masked);
 
   const imports: ImportSpecifierInfo[] = rawImports
     .filter((imp) => imp.n !== undefined)

package/src/src/transforms/mdx/esm-module-loader/import-transformer.ts

@@ -91,7 +91,7 @@ export async function transformJsxImports(
   adapter: ESMLoaderContext["adapter"],
   esmCacheDir: string,
 ): Promise<string> {
-  const { transform } = await import("esbuild");
+  const { transform } = await import("../../../extensions/bundler.js");
 
   const importsToProcess: Array<{
     fullMatch: string;

package/src/src/transforms/pipeline/stages/ssr-vf-modules/transform.ts

@@ -107,7 +107,7 @@ export async function transformFrameworkCode(
       depth,
     });
     // Return minimally transformed code - it will fail at runtime but won't hang
-    const { transform } = await import("esbuild");
+    const { transform } = await import("../../../../extensions/bundler.js");
     const ext = sourcePath.match(/\.(tsx?|jsx?)$/)?.[1] ?? "tsx";
     let loader: "tsx" | "ts" | "jsx" | "js" = "js";
     if (ext === "tsx") loader = "tsx";
@@ -151,7 +151,7 @@ export async function transformFrameworkCode(
   transformingFiles.add(sourcePath);
 
   try {
-    const { transform } = await import("esbuild");
+    const { transform } = await import("../../../../extensions/bundler.js");
 
     const ext = sourcePath.match(/\.(tsx?|jsx?)$/)?.[1] ?? "tsx";
     let loader: "tsx" | "ts" | "jsx" | "js" = "js";

package/src/src/utils/version-constant.ts

@@ -1,3 +1,3 @@
 // Keep in sync with deno.json version.
 // scripts/release.ts updates this constant during releases.
-export const VERSION = "0.1.367";
+export const VERSION = "0.1.369";