@vercube/vite 1.1.2 → 1.1.4

package/README.md

@@ -79,17 +79,19 @@ node dist/index.mjs   # runs the built server
 | `scanDirs`   | `string[]`             | `['src']`       | Directories scanned (recursively) for `@Controller` and `@Injectable` classes.                                    |
 | `setupFile`  | `string`               | `undefined`     | Module whose default export `(app: App) => void \| Promise<void>` runs as `createApp`'s setup hook (before init). |
 | `runner`     | `string`               | `'node-worker'` | The `env-runner` runner used to execute server code in dev.                                                       |
-| `noExternal` | `(string \| RegExp)[]` | `undefined`     | Extra dev `resolve.noExternal` patterns merged after `@vercube/*` (see below).                                    |
+| `noExternal` | `(string \| RegExp)[]` | `undefined`     | Extra package patterns merged after `@vercube/*` for dev and production bundling (see below).                     |
 
-### Dev `noExternal`
+### `noExternal`
 
-In dev, Vercube keeps `@vercube/*` inside Vite's module graph so class-reference DI tokens are not loaded twice. If a dependency imports `@vercube/core` from its published `dist` while your app imports it through Vite, inject tokens such as `RequestContext` will not match.
+Vercube keeps `@vercube/*` in a single module graph so class-reference DI tokens are not loaded twice. If a dependency imports `@vercube/core` from its published `dist` while your app resolves a different copy (common with pnpm), inject tokens such as `RequestContext` will not match — auth middleware writes to one instance, your services read from another.
 
-Add those packages via `noExternal`:
+The same patterns apply in **dev** (`resolve.noExternal`). In **production** the server bundle keeps `@vercube/*` and plugin packages as runtime imports — only app source (`@/…`) is inlined. Use **one** `@vercube/core` version across the app and dependencies (e.g. pnpm `overrides`), otherwise class-reference DI tokens such as `RequestContext` will not match between `@enp/auth` and your services.
+
+Add packages that use Vercube DI tokens:
 
 ```ts
 vercube({
-  noExternal: [/^@org\//],
+  noExternal: [/^@enp\//],
 });
 ```
 

package/dist/{context-CfzvWZrR.mjs → context-sG04QQCS.mjs}

@@ -35,7 +35,8 @@ function generateServerEntry(ctx) {
 	else lines.push("const app = await createApp();", "");
 	lines.push(...[...imports.keys()].map((name) => `app.container.bind(${name});`), "");
 	lines.push("app.container.flushQueue();", "");
-	lines.push("if (import.meta.main) {", "  await app.listen();", "}", "");
+	if (ctx.hasClient) lines.push("if (import.meta.main) {", "  const dir = fileURLToPath(new URL('./public', import.meta.url));", "  app.container.get(HttpServer).enableSpaFallback(dir);", "  await app.listen();", "}", "");
+	else lines.push("if (import.meta.main) {", "  await app.listen();", "}", "");
 	lines.push("export const fetch = app.fetch.bind(app);", "");
 	lines.push("export const handleUpgrade = (req, socket, head) => globalThis.__vercube_ws_upgrade__?.(req, socket, head);", "");
 	return lines.join("\n");

package/dist/{dev-Bl0akm-q.mjs → dev-CKXS10LI.mjs}

@@ -1,4 +1,4 @@
-import { r as scanProject } from "./context-CfzvWZrR.mjs";
+import { r as scanProject } from "./context-sG04QQCS.mjs";
 import { t as VERCUBE_ENV } from "./types-Cpd32Lkt.mjs";
 import { createViteHotChannel } from "env-runner/vite";
 import { watch } from "chokidar";

package/dist/index.d.mts

@@ -34,15 +34,15 @@ interface VercubePluginConfig {
    */
   runner?: string;
   /**
-   * Additional package patterns passed to the Vercube environment's dev
-   * `resolve.noExternal`. They are merged after the built-in `@vercube/*`
-   * defaults so class-reference DI tokens are not duplicated in the module graph.
+   * Package patterns merged after the built-in `@vercube/*` defaults. In dev they
+   * are passed to `resolve.noExternal`; in production they are bundled into the
+   * server output so class-reference DI tokens are not duplicated at runtime.
    *
-   * Use this for workspace packages (for example `@org/*`) that import
-   * `@vercube/core` and register Vercube DI tokens.
+   * Use this for packages (for example `@enp/*`) that import `@vercube/core` and
+   * participate in request-scoped injection (`RequestContext`, etc.).
    *
    * @example
-   * vercube({ noExternal: [/^@org\//] })
+   * vercube({ noExternal: [/^@enp\//] })
    */
   noExternal?: (string | RegExp)[];
 }

package/dist/index.mjs

@@ -1,5 +1,6 @@
-import { i as setupContext, n as createContext, t as CLIENT_OUT_DIR } from "./context-CfzvWZrR.mjs";
+import { i as setupContext, n as createContext, t as CLIENT_OUT_DIR } from "./context-sG04QQCS.mjs";
 import { t as VERCUBE_ENV } from "./types-Cpd32Lkt.mjs";
+import { createRequire } from "node:module";
 import { defu } from "defu";
 import { dirname, isAbsolute, resolve } from "pathe";
 import { RunnerManager, loadRunner } from "env-runner";
@@ -8,25 +9,51 @@ import { fileURLToPath } from "node:url";
 * Absolute path to the worker bootstrap loaded by env-runner.
 */
 const devWorker = resolve(resolve(dirname(fileURLToPath(import.meta.url)), "runtime"), "dev-worker.mjs");
-//#endregion
-//#region src/env.ts
 /**
-* Default dev-only `resolve.noExternal` patterns. `@vercube/*` must stay in
-* Vite's module graph so class-reference DI tokens are not duplicated; other
-* deps (e.g. CJS-only `dotenv`) are left external and loaded via native
-* `import()`.
+* Default `resolve.noExternal` / production bundle patterns. `@vercube/*` must stay in
+* a single module graph so class-reference DI tokens (e.g. `RequestContext`) are not
+* duplicated between the app, plugins, and framework.
+*/
+const DEFAULT_NO_EXTERNAL = [/^@vercube\//, ...[
+	/^srvx/,
+	"rou3",
+	"c12",
+	"defu",
+	"pathe",
+	"evlog",
+	/^evlog\//,
+	"@standard-schema/spec"
+]];
+/** Vercube packages that must resolve to a single module id (class-reference DI tokens). */
+const VERCUBE_PACKAGES = [
+	"@vercube/core",
+	"@vercube/di",
+	"@vercube/auth",
+	"@vercube/logger",
+	"@vercube/schema"
+];
+/**
+* Canonical entry paths for `@vercube/*` packages from the consuming app's root.
+* Prevents the production bundler from inlining duplicate copies when workspace
+* links and `node_modules` paths both appear in the graph.
 */
-const DEV_NO_EXTERNAL = [/^@vercube\//];
+function createVercubeResolveAliases(root) {
+	const require = createRequire(resolve(root, "package.json"));
+	const aliases = {};
+	for (const name of VERCUBE_PACKAGES) try {
+		aliases[name] = require.resolve(name);
+	} catch {}
+	return aliases;
+}
 /**
-* Resolves the full dev `noExternal` list for the Vercube environment by
-* merging {@link DEV_NO_EXTERNAL} with optional plugin patterns.
+* Merges built-in {@link DEFAULT_NO_EXTERNAL} with optional plugin patterns.
 *
 * @param extra - Additional patterns from {@link VercubePluginConfig.noExternal}.
-* @returns Patterns for `resolve.noExternal` in dev.
+* @returns Patterns for dev `resolve.noExternal` and production bundling.
 */
-function resolveDevNoExternal(extra) {
-	if (!extra?.length) return DEV_NO_EXTERNAL;
-	return [...DEV_NO_EXTERNAL, ...extra];
+function resolveNoExternalPatterns(extra) {
+	if (!extra?.length) return DEFAULT_NO_EXTERNAL;
+	return [...DEFAULT_NO_EXTERNAL, ...extra];
 }
 /**
 * The custom message event used to tell the worker which entry an environment loads.
@@ -43,9 +70,10 @@ const VITE_ENV_EVENT = "vercube:vite-env";
 * @returns The environment options for the `vercube` environment.
 */
 function createVercubeEnvironment(ctx) {
+	const noExternal = resolveNoExternalPatterns(ctx.pluginConfig.noExternal);
 	return {
 		consumer: "server",
-		resolve: ctx.dev ? { noExternal: resolveDevNoExternal(ctx.pluginConfig.noExternal) } : {},
+		resolve: ctx.dev ? { noExternal } : {},
 		build: {
 			outDir: resolve(ctx.root, "dist"),
 			emptyOutDir: false,
@@ -61,7 +89,7 @@ function createVercubeEnvironment(ctx) {
 			}
 		},
 		dev: { createEnvironment: async (envName, envConfig) => {
-			const { createFetchableDevEnvironment } = await import("./dev-Bl0akm-q.mjs");
+			const { createFetchableDevEnvironment } = await import("./dev-CKXS10LI.mjs");
 			const env = createFetchableDevEnvironment(envName, envConfig, getEnvRunner(ctx), ctx.serverEntry);
 			(ctx._viteEnvs ??= /* @__PURE__ */ new Map()).set(envName, ctx.serverEntry);
 			return env;
@@ -153,7 +181,8 @@ async function loadRunnerInto(ctx, manager) {
 * @returns The array of Vite plugins composing the integration.
 */
 function vercube(pluginConfig = {}) {
-	return [vercubeMain(createContext(pluginConfig))];
+	const ctx = createContext(pluginConfig);
+	return [vercubeMain(ctx), vercubeResolveDedupe(ctx)];
 }
 /**
 * The primary sub-plugin: defines the Vercube environment, warms the dev worker,
@@ -176,6 +205,7 @@ function vercubeMain(ctx) {
 			}
 			return {
 				builder: { sharedConfigBuild: true },
+				resolve: { alias: createVercubeResolveAliases(ctx.root) },
 				environments: {
 					client: { build: { outDir: resolve(ctx.root, CLIENT_OUT_DIR) } },
 					[VERCUBE_ENV]: createVercubeEnvironment(ctx)
@@ -190,8 +220,8 @@ function vercubeMain(ctx) {
 			}
 		},
 		configureServer: async (server) => {
-			const { configureViteDevServer } = await import("./dev-Bl0akm-q.mjs");
-			return configureViteDevServer(ctx, server);
+			const { configureViteDevServer } = await import("./dev-CKXS10LI.mjs");
+			await configureViteDevServer(ctx, server);
 		},
 		hotUpdate() {
 			if (this.environment.name !== "vercube") return;
@@ -200,5 +230,22 @@ function vercubeMain(ctx) {
 		}
 	};
 }
+/**
+* Forces every `@vercube/*` import in the server environment to the same resolved
+* entry path so class-reference DI tokens are not duplicated in production bundles.
+*/
+function vercubeResolveDedupe(ctx) {
+	return {
+		name: "vercube:resolve-dedupe",
+		apply: "build",
+		resolveId: {
+			filter: { id: /^@vercube\// },
+			handler(id) {
+				if (this.environment.name !== "vercube") return;
+				return createVercubeResolveAliases(ctx.root)[id] ?? null;
+			}
+		}
+	};
+}
 //#endregion
 export { VERCUBE_ENV, vercube };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercube/vite",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Vite plugin integrating Vercube with the Vite Environment API",
   "repository": {
     "type": "git",
@@ -36,7 +36,7 @@
     "pathe": "2.0.3",
     "rou3": "0.8.1",
     "srvx": "0.11.17",
-    "@vercube/scan": "1.1.2"
+    "@vercube/scan": "1.1.4"
   },
   "peerDependencies": {
     "vite": "^8.0.0"