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

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 - Nuxt Project
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/index.d.ts

@@ -3,8 +3,7 @@ import { LoadConfigOptions } from 'c12';
 import { Import } from 'unimport';
 import { Configuration, WebpackPluginInstance } from 'webpack';
 import { UserConfig, Plugin } from 'vite';
-import * as unctx from 'unctx';
-import { Middleware } from 'h3';
+import * as unctx_index from 'unctx/index';
 import { NitroEventHandler, NitroDevEventHandler, Nitro } from 'nitropack';
 import * as consola from 'consola';
 import { genSafeVariableName } from 'knitwork';
@@ -100,11 +99,11 @@ declare function extendViteConfig(fn: ((config: UserConfig) => void), options?:
 /**
  * Append Webpack plugin to the config.
  */
-declare function addWebpackPlugin(plugin: WebpackPluginInstance, options?: ExtendWebpackConfigOptions): void;
+declare function addWebpackPlugin(plugin: WebpackPluginInstance | WebpackPluginInstance[], options?: ExtendWebpackConfigOptions): void;
 /**
  * Append Vite plugin to the config.
  */
-declare function addVitePlugin(plugin: Plugin, options?: ExtendViteConfigOptions): void;
+declare function addVitePlugin(plugin: Plugin | Plugin[], options?: ExtendViteConfigOptions): void;
 
 /**
  * Check version constraints and return incompatibility issues as an array
@@ -149,7 +148,7 @@ declare type AddComponentOptions = {
 declare function addComponent(opts: AddComponentOptions): Promise<void>;
 
 /** Direct access to the Nuxt context - see https://github.com/unjs/unctx. */
-declare const nuxtCtx: unctx.UseContext<Nuxt>;
+declare const nuxtCtx: unctx_index.UseContext<Nuxt>;
 /**
  * Get access to Nuxt instance.
  *
@@ -248,18 +247,6 @@ declare function resolveFiles(path: string, pattern: string | string[], opts?: {
     followSymbolicLinks?: boolean;
 }): Promise<string[]>;
 
-interface LegacyServerMiddleware {
-    route?: string;
-    path?: string;
-    handle?: Middleware | string;
-    handler: Middleware | string;
-}
-/**
- * Adds a new server middleware to the end of the server middleware array.
- *
- * @deprecated Use addServerHandler instead
- */
-declare function addServerMiddleware(middleware: LegacyServerMiddleware): void;
 /**
  * Adds a nitro server handler
  *
@@ -270,6 +257,14 @@ declare function addServerHandler(handler: NitroEventHandler): void;
  *
  */
 declare function addDevServerHandler(handler: NitroDevEventHandler): void;
+/**
+ * Adds a Nitro plugin
+ */
+declare function addServerPlugin(plugin: string): void;
+/**
+ * Adds routes to be prerendered
+ */
+declare function addPrerenderRoutes(routes: string | string[]): void;
 /**
  * Access to the Nitro instance
  *
@@ -295,6 +290,14 @@ declare function addTemplate(_template: NuxtTemplate<any> | string): ResolvedNux
  * Normalize a nuxt template object
  */
 declare function normalizeTemplate(template: NuxtTemplate<any> | string): ResolvedNuxtTemplate<any>;
+/**
+ * Trigger rebuilding Nuxt templates
+ *
+ * You can pass a filter within the options to selectively regenerate a subset of templates.
+ */
+declare function updateTemplates(options?: {
+    filter?: (template: ResolvedNuxtTemplate<any>) => boolean;
+}): Promise<any>;
 
 declare const logger: consola.Consola;
 declare function useLogger(scope?: string): consola.Consola;
@@ -336,4 +339,4 @@ declare const templateUtils: {
     }) => string;
 };
 
-export { AddComponentOptions, AddPluginOptions, ExtendConfigOptions, ExtendViteConfigOptions, ExtendWebpackConfigOptions, LegacyServerMiddleware, LoadNuxtConfigOptions, LoadNuxtOptions, RequireModuleOptions, ResolveModuleOptions, ResolvePathOptions, Resolver, addAutoImport, addAutoImportDir, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, 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, useNitro, useNuxt };
+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 };

package/dist/index.mjs

@@ -7,7 +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 { resolveAlias as resolveAlias$1 } from 'pathe/utils';
 import { interopDefault } from 'mlly';
 import jiti from 'jiti';
 import ignore from 'ignore';
@@ -95,6 +95,9 @@ function normalizeTemplate(template) {
   }
   return template;
 }
+function updateTemplates(options) {
+  return useNuxt().hooks.callHook("builder:generateApp", options);
+}
 
 async function checkNuxtCompatibility(constraints, nuxt = useNuxt()) {
   const issues = [];
@@ -188,30 +191,6 @@ function addLayout(template, name) {
   });
 }
 
-function normalizeHandlerMethod(handler) {
-  const [, method = void 0] = handler.handler.match(/\.(get|head|patch|post|put|delete|connect|options|trace)(\.\w+)*$/) || [];
-  return {
-    method,
-    ...handler
-  };
-}
-function addServerMiddleware(middleware) {
-  useNuxt().options.serverMiddleware.push(middleware);
-}
-function addServerHandler(handler) {
-  useNuxt().options.serverHandlers.push(normalizeHandlerMethod(handler));
-}
-function addDevServerHandler(handler) {
-  useNuxt().options.devServerHandlers.push(handler);
-}
-function useNitro() {
-  const nuxt = useNuxt();
-  if (!nuxt._nitro) {
-    throw new Error("Nitro is not initialized yet. You can call `useNitro()` only after `ready` hook.");
-  }
-  return nuxt._nitro;
-}
-
 const _require = jiti(process.cwd(), { interopDefault: true, esmResolve: true });
 function isNodeModules(id) {
   return /[/\\]node_modules[/\\]/.test(id);
@@ -331,7 +310,7 @@ async function resolvePath(path, opts = {}) {
   if (isAbsolute(path) && existsSync(path) && !await isDirectory(path)) {
     return path;
   }
-  const nuxt = useNuxt();
+  const nuxt = tryUseNuxt();
   const cwd = opts.cwd || (nuxt ? nuxt.options.rootDir : process.cwd());
   const extensions = opts.extensions || (nuxt ? nuxt.options.extensions : [".ts", ".mjs", ".cjs", ".json"]);
   const modulesDir = nuxt ? nuxt.options.modulesDir : [];
@@ -381,15 +360,7 @@ function resolveAlias(path, alias) {
   if (!alias) {
     alias = tryUseNuxt()?.options.alias || {};
   }
-  for (const key in normalizeAliases(alias)) {
-    if (key === "@" && !path.startsWith("@/")) {
-      continue;
-    }
-    if (path.startsWith(key)) {
-      path = alias[key] + path.slice(key.length);
-    }
-  }
-  return path;
+  return resolveAlias$1(path, alias);
 }
 function createResolver(base) {
   if (!base) {
@@ -473,7 +444,12 @@ async function normalizeModule(nuxtModule, inlineOptions) {
   if (typeof nuxtModule === "string") {
     const _src = resolveModule(resolveAlias(nuxtModule), { paths: nuxt.options.modulesDir });
     const isESM = _src.endsWith(".mjs");
-    nuxtModule = isESM ? await importModule(_src) : requireModule(_src);
+    try {
+      nuxtModule = isESM ? await importModule(_src) : requireModule(_src);
+    } catch (error) {
+      console.error(`Error while requiring module \`${nuxtModule}\`: ${error}`);
+      throw error;
+    }
   }
   if (typeof nuxtModule !== "function") {
     throw new TypeError("Nuxt module should be a function: " + nuxtModule);
@@ -514,7 +490,8 @@ function useModuleContainer(nuxt = useNuxt()) {
     },
     requireModule,
     addModule: requireModule,
-    addServerMiddleware,
+    addServerMiddleware: () => {
+    },
     addTemplate(template) {
       if (typeof template === "string") {
         template = { src: template };
@@ -703,9 +680,10 @@ async function loadNuxtConfig(opts) {
     layer.config.rootDir = layer.config.rootDir ?? layer.cwd;
     layer.config.srcDir = resolve(layer.config.rootDir, layer.config.srcDir);
   }
-  nuxtConfig._layers = layers.filter((layer) => layer.configFile && !layer.configFile.endsWith(".nuxtrc"));
-  if (!nuxtConfig._layers.length) {
-    nuxtConfig._layers.push({
+  const _layers = layers.filter((layer) => layer.configFile && !layer.configFile.endsWith(".nuxtrc"));
+  nuxtConfig._layers = _layers;
+  if (!_layers.length) {
+    _layers.push({
       cwd,
       config: {
         rootDir: cwd,
@@ -829,13 +807,21 @@ function extendViteConfig(fn, options = {}) {
 function addWebpackPlugin(plugin, options) {
   extendWebpackConfig((config) => {
     config.plugins = config.plugins || [];
-    config.plugins.push(plugin);
+    if (Array.isArray(plugin)) {
+      config.plugins.push(...plugin);
+    } else {
+      config.plugins.push(plugin);
+    }
   }, options);
 }
 function addVitePlugin(plugin, options) {
   extendViteConfig((config) => {
     config.plugins = config.plugins || [];
-    config.plugins.push(plugin);
+    if (Array.isArray(plugin)) {
+      config.plugins.push(...plugin);
+    } else {
+      config.plugins.push(plugin);
+    }
   }, options);
 }
 
@@ -888,4 +874,46 @@ function extendPages(cb) {
   }
 }
 
-export { addAutoImport, addAutoImportDir, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, 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, useNitro, useNuxt };
+function normalizeHandlerMethod(handler) {
+  const [, method = void 0] = handler.handler.match(/\.(get|head|patch|post|put|delete|connect|options|trace)(\.\w+)*$/) || [];
+  return {
+    method,
+    ...handler,
+    handler: normalize(handler.handler)
+  };
+}
+function addServerHandler(handler) {
+  useNuxt().options.serverHandlers.push(normalizeHandlerMethod(handler));
+}
+function addDevServerHandler(handler) {
+  useNuxt().options.devServerHandlers.push(handler);
+}
+function addServerPlugin(plugin) {
+  const nuxt = useNuxt();
+  nuxt.options.nitro.plugins = nuxt.options.nitro.plugins || [];
+  nuxt.options.nitro.plugins.push(normalize(plugin));
+}
+function addPrerenderRoutes(routes) {
+  const nuxt = useNuxt();
+  if (!Array.isArray(routes)) {
+    routes = [routes];
+  }
+  routes = routes.filter(Boolean);
+  if (!routes.length) {
+    return;
+  }
+  nuxt.hook("prerender:routes", (ctx) => {
+    for (const route of routes) {
+      ctx.routes.add(route);
+    }
+  });
+}
+function useNitro() {
+  const nuxt = useNuxt();
+  if (!nuxt._nitro) {
+    throw new Error("Nitro is not initialized yet. You can call `useNitro()` only after `ready` hook.");
+  }
+  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 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit",
-  "version": "3.0.0-rc.11",
+  "version": "3.0.0-rc.13",
   "repository": "nuxt/framework",
   "license": "MIT",
   "type": "module",
@@ -9,11 +9,8 @@
   "files": [
     "dist"
   ],
-  "scripts": {
-    "prepack": "unbuild"
-  },
   "dependencies": {
-    "@nuxt/schema": "3.0.0-rc.11",
+    "@nuxt/schema": "3.0.0-rc.13",
     "c12": "^0.2.13",
     "consola": "^2.15.3",
     "defu": "^6.1.0",
@@ -24,12 +21,12 @@
     "knitwork": "^0.1.2",
     "lodash.template": "^4.5.0",
     "mlly": "^0.5.16",
-    "pathe": "^0.3.8",
-    "pkg-types": "^0.3.5",
+    "pathe": "^0.3.9",
+    "pkg-types": "^0.3.6",
     "scule": "^0.3.2",
-    "semver": "^7.3.7",
+    "semver": "^7.3.8",
     "unctx": "^2.0.2",
-    "unimport": "^0.6.7",
+    "unimport": "^0.7.0",
     "untyped": "^0.5.0"
   },
   "devDependencies": {
@@ -38,6 +35,7 @@
     "unbuild": "latest"
   },
   "engines": {
-    "node": "^14.16.0 || ^16.11.0 || ^17.0.0 || ^18.0.0"
-  }
-}
+    "node": "^14.16.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+  },
+  "scripts": {}
+}