nitro-nightly 3.0.1-20251106-140827-5d57690c → 3.0.1-20251106-140852-29edf873

package/dist/_build/vite.plugin.mjs

@@ -52,7 +52,7 @@ const getViteRollupConfig = (ctx) => {
 		input: nitro$1.options.entry,
 		external: [...base.env.external],
 		plugins: [
-			ctx.pluginConfig.experimental?.virtualBundle && virtualBundlePlugin(ctx._serviceBundles),
+			ctx.pluginConfig.experimental?.vite?.virtualBundle && virtualBundlePlugin(ctx._serviceBundles),
 			...baseBuildPlugins(nitro$1, base),
 			alias({ entries: base.aliases }),
 			replace({
@@ -193,7 +193,6 @@ async function buildEnvironments(ctx, builder) {
 	if (nitro$1.options.commands.deploy) nitro$1.logger.success(`You can deploy this build using \`${rewriteRelativePaths(nitro$1.options.commands.deploy)}\``);
 }
 function prodSetup(ctx) {
-	const services = ctx.pluginConfig.services || {};
 	return `
 function lazyService(loader) {
   let promise, mod
@@ -209,9 +208,9 @@ function lazyService(loader) {
 }
 
 const services = {
-${Object.keys(services).map((name) => {
+${Object.keys(ctx.services).map((name) => {
 		let entry;
-		if (ctx.pluginConfig.experimental?.virtualBundle) entry = ctx._entryPoints[name];
+		if (ctx.pluginConfig.experimental?.vite?.virtualBundle) entry = ctx._entryPoints[name];
 		else entry = resolve$1(ctx.nitro.options.buildDir, "vite/services", name, ctx._entryPoints[name]);
 		return [name, entry];
 	}).map(([name, entry]) => `[${JSON.stringify(name)}]: lazyService(() => import(${JSON.stringify(entry)}))`).join(",\n")}
@@ -407,7 +406,7 @@ function createServiceEnvironment(ctx, name, serviceConfig) {
 	};
 }
 function createServiceEnvironments(ctx) {
-	return Object.fromEntries(Object.entries(ctx.pluginConfig.services || {}).map(([name, config]) => [name, createServiceEnvironment(ctx, name, config)]));
+	return Object.fromEntries(Object.entries(ctx.services).map(([name, config]) => [name, createServiceEnvironment(ctx, name, config)]));
 }
 function tryResolve(id) {
 	if (/^[~#/\0]/.test(id) || isAbsolute$1(id)) return id;
@@ -529,7 +528,7 @@ function nitro(pluginConfig = {}) {
 		nitroPrepare(ctx),
 		nitroService(ctx),
 		nitroPreviewPlugin(ctx),
-		pluginConfig.experimental?.assetsImport !== false && assetsPlugin({ experimental: { clientBuildFallback: false } })
+		pluginConfig.experimental?.vite?.assetsImport !== false && assetsPlugin({ experimental: { clientBuildFallback: false } })
 	].filter(Boolean);
 }
 function nitroInit(ctx) {
@@ -576,7 +575,7 @@ function nitroEnv(ctx) {
 				debug("[env]  Configuring client environment", name === "client" ? "" : ` (${name})`);
 				config.build.emptyOutDir = false;
 				config.build.outDir = useNitro(ctx).options.output.publicDir;
-			} else if (ctx.pluginConfig.experimental?.virtualBundle && name in (ctx.pluginConfig.services || {})) {
+			} else if (ctx.pluginConfig.experimental?.vite?.virtualBundle && name in (ctx.services || {})) {
 				debug("[env]  Configuring service environment for virtual:", name);
 				config.build ??= {};
 				config.build.write = config.build.write ?? false;
@@ -627,8 +626,7 @@ function nitroMain(ctx) {
 		generateBundle: { handler(_options, bundle) {
 			const environment = this.environment;
 			debug("[main] Generating manifest and entry points for environment:", environment.name);
-			const services = ctx.pluginConfig.services || {};
-			const isRegisteredService = Object.keys(services).includes(environment.name);
+			const isRegisteredService = Object.keys(ctx.services).includes(environment.name);
 			let entryFile;
 			for (const [_name, file] of Object.entries(bundle)) if (file.type === "chunk" && isRegisteredService && file.isEntry) if (entryFile === void 0) entryFile = file.fileName;
 			else this.warn(`Multiple entry points found for service "${environment.name}"`);
@@ -644,7 +642,7 @@ function nitroMain(ctx) {
 		},
 		async hotUpdate({ server, modules, timestamp }) {
 			const env = this.environment;
-			if (ctx.pluginConfig.experimental?.serverReload === false || env.config.consumer === "client") return;
+			if (ctx.pluginConfig.experimental?.vite.serverReload === false || env.config.consumer === "client") return;
 			const clientEnvs = Object.values(server.environments).filter((env$1) => env$1.config.consumer === "client");
 			let hasServerOnlyModule = false;
 			const invalidated = /* @__PURE__ */ new Set();
@@ -695,6 +693,7 @@ function nitroService(ctx) {
 function createContext(pluginConfig) {
 	return {
 		pluginConfig,
+		services: {},
 		_entryPoints: {},
 		_serviceBundles: {}
 	};
@@ -707,7 +706,7 @@ async function setupNitroContext(ctx, configEnv, userConfig) {
 	const nitroConfig = {
 		dev: configEnv.command === "serve",
 		rootDir: userConfig.root,
-		...defu(ctx.pluginConfig.config, userConfig.nitro)
+		...defu(ctx.pluginConfig, ctx.pluginConfig.config, userConfig.nitro)
 	};
 	nitroConfig.modules ??= [];
 	for (const plugin of flattenPlugins(userConfig.plugins || [])) if (plugin.nitro) nitroConfig.modules.push(plugin.nitro);
@@ -715,36 +714,33 @@ async function setupNitroContext(ctx, configEnv, userConfig) {
 	debug("[init] Using builder:", nitroConfig.builder);
 	ctx.nitro = ctx.pluginConfig._nitro || await createNitro(nitroConfig);
 	ctx.nitro.options.builder = ctx._isRolldown ? "rolldown-vite" : "vite";
-	if (!ctx.pluginConfig.services?.ssr) {
-		ctx.pluginConfig.services ??= {};
-		if (userConfig.environments?.ssr === void 0) {
-			const ssrEntry = resolveModulePath("./entry-server", {
-				from: [
-					"app",
-					"src",
-					""
-				].flatMap((d) => [ctx.nitro.options.rootDir, ...ctx.nitro.options.scanDirs].map((s) => join$1(s, d) + "/")),
+	if (!ctx.services?.ssr) if (userConfig.environments?.ssr === void 0) {
+		const ssrEntry = resolveModulePath("./entry-server", {
+			from: [
+				"app",
+				"src",
+				""
+			].flatMap((d) => [ctx.nitro.options.rootDir, ...ctx.nitro.options.scanDirs].map((s) => join$1(s, d) + "/")),
+			extensions: DEFAULT_EXTENSIONS,
+			try: true
+		});
+		if (ssrEntry) {
+			ctx.services.ssr = { entry: ssrEntry };
+			ctx.nitro.logger.info(`Using \`${prettyPath(ssrEntry)}\` as vite ssr entry.`);
+		}
+	} else {
+		let ssrEntry = getEntry(userConfig.environments.ssr.build?.rollupOptions?.input);
+		if (typeof ssrEntry === "string") {
+			ssrEntry = resolveModulePath(ssrEntry, {
+				from: [ctx.nitro.options.rootDir, ...ctx.nitro.options.scanDirs],
 				extensions: DEFAULT_EXTENSIONS,
+				suffixes: ["", "/index"],
 				try: true
-			});
-			if (ssrEntry) {
-				ctx.pluginConfig.services.ssr = { entry: ssrEntry };
-				ctx.nitro.logger.info(`Using \`${prettyPath(ssrEntry)}\` as vite ssr entry.`);
-			}
-		} else {
-			let ssrEntry = getEntry(userConfig.environments.ssr.build?.rollupOptions?.input);
-			if (typeof ssrEntry === "string") {
-				ssrEntry = resolveModulePath(ssrEntry, {
-					from: [ctx.nitro.options.rootDir, ...ctx.nitro.options.scanDirs],
-					extensions: DEFAULT_EXTENSIONS,
-					suffixes: ["", "/index"],
-					try: true
-				}) || ssrEntry;
-				ctx.pluginConfig.services.ssr = { entry: ssrEntry };
-			}
+			}) || ssrEntry;
+			ctx.services.ssr = { entry: ssrEntry };
 		}
 	}
-	if (!ctx.nitro.options.renderer?.entry && !ctx.nitro.options.renderer?.template && ctx.pluginConfig.services.ssr?.entry) {
+	if (!ctx.nitro.options.renderer?.entry && !ctx.nitro.options.renderer?.template && ctx.services.ssr?.entry) {
 		ctx.nitro.options.renderer ??= {};
 		ctx.nitro.options.renderer.entry = resolve$1(runtimeDir, "internal/vite/ssr-renderer");
 	}

package/dist/vite.d.mts

@@ -21,59 +21,34 @@ declare module "rollup" {
     nitro?: NitroModule;
   }
 }
-interface NitroPluginConfig {
-  /** Custom Nitro config */
-  config?: NitroConfig;
+interface NitroPluginConfig extends NitroConfig {
   /**
-   * Fetchable service environments automatically created by the plugin.
-   *
-   * **Note:** You can use top level `environments` with same keys to extend environment configurations.
-   */
-  services?: Record<string, ServiceConfig>;
-  /**
-   * @internal Pre-initialized Nitro instance.
+   * @internal Use preinitialized Nitro instance for the plugin.
    */
   _nitro?: Nitro;
-  experimental?: {
-    /**
-     * @experimental Use the virtual filesystem for intermediate environment build output files.
-     * @note This is unsafe if plugins rely on temporary files on the filesystem.
-     */
-    virtualBundle?: boolean;
-    /**
-     * @experimental Enable `?assets` import proposed by https://github.com/vitejs/vite/discussions/20913
-     * @default true
-     */
-    assetsImport?: boolean;
-    /**
-     * Reload the page when a server module is updated.
-     *
-     * @default true
-     */
-    serverReload: boolean;
+  experimental?: NitroConfig["experimental"] & {
+    vite: {
+      /**
+       * @experimental Use the virtual filesystem for intermediate environment build output files.
+       * @note This is unsafe if plugins rely on temporary files on the filesystem.
+       */
+      virtualBundle?: boolean;
+      /**
+       * @experimental Enable `?assets` import proposed by https://github.com/vitejs/vite/discussions/20913
+       * @default true
+       */
+      assetsImport?: boolean;
+      /**
+       * Reload the page when a server module is updated.
+       *
+       * @default true
+       */
+      serverReload: boolean;
+    };
   };
 }
 interface ServiceConfig {
-  /**
-   * Path to the service entrypoint file.
-   *
-   * Services should export a web standard fetch handler function.
-   *
-   * Example:
-   * ```ts
-   * export default async (req: Request) => {
-   *   return Response.json({ message: "Hello from service!" });
-   * };
-   * ```
-   */
   entry: string;
-  /**
-   * Service route.
-   *
-   * - If `route` is not set, services are only accessible via `fetch("<url>", { viteEnv: "<name>" })`.
-   * - `ssr` service is special and defaults to `"/**"` route, meaning it will handle all requests.
-   */
-  route?: string;
 }
 //#endregion
 //#region src/build/vite/plugin.d.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitro-nightly",
-  "version": "3.0.1-20251106-140827-5d57690c",
+  "version": "3.0.1-20251106-140852-29edf873",
   "description": "Build and Deploy Universal JavaScript Servers",
   "homepage": "https://nitro.build",
   "repository": "nitrojs/nitro",