@nuxt/kit 3.0.0-rc.10 → 3.0.0-rc.12

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,9 +3,9 @@ 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 { NitroEventHandler, NitroDevEventHandler } from 'nitropack';
+import * as unctx_index from 'unctx/index';
+import { NodeMiddleware } from 'h3';
+import { NitroEventHandler, NitroDevEventHandler, Nitro } from 'nitropack';
 import * as consola from 'consola';
 import { genSafeVariableName } from 'knitwork';
 
@@ -100,11 +100,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 +149,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.
  *
@@ -251,8 +251,8 @@ declare function resolveFiles(path: string, pattern: string | string[], opts?: {
 interface LegacyServerMiddleware {
     route?: string;
     path?: string;
-    handle?: Middleware | string;
-    handler: Middleware | string;
+    handle?: NodeMiddleware | string;
+    handler: NodeMiddleware | string;
 }
 /**
  * Adds a new server middleware to the end of the server middleware array.
@@ -270,6 +270,22 @@ declare function addServerHandler(handler: NitroEventHandler): void;
  *
  */
 declare function addDevServerHandler(handler: NitroDevEventHandler): void;
+/**
+ * Access to the Nitro instance
+ *
+ * **Note:** You can call `useNitro()` only after `ready` hook.
+ *
+ * **Note:** Changes to the Nitro instance configuration are not applied.
+ *
+ * @example
+ *
+ * ```ts
+ * nuxt.hook('ready', () => {
+ *   console.log(useNitro())
+ * })
+ * ```
+ */
+declare function useNitro(): Nitro;
 
 /**
  * Renders given template using lodash template during build into the project buildDir
@@ -320,4 +336,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, useNuxt };
+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 };

package/dist/index.mjs

@@ -204,6 +204,13 @@ function addServerHandler(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) {
@@ -466,7 +473,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);
@@ -822,13 +834,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);
 }
 
@@ -881,4 +901,4 @@ 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, useNuxt };
+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 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit",
-  "version": "3.0.0-rc.10",
+  "version": "3.0.0-rc.12",
   "repository": "nuxt/framework",
   "license": "MIT",
   "type": "module",
@@ -9,27 +9,24 @@
   "files": [
     "dist"
   ],
-  "scripts": {
-    "prepack": "unbuild"
-  },
   "dependencies": {
-    "@nuxt/schema": "3.0.0-rc.10",
-    "c12": "^0.2.12",
+    "@nuxt/schema": "3.0.0-rc.12",
+    "c12": "^0.2.13",
     "consola": "^2.15.3",
     "defu": "^6.1.0",
     "globby": "^13.1.2",
     "hash-sum": "^2.0.0",
     "ignore": "^5.2.0",
-    "jiti": "^1.15.0",
+    "jiti": "^1.16.0",
     "knitwork": "^0.1.2",
     "lodash.template": "^4.5.0",
-    "mlly": "^0.5.14",
-    "pathe": "^0.3.7",
+    "mlly": "^0.5.16",
+    "pathe": "^0.3.9",
     "pkg-types": "^0.3.5",
     "scule": "^0.3.2",
-    "semver": "^7.3.7",
+    "semver": "^7.3.8",
     "unctx": "^2.0.2",
-    "unimport": "^0.6.7",
+    "unimport": "^0.6.8",
     "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"
+  },
+  "scripts": {}
+}