@nuxt/kit 3.0.0-rc.13 → 3.0.0-rc.14

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Nuxt, ModuleContainer, ModuleOptions, ModuleDefinition, NuxtModule, NuxtConfig, NuxtOptions, ImportPresetWithDeprecation, NuxtCompatibility, NuxtCompatibilityIssues, ComponentsDir, Component, NuxtTemplate, NuxtHooks, NuxtPlugin, NuxtPluginTemplate, ResolvedNuxtTemplate } from '@nuxt/schema';
+import { ModuleOptions, ModuleDefinition, NuxtModule, Nuxt, NuxtConfig, NuxtOptions, ImportPresetWithDeprecation, 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';
@@ -8,8 +8,6 @@ import { NitroEventHandler, NitroDevEventHandler, Nitro } from 'nitropack';
 import * as consola from 'consola';
 import { genSafeVariableName } from 'knitwork';
 
-declare function useModuleContainer(nuxt?: Nuxt): ModuleContainer;
-
 /**
  * Define a Nuxt module, automatically merging defaults with user provided options, installing
  * any hooks that are provided, and calling an optional setup function for full control.
@@ -37,15 +35,7 @@ declare function loadNuxt(opts: LoadNuxtOptions): Promise<Nuxt>;
 declare function buildNuxt(nuxt: Nuxt): Promise<any>;
 
 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;
 declare function addImportsSources(presets: ImportPresetWithDeprecation | ImportPresetWithDeprecation[]): void;
 
 interface ExtendConfigOptions {
@@ -75,13 +65,6 @@ interface ExtendConfigOptions {
     client?: boolean;
 }
 interface ExtendWebpackConfigOptions extends ExtendConfigOptions {
-    /**
-     * Install plugin on modern build
-     *
-     * @default true
-     * @deprecated Nuxt 2 only
-     */
-    modern?: boolean;
 }
 interface ExtendViteConfigOptions extends ExtendConfigOptions {
 }
@@ -136,7 +119,7 @@ declare function getNuxtVersion(nuxt?: Nuxt | any): any;
  * Requires Nuxt 2.13+
  */
 declare function addComponentsDir(dir: ComponentsDir): Promise<void>;
-declare type AddComponentOptions = {
+type AddComponentOptions = {
     name: string;
     filePath: string;
 } & Partial<Exclude<Component, 'shortPath' | 'async' | 'level' | 'import' | 'asyncImport'>>;
@@ -302,33 +285,41 @@ declare function updateTemplates(options?: {
 declare const logger: consola.Consola;
 declare function useLogger(scope?: string): consola.Consola;
 
+/** @deprecated Do not use CJS utils */
 interface ResolveModuleOptions {
     paths?: string | string[];
 }
+/** @deprecated Do not use CJS utils */
 interface RequireModuleOptions extends ResolveModuleOptions {
     /** Clear the require cache (force fresh require) but only if not within `node_modules` */
     clearCache?: boolean;
     /** Automatically de-default the result of requiring the module. */
     interopDefault?: boolean;
 }
+/** @deprecated Do not use CJS utils */
 declare function isNodeModules(id: string): boolean;
+/** @deprecated Do not use CJS utils */
 declare function clearRequireCache(id: string): void;
+/** @deprecated Do not use CJS utils */
 declare function scanRequireTree(id: string, files?: Set<string>): Set<string>;
-/** Access the require cache by module id. */
+/** @deprecated Do not use CJS utils */
 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. */
+/** @deprecated Do not use CJS utils */
 declare function resolveModule(id: string, opts?: ResolveModuleOptions): string;
-/** Try to resolve the path of a module, but don't emit an error if it can't be found. */
+/** @deprecated Do not use CJS utils */
 declare function tryResolveModule(path: string, opts?: ResolveModuleOptions): string | null;
-/** Require a module and return it. */
+/** @deprecated Do not use CJS utils */
 declare function requireModule(id: string, opts?: RequireModuleOptions): any;
+/** @deprecated Do not use CJS utils */
 declare function importModule(id: string, opts?: RequireModuleOptions): Promise<any>;
+/** @deprecated Do not use CJS utils */
 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. */
+/** @deprecated Do not use CJS utils */
 declare function tryRequireModule(id: string, opts?: RequireModuleOptions): any;
 
+/** @deprecated */
 declare function compileTemplate(template: NuxtTemplate, ctx: any): Promise<string>;
 /** @deprecated */
 declare const templateUtils: {
@@ -339,4 +330,4 @@ declare const templateUtils: {
     }) => string;
 };
 
-export { AddComponentOptions, AddPluginOptions, ExtendConfigOptions, ExtendViteConfigOptions, ExtendWebpackConfigOptions, LoadNuxtConfigOptions, LoadNuxtOptions, RequireModuleOptions, ResolveModuleOptions, ResolvePathOptions, Resolver, addAutoImport, addAutoImportDir, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addServerHandler, addServerPlugin, 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, updateTemplates, useLogger, useModuleContainer, useNitro, useNuxt };
+export { AddComponentOptions, AddPluginOptions, ExtendConfigOptions, ExtendViteConfigOptions, ExtendWebpackConfigOptions, LoadNuxtConfigOptions, LoadNuxtOptions, RequireModuleOptions, ResolveModuleOptions, ResolvePathOptions, Resolver, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addServerHandler, addServerPlugin, 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, updateTemplates, useLogger, useNitro, useNuxt };

package/dist/index.mjs

@@ -1,46 +1,27 @@
-import { parse, basename, resolve, relative, join, normalize, isAbsolute, dirname } from 'pathe';
-import { existsSync, readFileSync, promises } from 'node:fs';
-import hash from 'hash-sum';
+import { promises, existsSync, readFileSync } from 'node:fs';
+import defu from 'defu';
+import { applyDefaults } from 'untyped';
+import { dirname, join, normalize, relative, isAbsolute, resolve, basename, parse } from 'pathe';
+import consola from 'consola';
 import { getContext } from 'unctx';
-import { kebabCase, pascalCase } from 'scule';
 import satisfies from 'semver/functions/satisfies.js';
-import consola from 'consola';
+import lodashTemplate from 'lodash.template';
+import { genSafeVariableName, genDynamicImport, genImport } from 'knitwork';
 import { pathToFileURL, fileURLToPath } from 'node:url';
-import { globby } from 'globby';
-import { resolveAlias as resolveAlias$1 } from 'pathe/utils';
 import { interopDefault } from 'mlly';
 import jiti from 'jiti';
+import { globby } from 'globby';
+import { resolveAlias as resolveAlias$1 } from 'pathe/utils';
 import ignore from 'ignore';
-import defu from 'defu';
-import { applyDefaults } from 'untyped';
-import lodashTemplate from 'lodash.template';
-import { genSafeVariableName, genDynamicImport, genImport } from 'knitwork';
 import { loadConfig } from 'c12';
 import { NuxtConfigSchema } from '@nuxt/schema';
 import { resolvePackageJSON, readPackageJSON } from 'pkg-types';
+import { kebabCase, pascalCase } from 'scule';
+import hash from 'hash-sum';
 
-function chainFn(base, fn) {
-  if (typeof fn !== "function") {
-    return base;
-  }
-  return function(...args) {
-    if (typeof base !== "function") {
-      return fn.apply(this, args);
-    }
-    let baseResult = base.apply(this, args);
-    if (baseResult === void 0) {
-      [baseResult] = args;
-    }
-    const fnResult = fn.call(
-      this,
-      baseResult,
-      ...Array.prototype.slice.call(args, 1)
-    );
-    if (fnResult === void 0) {
-      return baseResult;
-    }
-    return fnResult;
-  };
+const logger = consola;
+function useLogger(scope) {
+  return scope ? logger.withScope(scope) : logger;
 }
 
 const nuxtCtx = getContext("nuxt");
@@ -55,50 +36,6 @@ function tryUseNuxt() {
   return nuxtCtx.tryUse();
 }
 
-function addTemplate(_template) {
-  const nuxt = useNuxt();
-  const template = normalizeTemplate(_template);
-  nuxt.options.build.templates = nuxt.options.build.templates.filter((p) => normalizeTemplate(p).filename !== template.filename);
-  nuxt.options.build.templates.push(template);
-  return template;
-}
-function normalizeTemplate(template) {
-  if (!template) {
-    throw new Error("Invalid template: " + JSON.stringify(template));
-  }
-  if (typeof template === "string") {
-    template = { src: template };
-  } else {
-    template = { ...template };
-  }
-  if (template.src) {
-    if (!existsSync(template.src)) {
-      throw new Error("Template not found: " + template.src);
-    }
-    if (!template.filename) {
-      const srcPath = parse(template.src);
-      template.filename = template.fileName || `${basename(srcPath.dir)}.${srcPath.name}.${hash(template.src)}${srcPath.ext}`;
-    }
-  }
-  if (!template.src && !template.getContents) {
-    throw new Error("Invalid template. Either getContents or src options should be provided: " + JSON.stringify(template));
-  }
-  if (!template.filename) {
-    throw new Error("Invalid template. Either filename should be provided: " + JSON.stringify(template));
-  }
-  if (template.filename.endsWith(".d.ts")) {
-    template.write = true;
-  }
-  if (!template.dst) {
-    const nuxt = useNuxt();
-    template.dst = resolve(nuxt.options.buildDir, template.filename);
-  }
-  return template;
-}
-function updateTemplates(options) {
-  return useNuxt().hooks.callHook("builder:generateApp", options);
-}
-
 async function checkNuxtCompatibility(constraints, nuxt = useNuxt()) {
   const issues = [];
   if (constraints.nuxt) {
@@ -155,39 +92,122 @@ function getNuxtVersion(nuxt = useNuxt()) {
   return version;
 }
 
-const logger = consola;
-function useLogger(scope) {
-  return scope ? logger.withScope(scope) : logger;
+async function compileTemplate(template, ctx) {
+  const data = { ...ctx, options: template.options };
+  if (template.src) {
+    try {
+      const srcContents = await promises.readFile(template.src, "utf-8");
+      return lodashTemplate(srcContents, {})(data);
+    } catch (err) {
+      console.error("Error compiling template: ", template);
+      throw err;
+    }
+  }
+  if (template.getContents) {
+    return template.getContents(data);
+  }
+  throw new Error("Invalid template: " + JSON.stringify(template));
 }
+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) => {
+    if (lazy) {
+      return `const ${genSafeVariableName(src)} = ${genDynamicImport(src, { comment: `webpackChunkName: ${JSON.stringify(src)}` })}`;
+    }
+    return genImport(src, genSafeVariableName(src));
+  }).join("\n");
+};
+const importName = genSafeVariableName;
+const templateUtils = { serialize, importName, importSources };
 
-function addLayout(template, name) {
-  const nuxt = useNuxt();
-  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) {
-      return logger.warn(
-        `Not overriding \`${layoutName}\` (provided by \`${layout}\`) with \`${src || filename}\`.`
-      );
+function defineNuxtModule(definition) {
+  if (!definition.meta) {
+    definition.meta = {};
+  }
+  if (definition.meta.configKey === void 0) {
+    definition.meta.configKey = definition.meta.name;
+  }
+  async function getOptions(inlineOptions, nuxt = useNuxt()) {
+    const configKey = definition.meta.configKey || definition.meta.name;
+    const _defaults = definition.defaults instanceof Function ? definition.defaults(nuxt) : definition.defaults;
+    let _options = defu(inlineOptions, nuxt.options[configKey], _defaults);
+    if (definition.schema) {
+      _options = await applyDefaults(definition.schema, _options);
     }
-    nuxt.options.layouts[layoutName] = `./${filename}`;
-    if (name === "error") {
-      this.addErrorLayout(filename);
+    return Promise.resolve(_options);
+  }
+  async function normalizedModule(inlineOptions, nuxt) {
+    if (!nuxt) {
+      nuxt = tryUseNuxt() || this.nuxt;
+    }
+    const uniqueKey = definition.meta.name || definition.meta.configKey;
+    if (uniqueKey) {
+      nuxt.options._requiredModules = nuxt.options._requiredModules || {};
+      if (nuxt.options._requiredModules[uniqueKey]) {
+        return;
+      }
+      nuxt.options._requiredModules[uniqueKey] = true;
+    }
+    if (definition.meta.compatibility) {
+      const issues = await checkNuxtCompatibility(definition.meta.compatibility, nuxt);
+      if (issues.length) {
+        logger.warn(`Module \`${definition.meta.name}\` is disabled due to incompatibility issues:
+${issues.toString()}`);
+        return;
+      }
+    }
+    nuxt2Shims(nuxt);
+    const _options = await getOptions(inlineOptions, nuxt);
+    if (definition.hooks) {
+      nuxt.hooks.addHooks(definition.hooks);
     }
+    await definition.setup?.call(null, _options, nuxt);
+  }
+  normalizedModule.getMeta = () => Promise.resolve(definition.meta);
+  normalizedModule.getOptions = getOptions;
+  return normalizedModule;
+}
+const NUXT2_SHIMS_KEY = "__nuxt2_shims_key__";
+function nuxt2Shims(nuxt) {
+  if (!isNuxt2(nuxt) || nuxt[NUXT2_SHIMS_KEY]) {
     return;
   }
-  nuxt.hook("app:templates", (app) => {
-    if (layoutName in app.layouts) {
-      const relativePath = relative(nuxt.options.srcDir, app.layouts[layoutName].file);
-      return logger.warn(
-        `Not overriding \`${layoutName}\` (provided by \`~/${relativePath}\`) with \`${src || filename}\`.`
-      );
+  nuxt[NUXT2_SHIMS_KEY] = true;
+  nuxt.hooks = nuxt;
+  if (!nuxtCtx.tryUse()) {
+    nuxtCtx.set(nuxt);
+    nuxt.hook("close", () => nuxtCtx.unset());
+  }
+  let virtualTemplates;
+  nuxt.hook("builder:prepared", (_builder, buildOptions) => {
+    virtualTemplates = buildOptions.templates.filter((t) => t.getContents);
+    for (const template of virtualTemplates) {
+      buildOptions.templates.splice(buildOptions.templates.indexOf(template), 1);
     }
-    app.layouts[layoutName] = {
-      file: join("#build", filename),
-      name: layoutName
+  });
+  nuxt.hook("build:templates", async (templates) => {
+    const context = {
+      nuxt,
+      utils: templateUtils,
+      app: {
+        dir: nuxt.options.srcDir,
+        extensions: nuxt.options.extensions,
+        plugins: nuxt.options.plugins,
+        templates: [
+          ...templates.templatesFiles,
+          ...virtualTemplates
+        ],
+        templateVars: templates.templateVars
+      }
     };
+    for await (const template of virtualTemplates) {
+      const contents = await compileTemplate({ ...template, src: "" }, context);
+      await promises.mkdir(dirname(template.dst), { recursive: true });
+      await promises.writeFile(template.dst, contents);
+    }
   });
 }
 
@@ -390,45 +410,13 @@ async function resolveFiles(path, pattern, opts = {}) {
   return files.map((p) => resolve(path, p)).filter((p) => !isIgnored(p)).sort();
 }
 
-function normalizePlugin(plugin) {
-  if (typeof plugin === "string") {
-    plugin = { src: plugin };
-  } else {
-    plugin = { ...plugin };
-  }
-  if (!plugin.src) {
-    throw new Error("Invalid plugin. src option is required: " + JSON.stringify(plugin));
-  }
-  plugin.src = normalize(resolveAlias(plugin.src));
-  if (plugin.ssr) {
-    plugin.mode = "server";
-  }
-  if (!plugin.mode) {
-    const [, mode = "all"] = plugin.src.match(/\.(server|client)(\.\w+)*$/) || [];
-    plugin.mode = mode;
-  }
-  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);
-  nuxt.options.plugins[opts.append ? "push" : "unshift"](plugin);
-  return plugin;
-}
-function addPluginTemplate(plugin, opts = {}) {
-  const normalizedPlugin = typeof plugin === "string" ? { src: plugin } : { ...plugin, src: addTemplate(plugin).dst };
-  return addPlugin(normalizedPlugin, 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(inlineOptions, nuxt);
+  if (typeof moduleToInstall === "string") {
+    nuxt.options.build.transpile.push(moduleToInstall);
+  }
   nuxt.options._installedModules = nuxt.options._installedModules || [];
   nuxt.options._installedModules.push({
     meta: await nuxtModule.getMeta?.(),
@@ -437,10 +425,6 @@ async function installModule(moduleToInstall, _inlineOptions, _nuxt) {
 }
 async function normalizeModule(nuxtModule, inlineOptions) {
   const nuxt = useNuxt();
-  if (nuxtModule?._version || nuxtModule?.version || nuxtModule?.constructor?.version || "") {
-    [nuxtModule, inlineOptions] = [inlineOptions, {}];
-    console.warn(new Error("`installModule` is being called with old signature!"));
-  }
   if (typeof nuxtModule === "string") {
     const _src = resolveModule(resolveAlias(nuxtModule), { paths: nuxt.options.modulesDir });
     const isESM = _src.endsWith(".mjs");
@@ -457,207 +441,6 @@ async function normalizeModule(nuxtModule, inlineOptions) {
   return { nuxtModule, inlineOptions };
 }
 
-const MODULE_CONTAINER_KEY = "__module_container__";
-function useModuleContainer(nuxt = useNuxt()) {
-  if (nuxt[MODULE_CONTAINER_KEY]) {
-    return nuxt[MODULE_CONTAINER_KEY];
-  }
-  async function requireModule(moduleOpts) {
-    let src, inlineOptions;
-    if (typeof moduleOpts === "string") {
-      src = moduleOpts;
-    } else if (Array.isArray(moduleOpts)) {
-      [src, inlineOptions] = moduleOpts;
-    } else if (typeof moduleOpts === "object") {
-      if (moduleOpts.src || moduleOpts.handler) {
-        src = moduleOpts.src || moduleOpts.handler;
-        inlineOptions = moduleOpts.options;
-      } else {
-        src = moduleOpts;
-      }
-    } else {
-      src = moduleOpts;
-    }
-    await installModule(src, inlineOptions);
-  }
-  const container = {
-    nuxt,
-    options: nuxt.options,
-    ready() {
-      return Promise.resolve();
-    },
-    addVendor() {
-    },
-    requireModule,
-    addModule: requireModule,
-    addServerMiddleware: () => {
-    },
-    addTemplate(template) {
-      if (typeof template === "string") {
-        template = { src: template };
-      }
-      if (template.write === void 0) {
-        template.write = true;
-      }
-      return addTemplate(template);
-    },
-    addPlugin(pluginTemplate) {
-      return addPluginTemplate(pluginTemplate);
-    },
-    addLayout(tmpl, name) {
-      return addLayout(tmpl, name);
-    },
-    addErrorLayout(dst) {
-      const relativeBuildDir = relative(nuxt.options.rootDir, nuxt.options.buildDir);
-      nuxt.options.ErrorPage = `~/${relativeBuildDir}/${dst}`;
-    },
-    extendBuild(fn) {
-      nuxt.options.build.extend = chainFn(nuxt.options.build.extend, fn);
-      if (!isNuxt2(nuxt)) {
-        console.warn("[kit] [compat] Using `extendBuild` in Nuxt 3 has no effect. Instead call extendWebpackConfig and extendViteConfig.");
-      }
-    },
-    extendRoutes(fn) {
-      if (isNuxt2(nuxt)) {
-        nuxt.options.router.extendRoutes = chainFn(nuxt.options.router.extendRoutes, fn);
-      } else {
-        nuxt.hook("pages:extend", async (pages, ...args) => {
-          const maybeRoutes = await fn(pages, ...args);
-          if (maybeRoutes) {
-            console.warn("[kit] [compat] Using `extendRoutes` in Nuxt 3 needs to directly modify first argument instead of returning updated routes. Skipping extended routes.");
-          }
-        });
-      }
-    }
-  };
-  nuxt[MODULE_CONTAINER_KEY] = container;
-  return nuxt[MODULE_CONTAINER_KEY];
-}
-
-async function compileTemplate(template, ctx) {
-  const data = { ...ctx, options: template.options };
-  if (template.src) {
-    try {
-      const srcContents = await promises.readFile(template.src, "utf-8");
-      return lodashTemplate(srcContents, {})(data);
-    } catch (err) {
-      console.error("Error compiling template: ", template);
-      throw err;
-    }
-  }
-  if (template.getContents) {
-    return template.getContents(data);
-  }
-  throw new Error("Invalid template: " + JSON.stringify(template));
-}
-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) => {
-    if (lazy) {
-      return `const ${genSafeVariableName(src)} = ${genDynamicImport(src, { comment: `webpackChunkName: ${JSON.stringify(src)}` })}`;
-    }
-    return genImport(src, genSafeVariableName(src));
-  }).join("\n");
-};
-const importName = genSafeVariableName;
-const templateUtils = { serialize, importName, importSources };
-
-function defineNuxtModule(definition) {
-  if (typeof definition === "function") {
-    definition = definition(useNuxt());
-    logger.warn("Module definition as function is deprecated and will be removed in the future versions", definition);
-  }
-  if (!definition.meta) {
-    definition.meta = {};
-  }
-  if (!definition.meta.configKey) {
-    definition.meta.name = definition.meta.name || definition.name;
-    definition.meta.configKey = definition.configKey || definition.meta.name;
-  }
-  async function getOptions(inlineOptions, nuxt = useNuxt()) {
-    const configKey = definition.meta.configKey || definition.meta.name;
-    const _defaults = definition.defaults instanceof Function ? definition.defaults(nuxt) : definition.defaults;
-    let _options = defu(inlineOptions, nuxt.options[configKey], _defaults);
-    if (definition.schema) {
-      _options = await applyDefaults(definition.schema, _options);
-    }
-    return Promise.resolve(_options);
-  }
-  async function normalizedModule(inlineOptions, nuxt) {
-    if (!nuxt) {
-      nuxt = tryUseNuxt() || this.nuxt;
-    }
-    const uniqueKey = definition.meta.name || definition.meta.configKey;
-    if (uniqueKey) {
-      nuxt.options._requiredModules = nuxt.options._requiredModules || {};
-      if (nuxt.options._requiredModules[uniqueKey]) {
-        return;
-      }
-      nuxt.options._requiredModules[uniqueKey] = true;
-    }
-    if (definition.meta.compatibility) {
-      const issues = await checkNuxtCompatibility(definition.meta.compatibility, nuxt);
-      if (issues.length) {
-        logger.warn(`Module \`${definition.meta.name}\` is disabled due to incompatibility issues:
-${issues.toString()}`);
-        return;
-      }
-    }
-    nuxt2Shims(nuxt);
-    const _options = await getOptions(inlineOptions, nuxt);
-    if (definition.hooks) {
-      nuxt.hooks.addHooks(definition.hooks);
-    }
-    await definition.setup?.call(null, _options, nuxt);
-  }
-  normalizedModule.getMeta = () => Promise.resolve(definition.meta);
-  normalizedModule.getOptions = getOptions;
-  return normalizedModule;
-}
-const NUXT2_SHIMS_KEY = "__nuxt2_shims_key__";
-function nuxt2Shims(nuxt) {
-  if (!isNuxt2(nuxt) || nuxt[NUXT2_SHIMS_KEY]) {
-    return;
-  }
-  nuxt[NUXT2_SHIMS_KEY] = true;
-  nuxt.hooks = nuxt;
-  if (!nuxtCtx.tryUse()) {
-    nuxtCtx.set(nuxt);
-    nuxt.hook("close", () => nuxtCtx.unset());
-  }
-  let virtualTemplates;
-  nuxt.hook("builder:prepared", (_builder, buildOptions) => {
-    virtualTemplates = buildOptions.templates.filter((t) => t.getContents);
-    for (const template of virtualTemplates) {
-      buildOptions.templates.splice(buildOptions.templates.indexOf(template), 1);
-    }
-  });
-  nuxt.hook("build:templates", async (templates) => {
-    const context = {
-      nuxt,
-      utils: templateUtils,
-      app: {
-        dir: nuxt.options.srcDir,
-        extensions: nuxt.options.extensions,
-        plugins: nuxt.options.plugins,
-        templates: [
-          ...templates.templatesFiles,
-          ...virtualTemplates
-        ],
-        templateVars: templates.templateVars
-      }
-    };
-    for await (const template of virtualTemplates) {
-      const contents = await compileTemplate({ ...template, src: "" }, context);
-      await promises.mkdir(dirname(template.dst), { recursive: true });
-      await promises.writeFile(template.dst, contents);
-    }
-  });
-}
-
 async function loadNuxtConfig(opts) {
   globalThis.defineNuxtConfig = (c) => c;
   const result = await loadConfig({
@@ -732,27 +515,25 @@ async function buildNuxt(nuxt) {
 
 function addImports(imports) {
   assertNuxtCompatibility({ bridge: true });
-  useNuxt().hook("autoImports:extend", (_imports) => {
+  useNuxt().hook("imports:extend", (_imports) => {
     _imports.push(...Array.isArray(imports) ? imports : [imports]);
-  }, { allowDeprecated: true });
+  });
 }
-const addAutoImport = addImports;
 function addImportsDir(dirs) {
   assertNuxtCompatibility({ bridge: true });
-  useNuxt().hook("autoImports:dirs", (_dirs) => {
+  useNuxt().hook("imports:dirs", (_dirs) => {
     for (const dir of Array.isArray(dirs) ? dirs : [dirs]) {
       _dirs.push(dir);
     }
-  }, { allowDeprecated: true });
+  });
 }
-const addAutoImportDir = addImportsDir;
 function addImportsSources(presets) {
   assertNuxtCompatibility({ bridge: true });
-  useNuxt().hook("autoImports:sources", (_presets) => {
+  useNuxt().hook("imports:sources", (_presets) => {
     for (const preset of Array.isArray(presets) ? presets : [presets]) {
       _presets.push(preset);
     }
-  }, { allowDeprecated: true });
+  });
 }
 
 function extendWebpackConfig(fn, options = {}) {
@@ -776,12 +557,6 @@ function extendWebpackConfig(fn, options = {}) {
         fn(config);
       }
     }
-    if (options.modern !== false) {
-      const config = configs.find((i) => i.name === "modern");
-      if (config) {
-        fn(config);
-      }
-    }
   });
 }
 function extendViteConfig(fn, options = {}) {
@@ -847,10 +622,6 @@ async function addComponent(opts) {
     preload: false,
     mode: "all",
     shortPath: opts.filePath,
-    async: false,
-    level: 0,
-    asyncImport: `${genDynamicImport(opts.filePath)}.then(r => r['${opts.export || "default"}'])`,
-    import: `require(${JSON.stringify(opts.filePath)})['${opts.export || "default"}']`,
     ...opts
   };
   nuxt.hook("components:extend", (components) => {
@@ -865,6 +636,81 @@ 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).filename !== template.filename);
+  nuxt.options.build.templates.push(template);
+  return template;
+}
+function normalizeTemplate(template) {
+  if (!template) {
+    throw new Error("Invalid template: " + JSON.stringify(template));
+  }
+  if (typeof template === "string") {
+    template = { src: template };
+  } else {
+    template = { ...template };
+  }
+  if (template.src) {
+    if (!existsSync(template.src)) {
+      throw new Error("Template not found: " + template.src);
+    }
+    if (!template.filename) {
+      const srcPath = parse(template.src);
+      template.filename = template.fileName || `${basename(srcPath.dir)}.${srcPath.name}.${hash(template.src)}${srcPath.ext}`;
+    }
+  }
+  if (!template.src && !template.getContents) {
+    throw new Error("Invalid template. Either getContents or src options should be provided: " + JSON.stringify(template));
+  }
+  if (!template.filename) {
+    throw new Error("Invalid template. Either filename should be provided: " + JSON.stringify(template));
+  }
+  if (template.filename.endsWith(".d.ts")) {
+    template.write = true;
+  }
+  if (!template.dst) {
+    const nuxt = useNuxt();
+    template.dst = resolve(nuxt.options.buildDir, template.filename);
+  }
+  return template;
+}
+function updateTemplates(options) {
+  return useNuxt().hooks.callHook("builder:generateApp", options);
+}
+
+function addLayout(template, name) {
+  const nuxt = useNuxt();
+  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) {
+      return logger.warn(
+        `Not overriding \`${layoutName}\` (provided by \`${layout}\`) with \`${src || filename}\`.`
+      );
+    }
+    nuxt.options.layouts[layoutName] = `./${filename}`;
+    if (name === "error") {
+      this.addErrorLayout(filename);
+    }
+    return;
+  }
+  nuxt.hook("app:templates", (app) => {
+    if (layoutName in app.layouts) {
+      const relativePath = relative(nuxt.options.srcDir, app.layouts[layoutName].file);
+      return logger.warn(
+        `Not overriding \`${layoutName}\` (provided by \`~/${relativePath}\`) with \`${src || filename}\`.`
+      );
+    }
+    app.layouts[layoutName] = {
+      file: join("#build", filename),
+      name: layoutName
+    };
+  });
+}
+
 function extendPages(cb) {
   const nuxt = useNuxt();
   if (isNuxt2(nuxt)) {
@@ -874,6 +720,37 @@ function extendPages(cb) {
   }
 }
 
+function normalizePlugin(plugin) {
+  if (typeof plugin === "string") {
+    plugin = { src: plugin };
+  } else {
+    plugin = { ...plugin };
+  }
+  if (!plugin.src) {
+    throw new Error("Invalid plugin. src option is required: " + JSON.stringify(plugin));
+  }
+  plugin.src = normalize(resolveAlias(plugin.src));
+  if (plugin.ssr) {
+    plugin.mode = "server";
+  }
+  if (!plugin.mode) {
+    const [, mode = "all"] = plugin.src.match(/\.(server|client)(\.\w+)*$/) || [];
+    plugin.mode = mode;
+  }
+  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);
+  nuxt.options.plugins[opts.append ? "push" : "unshift"](plugin);
+  return plugin;
+}
+function addPluginTemplate(plugin, opts = {}) {
+  const normalizedPlugin = typeof plugin === "string" ? { src: plugin } : { ...plugin, src: addTemplate(plugin).dst };
+  return addPlugin(normalizedPlugin, opts);
+}
+
 function normalizeHandlerMethod(handler) {
   const [, method = void 0] = handler.handler.match(/\.(get|head|patch|post|put|delete|connect|options|trace)(\.\w+)*$/) || [];
   return {
@@ -916,4 +793,4 @@ function useNitro() {
   return nuxt._nitro;
 }
 
-export { addAutoImport, addAutoImportDir, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addServerHandler, addServerPlugin, 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, updateTemplates, useLogger, useModuleContainer, useNitro, useNuxt };
+export { addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addServerHandler, addServerPlugin, 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, updateTemplates, useLogger, useNitro, useNuxt };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit",
-  "version": "3.0.0-rc.13",
+  "version": "3.0.0-rc.14",
   "repository": "nuxt/framework",
   "license": "MIT",
   "type": "module",
@@ -10,24 +10,24 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/schema": "3.0.0-rc.13",
-    "c12": "^0.2.13",
+    "@nuxt/schema": "3.0.0-rc.14",
+    "c12": "^1.0.1",
     "consola": "^2.15.3",
-    "defu": "^6.1.0",
+    "defu": "^6.1.1",
     "globby": "^13.1.2",
     "hash-sum": "^2.0.0",
     "ignore": "^5.2.0",
     "jiti": "^1.16.0",
-    "knitwork": "^0.1.2",
+    "knitwork": "^1.0.0",
     "lodash.template": "^4.5.0",
-    "mlly": "^0.5.16",
-    "pathe": "^0.3.9",
-    "pkg-types": "^0.3.6",
-    "scule": "^0.3.2",
+    "mlly": "^1.0.0",
+    "pathe": "^1.0.0",
+    "pkg-types": "^1.0.1",
+    "scule": "^1.0.0",
     "semver": "^7.3.8",
-    "unctx": "^2.0.2",
-    "unimport": "^0.7.0",
-    "untyped": "^0.5.0"
+    "unctx": "^2.1.0",
+    "unimport": "^1.0.0",
+    "untyped": "^1.0.0"
   },
   "devDependencies": {
     "@types/lodash.template": "^4",