@nuxt/kit-nightly 4.6.0-29776095.3d108708 → 4.6.0-29776185.65fb0aaa

package/dist/index.mjs

@@ -2663,31 +2663,20 @@ function addVitePlugin(pluginOrGetter, options = {}) {
 	if (options.dev === false && nuxt.options.dev) return;
 	if (options.build === false && nuxt.options.build) return;
 	let needsEnvInjection = false;
+	const isIsomorphic = options.server !== false && options.client !== false;
 	nuxt.hook("vite:extend", async ({ config }) => {
 		config.plugins ||= [];
 		const plugin = toArray(typeof pluginOrGetter === "function" ? await pluginOrGetter() : pluginOrGetter);
-		if (options.server !== false && options.client !== false) {
-			const method = options?.prepend ? "unshift" : "push";
-			config.plugins[method](...plugin);
-			return;
-		}
+		const method = options?.prepend ? "unshift" : "push";
 		if (!config.environments?.ssr || !config.environments.client) {
-			needsEnvInjection = true;
+			if (isIsomorphic) config.plugins[method](...plugin);
+			else needsEnvInjection = true;
 			return;
 		}
 		const environmentName = options.server === false ? "client" : "ssr";
-		const defaultEnforce = options?.prepend ? "pre" : "post";
-		const method = options?.prepend ? "unshift" : "push";
-		for (const [enforce, plugins] of groupByEnforce(plugin, defaultEnforce)) {
-			const pluginName = plugins.map((p) => p.name).join("|");
-			config.plugins[method]({
-				name: `${pluginName}:wrapper`,
-				enforce,
-				applyToEnvironment(environment) {
-					if (environment.name === environmentName) return resolveNestedPlugins(plugins, config, environment, nuxt);
-				}
-			});
-		}
+		const isAllowed = isIsomorphic ? (name) => name === "client" || name === "ssr" : (name) => name === environmentName;
+		const defaultEnforce = isIsomorphic ? options?.prepend ? "pre" : void 0 : options?.prepend ? "pre" : "post";
+		config.plugins[method](...plugin.map((p) => scopeToEnvironments(p, defaultEnforce, isAllowed)));
 	});
 	nuxt.hook("vite:extendConfig", async (config, env) => {
 		if (!needsEnvInjection) return;
@@ -2697,53 +2686,29 @@ function addVitePlugin(pluginOrGetter, options = {}) {
 		if (env.isServer && options.client === false) config.plugins[method](...plugin);
 	});
 }
-function groupByEnforce(plugins, defaultEnforce) {
-	const groups = /* @__PURE__ */ new Map();
-	for (const plugin of plugins) {
-		const enforce = plugin.enforce ?? defaultEnforce;
-		const group = groups.get(enforce);
-		if (group) group.push(plugin);
-		else groups.set(enforce, [plugin]);
-	}
-	return groups;
-}
-/**
-* Vite only honours `apply` and `applyToEnvironment` for plugins it finds in the
-* top-level plugin array, so plugins nested behind a wrapper have to be resolved
-* by hand or (for example) dev-only plugins would leak into production builds.
-*/
-async function resolveNestedPlugins(plugins, config, environment, nuxt) {
-	const configEnv = resolveConfigEnv(environment, config, nuxt);
-	const resolved = [];
-	for (const plugin of plugins) {
-		const { apply, applyToEnvironment } = plugin;
-		if (apply && (typeof apply === "function" ? !apply(config, configEnv) : apply !== configEnv.command)) continue;
-		const applied = applyToEnvironment ? await applyToEnvironment(environment) : true;
-		if (applied === true) {
-			resolved.push(plugin);
-			continue;
-		}
-		resolved.push(...await flattenPlugins(applied));
-	}
-	return resolved;
-}
 /**
-* `getTopLevelConfig` is only available from Vite 6, and kit is used with older
-* versions of nuxt (and therefore vite), so fall back to what we can infer.
+* `addVitePlugin` has always scoped plugins to the app builds. Builders can contribute
+* further environments (Nitro adds `nitro`, and one per service), so a plugin registered
+* here has to opt out of any environment it wasn't registered for. The check runs per
+* environment as Vite resolves them, so environments added after the plugin was
+* registered are still excluded.
+*
+* The plugin is returned as a top-level plugin rather than nested behind a wrapper
+* so that Vite still applies `apply`, sorts by `enforce`, calls server-level hooks
+* like `configureServer`, and exposes any extra properties the plugin declares
+* (`api`, and whatever tooling scanning `config.plugins` looks for) as usual.
 */
-function resolveConfigEnv(environment, config, nuxt) {
-	const topLevelConfig = environment.getTopLevelConfig?.() ?? environment.config;
+function scopeToEnvironments(plugin, defaultEnforce, isAllowed) {
+	const { applyToEnvironment } = plugin;
 	return {
-		command: topLevelConfig?.command ?? (nuxt.options.dev ? "serve" : "build"),
-		mode: topLevelConfig?.mode ?? config.mode ?? nuxt.options.vite?.mode ?? (nuxt.options.dev ? "development" : "production")
+		...plugin,
+		enforce: plugin.enforce ?? defaultEnforce,
+		applyToEnvironment(environment) {
+			if (!isAllowed(environment.name)) return false;
+			return applyToEnvironment ? applyToEnvironment(environment) : true;
+		}
 	};
 }
-async function flattenPlugins(option) {
-	const resolved = await option;
-	if (!resolved) return [];
-	if (Array.isArray(resolved)) return (await Promise.all(resolved.map(flattenPlugins))).flat();
-	return [resolved];
-}
 function addBuildPlugin(pluginFactory, options) {
 	if (pluginFactory.vite) addVitePlugin(pluginFactory.vite, options);
 	if (pluginFactory.webpack) addWebpackPlugin(pluginFactory.webpack, options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit-nightly",
-  "version": "4.6.0-29776095.3d108708",
+  "version": "4.6.0-29776185.65fb0aaa",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -69,7 +69,7 @@
     }
   },
   "devDependencies": {
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.6.0-29776095.3d108708",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.6.0-29776185.65fb0aaa",
     "c12": "4.0.0-beta.5",
     "chokidar": "^5.0.0",
     "dotenv": "^17.4.2",