@nuxt/kit 3.15.0 → 3.15.2

package/dist/index.d.mts

@@ -257,9 +257,6 @@ interface AddRouteMiddlewareOptions {
 }
 declare function addRouteMiddleware(input: NuxtMiddleware | NuxtMiddleware[], options?: AddRouteMiddlewareOptions): void;
 
-/**
- * Normalize a nuxt plugin object
- */
 declare function normalizePlugin(plugin: NuxtPlugin | string): NuxtPlugin;
 /**
  * Registers a nuxt plugin and to the plugins array.
@@ -386,7 +383,7 @@ declare function addServerScanDir(dirs: string | string[], opts?: {
 }): void;
 
 /**
- * Renders given template using lodash template during build into the project buildDir
+ * Renders given template during build into the virtual file system (and optionally to disk in the project `buildDir`)
  */
 declare function addTemplate<T>(_template: NuxtTemplate<T> | string): ResolvedNuxtTemplate<T>;
 /**
@@ -394,7 +391,7 @@ declare function addTemplate<T>(_template: NuxtTemplate<T> | string): ResolvedNu
  */
 declare function addServerTemplate(template: NuxtServerTemplate): NuxtServerTemplate;
 /**
- * Renders given types using lodash template during build into the project buildDir
+ * Renders given types during build to disk in the project `buildDir`
  * and register them as types.
  */
 declare function addTypeTemplate<T>(_template: NuxtTypeTemplate<T>): ResolvedNuxtTemplate<T>;

package/dist/index.d.ts

@@ -257,9 +257,6 @@ interface AddRouteMiddlewareOptions {
 }
 declare function addRouteMiddleware(input: NuxtMiddleware | NuxtMiddleware[], options?: AddRouteMiddlewareOptions): void;
 
-/**
- * Normalize a nuxt plugin object
- */
 declare function normalizePlugin(plugin: NuxtPlugin | string): NuxtPlugin;
 /**
  * Registers a nuxt plugin and to the plugins array.
@@ -386,7 +383,7 @@ declare function addServerScanDir(dirs: string | string[], opts?: {
 }): void;
 
 /**
- * Renders given template using lodash template during build into the project buildDir
+ * Renders given template during build into the virtual file system (and optionally to disk in the project `buildDir`)
  */
 declare function addTemplate<T>(_template: NuxtTemplate<T> | string): ResolvedNuxtTemplate<T>;
 /**
@@ -394,7 +391,7 @@ declare function addTemplate<T>(_template: NuxtTemplate<T> | string): ResolvedNu
  */
 declare function addServerTemplate(template: NuxtServerTemplate): NuxtServerTemplate;
 /**
- * Renders given types using lodash template during build into the project buildDir
+ * Renders given types during build to disk in the project `buildDir`
  * and register them as types.
  */
 declare function addTypeTemplate<T>(_template: NuxtTypeTemplate<T>): ResolvedNuxtTemplate<T>;

package/dist/index.mjs

@@ -23,6 +23,8 @@ import { snakeCase, kebabCase, pascalCase } from 'scule';
 import { klona } from 'klona';
 import { hash } from 'ohash';
 import { gte } from 'semver';
+import { isAbsolute as isAbsolute$1 } from 'node:path';
+import { isWindows } from 'std-env';
 
 const logger = consola;
 function useLogger(tag, options = {}) {
@@ -86,7 +88,7 @@ async function checkNuxtCompatibility(constraints, nuxt = useNuxt()) {
           message: `Not compatible with \`${nuxt.options.builder}\`.`
         });
       } else {
-        const builderVersion = await readPackageJSON(nuxt.options.builder, { url: nuxt.options.modulesDir }).then((r) => r.version).catch(() => void 0);
+        const builderVersion = await readPackageJSON(nuxt.options.builder, { url: nuxt.options.modulesDir }).then((r) => r.version).catch(() => undefined);
         if (builderVersion && !satisfies(normalizeSemanticVersion(builderVersion), constraint, { includePrerelease: true })) {
           issues.push({
             name: "builder",
@@ -140,7 +142,7 @@ var freeSelf = typeof self == 'object' && self && self.Object === Object && self
 var root = freeGlobal || freeSelf || Function('return this')();
 
 /** Built-in value references. */
-var Symbol = root.Symbol;
+var Symbol$1 = root.Symbol;
 
 /** Used for built-in method references. */
 var objectProto$b = Object.prototype;
@@ -156,7 +158,7 @@ var hasOwnProperty$9 = objectProto$b.hasOwnProperty;
 var nativeObjectToString$1 = objectProto$b.toString;
 
 /** Built-in value references. */
-var symToStringTag$1 = Symbol ? Symbol.toStringTag : undefined;
+var symToStringTag$1 = Symbol$1 ? Symbol$1.toStringTag : undefined;
 
 /**
  * A specialized version of `baseGetTag` which ignores `Symbol.toStringTag` values.
@@ -211,7 +213,7 @@ var nullTag = '[object Null]',
     undefinedTag = '[object Undefined]';
 
 /** Built-in value references. */
-var symToStringTag = Symbol ? Symbol.toStringTag : undefined;
+var symToStringTag = Symbol$1 ? Symbol$1.toStringTag : undefined;
 
 /**
  * The base implementation of `getTag` without fallbacks for buggy environments.
@@ -327,11 +329,8 @@ function arrayMap(array, iteratee) {
  */
 var isArray = Array.isArray;
 
-/** Used as references for various `Number` constants. */
-var INFINITY = 1 / 0;
-
 /** Used to convert symbols to primitives and strings. */
-var symbolProto = Symbol ? Symbol.prototype : undefined,
+var symbolProto = Symbol$1 ? Symbol$1.prototype : undefined,
     symbolToString = symbolProto ? symbolProto.toString : undefined;
 
 /**
@@ -355,7 +354,7 @@ function baseToString(value) {
     return symbolToString ? symbolToString.call(value) : '';
   }
   var result = (value + '');
-  return (result == '0' && (1 / value) == -INFINITY) ? '-0' : result;
+  return (result == '0' && (1 / value) == -Infinity) ? '-0' : result;
 }
 
 /**
@@ -2055,6 +2054,14 @@ function template(string, options, guard) {
 function toArray(value) {
   return Array.isArray(value) ? value : [value];
 }
+function filterInPlace(array, predicate) {
+  for (let i = array.length; i--; i >= 0) {
+    if (!predicate(array[i], i, array)) {
+      array.splice(i, 1);
+    }
+  }
+  return array;
+}
 const MODE_RE = /\.(server|client)(\.\w+)*$/;
 
 async function compileTemplate(template$1, ctx) {
@@ -2116,7 +2123,7 @@ function _defineNuxtModule(definition) {
     }
     const uniqueKey = module.meta.name || module.meta.configKey;
     if (uniqueKey) {
-      nuxt.options._requiredModules = nuxt.options._requiredModules || {};
+      nuxt.options._requiredModules ||= {};
       if (nuxt.options._requiredModules[uniqueKey]) {
         return false;
       }
@@ -2305,7 +2312,7 @@ async function resolvePath(path, opts = {}) {
   return opts.fallbackToOriginal ? _path : path;
 }
 async function findPath(paths, opts, pathType = "file") {
-  const nuxt = opts?.virtual ? tryUseNuxt() : void 0;
+  const nuxt = opts?.virtual ? tryUseNuxt() : undefined;
   for (const path of toArray(paths)) {
     const rPath = await resolvePath(path, opts);
     if (opts?.virtual && existsInVFS(rPath, nuxt)) {
@@ -2407,8 +2414,8 @@ async function installModule(moduleToInstall, inlineOptions, nuxt = useNuxt()) {
       nuxt.options.modulesDir.push(resolve(directory, "node_modules"));
     }
   }
-  nuxt.options._installedModules = nuxt.options._installedModules || [];
-  const entryPath = typeof moduleToInstall === "string" ? resolveAlias(moduleToInstall) : void 0;
+  nuxt.options._installedModules ||= [];
+  const entryPath = typeof moduleToInstall === "string" ? resolveAlias(moduleToInstall) : undefined;
   if (typeof moduleToInstall === "string" && entryPath !== moduleToInstall) {
     buildTimeModuleMeta.rawPath = moduleToInstall;
   }
@@ -2442,27 +2449,22 @@ async function loadNuxtModuleInstance(nuxtModule, nuxt = useNuxt()) {
     paths.add(join(nuxtModule, "module"));
     paths.add(nuxtModule);
     for (const path of paths) {
-      for (const parentURL of nuxt.options.modulesDir) {
-        try {
-          const src = isAbsolute(path) ? pathToFileURL(await resolvePath(path, { cwd: parentURL, fallbackToOriginal: false, extensions: nuxt.options.extensions })).href : await resolve$1(path, { url: pathToFileURL(parentURL.replace(/\/node_modules\/?$/, "")), extensions: nuxt.options.extensions });
-          nuxtModule = await jiti.import(src, { default: true });
-          resolvedModulePath = fileURLToPath(new URL(src));
-          const moduleMetadataPath = new URL("module.json", src);
-          if (existsSync(moduleMetadataPath)) {
-            buildTimeModuleMeta = JSON.parse(await promises.readFile(moduleMetadataPath, "utf-8"));
-          }
-          break;
-        } catch (error) {
-          const code = error.code;
-          if (code === "MODULE_NOT_FOUND" || code === "ERR_PACKAGE_PATH_NOT_EXPORTED" || code === "ERR_MODULE_NOT_FOUND" || code === "ERR_UNSUPPORTED_DIR_IMPORT" || code === "ENOTDIR") {
-            continue;
-          }
-          logger.error(`Error while importing module \`${nuxtModule}\`: ${error}`);
-          throw error;
+      try {
+        const src = isAbsolute(path) ? pathToFileURL(await resolvePath(path, { fallbackToOriginal: false, extensions: nuxt.options.extensions })).href : await resolve$1(path, { url: nuxt.options.modulesDir.map((m) => pathToFileURL(m.replace(/\/node_modules\/?$/, ""))), extensions: nuxt.options.extensions });
+        nuxtModule = await jiti.import(src, { default: true });
+        resolvedModulePath = fileURLToPath(new URL(src));
+        const moduleMetadataPath = new URL("module.json", src);
+        if (existsSync(moduleMetadataPath)) {
+          buildTimeModuleMeta = JSON.parse(await promises.readFile(moduleMetadataPath, "utf-8"));
         }
-      }
-      if (typeof nuxtModule !== "string") {
         break;
+      } catch (error) {
+        const code = error.code;
+        if (code === "MODULE_NOT_FOUND" || code === "ERR_PACKAGE_PATH_NOT_EXPORTED" || code === "ERR_MODULE_NOT_FOUND" || code === "ERR_UNSUPPORTED_DIR_IMPORT" || code === "ENOTDIR") {
+          continue;
+        }
+        logger.error(`Error while importing module \`${nuxtModule}\`: ${error}`);
+        throw error;
       }
     }
   }
@@ -2554,7 +2556,7 @@ async function loadNuxtConfig(opts) {
   const _layers = [];
   const processedLayers = /* @__PURE__ */ new Set();
   for (const layer of layers) {
-    layer.config = layer.config || {};
+    layer.config ||= {};
     layer.config.rootDir = layer.config.rootDir ?? layer.cwd;
     if (processedLayers.has(layer.config.rootDir)) {
       continue;
@@ -2626,7 +2628,7 @@ function tryRequireModule(id, opts) {
 
 async function loadNuxt(opts) {
   opts.cwd = opts.cwd || opts.rootDir;
-  opts.overrides = opts.overrides || opts.config || {};
+  opts.overrides ||= opts.config || {};
   opts.overrides.dev = !!opts.dev;
   const nearestNuxtPkg = await Promise.all(["nuxt-nightly", "nuxt3", "nuxt", "nuxt-edge"].map((pkg2) => resolvePackageJSON(pkg2, { url: opts.cwd }).catch(() => null))).then((r) => r.filter(Boolean).sort((a, b) => b.length - a.length)[0]);
   if (!nearestNuxtPkg) {
@@ -2696,7 +2698,7 @@ function addImportsSources(presets) {
 
 const HANDLER_METHOD_RE = /\.(get|head|patch|post|put|delete|connect|options|trace)(\.\w+)*$/;
 function normalizeHandlerMethod(handler) {
-  const [, method = void 0] = handler.handler.match(HANDLER_METHOD_RE) || [];
+  const [, method = undefined] = handler.handler.match(HANDLER_METHOD_RE) || [];
   return {
     method,
     ...handler,
@@ -2711,7 +2713,7 @@ function addDevServerHandler(handler) {
 }
 function addServerPlugin(plugin) {
   const nuxt = useNuxt();
-  nuxt.options.nitro.plugins = nuxt.options.nitro.plugins || [];
+  nuxt.options.nitro.plugins ||= [];
   nuxt.options.nitro.plugins.push(normalize(plugin));
 }
 function addPrerenderRoutes(routes) {
@@ -2736,8 +2738,8 @@ function useNitro() {
 function addServerImports(imports) {
   const nuxt = useNuxt();
   nuxt.hook("nitro:config", (config) => {
-    config.imports = config.imports || {};
-    config.imports.imports = config.imports.imports || [];
+    config.imports ||= {};
+    config.imports.imports ||= [];
     config.imports.imports.push(...imports);
   });
 }
@@ -2745,15 +2747,15 @@ function addServerImportsDir(dirs, opts = {}) {
   const nuxt = useNuxt();
   const _dirs = toArray(dirs);
   nuxt.hook("nitro:config", (config) => {
-    config.imports = config.imports || {};
-    config.imports.dirs = config.imports.dirs || [];
+    config.imports ||= {};
+    config.imports.dirs ||= [];
     config.imports.dirs[opts.prepend ? "unshift" : "push"](..._dirs);
   });
 }
 function addServerScanDir(dirs, opts = {}) {
   const nuxt = useNuxt();
   nuxt.hook("nitro:config", (config) => {
-    config.scanDirs = config.scanDirs || [];
+    config.scanDirs ||= [];
     for (const dir of toArray(dirs)) {
       config.scanDirs[opts.prepend ? "unshift" : "push"](dir);
     }
@@ -2793,7 +2795,7 @@ function applyEnv(obj, opts, parentKey = "") {
       if (_isObject(envValue)) {
         obj[key] = { ...obj[key], ...envValue };
         applyEnv(obj[key], opts, subKey);
-      } else if (envValue === void 0) {
+      } else if (envValue === undefined) {
         applyEnv(obj[key], opts, subKey);
       } else {
         obj[key] = envValue ?? obj[key];
@@ -2863,7 +2865,7 @@ function addWebpackPlugin(pluginOrGetter, options) {
   extendWebpackConfig((config) => {
     const method = options?.prepend ? "unshift" : "push";
     const plugin = typeof pluginOrGetter === "function" ? pluginOrGetter() : pluginOrGetter;
-    config.plugins = config.plugins || [];
+    config.plugins ||= [];
     config.plugins[method](...toArray(plugin));
   }, options);
 }
@@ -2871,7 +2873,7 @@ function addRspackPlugin(pluginOrGetter, options) {
   extendRspackConfig((config) => {
     const method = options?.prepend ? "unshift" : "push";
     const plugin = typeof pluginOrGetter === "function" ? pluginOrGetter() : pluginOrGetter;
-    config.plugins = config.plugins || [];
+    config.plugins ||= [];
     config.plugins[method](...toArray(plugin));
   }, options);
 }
@@ -2879,7 +2881,7 @@ function addVitePlugin(pluginOrGetter, options) {
   extendViteConfig((config) => {
     const method = options?.prepend ? "unshift" : "push";
     const plugin = typeof pluginOrGetter === "function" ? pluginOrGetter() : pluginOrGetter;
-    config.plugins = config.plugins || [];
+    config.plugins ||= [];
     config.plugins[method](...toArray(plugin));
   }, options);
 }
@@ -2898,7 +2900,7 @@ function addBuildPlugin(pluginFactory, options) {
 async function addComponentsDir(dir, opts = {}) {
   const nuxt = useNuxt();
   await assertNuxtCompatibility({ nuxt: ">=2.13" }, nuxt);
-  nuxt.options.components = nuxt.options.components || [];
+  nuxt.options.components ||= [];
   dir.priority ||= 0;
   nuxt.hook("components:dirs", (dirs) => {
     dirs[opts.prepend ? "unshift" : "push"](dir);
@@ -2907,7 +2909,7 @@ async function addComponentsDir(dir, opts = {}) {
 async function addComponent(opts) {
   const nuxt = useNuxt();
   await assertNuxtCompatibility({ nuxt: ">=2.13" }, nuxt);
-  nuxt.options.components = nuxt.options.components || [];
+  nuxt.options.components ||= [];
   if (!opts.mode) {
     const [, mode = "all"] = opts.filePath.match(MODE_RE) || [];
     opts.mode = mode;
@@ -2949,7 +2951,7 @@ async function addComponent(opts) {
 function addTemplate(_template) {
   const nuxt = useNuxt();
   const template = normalizeTemplate(_template);
-  nuxt.options.build.templates = nuxt.options.build.templates.filter((p) => normalizeTemplate(p).dst !== template.dst);
+  filterInPlace(nuxt.options.build.templates, (p) => normalizeTemplate(p).dst !== template.dst);
   nuxt.options.build.templates.push(template);
   return template;
 }
@@ -3097,9 +3099,9 @@ async function _generateTypes(nuxt) {
   });
   const aliases = nuxt.options.alias;
   const basePath = tsConfig.compilerOptions.baseUrl ? resolve(nuxt.options.buildDir, tsConfig.compilerOptions.baseUrl) : nuxt.options.buildDir;
-  tsConfig.compilerOptions = tsConfig.compilerOptions || {};
-  tsConfig.compilerOptions.paths = tsConfig.compilerOptions.paths || {};
-  tsConfig.include = tsConfig.include || [];
+  tsConfig.compilerOptions ||= {};
+  tsConfig.compilerOptions.paths ||= {};
+  tsConfig.include ||= [];
   for (const alias in aliases) {
     if (excludedAlias.some((re) => re.test(alias))) {
       continue;
@@ -3154,6 +3156,7 @@ async function _generateTypes(nuxt) {
       return relativeWithDot(nuxt.options.buildDir, stats?.isFile() ? path.replace(EXTENSION_RE, "") : path);
     }));
   }
+  sortTsPaths(tsConfig.compilerOptions.paths);
   tsConfig.include = [...new Set(tsConfig.include.map((p) => isAbsolute(p) ? relativeWithDot(nuxt.options.buildDir, p) : p))];
   tsConfig.exclude = [...new Set(tsConfig.exclude.map((p) => isAbsolute(p) ? relativeWithDot(nuxt.options.buildDir, p) : p))];
   const declaration = [
@@ -3186,6 +3189,15 @@ async function writeTypes(nuxt) {
   nuxt.hook("builder:prepared", writeFile);
   await writeFile();
 }
+function sortTsPaths(paths) {
+  for (const pathKey in paths) {
+    if (pathKey.startsWith("#build")) {
+      const pathValue = paths[pathKey];
+      delete paths[pathKey];
+      paths[pathKey] = pathValue;
+    }
+  }
+}
 function renderAttrs(obj) {
   const attrs = [];
   for (const key in obj) {
@@ -3244,9 +3256,7 @@ function extendPages(cb) {
 function extendRouteRules(route, rule, options = {}) {
   const nuxt = useNuxt();
   for (const opts of [nuxt.options, nuxt.options.nitro]) {
-    if (!opts.routeRules) {
-      opts.routeRules = {};
-    }
+    opts.routeRules ||= {};
     opts.routeRules[route] = options.override ? defu(rule, opts.routeRules[route]) : defu(opts.routeRules[route], rule);
   }
 }
@@ -3275,16 +3285,26 @@ function addRouteMiddleware(input, options = {}) {
   });
 }
 
+const pluginSymbol = Symbol.for("nuxt plugin");
 function normalizePlugin(plugin) {
   if (typeof plugin === "string") {
     plugin = { src: plugin };
   } else {
     plugin = { ...plugin };
   }
+  if (pluginSymbol in plugin) {
+    return plugin;
+  }
   if (!plugin.src) {
     throw new Error("Invalid plugin. src option is required: " + JSON.stringify(plugin));
   }
   plugin.src = normalize(resolveAlias(plugin.src));
+  if (!existsSync(plugin.src) && isAbsolute$1(plugin.src)) {
+    try {
+      plugin.src = resolvePathSync(isWindows ? pathToFileURL(plugin.src).href : plugin.src, { extensions: tryUseNuxt()?.options.extensions });
+    } catch {
+    }
+  }
   if (plugin.ssr) {
     plugin.mode = "server";
   }
@@ -3292,12 +3312,13 @@ function normalizePlugin(plugin) {
     const [, mode = "all"] = plugin.src.match(MODE_RE) || [];
     plugin.mode = mode;
   }
+  plugin[pluginSymbol] = true;
   return plugin;
 }
 function addPlugin(_plugin, opts = {}) {
   const nuxt = useNuxt();
   const plugin = normalizePlugin(_plugin);
-  nuxt.options.plugins = nuxt.options.plugins.filter((p) => normalizePlugin(p).src !== plugin.src);
+  filterInPlace(nuxt.options.plugins, (p) => normalizePlugin(p).src !== plugin.src);
   nuxt.options.plugins[opts.append ? "push" : "unshift"](plugin);
   return plugin;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit",
-  "version": "3.15.0",
+  "version": "3.15.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -24,25 +24,26 @@
   ],
   "dependencies": {
     "c12": "^2.0.1",
-    "consola": "^3.3.1",
+    "consola": "^3.4.0",
     "defu": "^6.1.4",
     "destr": "^2.0.3",
     "globby": "^14.0.2",
-    "ignore": "^7.0.0",
+    "ignore": "^7.0.3",
     "jiti": "^2.4.2",
     "klona": "^2.0.6",
     "knitwork": "^1.2.0",
-    "mlly": "^1.7.3",
+    "mlly": "^1.7.4",
     "ohash": "^1.1.4",
-    "pathe": "^1.1.2",
-    "pkg-types": "^1.2.1",
+    "pathe": "^2.0.1",
+    "pkg-types": "^1.3.1",
     "scule": "^1.3.0",
     "semver": "^7.6.3",
+    "std-env": "^3.8.0",
     "ufo": "^1.5.4",
     "unctx": "^2.4.1",
-    "unimport": "^3.14.5",
+    "unimport": "^3.14.6",
     "untyped": "^1.5.2",
-    "@nuxt/schema": "3.15.0"
+    "@nuxt/schema": "3.15.2"
   },
   "devDependencies": {
     "@rspack/core": "1.1.8",
@@ -51,12 +52,12 @@
     "lodash-es": "4.17.21",
     "nitropack": "2.10.4",
     "unbuild": "latest",
-    "vite": "6.0.5",
+    "vite": "6.0.7",
     "vitest": "2.1.8",
     "webpack": "5.96.1"
   },
   "engines": {
-    "node": ">=18.20.5"
+    "node": ">=18.0.0"
   },
   "scripts": {
     "test:attw": "attw --pack"