nitro 3.0.260522-beta → 3.0.260610-beta

package/dist/vite.mjs

@@ -2,7 +2,7 @@ import { NODE_MODULES_RE, baseBuildConfig, baseBuildPlugins, basename, copyPubli
 import { formatCompatibilityDate } from "./_libs/compatx.mjs";
 import { createNitro, prerender } from "./_chunks/nitro.mjs";
 import { NitroDevApp } from "./_dev.mjs";
-import { createNitroEnvironment, createServiceEnvironment, createServiceEnvironments, getEnvRunner, initEnvRunner, nitroServiceProxy } from "./_build/vite.env.mjs";
+import { createNitroEnvironment, createServiceEnvironment, createServiceEnvironments, getEnvRunner, initEnvRunner } from "./_build/vite.env.mjs";
 import { startPreview } from "./_chunks/nitro2.mjs";
 import { assetsPlugin } from "./_libs/pluginutils.mjs";
 import { runtimeDir } from "nitro/meta";
@@ -93,7 +93,7 @@ async function buildEnvironments(ctx, builder) {
 	if (nitroOptions.renderer?.template && nitroOptions.renderer?.template === clientInput) {
 		const outputPath = resolve(nitroOptions.output.publicDir, basename(clientInput));
 		if (existsSync(outputPath)) {
-			const html = await readFile(outputPath, "utf8").then((r) => r.replace("<!--ssr-outlet-->", `{{{ globalThis.__nitro_vite_envs__?.["ssr"]?.fetch($REQUEST) || "" }}}`));
+			const html = await readFile(outputPath, "utf8").then((r) => r.replace("<!--ssr-outlet-->", `{{{ fetchViteEnv("ssr", $REQUEST) || "" }}}`));
 			await rm(outputPath);
 			const tmp = resolve(nitroOptions.buildDir, "vite/index.html");
 			await mkdir(dirname(tmp), { recursive: true });
@@ -122,32 +122,12 @@ async function buildEnvironments(ctx, builder) {
 	await nitro.hooks.callHook("compiled", nitro);
 	await writeBuildInfo(nitro, output);
 	if (!v && !m) console.log();
-	nitro.logger.success("You can preview this build using `npx vite preview`");
-	if (nitro.options.commands.deploy) nitro.logger.success("You can deploy this build using `npx nitro deploy --prebuilt`");
-}
-function prodSetup(ctx) {
-	return `
-function lazyService(loader) {
-  let promise, mod
-  return {
-    fetch(req) {
-      if (mod) { return mod.fetch(req) }
-      if (!promise) {
-        promise = loader().then(_mod => (mod = _mod.default || _mod))
-      }
-      return promise.then(mod => mod.fetch(req))
-    }
-  }
-}
-
-const services = {
-${Object.keys(ctx.services).map((name) => {
-		return [name, resolve(ctx.nitro.options.buildDir, "vite/services", name, ctx._entryPoints[name])];
-	}).map(([name, entry]) => `[${JSON.stringify(name)}]: lazyService(() => import(${JSON.stringify(entry)}))`).join(",\n")}
-};
-
-globalThis.__nitro_vite_envs__ = services;
-  `;
+	const previewCommand = nitro.options.framework.previewCommand || "npx vite preview";
+	nitro.logger.success(`You can preview this build using \`${previewCommand}\``);
+	if (nitro.options.commands.deploy) {
+		const deployCommand = nitro.options.framework.deployCommand || "npx nitro deploy --prebuilt";
+		nitro.logger.success(`You can deploy this build using \`${deployCommand}\``);
+	}
 }
 function nitroPreviewPlugin(ctx) {
 	return {
@@ -178,6 +158,67 @@ function nitroPreviewPlugin(ctx) {
 		}
 	};
 }
+function viteServicesTemplate(ctx) {
+	const serviceNames = Object.keys(ctx.services);
+	if (ctx.nitro.options.dev) return `
+export const viteServices = {
+${serviceNames.map((name) => `  get [${JSON.stringify(name)}]() { return globalThis.__nitro_vite_envs__[${JSON.stringify(name)}] }`).join(",\n")}
+};
+  `;
+	return `
+function lazyService(loader) {
+  let promise, mod
+  return {
+    fetch(req) {
+      if (mod) { return mod.fetch(req) }
+      if (!promise) {
+        promise = loader().then(_mod => (mod = _mod.default || _mod))
+      }
+      return promise.then(mod => mod.fetch(req))
+    }
+  }
+}
+
+export const viteServices = {
+${serviceNames.map((name) => {
+		return [name, resolve(ctx.nitro.options.buildDir, "vite/services", name, ctx._entryPoints[name])];
+	}).map(([name, entry]) => `[${JSON.stringify(name)}]: lazyService(() => import(${JSON.stringify(entry)}))`).join(",\n")}
+};
+  `;
+}
+const NITRO_PROXY_PREFIX = "\0nitro-env-proxy:";
+function nitroDevServiceProxy() {
+	return {
+		name: "nitro:dev-service-proxy",
+		enforce: "pre",
+		applyToEnvironment: (env) => env.name !== "nitro" && env.config.consumer === "server",
+		apply: (_config, configEnv) => configEnv.command === "serve",
+		resolveId: {
+			filter: { id: /^nitro(\/|$)/ },
+			handler(id) {
+				if (id === "nitro" || id.startsWith("nitro/")) return {
+					id: NITRO_PROXY_PREFIX + id,
+					moduleSideEffects: false
+				};
+			}
+		},
+		load: {
+			filter: { id: /^\0nitro-env-proxy:/ },
+			handler(id) {
+				if (!id.startsWith(NITRO_PROXY_PREFIX)) return;
+				const originalId = id.slice(17);
+				return {
+					code: [
+						`const _mod = await globalThis.__VITE_ENVIRONMENT_RUNNER_IMPORT__("nitro", ${JSON.stringify(originalId)});`,
+						`__vite_ssr_exportAll__(_mod);`,
+						`export default _mod.default;`
+					].join("\n"),
+					map: null
+				};
+			}
+		}
+	};
+}
 const DEFAULT_EXTENSIONS = [
 	".ts",
 	".js",
@@ -195,8 +236,7 @@ function nitro(pluginConfig = {}) {
 		nitroEnv(ctx),
 		nitroMain(ctx),
 		nitroPrepare(ctx),
-		nitroService(ctx),
-		nitroServiceProxy(),
+		nitroDevServiceProxy(),
 		nitroPreviewPlugin(ctx),
 		pluginConfig.experimental?.vite?.assetsImport !== false && assetsPlugin({ experimental: { clientBuildFallback: false } })
 	].filter(Boolean);
@@ -353,29 +393,6 @@ function nitroPrepare(ctx) {
 		}
 	};
 }
-function nitroService(ctx) {
-	return {
-		name: "nitro:service",
-		enforce: "pre",
-		sharedDuringBuild: true,
-		applyToEnvironment: (env) => env.name === "nitro",
-		resolveId: {
-			filter: { id: /^#nitro-vite-setup$/ },
-			async handler(id) {
-				if (id === "#nitro-vite-setup") return {
-					id,
-					moduleSideEffects: true
-				};
-			}
-		},
-		load: {
-			filter: { id: /^#nitro-vite-setup$/ },
-			async handler(id) {
-				if (id === "#nitro-vite-setup") return prodSetup(ctx);
-			}
-		}
-	};
-}
 function createContext(pluginConfig) {
 	return {
 		pluginConfig,
@@ -388,6 +405,7 @@ function useNitro(ctx) {
 	return ctx.nitro;
 }
 async function setupNitroContext(ctx, configEnv, userConfig) {
+	const providedNitro = ctx.pluginConfig._nitro;
 	const nitroConfig = {
 		dev: configEnv.command === "serve",
 		builder: "vite",
@@ -396,9 +414,13 @@ async function setupNitroContext(ctx, configEnv, userConfig) {
 	};
 	nitroConfig.modules ??= [];
 	for (const plugin of flattenPlugins(userConfig.plugins || [])) if (plugin.nitro) nitroConfig.modules.push(plugin.nitro);
+	const vServicesId = "#nitro/virtual/vite-services";
+	nitroConfig.virtual ??= {};
+	nitroConfig.virtual[vServicesId] = () => viteServicesTemplate(ctx);
+	if (providedNitro) providedNitro.options.virtual[vServicesId] = nitroConfig.virtual[vServicesId];
 	const dotenvFileNames = [".env", ".env.local"];
 	if (configEnv.mode) dotenvFileNames.push(`.env.${configEnv.mode}`, `.env.${configEnv.mode}.local`);
-	ctx.nitro = ctx.pluginConfig._nitro || await createNitro(nitroConfig, { dotenv: { fileName: dotenvFileNames } });
+	ctx.nitro = providedNitro || await createNitro(nitroConfig, { dotenv: { fileName: dotenvFileNames } });
 	if (!ctx.services?.ssr) if (userConfig.environments?.ssr === void 0) {
 		const ssrEntry = resolveModulePath("./entry-server", {
 			from: [
@@ -436,10 +458,6 @@ async function setupNitroContext(ctx, configEnv, userConfig) {
 		baseURL: "/",
 		fallthrough: true
 	});
-	if (!ctx.nitro.options.dev) ctx.nitro.options.unenv.push({
-		meta: { name: "nitro-vite" },
-		polyfill: ["#nitro-vite-setup"]
-	});
 	await ctx.nitro.hooks.callHook("build:before", ctx.nitro);
 	ctx.bundlerConfig = await getBundlerConfig(ctx);
 	await ctx.nitro.hooks.callHook("rollup:before", ctx.nitro, ctx.bundlerConfig.rollupConfig || ctx.bundlerConfig.rolldownConfig);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitro",
-  "version": "3.0.260522-beta",
+  "version": "3.0.260610-beta",
   "description": "Build and Deploy Universal JavaScript Servers",
   "keywords": [
     "api-routes",
@@ -69,51 +69,51 @@
   },
   "dependencies": {
     "consola": "^3.4.2",
-    "crossws": "^0.4.5",
+    "crossws": "^0.4.6",
     "db0": "^0.3.4",
-    "env-runner": "^0.1.9",
-    "h3": "^2.0.1-rc.22",
+    "env-runner": "^0.1.12",
+    "h3": "2.0.1-rc.22",
     "hookable": "^6.1.1",
     "nf3": "^0.3.17",
-    "ocache": "^0.1.4",
-    "ofetch": "^2.0.0-alpha.3",
+    "ocache": "^0.1.5",
+    "ofetch": "2.0.0-alpha.3",
     "ohash": "^2.0.11",
-    "rolldown": "^1.0.2",
-    "srvx": "^0.11.15",
-    "unenv": "^2.0.0-rc.24",
-    "unstorage": "^2.0.0-alpha.7"
+    "rolldown": "^1.1.0",
+    "srvx": "^0.11.16",
+    "unenv": "2.0.0-rc.24",
+    "unstorage": "2.0.0-alpha.7"
   },
   "devDependencies": {
     "@apphosting/common": "^0.0.9",
     "@azure/functions": "^3.5.1",
     "@azure/static-web-apps-cli": "^2.0.9",
-    "@cloudflare/workers-types": "^4.20260521.1",
-    "@cloudflare/workers-utils": "^0.21.0",
+    "@cloudflare/workers-types": "^4.20260609.1",
+    "@cloudflare/workers-utils": "^0.23.0",
     "@deno/types": "^0.0.1",
     "@hiogawa/vite-plugin-fullstack": "^0.0.11",
-    "@netlify/edge-functions": "^3.0.7",
-    "@netlify/functions": "^5.2.2",
+    "@netlify/edge-functions": "^3.0.8",
+    "@netlify/functions": "^5.3.0",
     "@rollup/plugin-alias": "^6.0.0",
-    "@rollup/plugin-commonjs": "^29.0.2",
+    "@rollup/plugin-commonjs": "^29.0.3",
     "@rollup/plugin-inject": "^5.0.5",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-replace": "^6.0.3",
-    "@scalar/api-reference": "^1.57.2",
-    "@scalar/openapi-types": "^0.8.0",
-    "@types/aws-lambda": "^8.10.161",
+    "@scalar/api-reference": "^1.59.2",
+    "@scalar/openapi-types": "^0.9.1",
+    "@types/aws-lambda": "^8.10.162",
     "@types/estree": "^1.0.9",
     "@types/etag": "^1.8.4",
     "@types/http-proxy": "^1.17.17",
-    "@types/node": "^25.9.1",
+    "@types/node": "^25.9.2",
     "@types/node-fetch": "^2.6.13",
     "@types/semver": "^7.7.1",
     "@types/xml2js": "^0.4.14",
-    "@typescript/native-preview": "7.0.0-dev.20260521.1",
-    "@vercel/queue": "^0.2.0",
-    "@vitest/coverage-v8": "^4.1.7",
+    "@typescript/native-preview": "7.0.0-dev.20260609.1",
+    "@vercel/queue": "^0.3.0",
+    "@vitest/coverage-v8": "^4.1.8",
     "automd": "^0.4.3",
-    "c12": "^4.0.0-beta.5",
+    "c12": "4.0.0-beta.5",
     "changelogen": "^0.6.2",
     "chokidar": "^5.0.0",
     "citty": "^0.2.2",
@@ -138,27 +138,27 @@
     "magic-string": "^0.30.21",
     "mdzilla": "^0.2.1",
     "mime": "^4.1.0",
-    "miniflare": "^4.20260520.0",
+    "miniflare": "^4.20260609.0",
     "mlly": "^1.8.2",
     "nypm": "^0.6.6",
     "obuild": "^0.4.36",
     "oxc-parser": "link:shims/oxc-parser",
-    "oxfmt": "^0.51.0",
-    "oxlint": "^1.66.0",
+    "oxfmt": "^0.54.0",
+    "oxlint": "^1.69.0",
     "pathe": "^2.0.3",
     "perfect-debounce": "^2.1.0",
     "pkg-types": "^2.3.1",
     "pretty-bytes": "^7.1.0",
-    "react": "^19.2.6",
+    "react": "^19.2.7",
     "rendu": "^0.1.0",
-    "rollup": "^4.60.4",
+    "rollup": "^4.61.1",
     "rou3": "^0.8.1",
     "scule": "^1.3.0",
-    "semver": "^7.8.0",
+    "semver": "^7.8.3",
     "serve-placeholder": "^2.0.2",
     "source-map": "^0.7.6",
     "std-env": "^4.1.0",
-    "tinyglobby": "^0.2.16",
+    "tinyglobby": "^0.2.17",
     "tsconfck": "^3.1.6",
     "typescript": "^6.0.3",
     "ufo": "^1.6.4",
@@ -168,21 +168,21 @@
     "unimport": "^6.3.0",
     "untyped": "^2.0.0",
     "unwasm": "^0.5.3",
-    "vite": "^8.0.14",
-    "vite7": "npm:vite@^7.3.2",
-    "vitest": "^4.1.7",
-    "wrangler": "^4.93.1",
+    "vite": "^8.0.16",
+    "vite7": "npm:vite@^7.3.5",
+    "vitest": "^4.1.8",
+    "wrangler": "^4.99.0",
     "xml2js": "^0.6.2",
     "youch": "^4.1.1",
     "youch-core": "^0.3.3",
-    "zephyr-agent": "^1.1.1"
+    "zephyr-agent": "^0.2.0"
   },
   "peerDependencies": {
-    "@vercel/queue": "^0.2.0",
+    "@vercel/queue": "^0.3.0",
     "dotenv": "*",
     "giget": "*",
-    "jiti": "^2.6.1",
-    "rollup": "^4.60.3",
+    "jiti": "^2.7.0",
+    "rollup": "^4.61.1",
     "vite": "^7 || ^8",
     "xml2js": "^0.6.2",
     "zephyr-agent": "^0.2.0"
@@ -216,7 +216,7 @@
   "engines": {
     "node": "^20.19.0 || >=22.12.0"
   },
-  "packageManager": "pnpm@11.1.3",
+  "packageManager": "pnpm@11.5.2",
   "compatiblePackages": {
     "schemaVersion": 1,
     "vite": {