@nuxt/kit 3.12.3 → 3.13.0

package/README.md

@@ -34,7 +34,7 @@ It provides a number of features that make it easy to build fast, SEO-friendly,
 - 🏠 [Local Development](#local-development)
 - ⛰️ [Nuxt 2](#nuxt-2)
 - 🛟 [Professional Support](#professional-support)
-- 🔗 [Follow us](#follow-us)
+- 🔗 [Follow Us](#follow-us)
 - ⚖️ [License](#license)
 
 ---
@@ -106,10 +106,10 @@ Follow the docs to [Set Up Your Local Development Environment](https://nuxt.com/
 - Technical audit & consulting: [Nuxt Experts](https://nuxt.com/enterprise/support)
 - Custom development & more: [Nuxt Agencies Partners](https://nuxt.com/enterprise/agencies)
 
-## <a name="follow-us">🔗 Follow us</a>
+## <a name="follow-us">🔗 Follow Us</a>
 
 <p valign="center">
-  <a href="https://chat.nuxt.dev"><img width="20px" src="https://github.com/nuxt/nuxt/tree/main/.github/assets/discord.svg" alt="Discord"></a>&nbsp;&nbsp;<a href="https://twitter.nuxt.dev"><img width="20px" src="https://github.com/nuxt/nuxt/tree/main/.github/assets/twitter.svg" alt="Twitter"></a>&nbsp;&nbsp;<a href="https://github.nuxt.dev"><img width="20px" src="https://github.com/nuxt/nuxt/tree/main/.github/assets/github.svg" alt="GitHub"></a>
+  <a href="https://go.nuxt.com/discord"><img width="20px" src="https://github.com/nuxt/nuxt/tree/main/.github/assets/discord.svg" alt="Discord"></a>&nbsp;&nbsp;<a href="https://go.nuxt.com/x"><img width="20px" src="https://github.com/nuxt/nuxt/tree/main/.github/assets/twitter.svg" alt="Twitter"></a>&nbsp;&nbsp;<a href="https://go.nuxt.com/github"><img width="20px" src="https://github.com/nuxt/nuxt/tree/main/.github/assets/github.svg" alt="GitHub"></a>
 </p>
 
 ## <a name="license">⚖️ License</a>

package/dist/index.d.mts

@@ -13,7 +13,10 @@ import { genSafeVariableName } from 'knitwork';
  * 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.
  */
-declare function defineNuxtModule<OptionsT extends ModuleOptions>(definition: ModuleDefinition<OptionsT> | NuxtModule<OptionsT>): NuxtModule<OptionsT>;
+declare function defineNuxtModule<TOptions extends ModuleOptions>(definition: ModuleDefinition<TOptions, Partial<TOptions>, false> | NuxtModule<TOptions, Partial<TOptions>, false>): NuxtModule<TOptions, TOptions, false>;
+declare function defineNuxtModule<TOptions extends ModuleOptions>(): {
+    with: <TOptionsDefaults extends Partial<TOptions>>(definition: ModuleDefinition<TOptions, TOptionsDefaults, true> | NuxtModule<TOptions, TOptionsDefaults, true>) => NuxtModule<TOptions, TOptionsDefaults, true>;
+};
 
 /** Installs a module on a Nuxt instance. */
 declare function installModule<T extends string | NuxtModule, Config extends Extract<NonNullable<NuxtConfig['modules']>[number], [T, any]>>(moduleToInstall: T, inlineOptions?: [Config] extends [never] ? any : Config[1], nuxt?: Nuxt): Promise<void>;
@@ -148,17 +151,17 @@ declare function assertNuxtCompatibility(constraints: NuxtCompatibility, nuxt?:
  */
 declare function hasNuxtCompatibility(constraints: NuxtCompatibility, nuxt?: Nuxt): Promise<boolean>;
 /**
- * Check if current nuxt instance is version 2 legacy
+ * @deprecated Use `isNuxtMajorVersion(2, nuxt)` instead. This may be removed in \@nuxt/kit v5 or a future major version.
  */
 declare function isNuxt2(nuxt?: Nuxt): boolean;
 /**
- * Check if current nuxt instance is version 3
+ * @deprecated Use `isNuxtMajorVersion(3, nuxt)` instead. This may be removed in \@nuxt/kit v5 or a future major version.
  */
 declare function isNuxt3(nuxt?: Nuxt): boolean;
 /**
  * Get nuxt version
  */
-declare function getNuxtVersion(nuxt?: Nuxt | any): any;
+declare function getNuxtVersion(nuxt?: Nuxt | any): string;
 
 /**
  * Register a directory to be scanned for components and imported only when used.
@@ -228,6 +231,11 @@ interface AddRouteMiddlewareOptions {
      * @default false
      */
     override?: boolean;
+    /**
+     * Prepend middleware to the list
+     * @default false
+     */
+    prepend?: boolean;
 }
 declare function addRouteMiddleware(input: NuxtMiddleware | NuxtMiddleware[], options?: AddRouteMiddlewareOptions): void;
 

package/dist/index.d.ts

@@ -13,7 +13,10 @@ import { genSafeVariableName } from 'knitwork';
  * 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.
  */
-declare function defineNuxtModule<OptionsT extends ModuleOptions>(definition: ModuleDefinition<OptionsT> | NuxtModule<OptionsT>): NuxtModule<OptionsT>;
+declare function defineNuxtModule<TOptions extends ModuleOptions>(definition: ModuleDefinition<TOptions, Partial<TOptions>, false> | NuxtModule<TOptions, Partial<TOptions>, false>): NuxtModule<TOptions, TOptions, false>;
+declare function defineNuxtModule<TOptions extends ModuleOptions>(): {
+    with: <TOptionsDefaults extends Partial<TOptions>>(definition: ModuleDefinition<TOptions, TOptionsDefaults, true> | NuxtModule<TOptions, TOptionsDefaults, true>) => NuxtModule<TOptions, TOptionsDefaults, true>;
+};
 
 /** Installs a module on a Nuxt instance. */
 declare function installModule<T extends string | NuxtModule, Config extends Extract<NonNullable<NuxtConfig['modules']>[number], [T, any]>>(moduleToInstall: T, inlineOptions?: [Config] extends [never] ? any : Config[1], nuxt?: Nuxt): Promise<void>;
@@ -148,17 +151,17 @@ declare function assertNuxtCompatibility(constraints: NuxtCompatibility, nuxt?:
  */
 declare function hasNuxtCompatibility(constraints: NuxtCompatibility, nuxt?: Nuxt): Promise<boolean>;
 /**
- * Check if current nuxt instance is version 2 legacy
+ * @deprecated Use `isNuxtMajorVersion(2, nuxt)` instead. This may be removed in \@nuxt/kit v5 or a future major version.
  */
 declare function isNuxt2(nuxt?: Nuxt): boolean;
 /**
- * Check if current nuxt instance is version 3
+ * @deprecated Use `isNuxtMajorVersion(3, nuxt)` instead. This may be removed in \@nuxt/kit v5 or a future major version.
  */
 declare function isNuxt3(nuxt?: Nuxt): boolean;
 /**
  * Get nuxt version
  */
-declare function getNuxtVersion(nuxt?: Nuxt | any): any;
+declare function getNuxtVersion(nuxt?: Nuxt | any): string;
 
 /**
  * Register a directory to be scanned for components and imported only when used.
@@ -228,6 +231,11 @@ interface AddRouteMiddlewareOptions {
      * @default false
      */
     override?: boolean;
+    /**
+     * Prepend middleware to the list
+     * @default false
+     */
+    prepend?: boolean;
 }
 declare function addRouteMiddleware(input: NuxtMiddleware | NuxtMiddleware[], options?: AddRouteMiddlewareOptions): void;
 

package/dist/index.mjs

@@ -109,18 +109,20 @@ async function hasNuxtCompatibility(constraints, nuxt = useNuxt()) {
   const issues = await checkNuxtCompatibility(constraints, nuxt);
   return !issues.length;
 }
-function isNuxt2(nuxt = useNuxt()) {
+function isNuxtMajorVersion(majorVersion, nuxt = useNuxt()) {
   const version = getNuxtVersion(nuxt);
-  return version[0] === "2" && version[1] === ".";
+  return version[0] === majorVersion.toString() && version[1] === ".";
+}
+function isNuxt2(nuxt = useNuxt()) {
+  return isNuxtMajorVersion(2, nuxt);
 }
 function isNuxt3(nuxt = useNuxt()) {
-  const version = getNuxtVersion(nuxt);
-  return version[0] === "3" && version[1] === ".";
+  return isNuxtMajorVersion(3, nuxt);
 }
 function getNuxtVersion(nuxt = useNuxt()) {
   const rawVersion = nuxt?._version || nuxt?.version || nuxt?.constructor?.version;
-  if (!rawVersion) {
-    throw new Error("Cannot determine nuxt version! Is current instance passed?");
+  if (typeof rawVersion !== "string") {
+    throw new TypeError("Cannot determine nuxt version! Is current instance passed?");
   }
   return rawVersion.replace(/^v/g, "");
 }
@@ -2081,21 +2083,29 @@ const importName = genSafeVariableName;
 const templateUtils = { serialize, importName, importSources };
 
 function defineNuxtModule(definition) {
+  if (definition) {
+    return _defineNuxtModule(definition);
+  }
+  return {
+    with: (definition2) => _defineNuxtModule(definition2)
+  };
+}
+function _defineNuxtModule(definition) {
+  var _a;
   if (typeof definition === "function") {
-    return defineNuxtModule({ setup: definition });
+    return _defineNuxtModule({ setup: definition });
   }
   const module = defu(definition, { meta: {} });
-  if (module.meta.configKey === void 0) {
-    module.meta.configKey = module.meta.name;
-  }
+  (_a = module.meta).configKey || (_a.configKey = module.meta.name);
   async function getOptions(inlineOptions, nuxt = useNuxt()) {
-    const configKey = module.meta.configKey || module.meta.name;
-    const _defaults = module.defaults instanceof Function ? module.defaults(nuxt) : module.defaults;
-    let _options = defu(inlineOptions, nuxt.options[configKey], _defaults);
+    const nuxtConfigOptionsKey = module.meta.configKey || module.meta.name;
+    const nuxtConfigOptions = nuxtConfigOptionsKey && nuxtConfigOptionsKey in nuxt.options ? nuxt.options[nuxtConfigOptionsKey] : {};
+    const optionsDefaults = module.defaults instanceof Function ? module.defaults(nuxt) : module.defaults ?? {};
+    let options = defu(inlineOptions, nuxtConfigOptions, optionsDefaults);
     if (module.schema) {
-      _options = await applyDefaults(module.schema, _options);
+      options = await applyDefaults(module.schema, options);
     }
-    return Promise.resolve(_options);
+    return Promise.resolve(options);
   }
   async function normalizedModule(inlineOptions, nuxt) {
     if (!nuxt) {
@@ -2209,7 +2219,7 @@ function clearRequireCache(id) {
 function getRequireCacheItem(id) {
   try {
     return _require.cache[id];
-  } catch (e) {
+  } catch {
   }
 }
 function getNodeModulesPaths(paths) {
@@ -2490,7 +2500,7 @@ async function installModule(moduleToInstall, inlineOptions, nuxt = useNuxt()) {
 function getDirectory(p) {
   try {
     return isAbsolute(p) && lstatSync(p).isFile() ? dirname(p) : p;
-  } catch (e) {
+  } catch {
   }
   return p;
 }
@@ -2569,7 +2579,7 @@ async function getNuxtModuleVersion(module, nuxt = useNuxt()) {
   return false;
 }
 
-const layerSchemaKeys = ["future", "srcDir", "rootDir", "dir"];
+const layerSchemaKeys = ["future", "srcDir", "rootDir", "serverDir", "dir"];
 const layerSchema = /* @__PURE__ */ Object.create(null);
 for (const key of layerSchemaKeys) {
   if (key in NuxtConfigSchema) {
@@ -3034,6 +3044,8 @@ async function _generateTypes(nuxt) {
     const relative2 = relativeWithDot(nuxt.options.buildDir, path);
     include.add(join(relative2, "runtime"));
     exclude.add(join(relative2, "runtime/server"));
+    include.add(join(relative2, "dist/runtime"));
+    exclude.add(join(relative2, "dist/runtime/server"));
   }
   const isV4 = nuxt.options.future?.compatibilityVersion === 4;
   const hasTypescriptVersionWithModulePreserve = await readPackageJSON("typescript", { url: nuxt.options.modulesDir }).then((r) => r?.version && gte(r.version, "5.4.0")).catch(() => isV4);
@@ -3254,6 +3266,8 @@ function addRouteMiddleware(input, options = {}) {
         } else {
           logger.warn(`'${middleware.name}' middleware already exists at '${foundPath}'. You can set \`override: true\` to replace it.`);
         }
+      } else if (options.prepend === true) {
+        app.middleware.unshift({ ...middleware });
       } else {
         app.middleware.push({ ...middleware });
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit",
-  "version": "3.12.3",
+  "version": "3.13.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -29,20 +29,20 @@
     "destr": "^2.0.3",
     "globby": "^14.0.2",
     "hash-sum": "^2.0.0",
-    "ignore": "^5.3.1",
+    "ignore": "^5.3.2",
     "jiti": "^1.21.6",
     "klona": "^2.0.6",
     "knitwork": "^1.1.0",
     "mlly": "^1.7.1",
     "pathe": "^1.1.2",
-    "pkg-types": "^1.1.2",
+    "pkg-types": "^1.1.3",
     "scule": "^1.3.0",
-    "semver": "^7.6.2",
-    "ufo": "^1.5.3",
+    "semver": "^7.6.3",
+    "ufo": "^1.5.4",
     "unctx": "^2.3.1",
-    "unimport": "^3.7.2",
+    "unimport": "^3.11.0",
     "untyped": "^1.4.2",
-    "@nuxt/schema": "3.12.3"
+    "@nuxt/schema": "3.13.0"
   },
   "devDependencies": {
     "@types/hash-sum": "1.0.2",
@@ -51,9 +51,9 @@
     "lodash-es": "4.17.21",
     "nitropack": "2.9.7",
     "unbuild": "latest",
-    "vite": "5.3.2",
-    "vitest": "1.6.0",
-    "webpack": "5.92.1"
+    "vite": "5.4.2",
+    "vitest": "2.0.5",
+    "webpack": "5.94.0"
   },
   "engines": {
     "node": "^14.18.0 || >=16.10.0"