@nuxt/kit-nightly 4.2.0-29344661.0b65203b → 4.2.0-29344710.84b82c47

package/dist/index.d.mts

@@ -158,23 +158,7 @@ interface ExtendConfigOptions {
 }
 interface ExtendWebpackConfigOptions extends ExtendConfigOptions {
 }
-interface ExtendViteConfigOptions extends Omit<ExtendConfigOptions, 'server' | 'client'> {
-    /**
-     * Extend server Vite configuration
-     * @default true
-     * @deprecated calling \`extendViteConfig\` with only server/client environment is deprecated.
-     * Nuxt 5+ uses the Vite Environment API which shares a configuration between environments.
-     * You can likely use a Vite plugin to achieve the same result.
-     */
-    server?: boolean;
-    /**
-     * Extend client Vite configuration
-     * @default true
-     * @deprecated calling \`extendViteConfig\` with only server/client environment is deprecated.
-     * Nuxt 5+ uses the Vite Environment API which shares a configuration between environments.
-     * You can likely use a Vite plugin to achieve the same result.
-     */
-    client?: boolean;
+interface ExtendViteConfigOptions extends ExtendConfigOptions {
 }
 /**
  * Extend webpack config
@@ -205,7 +189,7 @@ declare function addRspackPlugin(pluginOrGetter: RspackPluginInstance | RspackPl
 /**
  * Append Vite plugin to the config.
  */
-declare function addVitePlugin(pluginOrGetter: Plugin | Plugin[] | (() => Plugin | Plugin[]), options?: ExtendConfigOptions): void;
+declare function addVitePlugin(pluginOrGetter: Plugin | Plugin[] | (() => Plugin | Plugin[]), options?: ExtendViteConfigOptions): void;
 interface AddBuildPluginFactory {
     vite?: () => Plugin | Plugin[];
     webpack?: () => WebpackPluginInstance | WebpackPluginInstance[];

package/dist/index.d.ts

@@ -158,23 +158,7 @@ interface ExtendConfigOptions {
 }
 interface ExtendWebpackConfigOptions extends ExtendConfigOptions {
 }
-interface ExtendViteConfigOptions extends Omit<ExtendConfigOptions, 'server' | 'client'> {
-    /**
-     * Extend server Vite configuration
-     * @default true
-     * @deprecated calling \`extendViteConfig\` with only server/client environment is deprecated.
-     * Nuxt 5+ uses the Vite Environment API which shares a configuration between environments.
-     * You can likely use a Vite plugin to achieve the same result.
-     */
-    server?: boolean;
-    /**
-     * Extend client Vite configuration
-     * @default true
-     * @deprecated calling \`extendViteConfig\` with only server/client environment is deprecated.
-     * Nuxt 5+ uses the Vite Environment API which shares a configuration between environments.
-     * You can likely use a Vite plugin to achieve the same result.
-     */
-    client?: boolean;
+interface ExtendViteConfigOptions extends ExtendConfigOptions {
 }
 /**
  * Extend webpack config
@@ -205,7 +189,7 @@ declare function addRspackPlugin(pluginOrGetter: RspackPluginInstance | RspackPl
 /**
  * Append Vite plugin to the config.
  */
-declare function addVitePlugin(pluginOrGetter: Plugin | Plugin[] | (() => Plugin | Plugin[]), options?: ExtendConfigOptions): void;
+declare function addVitePlugin(pluginOrGetter: Plugin | Plugin[] | (() => Plugin | Plugin[]), options?: ExtendViteConfigOptions): void;
 interface AddBuildPluginFactory {
     vite?: () => Plugin | Plugin[];
     webpack?: () => WebpackPluginInstance | WebpackPluginInstance[];

package/dist/index.mjs

@@ -1162,13 +1162,17 @@ function extendViteConfig(fn, options = {}) {
   if (options.build === false && nuxt.options.build) {
     return;
   }
-  if (options.server === false || options.client === false) {
-    const caller = getUserCaller();
-    const explanation = caller ? ` (used at \`${resolveAlias(caller.source)}:${caller.line}:${caller.column}\`)` : "";
-    const warning = `[@nuxt/kit] calling \`extendViteConfig\` with only server/client environment is deprecated${explanation}. Nuxt 5+ will use the Vite Environment API which shares a configuration between environments. You can likely use a Vite plugin to achieve the same result.`;
-    warn(warning);
+  if (options.server !== false && options.client !== false) {
+    return nuxt.hook("vite:extend", ({ config }) => fn(config));
   }
-  return nuxt.hook("vite:extend", ({ config }) => fn(config));
+  nuxt.hook("vite:extendConfig", (config, { isClient, isServer }) => {
+    if (options.server !== false && isServer) {
+      return fn(config);
+    }
+    if (options.client !== false && isClient) {
+      return fn(config);
+    }
+  });
 }
 function addWebpackPlugin(pluginOrGetter, options) {
   extendWebpackConfig((config) => {
@@ -1186,52 +1190,13 @@ function addRspackPlugin(pluginOrGetter, options) {
     config.plugins[method](...toArray(plugin));
   }, options);
 }
-function addVitePlugin(pluginOrGetter, options = {}) {
-  const nuxt = useNuxt();
-  if (options.dev === false && nuxt.options.dev) {
-    return;
-  }
-  if (options.build === false && nuxt.options.build) {
-    return;
-  }
-  let needsEnvInjection = false;
-  nuxt.hook("vite:extend", ({ config }) => {
-    config.plugins ||= [];
-    const plugin = toArray(typeof pluginOrGetter === "function" ? pluginOrGetter() : pluginOrGetter);
-    if (options.server !== false && options.client !== false) {
-      const method = options?.prepend ? "unshift" : "push";
-      config.plugins[method](...plugin);
-      return;
-    }
-    if (!config.environments?.ssr || !config.environments.client) {
-      needsEnvInjection = true;
-      return;
-    }
-    const environmentName = options.server === false ? "client" : "ssr";
-    const pluginName = plugin.map((p) => p.name).join("|");
-    config.plugins.push({
-      name: `${pluginName}:wrapper`,
-      enforce: options?.prepend ? "pre" : "post",
-      applyToEnvironment(environment) {
-        if (environment.name === environmentName) {
-          return plugin;
-        }
-      }
-    });
-  });
-  nuxt.hook("vite:extendConfig", (config, env) => {
-    if (!needsEnvInjection) {
-      return;
-    }
-    const plugin = toArray(typeof pluginOrGetter === "function" ? pluginOrGetter() : pluginOrGetter);
+function addVitePlugin(pluginOrGetter, options) {
+  extendViteConfig((config) => {
     const method = options?.prepend ? "unshift" : "push";
-    if (env.isClient && options.server === false) {
-      config.plugins[method](...plugin);
-    }
-    if (env.isServer && options.client === false) {
-      config.plugins[method](...plugin);
-    }
-  });
+    const plugin = typeof pluginOrGetter === "function" ? pluginOrGetter() : pluginOrGetter;
+    config.plugins ||= [];
+    config.plugins[method](...toArray(plugin));
+  }, options);
 }
 function addBuildPlugin(pluginFactory, options) {
   if (pluginFactory.vite) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit-nightly",
-  "version": "4.2.0-29344661.0b65203b",
+  "version": "4.2.0-29344710.84b82c47",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -45,7 +45,7 @@
     "untyped": "^2.0.0"
   },
   "devDependencies": {
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.2.0-29344661.0b65203b",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.2.0-29344710.84b82c47",
     "@rspack/core": "1.5.8",
     "@types/semver": "7.7.1",
     "hookable": "5.5.3",