@nuxt/kit-nightly 4.2.3-29422039.47e05245 → 4.2.3-29425455.7d502292

package/dist/index.d.mts

@@ -1,15 +1,13 @@
-import * as _nuxt_schema from '@nuxt/schema';
 import { ModuleOptions, ModuleDefinition, NuxtModule, NuxtConfig, Nuxt, ModuleMeta, NuxtOptions, SchemaDefinition, NuxtAppConfig, NuxtCompatibility, NuxtCompatibilityIssues, Component, ComponentsDir, NuxtTemplate, NuxtMiddleware, NuxtHooks, NuxtPlugin, NuxtPluginTemplate, ResolvedNuxtTemplate, NuxtServerTemplate, NuxtTypeTemplate } from '@nuxt/schema';
 import { LoadConfigOptions } from 'c12';
 import { Import, InlinePreset } from 'unimport';
 import { WebpackPluginInstance, Configuration } from 'webpack';
 import { RspackPluginInstance } from '@rspack/core';
 import { Plugin, UserConfig } from 'vite';
-import * as unctx from 'unctx';
+import { UseContext } from 'unctx';
 import { NitroRouteConfig, NitroEventHandler, NitroDevEventHandler, Nitro } from 'nitropack/types';
 import { GlobOptions } from 'tinyglobby';
-import * as consola from 'consola';
-import { ConsolaOptions } from 'consola';
+import { ConsolaInstance, ConsolaOptions } from 'consola';
 
 /**
  * Define a Nuxt module, automatically merging defaults with user provided options, installing
@@ -52,7 +50,7 @@ declare const normalizeModuleTranspilePath: (p: string) => string;
  */
 declare function hasNuxtModule(moduleName: string, nuxt?: Nuxt): boolean;
 /**
- * Checks if a Nuxt Module is compatible with a given semver version.
+ * Checks if a Nuxt module is compatible with a given semver version.
  */
 declare function hasNuxtModuleCompatibility(module: string | NuxtModule, semverVersion: string, nuxt?: Nuxt): Promise<boolean>;
 /**
@@ -111,7 +109,7 @@ interface LayerDirectories {
  * @param nuxt - The Nuxt instance to get layers from. Defaults to the current Nuxt context.
  * @returns Array of LayerDirectories objects, ordered by priority (user layer first)
  */
-declare function getLayerDirectories(nuxt?: _nuxt_schema.Nuxt): LayerDirectories[];
+declare function getLayerDirectories(nuxt?: Nuxt): LayerDirectories[];
 
 declare function setGlobalHead(head: NuxtAppConfig['head']): void;
 
@@ -178,20 +176,21 @@ interface ExtendViteConfigOptions extends Omit<ExtendConfigOptions, 'server' | '
      */
     client?: boolean;
 }
+type ExtendWebpacklikeConfig = (fn: (config: Configuration) => void, options?: ExtendWebpackConfigOptions) => void;
 /**
  * Extend webpack config
  *
  * The fallback function might be called multiple times
  * when applying to both client and server builds.
  */
-declare const extendWebpackConfig: (fn: ((config: Configuration) => void), options?: ExtendWebpackConfigOptions) => void;
+declare const extendWebpackConfig: ExtendWebpacklikeConfig;
 /**
  * Extend rspack config
  *
  * The fallback function might be called multiple times
  * when applying to both client and server builds.
  */
-declare const extendRspackConfig: (fn: ((config: Configuration) => void), options?: ExtendWebpackConfigOptions) => void;
+declare const extendRspackConfig: ExtendWebpacklikeConfig;
 /**
  * Extend Vite config
  */
@@ -270,7 +269,7 @@ declare function addComponent(opts: AddComponentOptions): void;
  * Direct access to the Nuxt global context - see https://github.com/unjs/unctx.
  * @deprecated Use `getNuxtCtx` instead
  */
-declare const nuxtCtx: unctx.UseContext<Nuxt>;
+declare const nuxtCtx: UseContext<Nuxt>;
 /** Direct access to the Nuxt context with asyncLocalStorage - see https://github.com/unjs/unctx. */
 declare const getNuxtCtx: () => Nuxt | null;
 /**
@@ -298,11 +297,11 @@ declare function useNuxt(): Nuxt;
 declare function tryUseNuxt(): Nuxt | null;
 declare function runWithNuxtContext<T extends (...args: any[]) => any>(nuxt: Nuxt, fn: T): ReturnType<T>;
 
-declare function createIsIgnored(nuxt?: _nuxt_schema.Nuxt | null): (pathname: string, stats?: unknown) => boolean;
+declare function createIsIgnored(nuxt?: Nuxt | null | undefined): (pathname: string, stats?: unknown) => boolean;
 /**
  * Return a filter function to filter an array of paths
  */
-declare function isIgnored(pathname: string, _stats?: unknown, nuxt?: _nuxt_schema.Nuxt | null): boolean;
+declare function isIgnored(pathname: string, _stats?: unknown, nuxt?: Nuxt | null | undefined): boolean;
 declare function resolveIgnorePatterns(relativePath?: string): string[];
 
 declare function addLayout(template: NuxtTemplate | string, name?: string): void;
@@ -509,11 +508,11 @@ declare function normalizeTemplate<T>(template: NuxtTemplate<T> | string, buildD
  */
 declare function updateTemplates(options?: {
     filter?: (template: ResolvedNuxtTemplate<any>) => boolean;
-}): Promise<any>;
+}): Promise<void>;
 declare function writeTypes(nuxt: Nuxt): Promise<void>;
 
-declare const logger: consola.ConsolaInstance;
-declare function useLogger(tag?: string, options?: Partial<ConsolaOptions>): consola.ConsolaInstance;
+declare const logger: ConsolaInstance;
+declare function useLogger(tag?: string, options?: Partial<ConsolaOptions>): ConsolaInstance;
 
 interface ResolveModuleOptions {
     /** @deprecated use `url` with URLs pointing at a file - never a directory */

package/dist/index.d.ts

@@ -1,15 +1,13 @@
-import * as _nuxt_schema from '@nuxt/schema';
 import { ModuleOptions, ModuleDefinition, NuxtModule, NuxtConfig, Nuxt, ModuleMeta, NuxtOptions, SchemaDefinition, NuxtAppConfig, NuxtCompatibility, NuxtCompatibilityIssues, Component, ComponentsDir, NuxtTemplate, NuxtMiddleware, NuxtHooks, NuxtPlugin, NuxtPluginTemplate, ResolvedNuxtTemplate, NuxtServerTemplate, NuxtTypeTemplate } from '@nuxt/schema';
 import { LoadConfigOptions } from 'c12';
 import { Import, InlinePreset } from 'unimport';
 import { WebpackPluginInstance, Configuration } from 'webpack';
 import { RspackPluginInstance } from '@rspack/core';
 import { Plugin, UserConfig } from 'vite';
-import * as unctx from 'unctx';
+import { UseContext } from 'unctx';
 import { NitroRouteConfig, NitroEventHandler, NitroDevEventHandler, Nitro } from 'nitropack/types';
 import { GlobOptions } from 'tinyglobby';
-import * as consola from 'consola';
-import { ConsolaOptions } from 'consola';
+import { ConsolaInstance, ConsolaOptions } from 'consola';
 
 /**
  * Define a Nuxt module, automatically merging defaults with user provided options, installing
@@ -52,7 +50,7 @@ declare const normalizeModuleTranspilePath: (p: string) => string;
  */
 declare function hasNuxtModule(moduleName: string, nuxt?: Nuxt): boolean;
 /**
- * Checks if a Nuxt Module is compatible with a given semver version.
+ * Checks if a Nuxt module is compatible with a given semver version.
  */
 declare function hasNuxtModuleCompatibility(module: string | NuxtModule, semverVersion: string, nuxt?: Nuxt): Promise<boolean>;
 /**
@@ -111,7 +109,7 @@ interface LayerDirectories {
  * @param nuxt - The Nuxt instance to get layers from. Defaults to the current Nuxt context.
  * @returns Array of LayerDirectories objects, ordered by priority (user layer first)
  */
-declare function getLayerDirectories(nuxt?: _nuxt_schema.Nuxt): LayerDirectories[];
+declare function getLayerDirectories(nuxt?: Nuxt): LayerDirectories[];
 
 declare function setGlobalHead(head: NuxtAppConfig['head']): void;
 
@@ -178,20 +176,21 @@ interface ExtendViteConfigOptions extends Omit<ExtendConfigOptions, 'server' | '
      */
     client?: boolean;
 }
+type ExtendWebpacklikeConfig = (fn: (config: Configuration) => void, options?: ExtendWebpackConfigOptions) => void;
 /**
  * Extend webpack config
  *
  * The fallback function might be called multiple times
  * when applying to both client and server builds.
  */
-declare const extendWebpackConfig: (fn: ((config: Configuration) => void), options?: ExtendWebpackConfigOptions) => void;
+declare const extendWebpackConfig: ExtendWebpacklikeConfig;
 /**
  * Extend rspack config
  *
  * The fallback function might be called multiple times
  * when applying to both client and server builds.
  */
-declare const extendRspackConfig: (fn: ((config: Configuration) => void), options?: ExtendWebpackConfigOptions) => void;
+declare const extendRspackConfig: ExtendWebpacklikeConfig;
 /**
  * Extend Vite config
  */
@@ -270,7 +269,7 @@ declare function addComponent(opts: AddComponentOptions): void;
  * Direct access to the Nuxt global context - see https://github.com/unjs/unctx.
  * @deprecated Use `getNuxtCtx` instead
  */
-declare const nuxtCtx: unctx.UseContext<Nuxt>;
+declare const nuxtCtx: UseContext<Nuxt>;
 /** Direct access to the Nuxt context with asyncLocalStorage - see https://github.com/unjs/unctx. */
 declare const getNuxtCtx: () => Nuxt | null;
 /**
@@ -298,11 +297,11 @@ declare function useNuxt(): Nuxt;
 declare function tryUseNuxt(): Nuxt | null;
 declare function runWithNuxtContext<T extends (...args: any[]) => any>(nuxt: Nuxt, fn: T): ReturnType<T>;
 
-declare function createIsIgnored(nuxt?: _nuxt_schema.Nuxt | null): (pathname: string, stats?: unknown) => boolean;
+declare function createIsIgnored(nuxt?: Nuxt | null | undefined): (pathname: string, stats?: unknown) => boolean;
 /**
  * Return a filter function to filter an array of paths
  */
-declare function isIgnored(pathname: string, _stats?: unknown, nuxt?: _nuxt_schema.Nuxt | null): boolean;
+declare function isIgnored(pathname: string, _stats?: unknown, nuxt?: Nuxt | null | undefined): boolean;
 declare function resolveIgnorePatterns(relativePath?: string): string[];
 
 declare function addLayout(template: NuxtTemplate | string, name?: string): void;
@@ -509,11 +508,11 @@ declare function normalizeTemplate<T>(template: NuxtTemplate<T> | string, buildD
  */
 declare function updateTemplates(options?: {
     filter?: (template: ResolvedNuxtTemplate<any>) => boolean;
-}): Promise<any>;
+}): Promise<void>;
 declare function writeTypes(nuxt: Nuxt): Promise<void>;
 
-declare const logger: consola.ConsolaInstance;
-declare function useLogger(tag?: string, options?: Partial<ConsolaOptions>): consola.ConsolaInstance;
+declare const logger: ConsolaInstance;
+declare function useLogger(tag?: string, options?: Partial<ConsolaOptions>): ConsolaInstance;
 
 interface ResolveModuleOptions {
     /** @deprecated use `url` with URLs pointing at a file - never a directory */

package/dist/index.mjs

@@ -12,7 +12,7 @@ import { resolve, relative, join, dirname, normalize, isAbsolute, basename, pars
 import { createJiti } from 'jiti';
 import { parseNodeModulePath, interopDefault, lookupNodeModuleSubpath, resolveModuleExportNames } from 'mlly';
 import { resolveModulePath, resolveModuleURL } from 'exsolve';
-import { isRelative, withTrailingSlash as withTrailingSlash$2 } from 'ufo';
+import { isRelative, withTrailingSlash as withTrailingSlash$2, withoutTrailingSlash } from 'ufo';
 import { read, update } from 'rc9';
 import semver, { gte } from 'semver';
 import { captureStackTrace } from 'errx';
@@ -887,7 +887,7 @@ async function loadNuxtConfig(opts) {
   const localLayers = (await glob("layers/*", {
     onlyDirectories: true,
     cwd: opts.cwd || process.cwd()
-  })).map((d) => d.endsWith("/") ? d.substring(0, d.length - 1) : d).sort((a, b) => b.localeCompare(a));
+  })).map((d) => withTrailingSlash$2(d)).sort((a, b) => b.localeCompare(a));
   opts.overrides = defu$1(opts.overrides, { _extends: localLayers });
   const { configFile, layers = [], cwd, config: nuxtConfig, meta } = await withDefineNuxtConfig(
     () => loadConfig({
@@ -925,7 +925,7 @@ async function loadNuxtConfig(opts) {
   }
   const _layers = [];
   const processedLayers = /* @__PURE__ */ new Set();
-  const localRelativePaths = new Set(localLayers);
+  const localRelativePaths = new Set(localLayers.map((layer) => withoutTrailingSlash(layer)));
   for (const layer of layers) {
     const resolvedRootDir = layer.config?.rootDir ?? layer.cwd;
     layer.config = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit-nightly",
-  "version": "4.2.3-29422039.47e05245",
+  "version": "4.2.3-29425455.7d502292",
   "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.3-29422039.47e05245",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.2.3-29425455.7d502292",
     "@rspack/core": "1.6.7",
     "@types/semver": "7.7.1",
     "hookable": "5.5.3",
@@ -61,6 +61,7 @@
   },
   "_name": "@nuxt/kit",
   "scripts": {
+    "build:stub": "unbuild --stub",
     "test:attw": "attw --pack"
   }
 }