@nuxt/kit 3.8.2 → 3.9.1

package/dist/index.d.mts

@@ -6,6 +6,7 @@ import { UserConfig, Plugin } from 'vite';
 import * as unctx_index from 'unctx/index';
 import { NitroRouteConfig, NitroEventHandler, NitroDevEventHandler, Nitro } from 'nitropack';
 import * as consola_dist_core from 'consola/dist/core';
+import { ConsolaOptions } from 'consola';
 import { genSafeVariableName } from 'knitwork';
 
 /**
@@ -137,11 +138,11 @@ declare function hasNuxtCompatibility(constraints: NuxtCompatibility, nuxt?: Nux
 /**
  * Check if current nuxt instance is version 2 legacy
  */
-declare function isNuxt2(nuxt?: Nuxt): any;
+declare function isNuxt2(nuxt?: Nuxt): boolean;
 /**
  * Check if current nuxt instance is version 3
  */
-declare function isNuxt3(nuxt?: Nuxt): any;
+declare function isNuxt3(nuxt?: Nuxt): boolean;
 /**
  * Get nuxt version
  */
@@ -152,7 +153,9 @@ declare function getNuxtVersion(nuxt?: Nuxt | any): any;
  *
  * Requires Nuxt 2.13+
  */
-declare function addComponentsDir(dir: ComponentsDir): Promise<void>;
+declare function addComponentsDir(dir: ComponentsDir, opts?: {
+    prepend?: boolean;
+}): Promise<void>;
 type AddComponentOptions = {
     name: string;
     filePath: string;
@@ -322,6 +325,13 @@ declare function addServerImports(imports: Import[]): void;
 declare function addServerImportsDir(dirs: string | string[], opts?: {
     prepend?: boolean;
 }): void;
+/**
+ * Add directories to be scanned by Nitro. It will check for subdirectories,
+ * which will be registered just like the `~/server` folder is.
+ */
+declare function addServerScanDir(dirs: string | string[], opts?: {
+    prepend?: boolean;
+}): void;
 
 /**
  * Renders given template using lodash template during build into the project buildDir
@@ -347,7 +357,7 @@ declare function updateTemplates(options?: {
 declare function writeTypes(nuxt: Nuxt): Promise<void>;
 
 declare const logger: consola_dist_core.ConsolaInstance;
-declare function useLogger(tag?: string): consola_dist_core.ConsolaInstance;
+declare function useLogger(tag?: string, options?: Partial<ConsolaOptions>): consola_dist_core.ConsolaInstance;
 
 /** @deprecated Do not use CJS utils */
 interface ResolveModuleOptions {
@@ -390,4 +400,4 @@ declare const templateUtils: {
     }) => string;
 };
 
-export { type AddComponentOptions, type AddPluginOptions, type AddRouteMiddlewareOptions, type ExtendConfigOptions, type ExtendRouteRulesOptions, type ExtendViteConfigOptions, type ExtendWebpackConfigOptions, type LoadNuxtConfigOptions, type LoadNuxtOptions, type RequireModuleOptions, type ResolveModuleOptions, type ResolvePathOptions, type Resolver, addBuildPlugin, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addServerHandler, addServerImports, addServerImportsDir, addServerPlugin, addTemplate, addTypeTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createResolver, defineNuxtModule, extendNuxtSchema, extendPages, extendRouteRules, extendViteConfig, extendWebpackConfig, findPath, getDirectory, getNuxtModuleVersion, getNuxtVersion, hasNuxtCompatibility, hasNuxtModule, hasNuxtModuleCompatibility, importModule, installModule, isIgnored, isNuxt2, isNuxt3, loadNuxt, loadNuxtConfig, loadNuxtModuleInstance, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeSemanticVersion, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveIgnorePatterns, resolveModule, resolveNuxtModule, resolvePath, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateTemplates, useLogger, useNitro, useNuxt, writeTypes };
+export { type AddComponentOptions, type AddPluginOptions, type AddRouteMiddlewareOptions, type ExtendConfigOptions, type ExtendRouteRulesOptions, type ExtendViteConfigOptions, type ExtendWebpackConfigOptions, type LoadNuxtConfigOptions, type LoadNuxtOptions, type RequireModuleOptions, type ResolveModuleOptions, type ResolvePathOptions, type Resolver, addBuildPlugin, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addServerHandler, addServerImports, addServerImportsDir, addServerPlugin, addServerScanDir, addTemplate, addTypeTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createResolver, defineNuxtModule, extendNuxtSchema, extendPages, extendRouteRules, extendViteConfig, extendWebpackConfig, findPath, getDirectory, getNuxtModuleVersion, getNuxtVersion, hasNuxtCompatibility, hasNuxtModule, hasNuxtModuleCompatibility, importModule, installModule, isIgnored, isNuxt2, isNuxt3, loadNuxt, loadNuxtConfig, loadNuxtModuleInstance, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeSemanticVersion, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveIgnorePatterns, resolveModule, resolveNuxtModule, resolvePath, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateTemplates, useLogger, useNitro, useNuxt, writeTypes };

package/dist/index.d.ts

@@ -6,6 +6,7 @@ import { UserConfig, Plugin } from 'vite';
 import * as unctx_index from 'unctx/index';
 import { NitroRouteConfig, NitroEventHandler, NitroDevEventHandler, Nitro } from 'nitropack';
 import * as consola_dist_core from 'consola/dist/core';
+import { ConsolaOptions } from 'consola';
 import { genSafeVariableName } from 'knitwork';
 
 /**
@@ -137,11 +138,11 @@ declare function hasNuxtCompatibility(constraints: NuxtCompatibility, nuxt?: Nux
 /**
  * Check if current nuxt instance is version 2 legacy
  */
-declare function isNuxt2(nuxt?: Nuxt): any;
+declare function isNuxt2(nuxt?: Nuxt): boolean;
 /**
  * Check if current nuxt instance is version 3
  */
-declare function isNuxt3(nuxt?: Nuxt): any;
+declare function isNuxt3(nuxt?: Nuxt): boolean;
 /**
  * Get nuxt version
  */
@@ -152,7 +153,9 @@ declare function getNuxtVersion(nuxt?: Nuxt | any): any;
  *
  * Requires Nuxt 2.13+
  */
-declare function addComponentsDir(dir: ComponentsDir): Promise<void>;
+declare function addComponentsDir(dir: ComponentsDir, opts?: {
+    prepend?: boolean;
+}): Promise<void>;
 type AddComponentOptions = {
     name: string;
     filePath: string;
@@ -322,6 +325,13 @@ declare function addServerImports(imports: Import[]): void;
 declare function addServerImportsDir(dirs: string | string[], opts?: {
     prepend?: boolean;
 }): void;
+/**
+ * Add directories to be scanned by Nitro. It will check for subdirectories,
+ * which will be registered just like the `~/server` folder is.
+ */
+declare function addServerScanDir(dirs: string | string[], opts?: {
+    prepend?: boolean;
+}): void;
 
 /**
  * Renders given template using lodash template during build into the project buildDir
@@ -347,7 +357,7 @@ declare function updateTemplates(options?: {
 declare function writeTypes(nuxt: Nuxt): Promise<void>;
 
 declare const logger: consola_dist_core.ConsolaInstance;
-declare function useLogger(tag?: string): consola_dist_core.ConsolaInstance;
+declare function useLogger(tag?: string, options?: Partial<ConsolaOptions>): consola_dist_core.ConsolaInstance;
 
 /** @deprecated Do not use CJS utils */
 interface ResolveModuleOptions {
@@ -390,4 +400,4 @@ declare const templateUtils: {
     }) => string;
 };
 
-export { type AddComponentOptions, type AddPluginOptions, type AddRouteMiddlewareOptions, type ExtendConfigOptions, type ExtendRouteRulesOptions, type ExtendViteConfigOptions, type ExtendWebpackConfigOptions, type LoadNuxtConfigOptions, type LoadNuxtOptions, type RequireModuleOptions, type ResolveModuleOptions, type ResolvePathOptions, type Resolver, addBuildPlugin, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addServerHandler, addServerImports, addServerImportsDir, addServerPlugin, addTemplate, addTypeTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createResolver, defineNuxtModule, extendNuxtSchema, extendPages, extendRouteRules, extendViteConfig, extendWebpackConfig, findPath, getDirectory, getNuxtModuleVersion, getNuxtVersion, hasNuxtCompatibility, hasNuxtModule, hasNuxtModuleCompatibility, importModule, installModule, isIgnored, isNuxt2, isNuxt3, loadNuxt, loadNuxtConfig, loadNuxtModuleInstance, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeSemanticVersion, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveIgnorePatterns, resolveModule, resolveNuxtModule, resolvePath, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateTemplates, useLogger, useNitro, useNuxt, writeTypes };
+export { type AddComponentOptions, type AddPluginOptions, type AddRouteMiddlewareOptions, type ExtendConfigOptions, type ExtendRouteRulesOptions, type ExtendViteConfigOptions, type ExtendWebpackConfigOptions, type LoadNuxtConfigOptions, type LoadNuxtOptions, type RequireModuleOptions, type ResolveModuleOptions, type ResolvePathOptions, type Resolver, addBuildPlugin, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addServerHandler, addServerImports, addServerImportsDir, addServerPlugin, addServerScanDir, addTemplate, addTypeTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createResolver, defineNuxtModule, extendNuxtSchema, extendPages, extendRouteRules, extendViteConfig, extendWebpackConfig, findPath, getDirectory, getNuxtModuleVersion, getNuxtVersion, hasNuxtCompatibility, hasNuxtModule, hasNuxtModuleCompatibility, importModule, installModule, isIgnored, isNuxt2, isNuxt3, loadNuxt, loadNuxtConfig, loadNuxtModuleInstance, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeSemanticVersion, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveIgnorePatterns, resolveModule, resolveNuxtModule, resolvePath, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateTemplates, useLogger, useNitro, useNuxt, writeTypes };

package/dist/index.mjs

@@ -21,8 +21,8 @@ import hash from 'hash-sum';
 import { withTrailingSlash } from 'ufo';
 
 const logger = consola;
-function useLogger(tag) {
-  return tag ? logger.withTag(tag) : logger;
+function useLogger(tag, options = {}) {
+  return tag ? logger.create(options).withTag(tag) : logger;
 }
 
 const nuxtCtx = getContext("nuxt");
@@ -82,10 +82,12 @@ async function hasNuxtCompatibility(constraints, nuxt = useNuxt()) {
   return !issues.length;
 }
 function isNuxt2(nuxt = useNuxt()) {
-  return getNuxtVersion(nuxt).startsWith("2.");
+  const version = getNuxtVersion(nuxt);
+  return version[0] === "2" && version[1] === ".";
 }
 function isNuxt3(nuxt = useNuxt()) {
-  return getNuxtVersion(nuxt).startsWith("3.");
+  const version = getNuxtVersion(nuxt);
+  return version[0] === "3" && version[1] === ".";
 }
 function getNuxtVersion(nuxt = useNuxt()) {
   const version = (nuxt?._version || nuxt?.version || nuxt?.constructor?.version || "").replace(/^v/g, "");
@@ -98,20 +100,14 @@ function getNuxtVersion(nuxt = useNuxt()) {
 /** Detect free variable `global` from Node.js. */
 var freeGlobal = typeof global == 'object' && global && global.Object === Object && global;
 
-const freeGlobal$1 = freeGlobal;
-
 /** Detect free variable `self`. */
 var freeSelf = typeof self == 'object' && self && self.Object === Object && self;
 
 /** Used as a reference to the global object. */
-var root = freeGlobal$1 || freeSelf || Function('return this')();
-
-const root$1 = root;
+var root = freeGlobal || freeSelf || Function('return this')();
 
 /** Built-in value references. */
-var Symbol = root$1.Symbol;
-
-const Symbol$1 = Symbol;
+var Symbol = root.Symbol;
 
 /** Used for built-in method references. */
 var objectProto$b = Object.prototype;
@@ -127,7 +123,7 @@ var hasOwnProperty$9 = objectProto$b.hasOwnProperty;
 var nativeObjectToString$1 = objectProto$b.toString;
 
 /** Built-in value references. */
-var symToStringTag$1 = Symbol$1 ? Symbol$1.toStringTag : undefined;
+var symToStringTag$1 = Symbol ? Symbol.toStringTag : undefined;
 
 /**
  * A specialized version of `baseGetTag` which ignores `Symbol.toStringTag` values.
@@ -182,7 +178,7 @@ var nullTag = '[object Null]',
     undefinedTag = '[object Undefined]';
 
 /** Built-in value references. */
-var symToStringTag = Symbol$1 ? Symbol$1.toStringTag : undefined;
+var symToStringTag = Symbol ? Symbol.toStringTag : undefined;
 
 /**
  * The base implementation of `getTag` without fallbacks for buggy environments.
@@ -298,13 +294,11 @@ function arrayMap(array, iteratee) {
  */
 var isArray = Array.isArray;
 
-const isArray$1 = isArray;
-
 /** Used as references for various `Number` constants. */
 var INFINITY = 1 / 0;
 
 /** Used to convert symbols to primitives and strings. */
-var symbolProto = Symbol$1 ? Symbol$1.prototype : undefined,
+var symbolProto = Symbol ? Symbol.prototype : undefined,
     symbolToString = symbolProto ? symbolProto.toString : undefined;
 
 /**
@@ -320,7 +314,7 @@ function baseToString(value) {
   if (typeof value == 'string') {
     return value;
   }
-  if (isArray$1(value)) {
+  if (isArray(value)) {
     // Recursively convert values (susceptible to call stack limits).
     return arrayMap(value, baseToString) + '';
   }
@@ -415,13 +409,11 @@ function isFunction(value) {
 }
 
 /** Used to detect overreaching core-js shims. */
-var coreJsData = root$1['__core-js_shared__'];
-
-const coreJsData$1 = coreJsData;
+var coreJsData = root['__core-js_shared__'];
 
 /** Used to detect methods masquerading as native. */
 var maskSrcKey = (function() {
-  var uid = /[^.]+$/.exec(coreJsData$1 && coreJsData$1.keys && coreJsData$1.keys.IE_PROTO || '');
+  var uid = /[^.]+$/.exec(coreJsData && coreJsData.keys && coreJsData.keys.IE_PROTO || '');
   return uid ? ('Symbol(src)_1.' + uid) : '';
 }());
 
@@ -616,8 +608,6 @@ var defineProperty = (function() {
   } catch (e) {}
 }());
 
-const defineProperty$1 = defineProperty;
-
 /**
  * The base implementation of `setToString` without support for hot loop shorting.
  *
@@ -626,8 +616,8 @@ const defineProperty$1 = defineProperty;
  * @param {Function} string The `toString` result.
  * @returns {Function} Returns `func`.
  */
-var baseSetToString = !defineProperty$1 ? identity : function(func, string) {
-  return defineProperty$1(func, 'toString', {
+var baseSetToString = !defineProperty ? identity : function(func, string) {
+  return defineProperty(func, 'toString', {
     'configurable': true,
     'enumerable': false,
     'value': constant(string),
@@ -647,8 +637,6 @@ const baseSetToString$1 = baseSetToString;
  */
 var setToString = shortOut(baseSetToString$1);
 
-const setToString$1 = setToString;
-
 /** Used as references for various `Number` constants. */
 var MAX_SAFE_INTEGER$1 = 9007199254740991;
 
@@ -683,8 +671,8 @@ function isIndex(value, length) {
  * @param {*} value The value to assign.
  */
 function baseAssignValue(object, key, value) {
-  if (key == '__proto__' && defineProperty$1) {
-    defineProperty$1(object, key, {
+  if (key == '__proto__' && defineProperty) {
+    defineProperty(object, key, {
       'configurable': true,
       'enumerable': true,
       'value': value,
@@ -833,7 +821,7 @@ function overRest(func, start, transform) {
  * @returns {Function} Returns the new function.
  */
 function baseRest(func, start) {
-  return setToString$1(overRest(func, start, identity), func + '');
+  return setToString(overRest(func, start, identity), func + '');
 }
 
 /** Used as references for various `Number` constants. */
@@ -1038,8 +1026,6 @@ var isArguments = baseIsArguments(function() { return arguments; }()) ? baseIsAr
     !propertyIsEnumerable.call(value, 'callee');
 };
 
-const isArguments$1 = isArguments;
-
 /**
  * This method returns `false`.
  *
@@ -1067,7 +1053,7 @@ var freeModule$1 = freeExports$1 && typeof module == 'object' && module && !modu
 var moduleExports$1 = freeModule$1 && freeModule$1.exports === freeExports$1;
 
 /** Built-in value references. */
-var Buffer = moduleExports$1 ? root$1.Buffer : undefined;
+var Buffer = moduleExports$1 ? root.Buffer : undefined;
 
 /* Built-in method references for those with the same name as other `lodash` methods. */
 var nativeIsBuffer = Buffer ? Buffer.isBuffer : undefined;
@@ -1091,8 +1077,6 @@ var nativeIsBuffer = Buffer ? Buffer.isBuffer : undefined;
  */
 var isBuffer = nativeIsBuffer || stubFalse;
 
-const isBuffer$1 = isBuffer;
-
 /** `Object#toString` result references. */
 var argsTag = '[object Arguments]',
     arrayTag = '[object Array]',
@@ -1171,7 +1155,7 @@ var freeModule = freeExports && typeof module == 'object' && module && !module.n
 var moduleExports = freeModule && freeModule.exports === freeExports;
 
 /** Detect free variable `process` from Node.js. */
-var freeProcess = moduleExports && freeGlobal$1.process;
+var freeProcess = moduleExports && freeGlobal.process;
 
 /** Used to access faster Node.js helpers. */
 var nodeUtil = (function() {
@@ -1188,10 +1172,8 @@ var nodeUtil = (function() {
   } catch (e) {}
 }());
 
-const nodeUtil$1 = nodeUtil;
-
 /* Node.js helper references. */
-var nodeIsTypedArray = nodeUtil$1 && nodeUtil$1.isTypedArray;
+var nodeIsTypedArray = nodeUtil && nodeUtil.isTypedArray;
 
 /**
  * Checks if `value` is classified as a typed array.
@@ -1212,8 +1194,6 @@ var nodeIsTypedArray = nodeUtil$1 && nodeUtil$1.isTypedArray;
  */
 var isTypedArray = nodeIsTypedArray ? baseUnary(nodeIsTypedArray) : baseIsTypedArray;
 
-const isTypedArray$1 = isTypedArray;
-
 /** Used for built-in method references. */
 var objectProto$5 = Object.prototype;
 
@@ -1229,10 +1209,10 @@ var hasOwnProperty$5 = objectProto$5.hasOwnProperty;
  * @returns {Array} Returns the array of property names.
  */
 function arrayLikeKeys(value, inherited) {
-  var isArr = isArray$1(value),
-      isArg = !isArr && isArguments$1(value),
-      isBuff = !isArr && !isArg && isBuffer$1(value),
-      isType = !isArr && !isArg && !isBuff && isTypedArray$1(value),
+  var isArr = isArray(value),
+      isArg = !isArr && isArguments(value),
+      isBuff = !isArr && !isArg && isBuffer(value),
+      isType = !isArr && !isArg && !isBuff && isTypedArray(value),
       skipIndexes = isArr || isArg || isBuff || isType,
       result = skipIndexes ? baseTimes(value.length, String) : [],
       length = result.length;
@@ -1272,8 +1252,6 @@ function overArg(func, transform) {
 /* Built-in method references for those with the same name as other `lodash` methods. */
 var nativeKeys = overArg(Object.keys, Object);
 
-const nativeKeys$1 = nativeKeys;
-
 /** Used for built-in method references. */
 var objectProto$4 = Object.prototype;
 
@@ -1289,7 +1267,7 @@ var hasOwnProperty$4 = objectProto$4.hasOwnProperty;
  */
 function baseKeys(object) {
   if (!isPrototype(object)) {
-    return nativeKeys$1(object);
+    return nativeKeys(object);
   }
   var result = [];
   for (var key in Object(object)) {
@@ -1439,8 +1417,6 @@ var assignInWith = createAssigner(function(object, source, srcIndex, customizer)
   copyObject(source, keysIn(source), object, customizer);
 });
 
-const extendWith = assignInWith;
-
 /**
  * Converts `value` to a string. An empty string is returned for `null`
  * and `undefined` values. The sign of `-0` is preserved.
@@ -1469,8 +1445,6 @@ function toString(value) {
 /** Built-in value references. */
 var getPrototype = overArg(Object.getPrototypeOf, Object);
 
-const getPrototype$1 = getPrototype;
-
 /** `Object#toString` result references. */
 var objectTag = '[object Object]';
 
@@ -1519,7 +1493,7 @@ function isPlainObject(value) {
   if (!isObjectLike(value) || baseGetTag(value) != objectTag) {
     return false;
   }
-  var proto = getPrototype$1(value);
+  var proto = getPrototype(value);
   if (proto === null) {
     return true;
   }
@@ -1589,8 +1563,6 @@ var attempt = baseRest(function(func, args) {
   }
 });
 
-const attempt$1 = attempt;
-
 /**
  * The base implementation of `_.propertyOf` without support for deep paths.
  *
@@ -1802,8 +1774,6 @@ var templateSettings = {
   }
 };
 
-const templateSettings$1 = templateSettings;
-
 /** Error message constants. */
 var INVALID_TEMPL_VAR_ERROR_TEXT = 'Invalid `variable` option passed into `_.template`';
 
@@ -1950,15 +1920,15 @@ function template(string, options, guard) {
   // Based on John Resig's `tmpl` implementation
   // (http://ejohn.org/blog/javascript-micro-templating/)
   // and Laura Doktorova's doT.js (https://github.com/olado/doT).
-  var settings = templateSettings$1.imports._.templateSettings || templateSettings$1;
+  var settings = templateSettings.imports._.templateSettings || templateSettings;
 
   if (guard && isIterateeCall(string, options, guard)) {
     options = undefined;
   }
   string = toString(string);
-  options = extendWith({}, options, settings, customDefaultsAssignIn);
+  options = assignInWith({}, options, settings, customDefaultsAssignIn);
 
-  var imports = extendWith({}, options.imports, settings.imports, customDefaultsAssignIn),
+  var imports = assignInWith({}, options.imports, settings.imports, customDefaultsAssignIn),
       importsKeys = keys(imports),
       importsValues = baseValues(imports, importsKeys);
 
@@ -2049,7 +2019,7 @@ function template(string, options, guard) {
     source +
     'return __p\n}';
 
-  var result = attempt$1(function() {
+  var result = attempt(function() {
     return Function(importsKeys, sourceURL + 'return ' + source)
       .apply(undefined, importsValues);
   });
@@ -2063,6 +2033,10 @@ function template(string, options, guard) {
   return result;
 }
 
+function toArray(value) {
+  return Array.isArray(value) ? value : [value];
+}
+
 async function compileTemplate(template$1, ctx) {
   const data = { ...ctx, options: template$1.options };
   if (template$1.src) {
@@ -2081,10 +2055,7 @@ async function compileTemplate(template$1, ctx) {
 }
 const serialize = (data) => JSON.stringify(data, null, 2).replace(/"{(.+)}"(?=,?$)/gm, (r) => JSON.parse(r).replace(/^{(.*)}$/, "$1"));
 const importSources = (sources, { lazy = false } = {}) => {
-  if (!Array.isArray(sources)) {
-    sources = [sources];
-  }
-  return sources.map((src) => {
+  return toArray(sources).map((src) => {
     if (lazy) {
       return `const ${genSafeVariableName(src)} = ${genDynamicImport(src, { comment: `webpackChunkName: ${JSON.stringify(src)}` })}`;
     }
@@ -2297,7 +2268,7 @@ function isIgnored(pathname) {
   const cwds = nuxt.options._layers?.map((layer2) => layer2.cwd).sort((a, b) => b.length - a.length);
   const layer = cwds?.find((cwd) => pathname.startsWith(cwd));
   const relativePath = relative(layer ?? nuxt.options.rootDir, pathname);
-  if (relativePath.startsWith("..")) {
+  if (relativePath[0] === "." && relativePath[1] === ".") {
     return false;
   }
   return !!(relativePath && nuxt._ignore.ignores(relativePath));
@@ -2316,7 +2287,7 @@ function resolveIgnorePatterns(relativePath) {
     }
   }
   if (relativePath) {
-    return nuxt._ignorePatterns.map((p) => p.startsWith("*") || p.startsWith("!*") ? p : relative(relativePath, resolve(nuxt.options.rootDir, p)));
+    return nuxt._ignorePatterns.map((p) => p[0] === "*" || p[0] === "!" && p[1] === "*" ? p : relative(relativePath, resolve(nuxt.options.rootDir, p)));
   }
   return nuxt._ignorePatterns;
 }
@@ -2373,10 +2344,7 @@ async function resolvePath(path, opts = {}) {
   return path;
 }
 async function findPath(paths, opts, pathType = "file") {
-  if (!Array.isArray(paths)) {
-    paths = [paths];
-  }
-  for (const path of paths) {
+  for (const path of toArray(paths)) {
     const rPath = await resolvePath(path, opts);
     if (await existsSensitive(rPath)) {
       const _isDir = await isDirectory(rPath);
@@ -2434,8 +2402,16 @@ async function resolveFiles(path, pattern, opts = {}) {
   return files.map((p) => resolve(path, p)).filter((p) => !isIgnored(p)).sort();
 }
 
+const NODE_MODULES_RE = /[/\\]node_modules[/\\]/;
 async function installModule(moduleToInstall, inlineOptions, nuxt = useNuxt()) {
   const { nuxtModule, buildTimeModuleMeta } = await loadNuxtModuleInstance(moduleToInstall, nuxt);
+  const localLayerModuleDirs = /* @__PURE__ */ new Set();
+  for (const l of nuxt.options._layers) {
+    const srcDir = l.config.srcDir || l.cwd;
+    if (!NODE_MODULES_RE.test(srcDir)) {
+      localLayerModuleDirs.add(resolve(srcDir, l.config?.dir?.modules || "modules"));
+    }
+  }
   const res = (isNuxt2() ? await nuxtModule.call(nuxt.moduleContainer, inlineOptions, nuxt) : await nuxtModule(inlineOptions, nuxt)) ?? {};
   if (res === false) {
     return;
@@ -2443,8 +2419,8 @@ async function installModule(moduleToInstall, inlineOptions, nuxt = useNuxt()) {
   if (typeof moduleToInstall === "string") {
     nuxt.options.build.transpile.push(normalizeModuleTranspilePath(moduleToInstall));
     const directory = getDirectory(moduleToInstall);
-    if (directory !== moduleToInstall) {
-      nuxt.options.modulesDir.push(getDirectory(moduleToInstall));
+    if (directory !== moduleToInstall && !localLayerModuleDirs.has(directory)) {
+      nuxt.options.modulesDir.push(directory);
     }
   }
   nuxt.options._installedModules = nuxt.options._installedModules || [];
@@ -2467,16 +2443,26 @@ const normalizeModuleTranspilePath = (p) => {
 async function loadNuxtModuleInstance(nuxtModule, nuxt = useNuxt()) {
   let buildTimeModuleMeta = {};
   if (typeof nuxtModule === "string") {
-    const src = await resolvePath(nuxtModule);
-    try {
-      nuxtModule = await importModule(src, nuxt.options.modulesDir).catch(() => null) ?? requireModule(src, { paths: nuxt.options.modulesDir });
-    } catch (error) {
+    const paths = [join(nuxtModule, "nuxt"), join(nuxtModule, "module"), nuxtModule];
+    let error;
+    for (const path of paths) {
+      const src = await resolvePath(path);
+      try {
+        nuxtModule = await importModule(src, nuxt.options.modulesDir).catch(() => null) ?? requireModule(src, { paths: nuxt.options.modulesDir });
+        const moduleMetadataPath = join(dirname(src), "module.json");
+        if (existsSync(moduleMetadataPath)) {
+          buildTimeModuleMeta = JSON.parse(await promises.readFile(moduleMetadataPath, "utf-8"));
+        }
+        break;
+      } catch (_err) {
+        error = _err;
+        continue;
+      }
+    }
+    if (typeof nuxtModule !== "function" && error) {
       logger.error(`Error while requiring module \`${nuxtModule}\`: ${error}`);
       throw error;
     }
-    if (existsSync(join(dirname(src), "module.json"))) {
-      buildTimeModuleMeta = JSON.parse(await promises.readFile(join(dirname(src), "module.json"), "utf-8"));
-    }
   }
   if (typeof nuxtModule !== "function") {
     throw new TypeError("Nuxt module should be a function: " + nuxtModule);
@@ -2618,13 +2604,13 @@ async function buildNuxt(nuxt) {
 function addImports(imports) {
   assertNuxtCompatibility({ bridge: true });
   useNuxt().hook("imports:extend", (_imports) => {
-    _imports.push(...Array.isArray(imports) ? imports : [imports]);
+    _imports.push(...toArray(imports));
   });
 }
 function addImportsDir(dirs, opts = {}) {
   assertNuxtCompatibility({ bridge: true });
   useNuxt().hook("imports:dirs", (_dirs) => {
-    for (const dir of Array.isArray(dirs) ? dirs : [dirs]) {
+    for (const dir of toArray(dirs)) {
       _dirs[opts.prepend ? "unshift" : "push"](dir);
     }
   });
@@ -2632,7 +2618,7 @@ function addImportsDir(dirs, opts = {}) {
 function addImportsSources(presets) {
   assertNuxtCompatibility({ bridge: true });
   useNuxt().hook("imports:sources", (_presets) => {
-    for (const preset of Array.isArray(presets) ? presets : [presets]) {
+    for (const preset of toArray(presets)) {
       _presets.push(preset);
     }
   });
@@ -2686,11 +2672,7 @@ function addWebpackPlugin(pluginOrGetter, options) {
     const method = options?.prepend ? "unshift" : "push";
     const plugin = typeof pluginOrGetter === "function" ? pluginOrGetter() : pluginOrGetter;
     config.plugins = config.plugins || [];
-    if (Array.isArray(plugin)) {
-      config.plugins[method](...plugin);
-    } else {
-      config.plugins[method](plugin);
-    }
+    config.plugins[method](...toArray(plugin));
   }, options);
 }
 function addVitePlugin(pluginOrGetter, options) {
@@ -2698,11 +2680,7 @@ function addVitePlugin(pluginOrGetter, options) {
     const method = options?.prepend ? "unshift" : "push";
     const plugin = typeof pluginOrGetter === "function" ? pluginOrGetter() : pluginOrGetter;
     config.plugins = config.plugins || [];
-    if (Array.isArray(plugin)) {
-      config.plugins[method](...plugin);
-    } else {
-      config.plugins[method](plugin);
-    }
+    config.plugins[method](...toArray(plugin));
   }, options);
 }
 function addBuildPlugin(pluginFactory, options) {
@@ -2714,19 +2692,23 @@ function addBuildPlugin(pluginFactory, options) {
   }
 }
 
-async function addComponentsDir(dir) {
+async function addComponentsDir(dir, opts = {}) {
   const nuxt = useNuxt();
   await assertNuxtCompatibility({ nuxt: ">=2.13" }, nuxt);
   nuxt.options.components = nuxt.options.components || [];
   dir.priority || (dir.priority = 0);
   nuxt.hook("components:dirs", (dirs) => {
-    dirs.push(dir);
+    dirs[opts.prepend ? "unshift" : "push"](dir);
   });
 }
 async function addComponent(opts) {
   const nuxt = useNuxt();
   await assertNuxtCompatibility({ nuxt: ">=2.13" }, nuxt);
   nuxt.options.components = nuxt.options.components || [];
+  if (!opts.mode) {
+    const [, mode = "all"] = opts.filePath.match(/\.(server|client)(\.\w+)*$/) || [];
+    opts.mode = mode;
+  }
   const component = {
     export: opts.export || "default",
     chunkName: "components/" + kebabCase(opts.name),
@@ -2827,7 +2809,7 @@ async function writeTypes(nuxt) {
       jsxImportSource: "vue",
       target: "ESNext",
       module: "ESNext",
-      moduleResolution: nuxt.options.experimental?.typescriptBundlerResolution ? "Bundler" : "Node",
+      moduleResolution: nuxt.options.future?.typescriptBundlerResolution || nuxt.options.experimental?.typescriptBundlerResolution ? "Bundler" : "Node",
       skipLibCheck: true,
       isolatedModules: true,
       useDefineForClassFields: true,
@@ -2900,9 +2882,6 @@ async function writeTypes(nuxt) {
     ...nuxt.options.modules,
     ...nuxt.options._modules
   ].filter((f) => typeof f === "string").map(async (id) => ({ types: (await readPackageJSON(id, { url: nodeModulePaths }).catch(() => null))?.name || id })));
-  if (nuxt.options.experimental?.reactivityTransform) {
-    references.push({ types: "vue/macros-global" });
-  }
   const declarations = [];
   await nuxt.callHook("prepare:types", { references, declarations, tsConfig });
   for (const alias in tsConfig.compilerOptions.paths) {
@@ -3003,7 +2982,7 @@ function extendRouteRules(route, rule, options = {}) {
 }
 function addRouteMiddleware(input, options = {}) {
   const nuxt = useNuxt();
-  const middlewares = Array.isArray(input) ? input : [input];
+  const middlewares = toArray(input);
   nuxt.hook("app:resolve", (app) => {
     for (const middleware of middlewares) {
       const find = app.middleware.findIndex((item) => item.name === middleware.name);
@@ -3076,10 +3055,7 @@ function addServerPlugin(plugin) {
 }
 function addPrerenderRoutes(routes) {
   const nuxt = useNuxt();
-  if (!Array.isArray(routes)) {
-    routes = [routes];
-  }
-  routes = routes.filter(Boolean);
+  routes = toArray(routes).filter(Boolean);
   if (!routes.length) {
     return;
   }
@@ -3100,21 +3076,27 @@ function addServerImports(imports) {
   const nuxt = useNuxt();
   nuxt.hook("nitro:config", (config) => {
     config.imports = config.imports || {};
-    if (Array.isArray(config.imports.imports)) {
-      config.imports.imports.push(...imports);
-    } else {
-      config.imports.imports = [config.imports.imports, ...imports];
-    }
+    config.imports.imports = config.imports.imports || [];
+    config.imports.imports.push(...imports);
   });
 }
 function addServerImportsDir(dirs, opts = {}) {
   const nuxt = useNuxt();
-  const _dirs = Array.isArray(dirs) ? dirs : [dirs];
+  const _dirs = toArray(dirs);
   nuxt.hook("nitro:config", (config) => {
     config.imports = config.imports || {};
     config.imports.dirs = 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 || [];
+    for (const dir of toArray(dirs)) {
+      config.scanDirs[opts.prepend ? "unshift" : "push"](dir);
+    }
+  });
+}
 
-export { addBuildPlugin, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addServerHandler, addServerImports, addServerImportsDir, addServerPlugin, addTemplate, addTypeTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createResolver, defineNuxtModule, extendNuxtSchema, extendPages, extendRouteRules, extendViteConfig, extendWebpackConfig, findPath, getDirectory, getNuxtModuleVersion, getNuxtVersion, hasNuxtCompatibility, hasNuxtModule, hasNuxtModuleCompatibility, importModule$1 as importModule, installModule, isIgnored, isNuxt2, isNuxt3, loadNuxt, loadNuxtConfig, loadNuxtModuleInstance, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeSemanticVersion, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveIgnorePatterns, resolveModule, resolveNuxtModule, resolvePath, templateUtils, tryImportModule$1 as tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateTemplates, useLogger, useNitro, useNuxt, writeTypes };
+export { addBuildPlugin, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addServerHandler, addServerImports, addServerImportsDir, addServerPlugin, addServerScanDir, addTemplate, addTypeTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createResolver, defineNuxtModule, extendNuxtSchema, extendPages, extendRouteRules, extendViteConfig, extendWebpackConfig, findPath, getDirectory, getNuxtModuleVersion, getNuxtVersion, hasNuxtCompatibility, hasNuxtModule, hasNuxtModuleCompatibility, importModule$1 as importModule, installModule, isIgnored, isNuxt2, isNuxt3, loadNuxt, loadNuxtConfig, loadNuxtModuleInstance, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeSemanticVersion, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveIgnorePatterns, resolveModule, resolveNuxtModule, resolvePath, templateUtils, tryImportModule$1 as tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateTemplates, useLogger, useNitro, useNuxt, writeTypes };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit",
-  "version": "3.8.2",
+  "version": "3.9.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -23,9 +23,9 @@
     "dist"
   ],
   "dependencies": {
-    "c12": "^1.5.1",
+    "c12": "^1.6.1",
     "consola": "^3.2.3",
-    "defu": "^6.1.3",
+    "defu": "^6.1.4",
     "globby": "^14.0.0",
     "hash-sum": "^2.0.0",
     "ignore": "^5.3.0",
@@ -34,23 +34,23 @@
     "mlly": "^1.4.2",
     "pathe": "^1.1.1",
     "pkg-types": "^1.0.3",
-    "scule": "^1.1.0",
+    "scule": "^1.1.1",
     "semver": "^7.5.4",
     "ufo": "^1.3.2",
     "unctx": "^2.3.1",
-    "unimport": "^3.5.0",
+    "unimport": "^3.7.1",
     "untyped": "^1.4.0",
-    "@nuxt/schema": "3.8.2"
+    "@nuxt/schema": "3.9.1"
   },
   "devDependencies": {
     "@types/hash-sum": "1.0.2",
-    "@types/lodash-es": "4.17.11",
-    "@types/semver": "7.5.5",
+    "@types/lodash-es": "4.17.12",
+    "@types/semver": "7.5.6",
     "lodash-es": "4.17.21",
-    "nitropack": "2.8.0",
+    "nitropack": "2.8.1",
     "unbuild": "latest",
-    "vite": "4.5.0",
-    "vitest": "0.33.0",
+    "vite": "5.0.11",
+    "vitest": "1.1.1",
     "webpack": "5.89.0"
   },
   "engines": {