@nuxt/kit 3.0.0-rc.8 → 3.0.0-rc.9

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Nuxt, ModuleContainer, ModuleOptions, ModuleDefinition, NuxtModule, NuxtConfig, NuxtOptions, NuxtCompatibility, NuxtCompatibilityIssues, ComponentsDir, Component, NuxtTemplate, NuxtHooks, NuxtPlugin, NuxtPluginTemplate } from '@nuxt/schema';
+import { Nuxt, ModuleContainer, ModuleOptions, ModuleDefinition, NuxtModule, NuxtConfig, NuxtOptions, NuxtCompatibility, NuxtCompatibilityIssues, ComponentsDir, Component, NuxtTemplate, NuxtHooks, NuxtPlugin, NuxtPluginTemplate, ResolvedNuxtTemplate } from '@nuxt/schema';
 import { LoadConfigOptions } from 'c12';
 import { Import } from 'unimport';
 import { Configuration, WebpackPluginInstance } from 'webpack';
@@ -37,8 +37,16 @@ interface LoadNuxtOptions extends LoadNuxtConfigOptions {
 declare function loadNuxt(opts: LoadNuxtOptions): Promise<Nuxt>;
 declare function buildNuxt(nuxt: Nuxt): Promise<any>;
 
-declare function addAutoImport(imports: Import | Import[]): void;
-declare function addAutoImportDir(_autoImportDirs: string | string[]): void;
+declare function addImports(imports: Import | Import[]): void;
+/**
+ * @deprecated Please use `addImports` instead with nuxt>=3.0.0-rc.9
+ */
+declare const addAutoImport: typeof addImports;
+declare function addImportsDir(dirs: string | string[]): void;
+/**
+ * @deprecated Please use `addImportsDir` instead with nuxt>=3.0.0-rc.9
+ */
+declare const addAutoImportDir: typeof addImportsDir;
 
 interface ExtendConfigOptions {
     /**
@@ -87,7 +95,7 @@ declare function extendWebpackConfig(fn: ((config: Configuration) => void), opti
 /**
  * Extend Vite config
  */
-declare function extendViteConfig(fn: ((config: UserConfig) => void), options?: ExtendViteConfigOptions): () => void;
+declare function extendViteConfig(fn: ((config: UserConfig) => void), options?: ExtendViteConfigOptions): (() => void) | undefined;
 /**
  * Append Webpack plugin to the config.
  */
@@ -172,7 +180,7 @@ declare function tryUseNuxt(): Nuxt | null;
  */
 declare function isIgnored(pathname: string): boolean;
 
-declare function addLayout(tmpl: NuxtTemplate, name?: string): void;
+declare function addLayout(this: any, template: NuxtTemplate, name?: string): void;
 
 declare function extendPages(cb: NuxtHooks['pages:extend']): void;
 
@@ -228,7 +236,7 @@ declare function findPath(paths: string | string[], opts?: ResolvePathOptions, p
  */
 declare function resolveAlias(path: string, alias?: Record<string, string>): string;
 interface Resolver {
-    resolve(...path: any[]): string;
+    resolve(...path: string[]): string;
     resolvePath(path: string, opts?: ResolvePathOptions): Promise<string>;
 }
 /**
@@ -265,11 +273,11 @@ declare function addDevServerHandler(handler: NitroDevEventHandler): void;
 /**
  * Renders given template using lodash template during build into the project buildDir
  */
-declare function addTemplate(_template: NuxtTemplate | string): NuxtTemplate;
+declare function addTemplate(_template: NuxtTemplate<any> | string): ResolvedNuxtTemplate<any>;
 /**
  * Normalize a nuxt template object
  */
-declare function normalizeTemplate(template: NuxtTemplate | string): NuxtTemplate;
+declare function normalizeTemplate(template: NuxtTemplate<any> | string): ResolvedNuxtTemplate<any>;
 
 declare const logger: consola.Consola;
 declare function useLogger(scope?: string): consola.Consola;
@@ -287,7 +295,7 @@ declare function isNodeModules(id: string): boolean;
 declare function clearRequireCache(id: string): void;
 declare function scanRequireTree(id: string, files?: Set<string>): Set<string>;
 /** Access the require cache by module id. */
-declare function getRequireCacheItem(id: string): NodeModule;
+declare function getRequireCacheItem(id: string): NodeModule | undefined;
 /** Resolve the `package.json` file for a given module. */
 declare function requireModulePkg(id: string, opts?: RequireModuleOptions): any;
 /** Resolve the path of a module. */
@@ -297,7 +305,7 @@ declare function tryResolveModule(path: string, opts?: ResolveModuleOptions): st
 /** Require a module and return it. */
 declare function requireModule(id: string, opts?: RequireModuleOptions): any;
 declare function importModule(id: string, opts?: RequireModuleOptions): Promise<any>;
-declare function tryImportModule(id: string, opts?: RequireModuleOptions): Promise<any>;
+declare function tryImportModule(id: string, opts?: RequireModuleOptions): Promise<any> | undefined;
 /** Try to require a module, but don't emit an error if the module can't be required. */
 declare function tryRequireModule(id: string, opts?: RequireModuleOptions): any;
 
@@ -307,8 +315,8 @@ declare const templateUtils: {
     serialize: (data: any) => string;
     importName: typeof genSafeVariableName;
     importSources: (sources: string | string[], { lazy }?: {
-        lazy?: boolean;
+        lazy?: boolean | undefined;
     }) => string;
 };
 
-export { AddComponentOptions, AddPluginOptions, ExtendConfigOptions, ExtendViteConfigOptions, ExtendWebpackConfigOptions, LegacyServerMiddleware, LoadNuxtConfigOptions, LoadNuxtOptions, RequireModuleOptions, ResolveModuleOptions, ResolvePathOptions, Resolver, addAutoImport, addAutoImportDir, addComponent, addComponentsDir, addDevServerHandler, addLayout, addPlugin, addPluginTemplate, addServerHandler, addServerMiddleware, addTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, clearRequireCache, compileTemplate, createResolver, defineNuxtModule, extendPages, extendViteConfig, extendWebpackConfig, findPath, getNuxtVersion, getRequireCacheItem, hasNuxtCompatibility, importModule, installModule, isIgnored, isNodeModules, isNuxt2, isNuxt3, loadNuxt, loadNuxtConfig, logger, normalizePlugin, normalizeTemplate, nuxtCtx, requireModule, requireModulePkg, resolveAlias, resolveFiles, resolveModule, resolvePath, scanRequireTree, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, useLogger, useModuleContainer, useNuxt };
+export { AddComponentOptions, AddPluginOptions, ExtendConfigOptions, ExtendViteConfigOptions, ExtendWebpackConfigOptions, LegacyServerMiddleware, LoadNuxtConfigOptions, LoadNuxtOptions, RequireModuleOptions, ResolveModuleOptions, ResolvePathOptions, Resolver, addAutoImport, addAutoImportDir, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addLayout, addPlugin, addPluginTemplate, addServerHandler, addServerMiddleware, addTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, clearRequireCache, compileTemplate, createResolver, defineNuxtModule, extendPages, extendViteConfig, extendWebpackConfig, findPath, getNuxtVersion, getRequireCacheItem, hasNuxtCompatibility, importModule, installModule, isIgnored, isNodeModules, isNuxt2, isNuxt3, loadNuxt, loadNuxtConfig, logger, normalizePlugin, normalizeTemplate, nuxtCtx, requireModule, requireModulePkg, resolveAlias, resolveFiles, resolveModule, resolvePath, scanRequireTree, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, useLogger, useModuleContainer, useNuxt };

package/dist/index.mjs

@@ -7,6 +7,7 @@ import satisfies from 'semver/functions/satisfies.js';
 import consola from 'consola';
 import { pathToFileURL, fileURLToPath } from 'node:url';
 import { globby } from 'globby';
+import { normalizeAliases } from 'pathe/utils';
 import { interopDefault } from 'mlly';
 import jiti from 'jiti';
 import ignore from 'ignore';
@@ -99,8 +100,8 @@ async function checkNuxtCompatibility(constraints, nuxt = useNuxt()) {
   const issues = [];
   if (constraints.nuxt) {
     const nuxtVersion = getNuxtVersion(nuxt);
-    const nuxtSemanticVersion = nuxtVersion.split("-").shift();
-    if (!satisfies(nuxtSemanticVersion, constraints.nuxt)) {
+    const nuxtSemanticVersion = nuxtVersion.replace(/-[0-9]+\.[0-9a-f]{7}/, "");
+    if (!satisfies(nuxtSemanticVersion, constraints.nuxt, { includePrerelease: true })) {
       issues.push({
         name: "nuxt",
         message: `Nuxt version \`${constraints.nuxt}\` is required but currently using \`${nuxtVersion}\``
@@ -156,10 +157,10 @@ function useLogger(scope) {
   return scope ? logger.withScope(scope) : logger;
 }
 
-function addLayout(tmpl, name) {
+function addLayout(template, name) {
   const nuxt = useNuxt();
-  const { filename, src } = addTemplate(tmpl);
-  const layoutName = kebabCase(name || parse(tmpl.filename).name).replace(/["']/g, "");
+  const { filename, src } = addTemplate(template);
+  const layoutName = kebabCase(name || parse(filename).name).replace(/["']/g, "");
   if (isNuxt2(nuxt)) {
     const layout = nuxt.options.layouts[layoutName];
     if (layout) {
@@ -253,7 +254,7 @@ function resolveModule(id, opts = {}) {
   return normalize(_require.resolve(id, {
     paths: [].concat(
       global.__NUXT_PREPATHS__,
-      opts.paths,
+      opts.paths || [],
       process.cwd(),
       global.__NUXT_PATHS__
     ).filter(Boolean)
@@ -263,7 +264,7 @@ function tryResolveModule(path, opts = {}) {
   try {
     return resolveModule(path, opts);
   } catch (error) {
-    if (error.code !== "MODULE_NOT_FOUND") {
+    if (error?.code !== "MODULE_NOT_FOUND") {
       throw error;
     }
   }
@@ -300,7 +301,7 @@ function tryRequireModule(id, opts = {}) {
 function isIgnored(pathname) {
   const nuxt = tryUseNuxt();
   if (!nuxt) {
-    return null;
+    return false;
   }
   if (!nuxt._ignore) {
     nuxt._ignore = ignore(nuxt.options.ignoreOptions);
@@ -314,7 +315,7 @@ function isIgnored(pathname) {
   if (relativePath.startsWith("..")) {
     return false;
   }
-  return relativePath && nuxt._ignore.ignores(relativePath);
+  return !!(relativePath && nuxt._ignore.ignores(relativePath));
 }
 
 async function resolvePath(path, opts = {}) {
@@ -373,7 +374,7 @@ function resolveAlias(path, alias) {
   if (!alias) {
     alias = tryUseNuxt()?.options.alias || {};
   }
-  for (const key in alias) {
+  for (const key in normalizeAliases(alias)) {
     if (key === "@" && !path.startsWith("@/")) {
       continue;
     }
@@ -445,7 +446,11 @@ function addPluginTemplate(plugin, opts = {}) {
 async function installModule(moduleToInstall, _inlineOptions, _nuxt) {
   const nuxt = useNuxt();
   const { nuxtModule, inlineOptions } = await normalizeModule(moduleToInstall, _inlineOptions);
-  await nuxtModule.call(useModuleContainer(), inlineOptions, nuxt);
+  await nuxtModule.call(
+    useModuleContainer(),
+    inlineOptions,
+    nuxt
+  );
   nuxt.options._installedModules = nuxt.options._installedModules || [];
   nuxt.options._installedModules.push({
     meta: await nuxtModule.getMeta?.(),
@@ -492,7 +497,7 @@ function useModuleContainer(nuxt = useNuxt()) {
     }
     await installModule(src, inlineOptions);
   }
-  nuxt[MODULE_CONTAINER_KEY] = {
+  const container = {
     nuxt,
     options: nuxt.options,
     ready() {
@@ -541,6 +546,7 @@ function useModuleContainer(nuxt = useNuxt()) {
       }
     }
   };
+  nuxt[MODULE_CONTAINER_KEY] = container;
   return nuxt[MODULE_CONTAINER_KEY];
 }
 
@@ -669,18 +675,22 @@ function nuxt2Shims(nuxt) {
 }
 
 async function loadNuxtConfig(opts) {
-  const { config: nuxtConfig, configFile, layers, cwd } = await loadConfig({
+  const result = await loadConfig({
     name: "nuxt",
     configFile: "nuxt.config",
     rcFile: ".nuxtrc",
+    extend: { extendKey: ["theme", "extends"] },
     dotenv: true,
     globalRc: true,
     ...opts
   });
+  const { configFile, layers = [], cwd } = result;
+  const nuxtConfig = result.config;
   nuxtConfig.rootDir = nuxtConfig.rootDir || cwd;
   nuxtConfig._nuxtConfigFile = configFile;
   nuxtConfig._nuxtConfigFiles = [configFile];
   for (const layer of layers) {
+    layer.config = layer.config || {};
     layer.config.rootDir = layer.config.rootDir ?? layer.cwd;
     layer.config.srcDir = resolve(layer.config.rootDir, layer.config.srcDir);
   }
@@ -724,20 +734,22 @@ async function buildNuxt(nuxt) {
   return build(nuxt);
 }
 
-function addAutoImport(imports) {
+function addImports(imports) {
   assertNuxtCompatibility({ bridge: true });
-  useNuxt().hook("autoImports:extend", (autoImports) => {
-    autoImports.push(...Array.isArray(imports) ? imports : [imports]);
-  });
+  useNuxt().hook("autoImports:extend", (_imports) => {
+    _imports.push(...Array.isArray(imports) ? imports : [imports]);
+  }, { allowDeprecated: true });
 }
-function addAutoImportDir(_autoImportDirs) {
+const addAutoImport = addImports;
+function addImportsDir(dirs) {
   assertNuxtCompatibility({ bridge: true });
-  useNuxt().hook("autoImports:dirs", (autoImportDirs) => {
-    for (const dir of Array.isArray(_autoImportDirs) ? _autoImportDirs : [_autoImportDirs]) {
-      autoImportDirs.push(dir);
+  useNuxt().hook("autoImports:dirs", (_dirs) => {
+    for (const dir of Array.isArray(dirs) ? dirs : [dirs]) {
+      _dirs.push(dir);
     }
-  });
+  }, { allowDeprecated: true });
 }
+const addAutoImportDir = addImportsDir;
 
 function extendWebpackConfig(fn, options = {}) {
   const nuxt = useNuxt();
@@ -850,4 +862,4 @@ function extendPages(cb) {
   }
 }
 
-export { addAutoImport, addAutoImportDir, addComponent, addComponentsDir, addDevServerHandler, addLayout, addPlugin, addPluginTemplate, addServerHandler, addServerMiddleware, addTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, clearRequireCache, compileTemplate, createResolver, defineNuxtModule, extendPages, extendViteConfig, extendWebpackConfig, findPath, getNuxtVersion, getRequireCacheItem, hasNuxtCompatibility, importModule, installModule, isIgnored, isNodeModules, isNuxt2, isNuxt3, loadNuxt, loadNuxtConfig, logger, normalizePlugin, normalizeTemplate, nuxtCtx, requireModule, requireModulePkg, resolveAlias, resolveFiles, resolveModule, resolvePath, scanRequireTree, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, useLogger, useModuleContainer, useNuxt };
+export { addAutoImport, addAutoImportDir, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addLayout, addPlugin, addPluginTemplate, addServerHandler, addServerMiddleware, addTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, clearRequireCache, compileTemplate, createResolver, defineNuxtModule, extendPages, extendViteConfig, extendWebpackConfig, findPath, getNuxtVersion, getRequireCacheItem, hasNuxtCompatibility, importModule, installModule, isIgnored, isNodeModules, isNuxt2, isNuxt3, loadNuxt, loadNuxtConfig, logger, normalizePlugin, normalizeTemplate, nuxtCtx, requireModule, requireModulePkg, resolveAlias, resolveFiles, resolveModule, resolvePath, scanRequireTree, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, useLogger, useModuleContainer, useNuxt };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit",
-  "version": "3.0.0-rc.8",
+  "version": "3.0.0-rc.9",
   "repository": "nuxt/framework",
   "license": "MIT",
   "type": "module",
@@ -13,24 +13,24 @@
     "prepack": "unbuild"
   },
   "dependencies": {
-    "@nuxt/schema": "3.0.0-rc.8",
-    "c12": "^0.2.9",
+    "@nuxt/schema": "3.0.0-rc.9",
+    "c12": "^0.2.10",
     "consola": "^2.15.3",
-    "defu": "^6.0.0",
+    "defu": "^6.1.0",
     "globby": "^13.1.2",
     "hash-sum": "^2.0.0",
     "ignore": "^5.2.0",
     "jiti": "^1.14.0",
     "knitwork": "^0.1.2",
     "lodash.template": "^4.5.0",
-    "mlly": "^0.5.12",
-    "pathe": "^0.3.4",
-    "pkg-types": "^0.3.3",
+    "mlly": "^0.5.14",
+    "pathe": "^0.3.5",
+    "pkg-types": "^0.3.4",
     "scule": "^0.3.2",
     "semver": "^7.3.7",
-    "unctx": "^2.0.1",
+    "unctx": "^2.0.2",
     "unimport": "^0.6.7",
-    "untyped": "^0.4.5"
+    "untyped": "^0.4.7"
   },
   "devDependencies": {
     "@types/lodash.template": "^4",