@nuxt/kit 3.4.3 → 3.5.0

package/dist/index.d.ts

@@ -38,7 +38,9 @@ declare function loadNuxt(opts: LoadNuxtOptions): Promise<Nuxt>;
 declare function buildNuxt(nuxt: Nuxt): Promise<any>;
 
 declare function addImports(imports: Import | Import[]): void;
-declare function addImportsDir(dirs: string | string[]): void;
+declare function addImportsDir(dirs: string | string[], opts?: {
+    prepend?: boolean;
+}): void;
 declare function addImportsSources(presets: ImportPresetWithDeprecation | ImportPresetWithDeprecation[]): void;
 
 interface ExtendConfigOptions {
@@ -66,6 +68,10 @@ interface ExtendConfigOptions {
      * @default true
      */
     client?: boolean;
+    /**
+     * Prepends the plugin to the array with `unshit()` instead of `push()`.
+     */
+    prepend?: boolean;
 }
 interface ExtendWebpackConfigOptions extends ExtendConfigOptions {
 }
@@ -85,11 +91,16 @@ declare function extendViteConfig(fn: ((config: UserConfig) => void), options?:
 /**
  * Append webpack plugin to the config.
  */
-declare function addWebpackPlugin(plugin: WebpackPluginInstance | WebpackPluginInstance[], options?: ExtendWebpackConfigOptions): void;
+declare function addWebpackPlugin(pluginOrGetter: WebpackPluginInstance | WebpackPluginInstance[] | (() => WebpackPluginInstance | WebpackPluginInstance[]), options?: ExtendWebpackConfigOptions): void;
 /**
  * Append Vite plugin to the config.
  */
-declare function addVitePlugin(plugin: Plugin | Plugin[], options?: ExtendViteConfigOptions): void;
+declare function addVitePlugin(pluginOrGetter: Plugin | Plugin[] | (() => Plugin | Plugin[]), options?: ExtendViteConfigOptions): void;
+interface AddBuildPluginFactory {
+    vite?: () => Plugin | Plugin[];
+    webpack?: () => WebpackPluginInstance | WebpackPluginInstance[];
+}
+declare function addBuildPlugin(pluginFactory: AddBuildPluginFactory, options?: ExtendConfigOptions): void;
 
 /**
  * Check version constraints and return incompatibility issues as an array
@@ -347,4 +358,4 @@ declare const templateUtils: {
     }) => string;
 };
 
-export { AddComponentOptions, AddPluginOptions, AddRouteMiddlewareOptions, ExtendConfigOptions, ExtendRouteRulesOptions, ExtendViteConfigOptions, ExtendWebpackConfigOptions, LoadNuxtConfigOptions, LoadNuxtOptions, RequireModuleOptions, ResolveModuleOptions, ResolvePathOptions, Resolver, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addServerHandler, addServerPlugin, addTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createResolver, defineNuxtModule, extendNuxtSchema, extendPages, extendRouteRules, extendViteConfig, extendWebpackConfig, findPath, getNuxtVersion, hasNuxtCompatibility, importModule, installModule, isIgnored, isNuxt2, isNuxt3, loadNuxt, loadNuxtConfig, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveModule, resolvePath, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateTemplates, useLogger, useNitro, useNuxt };
+export { AddComponentOptions, AddPluginOptions, AddRouteMiddlewareOptions, ExtendConfigOptions, ExtendRouteRulesOptions, ExtendViteConfigOptions, ExtendWebpackConfigOptions, LoadNuxtConfigOptions, LoadNuxtOptions, RequireModuleOptions, ResolveModuleOptions, ResolvePathOptions, Resolver, addBuildPlugin, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addServerHandler, addServerPlugin, addTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createResolver, defineNuxtModule, extendNuxtSchema, extendPages, extendRouteRules, extendViteConfig, extendWebpackConfig, findPath, getNuxtVersion, hasNuxtCompatibility, importModule, installModule, isIgnored, isNuxt2, isNuxt3, loadNuxt, loadNuxtConfig, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveModule, resolvePath, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateTemplates, useLogger, useNitro, useNuxt };

package/dist/index.mjs

@@ -266,16 +266,6 @@ function resolveModule(id, opts = {}) {
     ).filter(Boolean)
   }));
 }
-function tryResolveModule$1(path, opts = {}) {
-  try {
-    return resolveModule(path, opts);
-  } catch (error) {
-    if (error?.code !== "MODULE_NOT_FOUND") {
-      throw error;
-    }
-  }
-  return null;
-}
 function requireModule(id, opts = {}) {
   const resolvedPath = resolveModule(id, opts);
   if (opts.clearCache && !isNodeModules(id)) {
@@ -389,7 +379,7 @@ async function resolvePath(path, opts = {}) {
       return pathWithIndex;
     }
   }
-  const resolveModulePath = tryResolveModule$1(_path, { paths: [cwd, ...modulesDir] });
+  const resolveModulePath = await resolvePath$1(_path, { url: [cwd, ...modulesDir] }).catch(() => null);
   if (resolveModulePath) {
     return resolveModulePath;
   }
@@ -471,10 +461,9 @@ const normalizeModuleTranspilePath = (p) => {
 async function normalizeModule(nuxtModule, inlineOptions) {
   const nuxt = useNuxt();
   if (typeof nuxtModule === "string") {
-    const _src = resolveModule(resolveAlias(nuxtModule), { paths: nuxt.options.modulesDir });
-    const isESM = _src.endsWith(".mjs");
+    const src = normalize(resolveAlias(nuxtModule));
     try {
-      nuxtModule = isESM ? await importModule(_src, nuxt.options.rootDir) : requireModule(_src);
+      nuxtModule = await importModule(src, nuxt.options.modulesDir).catch(() => null) ?? requireModule(src, { paths: nuxt.options.modulesDir });
     } catch (error) {
       console.error(`Error while requiring module \`${nuxtModule}\`: ${error}`);
       throw error;
@@ -572,11 +561,11 @@ function addImports(imports) {
     _imports.push(...Array.isArray(imports) ? imports : [imports]);
   });
 }
-function addImportsDir(dirs) {
+function addImportsDir(dirs, opts = {}) {
   assertNuxtCompatibility({ bridge: true });
   useNuxt().hook("imports:dirs", (_dirs) => {
     for (const dir of Array.isArray(dirs) ? dirs : [dirs]) {
-      _dirs.push(dir);
+      _dirs[opts.prepend ? "unshift" : "push"](dir);
     }
   });
 }
@@ -632,26 +621,38 @@ function extendViteConfig(fn, options = {}) {
     }
   });
 }
-function addWebpackPlugin(plugin, options) {
+function addWebpackPlugin(pluginOrGetter, options) {
   extendWebpackConfig((config) => {
+    const method = options?.prepend ? "unshift" : "push";
+    const plugin = typeof pluginOrGetter === "function" ? pluginOrGetter() : pluginOrGetter;
     config.plugins = config.plugins || [];
     if (Array.isArray(plugin)) {
-      config.plugins.push(...plugin);
+      config.plugins[method](...plugin);
     } else {
-      config.plugins.push(plugin);
+      config.plugins[method](plugin);
     }
   }, options);
 }
-function addVitePlugin(plugin, options) {
+function addVitePlugin(pluginOrGetter, options) {
   extendViteConfig((config) => {
+    const method = options?.prepend ? "unshift" : "push";
+    const plugin = typeof pluginOrGetter === "function" ? pluginOrGetter() : pluginOrGetter;
     config.plugins = config.plugins || [];
     if (Array.isArray(plugin)) {
-      config.plugins.push(...plugin);
+      config.plugins[method](...plugin);
     } else {
-      config.plugins.push(plugin);
+      config.plugins[method](plugin);
     }
   }, options);
 }
+function addBuildPlugin(pluginFactory, options) {
+  if (pluginFactory.vite) {
+    addVitePlugin(pluginFactory.vite, options);
+  }
+  if (pluginFactory.webpack) {
+    addWebpackPlugin(pluginFactory.webpack, options);
+  }
+}
 
 async function addComponentsDir(dir) {
   const nuxt = useNuxt();
@@ -885,4 +886,4 @@ function useNitro() {
   return nuxt._nitro;
 }
 
-export { addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addServerHandler, addServerPlugin, addTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createResolver, defineNuxtModule, extendNuxtSchema, extendPages, extendRouteRules, extendViteConfig, extendWebpackConfig, findPath, getNuxtVersion, hasNuxtCompatibility, importModule$1 as importModule, installModule, isIgnored, isNuxt2, isNuxt3, loadNuxt, loadNuxtConfig, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveModule, resolvePath, templateUtils, tryImportModule$1 as tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateTemplates, useLogger, useNitro, useNuxt };
+export { addBuildPlugin, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addServerHandler, addServerPlugin, addTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createResolver, defineNuxtModule, extendNuxtSchema, extendPages, extendRouteRules, extendViteConfig, extendWebpackConfig, findPath, getNuxtVersion, hasNuxtCompatibility, importModule$1 as importModule, installModule, isIgnored, isNuxt2, isNuxt3, loadNuxt, loadNuxtConfig, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveModule, resolvePath, templateUtils, tryImportModule$1 as tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateTemplates, useLogger, useNitro, useNuxt };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit",
-  "version": "3.4.3",
+  "version": "3.5.0",
   "repository": "nuxt/nuxt",
   "license": "MIT",
   "type": "module",
@@ -26,25 +26,25 @@
     "jiti": "^1.18.2",
     "knitwork": "^1.0.0",
     "lodash.template": "^4.5.0",
-    "mlly": "^1.2.0",
+    "mlly": "^1.2.1",
     "pathe": "^1.1.0",
-    "pkg-types": "^1.0.2",
+    "pkg-types": "^1.0.3",
     "scule": "^1.0.0",
-    "semver": "^7.5.0",
+    "semver": "^7.5.1",
     "unctx": "^2.3.0",
     "unimport": "^3.0.6",
     "untyped": "^1.3.2",
-    "@nuxt/schema": "3.4.3"
+    "@nuxt/schema": "3.5.0"
   },
   "devDependencies": {
     "@types/hash-sum": "^1.0.0",
     "@types/lodash.template": "^4.5.1",
-    "@types/semver": "^7.3.13",
-    "nitropack": "^2.3.3",
+    "@types/semver": "^7.5.0",
+    "nitropack": "^2.4.0",
     "unbuild": "latest",
-    "vite": "^4.3.3",
-    "vitest": "^0.30.1",
-    "webpack": "^5.81.0"
+    "vite": "^4.3.6",
+    "vitest": "^0.31.0",
+    "webpack": "^5.82.1"
   },
   "engines": {
     "node": "^14.18.0 || >=16.10.0"