@nuxt/kit 3.19.2 → 3.20.0

package/README.md

@@ -60,7 +60,7 @@ Example of an `app.vue`:
 <script setup lang="ts">
 useSeoMeta({
   title: 'Meet Nuxt',
-  description: 'The Intuitive Vue Framework.'
+  description: 'The Intuitive Vue Framework.',
 })
 </script>
 

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { ModuleOptions, ModuleDefinition, NuxtModule, NuxtConfig, Nuxt, ModuleMeta, NuxtOptions, SchemaDefinition, ImportPresetWithDeprecation, NuxtCompatibility, NuxtCompatibilityIssues, Component, ComponentsDir, NuxtTemplate, NuxtMiddleware, NuxtHooks, NuxtPlugin, NuxtPluginTemplate, ResolvedNuxtTemplate, NuxtServerTemplate, NuxtTypeTemplate } from '@nuxt/schema';
+import { ModuleOptions, ModuleDefinition, NuxtModule, NuxtConfig, Nuxt, ModuleMeta, NuxtOptions, SchemaDefinition, NuxtAppConfig, ImportPresetWithDeprecation, NuxtCompatibility, NuxtCompatibilityIssues, Component, ComponentsDir, NuxtTemplate, NuxtMiddleware, NuxtHooks, NuxtPlugin, NuxtPluginTemplate, ResolvedNuxtTemplate, NuxtServerTemplate, NuxtTypeTemplate } from '@nuxt/schema';
 import { LoadConfigOptions } from 'c12';
 import { Import } from 'unimport';
 import { WebpackPluginInstance, Configuration } from 'webpack';
@@ -118,6 +118,8 @@ interface LayerDirectories {
  */
 declare function getLayerDirectories(nuxt?: _nuxt_schema.Nuxt): LayerDirectories[];
 
+declare function setGlobalHead(head: NuxtAppConfig['head']): void;
+
 declare function addImports(imports: Import | Import[]): void;
 declare function addImportsDir(dirs: string | string[], opts?: {
     prepend?: boolean;
@@ -163,7 +165,23 @@ interface ExtendConfigOptions {
 }
 interface ExtendWebpackConfigOptions extends ExtendConfigOptions {
 }
-interface ExtendViteConfigOptions 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;
 }
 /**
  * Extend webpack config
@@ -194,7 +212,7 @@ declare function addRspackPlugin(pluginOrGetter: RspackPluginInstance | RspackPl
 /**
  * Append Vite plugin to the config.
  */
-declare function addVitePlugin(pluginOrGetter: Plugin | Plugin[] | (() => Plugin | Plugin[]), options?: ExtendViteConfigOptions): void;
+declare function addVitePlugin(pluginOrGetter: Plugin | Plugin[] | (() => Plugin | Plugin[]), options?: ExtendConfigOptions): void;
 interface AddBuildPluginFactory {
     vite?: () => Plugin | Plugin[];
     webpack?: () => WebpackPluginInstance | WebpackPluginInstance[];
@@ -407,6 +425,9 @@ type PathType = 'file' | 'dir';
  * @param path path to the directory to resolve files in
  * @param pattern glob pattern or an array of glob patterns to match files
  * @param opts options for globbing
+ * @param opts.followSymbolicLinks whether to follow symbolic links, default is `true`
+ * @param opts.ignore additional glob patterns to ignore
+ * @returns sorted array of absolute file paths
  */
 declare function resolveFiles(path: string, pattern: string | string[], opts?: {
     followSymbolicLinks?: boolean;
@@ -505,6 +526,8 @@ interface ResolveModuleOptions {
     /** @deprecated use `url` with URLs pointing at a file - never a directory */
     paths?: string | string[];
     url?: URL | URL[];
+    /** @default ['.js', '.mjs', '.cjs', '.ts', '.mts', '.cts'] */
+    extensions?: string[];
 }
 declare function directoryToURL(dir: string): URL;
 /**
@@ -543,5 +566,5 @@ declare const templateUtils: {
     }) => string;
 };
 
-export { addBuildPlugin, addComponent, addComponentExports, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addRspackPlugin, addServerHandler, addServerImports, addServerImportsDir, addServerPlugin, addServerScanDir, addServerTemplate, addTemplate, addTypeTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createIsIgnored, createResolver, defineNuxtModule, directoryToURL, extendNuxtSchema, extendPages, extendRouteRules, extendRspackConfig, extendViteConfig, extendWebpackConfig, findPath, getDirectory, getLayerDirectories, getNuxtCtx, getNuxtModuleVersion, getNuxtVersion, hasNuxtCompatibility, hasNuxtModule, hasNuxtModuleCompatibility, importModule, installModule, installModules, isIgnored, isNuxt2, isNuxt3, isNuxtMajorVersion, loadNuxt, loadNuxtConfig, loadNuxtModuleInstance, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeSemanticVersion, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveIgnorePatterns, resolveModule, resolveModuleWithOptions, resolveNuxtModule, resolvePath, runWithNuxtContext, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateRuntimeConfig, updateTemplates, useLogger, useNitro, useNuxt, useRuntimeConfig, writeTypes };
+export { addBuildPlugin, addComponent, addComponentExports, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addRspackPlugin, addServerHandler, addServerImports, addServerImportsDir, addServerPlugin, addServerScanDir, addServerTemplate, addTemplate, addTypeTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createIsIgnored, createResolver, defineNuxtModule, directoryToURL, extendNuxtSchema, extendPages, extendRouteRules, extendRspackConfig, extendViteConfig, extendWebpackConfig, findPath, getDirectory, getLayerDirectories, getNuxtCtx, getNuxtModuleVersion, getNuxtVersion, hasNuxtCompatibility, hasNuxtModule, hasNuxtModuleCompatibility, importModule, installModule, installModules, isIgnored, isNuxt2, isNuxt3, isNuxtMajorVersion, loadNuxt, loadNuxtConfig, loadNuxtModuleInstance, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeSemanticVersion, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveIgnorePatterns, resolveModule, resolveModuleWithOptions, resolveNuxtModule, resolvePath, runWithNuxtContext, setGlobalHead, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateRuntimeConfig, updateTemplates, useLogger, useNitro, useNuxt, useRuntimeConfig, writeTypes };
 export type { AddComponentOptions, AddPluginOptions, AddRouteMiddlewareOptions, ExtendConfigOptions, ExtendRouteRulesOptions, ExtendViteConfigOptions, ExtendWebpackConfigOptions, ImportModuleOptions, LayerDirectories, LoadNuxtConfigOptions, LoadNuxtOptions, ResolveModuleOptions, ResolvePathOptions, Resolver };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { ModuleOptions, ModuleDefinition, NuxtModule, NuxtConfig, Nuxt, ModuleMeta, NuxtOptions, SchemaDefinition, ImportPresetWithDeprecation, NuxtCompatibility, NuxtCompatibilityIssues, Component, ComponentsDir, NuxtTemplate, NuxtMiddleware, NuxtHooks, NuxtPlugin, NuxtPluginTemplate, ResolvedNuxtTemplate, NuxtServerTemplate, NuxtTypeTemplate } from '@nuxt/schema';
+import { ModuleOptions, ModuleDefinition, NuxtModule, NuxtConfig, Nuxt, ModuleMeta, NuxtOptions, SchemaDefinition, NuxtAppConfig, ImportPresetWithDeprecation, NuxtCompatibility, NuxtCompatibilityIssues, Component, ComponentsDir, NuxtTemplate, NuxtMiddleware, NuxtHooks, NuxtPlugin, NuxtPluginTemplate, ResolvedNuxtTemplate, NuxtServerTemplate, NuxtTypeTemplate } from '@nuxt/schema';
 import { LoadConfigOptions } from 'c12';
 import { Import } from 'unimport';
 import { WebpackPluginInstance, Configuration } from 'webpack';
@@ -118,6 +118,8 @@ interface LayerDirectories {
  */
 declare function getLayerDirectories(nuxt?: _nuxt_schema.Nuxt): LayerDirectories[];
 
+declare function setGlobalHead(head: NuxtAppConfig['head']): void;
+
 declare function addImports(imports: Import | Import[]): void;
 declare function addImportsDir(dirs: string | string[], opts?: {
     prepend?: boolean;
@@ -163,7 +165,23 @@ interface ExtendConfigOptions {
 }
 interface ExtendWebpackConfigOptions extends ExtendConfigOptions {
 }
-interface ExtendViteConfigOptions 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;
 }
 /**
  * Extend webpack config
@@ -194,7 +212,7 @@ declare function addRspackPlugin(pluginOrGetter: RspackPluginInstance | RspackPl
 /**
  * Append Vite plugin to the config.
  */
-declare function addVitePlugin(pluginOrGetter: Plugin | Plugin[] | (() => Plugin | Plugin[]), options?: ExtendViteConfigOptions): void;
+declare function addVitePlugin(pluginOrGetter: Plugin | Plugin[] | (() => Plugin | Plugin[]), options?: ExtendConfigOptions): void;
 interface AddBuildPluginFactory {
     vite?: () => Plugin | Plugin[];
     webpack?: () => WebpackPluginInstance | WebpackPluginInstance[];
@@ -407,6 +425,9 @@ type PathType = 'file' | 'dir';
  * @param path path to the directory to resolve files in
  * @param pattern glob pattern or an array of glob patterns to match files
  * @param opts options for globbing
+ * @param opts.followSymbolicLinks whether to follow symbolic links, default is `true`
+ * @param opts.ignore additional glob patterns to ignore
+ * @returns sorted array of absolute file paths
  */
 declare function resolveFiles(path: string, pattern: string | string[], opts?: {
     followSymbolicLinks?: boolean;
@@ -505,6 +526,8 @@ interface ResolveModuleOptions {
     /** @deprecated use `url` with URLs pointing at a file - never a directory */
     paths?: string | string[];
     url?: URL | URL[];
+    /** @default ['.js', '.mjs', '.cjs', '.ts', '.mts', '.cts'] */
+    extensions?: string[];
 }
 declare function directoryToURL(dir: string): URL;
 /**
@@ -543,5 +566,5 @@ declare const templateUtils: {
     }) => string;
 };
 
-export { addBuildPlugin, addComponent, addComponentExports, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addRspackPlugin, addServerHandler, addServerImports, addServerImportsDir, addServerPlugin, addServerScanDir, addServerTemplate, addTemplate, addTypeTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createIsIgnored, createResolver, defineNuxtModule, directoryToURL, extendNuxtSchema, extendPages, extendRouteRules, extendRspackConfig, extendViteConfig, extendWebpackConfig, findPath, getDirectory, getLayerDirectories, getNuxtCtx, getNuxtModuleVersion, getNuxtVersion, hasNuxtCompatibility, hasNuxtModule, hasNuxtModuleCompatibility, importModule, installModule, installModules, isIgnored, isNuxt2, isNuxt3, isNuxtMajorVersion, loadNuxt, loadNuxtConfig, loadNuxtModuleInstance, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeSemanticVersion, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveIgnorePatterns, resolveModule, resolveModuleWithOptions, resolveNuxtModule, resolvePath, runWithNuxtContext, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateRuntimeConfig, updateTemplates, useLogger, useNitro, useNuxt, useRuntimeConfig, writeTypes };
+export { addBuildPlugin, addComponent, addComponentExports, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addRspackPlugin, addServerHandler, addServerImports, addServerImportsDir, addServerPlugin, addServerScanDir, addServerTemplate, addTemplate, addTypeTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createIsIgnored, createResolver, defineNuxtModule, directoryToURL, extendNuxtSchema, extendPages, extendRouteRules, extendRspackConfig, extendViteConfig, extendWebpackConfig, findPath, getDirectory, getLayerDirectories, getNuxtCtx, getNuxtModuleVersion, getNuxtVersion, hasNuxtCompatibility, hasNuxtModule, hasNuxtModuleCompatibility, importModule, installModule, installModules, isIgnored, isNuxt2, isNuxt3, isNuxtMajorVersion, loadNuxt, loadNuxtConfig, loadNuxtModuleInstance, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeSemanticVersion, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveIgnorePatterns, resolveModule, resolveModuleWithOptions, resolveNuxtModule, resolvePath, runWithNuxtContext, setGlobalHead, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateRuntimeConfig, updateTemplates, useLogger, useNitro, useNuxt, useRuntimeConfig, writeTypes };
 export type { AddComponentOptions, AddPluginOptions, AddRouteMiddlewareOptions, ExtendConfigOptions, ExtendRouteRulesOptions, ExtendViteConfigOptions, ExtendWebpackConfigOptions, ImportModuleOptions, LayerDirectories, LoadNuxtConfigOptions, LoadNuxtOptions, ResolveModuleOptions, ResolvePathOptions, Resolver };

package/dist/index.mjs

@@ -9,13 +9,14 @@ import { getContext, createContext } from 'unctx';
 import satisfies from 'semver/functions/satisfies.js';
 import { readPackageJSON, resolvePackageJSON } from 'pkg-types';
 import { genSafeVariableName, genDynamicImport, genImport } from 'knitwork';
-import { pathToFileURL, fileURLToPath } from 'node:url';
+import { fileURLToPath, pathToFileURL } from 'node:url';
 import { createJiti } from 'jiti';
-import { interopDefault, parseNodeModulePath, resolveModuleExportNames } from 'mlly';
+import { parseNodeModulePath, interopDefault, resolveModuleExportNames } from 'mlly';
 import { resolveModulePath, resolveModuleURL } from 'exsolve';
 import { isRelative, withTrailingSlash as withTrailingSlash$2 } from 'ufo';
 import { read, update } from 'rc9';
 import semver, { gte } from 'semver';
+import { captureStackTrace } from 'errx';
 import { glob } from 'tinyglobby';
 import { resolveAlias as resolveAlias$1, reverseResolveAlias } from 'pathe/utils';
 import ignore from 'ignore';
@@ -25,7 +26,6 @@ import destr from 'destr';
 import { snakeCase, pascalCase, kebabCase } from 'scule';
 import { klona } from 'klona';
 import { hash } from 'ohash';
-import { captureStackTrace } from 'errx';
 import { isAbsolute as isAbsolute$1 } from 'node:path';
 
 const logger = consola;
@@ -2239,49 +2239,26 @@ function nuxt2Shims(nuxt) {
   });
 }
 
-function directoryToURL(dir) {
-  return pathToFileURL(dir + "/");
-}
-function tryResolveModule(id, url = import.meta.url) {
-  return Promise.resolve(resolveModulePath(id, {
-    from: url,
-    suffixes: ["", "index"],
-    try: true
-  }));
-}
-function resolveModule(id, options) {
-  return resolveModulePath(id, {
-    // eslint-disable-next-line @typescript-eslint/no-deprecated
-    from: options?.url ?? options?.paths ?? [import.meta.url],
-    extensions: [".js", ".mjs", ".cjs", ".ts", ".mts", ".cts"]
-  });
-}
-async function importModule(id, opts) {
-  const resolvedPath = resolveModule(id, opts);
-  return await import(pathToFileURL(resolvedPath).href).then((r) => opts?.interopDefault !== false ? interopDefault(r) : r);
-}
-function tryImportModule(id, opts) {
-  try {
-    return importModule(id, opts).catch(() => void 0);
-  } catch {
+const distURL = import.meta.url.replace(/\/dist\/.*$/, "/");
+function getUserCaller() {
+  if (!import.meta.dev) {
+    return null;
   }
-}
-const warnings = /* @__PURE__ */ new Set();
-function requireModule(id, opts) {
-  if (!warnings.has(id)) {
-    console.warn("[@nuxt/kit] `requireModule` is deprecated. Please use `importModule` instead.");
-    warnings.add(id);
+  const { source, line, column } = captureStackTrace().find((entry) => !entry.source.startsWith(distURL)) ?? {};
+  if (!source) {
+    return null;
   }
-  const resolvedPath = resolveModule(id, opts);
-  const jiti = createJiti(import.meta.url, {
-    interopDefault: opts?.interopDefault !== false
-  });
-  return jiti(pathToFileURL(resolvedPath).href);
+  return {
+    source: source.replace(/^file:\/\//, ""),
+    line,
+    column
+  };
 }
-function tryRequireModule(id, opts) {
-  try {
-    return requireModule(id, opts);
-  } catch {
+const warnings = /* @__PURE__ */ new Set();
+function warn(warning) {
+  if (!warnings.has(warning)) {
+    console.warn(warning);
+    warnings.add(warning);
   }
 }
 
@@ -2542,6 +2519,51 @@ async function resolveFiles(path, pattern, opts = {}) {
   return files.sort();
 }
 
+function directoryToURL(dir) {
+  return pathToFileURL(dir + "/");
+}
+function tryResolveModule(id, url = import.meta.url) {
+  return Promise.resolve(resolveModulePath(id, {
+    from: url,
+    suffixes: ["", "index"],
+    try: true
+  }));
+}
+function resolveModule(id, options) {
+  return resolveModulePath(id, {
+    // eslint-disable-next-line @typescript-eslint/no-deprecated
+    from: options?.url ?? options?.paths ?? [import.meta.url],
+    extensions: options?.extensions ?? [".js", ".mjs", ".cjs", ".ts", ".mts", ".cts"]
+  });
+}
+async function importModule(id, opts) {
+  const resolvedPath = resolveModule(id, opts);
+  return await import(pathToFileURL(resolvedPath).href).then((r) => opts?.interopDefault !== false ? interopDefault(r) : r);
+}
+function tryImportModule(id, opts) {
+  try {
+    return importModule(id, opts).catch(() => void 0);
+  } catch {
+  }
+}
+function requireModule(id, opts) {
+  const caller = getUserCaller();
+  const explanation = caller ? ` (used at \`${resolveAlias(caller.source)}:${caller.line}:${caller.column}\`)` : "";
+  const warning = `[@nuxt/kit] \`requireModule\` is deprecated${explanation}. Please use \`importModule\` instead.`;
+  warn(warning);
+  const resolvedPath = resolveModule(id, opts);
+  const jiti = createJiti(import.meta.url, {
+    interopDefault: opts?.interopDefault !== false
+  });
+  return jiti(pathToFileURL(resolvedPath).href);
+}
+function tryRequireModule(id, opts) {
+  try {
+    return requireModule(id, opts);
+  } catch {
+  }
+}
+
 const NODE_MODULES_RE = /[/\\]node_modules[/\\]/;
 async function installModules(modulesToInstall, resolvedModulePaths, nuxt = useNuxt()) {
   const localLayerModuleDirs = [];
@@ -2838,17 +2860,17 @@ async function loadNuxtConfig(opts) {
     cwd: opts.cwd || process.cwd()
   })).map((d) => d.endsWith("/") ? d.substring(0, d.length - 1) : d).sort((a, b) => b.localeCompare(a));
   opts.overrides = defu$1(opts.overrides, { _extends: localLayers });
-  globalThis.defineNuxtConfig = (c) => c;
-  const { configFile, layers = [], cwd, config: nuxtConfig, meta } = await loadConfig({
-    name: "nuxt",
-    configFile: "nuxt.config",
-    rcFile: ".nuxtrc",
-    extend: { extendKey: ["theme", "_extends", "extends"] },
-    dotenv: true,
-    globalRc: true,
-    ...opts
-  });
-  delete globalThis.defineNuxtConfig;
+  const { configFile, layers = [], cwd, config: nuxtConfig, meta } = await withDefineNuxtConfig(
+    () => loadConfig({
+      name: "nuxt",
+      configFile: "nuxt.config",
+      rcFile: ".nuxtrc",
+      extend: { extendKey: ["theme", "_extends", "extends"] },
+      dotenv: true,
+      globalRc: true,
+      ...opts
+    })
+  );
   nuxtConfig.rootDir ||= cwd;
   nuxtConfig._nuxtConfigFile = configFile;
   nuxtConfig._nuxtConfigFiles = [configFile];
@@ -2916,6 +2938,23 @@ async function loadNuxtSchema(cwd) {
   const schemaPath = resolveModuleURL("@nuxt/schema", { try: true, from: urls }) ?? "@nuxt/schema";
   return await import(schemaPath).then((r) => r.NuxtConfigSchema);
 }
+async function withDefineNuxtConfig(fn) {
+  const key = "defineNuxtConfig";
+  const globalSelf = globalThis;
+  if (!globalSelf[key]) {
+    globalSelf[key] = (c) => c;
+    globalSelf[key].count = 0;
+  }
+  globalSelf[key].count++;
+  try {
+    return await fn();
+  } finally {
+    globalSelf[key].count--;
+    if (!globalSelf[key].count) {
+      delete globalSelf[key];
+    }
+  }
+}
 
 function extendNuxtSchema(def) {
   const nuxt = useNuxt();
@@ -2974,6 +3013,11 @@ async function buildNuxt(nuxt) {
   return runWithNuxtContext(nuxt, () => build(nuxt));
 }
 
+function setGlobalHead(head) {
+  const nuxt = useNuxt();
+  nuxt.options.app.head = defu(head, nuxt.options.app.head);
+}
+
 function addImports(imports) {
   assertNuxtCompatibility({ bridge: true });
   useNuxt().hook("imports:extend", (_imports) => {
@@ -3151,17 +3195,13 @@ function extendViteConfig(fn, options = {}) {
   if (options.build === false && nuxt.options.build) {
     return;
   }
-  if (options.server !== false && options.client !== false) {
-    return nuxt.hook("vite:extend", ({ config }) => fn(config));
+  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);
   }
-  nuxt.hook("vite:extendConfig", (config, { isClient, isServer }) => {
-    if (options.server !== false && isServer) {
-      return fn(config);
-    }
-    if (options.client !== false && isClient) {
-      return fn(config);
-    }
-  });
+  return nuxt.hook("vite:extend", ({ config }) => fn(config));
 }
 function addWebpackPlugin(pluginOrGetter, options) {
   extendWebpackConfig((config) => {
@@ -3179,13 +3219,52 @@ function addRspackPlugin(pluginOrGetter, options) {
     config.plugins[method](...toArray(plugin));
   }, options);
 }
-function addVitePlugin(pluginOrGetter, options) {
-  extendViteConfig((config) => {
-    const method = options?.prepend ? "unshift" : "push";
-    const plugin = typeof pluginOrGetter === "function" ? pluginOrGetter() : pluginOrGetter;
+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 ||= [];
-    config.plugins[method](...toArray(plugin));
-  }, options);
+    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);
+    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);
+    }
+  });
 }
 function addBuildPlugin(pluginFactory, options) {
   if (pluginFactory.vite) {
@@ -3718,4 +3797,4 @@ function addPluginTemplate(plugin, opts = {}) {
   return addPlugin(normalizedPlugin, opts);
 }
 
-export { addBuildPlugin, addComponent, addComponentExports, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addRspackPlugin, addServerHandler, addServerImports, addServerImportsDir, addServerPlugin, addServerScanDir, addServerTemplate, addTemplate, addTypeTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createIsIgnored, createResolver, defineNuxtModule, directoryToURL, extendNuxtSchema, extendPages, extendRouteRules, extendRspackConfig, extendViteConfig, extendWebpackConfig, findPath, getDirectory, getLayerDirectories, getNuxtCtx, getNuxtModuleVersion, getNuxtVersion, hasNuxtCompatibility, hasNuxtModule, hasNuxtModuleCompatibility, importModule, installModule, installModules, isIgnored, isNuxt2, isNuxt3, isNuxtMajorVersion, loadNuxt, loadNuxtConfig, loadNuxtModuleInstance, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeSemanticVersion, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveIgnorePatterns, resolveModule, resolveModuleWithOptions, resolveNuxtModule, resolvePath, runWithNuxtContext, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateRuntimeConfig, updateTemplates, useLogger, useNitro, useNuxt, useRuntimeConfig, writeTypes };
+export { addBuildPlugin, addComponent, addComponentExports, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addRspackPlugin, addServerHandler, addServerImports, addServerImportsDir, addServerPlugin, addServerScanDir, addServerTemplate, addTemplate, addTypeTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createIsIgnored, createResolver, defineNuxtModule, directoryToURL, extendNuxtSchema, extendPages, extendRouteRules, extendRspackConfig, extendViteConfig, extendWebpackConfig, findPath, getDirectory, getLayerDirectories, getNuxtCtx, getNuxtModuleVersion, getNuxtVersion, hasNuxtCompatibility, hasNuxtModule, hasNuxtModuleCompatibility, importModule, installModule, installModules, isIgnored, isNuxt2, isNuxt3, isNuxtMajorVersion, loadNuxt, loadNuxtConfig, loadNuxtModuleInstance, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeSemanticVersion, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveIgnorePatterns, resolveModule, resolveModuleWithOptions, resolveNuxtModule, resolvePath, runWithNuxtContext, setGlobalHead, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateRuntimeConfig, updateTemplates, useLogger, useNitro, useNuxt, useRuntimeConfig, writeTypes };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit",
-  "version": "3.19.2",
+  "version": "3.20.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -23,14 +23,14 @@
     "dist"
   ],
   "dependencies": {
-    "c12": "^3.2.0",
+    "c12": "^3.3.0",
     "consola": "^3.4.2",
     "defu": "^6.1.4",
     "destr": "^2.0.5",
     "errx": "^0.1.0",
     "exsolve": "^1.0.7",
     "ignore": "^7.0.5",
-    "jiti": "^2.5.1",
+    "jiti": "^2.6.1",
     "klona": "^2.0.6",
     "knitwork": "^1.2.0",
     "mlly": "^1.8.0",
@@ -39,26 +39,25 @@
     "pkg-types": "^2.3.0",
     "rc9": "^2.1.2",
     "scule": "^1.3.0",
-    "semver": "^7.7.2",
-    "std-env": "^3.9.0",
+    "semver": "^7.7.3",
     "tinyglobby": "^0.2.15",
     "ufo": "^1.6.1",
     "unctx": "^2.4.1",
-    "unimport": "^5.2.0",
     "untyped": "^2.0.0"
   },
   "devDependencies": {
-    "@rspack/core": "1.5.3",
+    "@rspack/core": "1.5.8",
     "@types/lodash-es": "4.17.12",
     "@types/semver": "7.7.1",
     "hookable": "5.5.3",
     "lodash-es": "4.17.21",
-    "nitropack": "2.12.5",
+    "nitropack": "2.12.8",
     "unbuild": "3.6.1",
-    "vite": "7.1.5",
+    "unimport": "5.4.1",
+    "vite": "7.1.9",
     "vitest": "3.2.4",
-    "webpack": "5.101.3",
-    "@nuxt/schema": "3.19.2"
+    "webpack": "5.102.1",
+    "@nuxt/schema": "3.20.0"
   },
   "engines": {
     "node": ">=18.12.0"