@nuxt/kit 3.17.7 → 3.18.1

package/README.md

@@ -44,7 +44,7 @@ It provides a number of features that make it easy to build fast, SEO-friendly,
 Use the following command to create a new starter project. This will create a starter project with all the necessary files and dependencies:
 
 ```bash
-npm create nuxt <my-project>
+npm create nuxt@latest <my-project>
 ```
 
 > [!TIP]

package/dist/index.d.mts

@@ -381,7 +381,7 @@ declare function useNitro(): Nitro;
 /**
  * Add server imports to be auto-imported by Nitro
  */
-declare function addServerImports(imports: Import[]): void;
+declare function addServerImports(imports: Import | Import[]): void;
 /**
  * Add directories to be scanned for auto-imports by Nitro
  */

package/dist/index.d.ts

@@ -381,7 +381,7 @@ declare function useNitro(): Nitro;
 /**
  * Add server imports to be auto-imported by Nitro
  */
-declare function addServerImports(imports: Import[]): void;
+declare function addServerImports(imports: Import | Import[]): void;
 /**
  * Add directories to be scanned for auto-imports by Nitro
  */

package/dist/index.mjs

@@ -15,7 +15,7 @@ import { interopDefault, parseNodeModulePath, resolveModuleExportNames } from 'm
 import { resolveModulePath, resolveModuleURL } from 'exsolve';
 import { isRelative, withTrailingSlash } from 'ufo';
 import { glob } from 'tinyglobby';
-import { resolveAlias as resolveAlias$1 } from 'pathe/utils';
+import { resolveAlias as resolveAlias$1, reverseResolveAlias } from 'pathe/utils';
 import ignore from 'ignore';
 import { loadConfig } from 'c12';
 import process$1 from 'node:process';
@@ -2372,10 +2372,16 @@ async function resolveNuxtModule(base, paths) {
   for (const path of paths) {
     if (path.startsWith(base)) {
       resolved.push(path.split("/index.ts")[0]);
-    } else {
-      const resolvedPath = await resolver.resolvePath(path);
-      resolved.push(resolvedPath.slice(0, resolvedPath.lastIndexOf(path) + path.length));
+      continue;
     }
+    const resolvedPath = await resolver.resolvePath(path);
+    const dir = parseNodeModulePath(resolvedPath).dir;
+    if (dir) {
+      resolved.push(dir);
+      continue;
+    }
+    const index = resolvedPath.lastIndexOf(path);
+    resolved.push(index === -1 ? dirname(resolvedPath) : resolvedPath.slice(0, index + path.length));
   }
   return resolved;
 }
@@ -2472,8 +2478,7 @@ function existsInVFS(path, nuxt = tryUseNuxt()) {
 }
 async function resolveFiles(path, pattern, opts = {}) {
   const files = [];
-  for (const file of await glob(pattern, { cwd: path, followSymbolicLinks: opts.followSymbolicLinks ?? true })) {
-    const p = resolve(path, file);
+  for (const p of await glob(pattern, { cwd: path, followSymbolicLinks: opts.followSymbolicLinks ?? true, absolute: true })) {
     if (!isIgnored(p)) {
       files.push(p);
     }
@@ -2638,7 +2643,7 @@ async function loadNuxtConfig(opts) {
   nuxtConfig.alias ||= {};
   if (meta?.name) {
     const alias = `#layers/${meta.name}`;
-    nuxtConfig.alias[alias] ||= nuxtConfig.rootDir;
+    nuxtConfig.alias[alias] ||= withTrailingSlash(nuxtConfig.rootDir);
   }
   const defaultBuildDir = join(nuxtConfig.rootDir, ".nuxt");
   if (!opts.overrides?._prepare && !nuxtConfig.dev && !nuxtConfig.buildDir && nuxtConfig.future?.compatibilityVersion === 4 && existsSync(defaultBuildDir)) {
@@ -2672,7 +2677,7 @@ async function loadNuxtConfig(opts) {
     }
     if (layer.meta?.name) {
       const alias = `#layers/${layer.meta.name}`;
-      nuxtConfig.alias[alias] ||= layer.config.rootDir || layer.cwd;
+      nuxtConfig.alias[alias] ||= withTrailingSlash(layer.config.rootDir || layer.cwd);
     }
     _layers.push(layer);
   }
@@ -2817,10 +2822,11 @@ function useNitro() {
 }
 function addServerImports(imports) {
   const nuxt = useNuxt();
+  const _imports = toArray(imports);
   nuxt.hook("nitro:config", (config) => {
     config.imports ||= {};
     config.imports.imports ||= [];
-    config.imports.imports.push(...imports);
+    config.imports.imports.push(..._imports);
   });
 }
 function addServerImportsDir(dirs, opts = {}) {
@@ -2889,7 +2895,7 @@ function applyEnv(obj, opts, parentKey = "") {
   }
   return obj;
 }
-const envExpandRx = /\{\{(.*?)\}\}/g;
+const envExpandRx = /\{\{([^{}]*)\}\}/g;
 function _expandFromEnv(value, env = process$1.env) {
   return value.replace(envExpandRx, (match, key) => {
     return env[key] || match;
@@ -3162,8 +3168,9 @@ async function _generateTypes(nuxt) {
   }
   const moduleEntryPaths = [];
   for (const m of nuxt.options._installedModules) {
-    if (m.entryPath) {
-      moduleEntryPaths.push(getDirectory(m.entryPath));
+    const path = m.meta?.rawPath || m.entryPath;
+    if (path) {
+      moduleEntryPaths.push(getDirectory(path));
     }
   }
   const modulePaths = await resolveNuxtModule(rootDirWithSlash, moduleEntryPaths);
@@ -3265,7 +3272,7 @@ async function _generateTypes(nuxt) {
       }
     }
     const relativePath = relativeWithDot(nuxt.options.buildDir, absolutePath);
-    if (stats?.isDirectory()) {
+    if (stats?.isDirectory() || aliases[alias].endsWith("/")) {
       tsConfig.compilerOptions.paths[alias] = [relativePath];
       tsConfig.compilerOptions.paths[`${alias}/*`] = [`${relativePath}/*`];
       if (!absolutePath.startsWith(rootDirWithSlash)) {
@@ -3384,9 +3391,9 @@ function addLayout(template, name) {
   }
   nuxt.hook("app:templates", (app) => {
     if (layoutName in app.layouts) {
-      const relativePath = relative(nuxt.options.srcDir, app.layouts[layoutName].file);
+      const relativePath = reverseResolveAlias(app.layouts[layoutName].file, { ...nuxt?.options.alias || {}, ...strippedAtAliases }).pop() || app.layouts[layoutName].file;
       return logger.warn(
-        `Not overriding \`${layoutName}\` (provided by \`~/${relativePath}\`) with \`${src || filename}\`.`
+        `Not overriding \`${layoutName}\` (provided by \`${relativePath}\`) with \`${src || filename}\`.`
       );
     }
     app.layouts[layoutName] = {
@@ -3395,6 +3402,10 @@ function addLayout(template, name) {
     };
   });
 }
+const strippedAtAliases = {
+  "@": "",
+  "@@": ""
+};
 
 function extendPages(cb) {
   const nuxt = useNuxt();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit",
-  "version": "3.17.7",
+  "version": "3.18.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -23,14 +23,14 @@
     "dist"
   ],
   "dependencies": {
-    "c12": "^3.0.4",
+    "c12": "^3.2.0",
     "consola": "^3.4.2",
     "defu": "^6.1.4",
     "destr": "^2.0.5",
     "errx": "^0.1.0",
     "exsolve": "^1.0.7",
     "ignore": "^7.0.5",
-    "jiti": "^2.4.2",
+    "jiti": "^2.5.1",
     "klona": "^2.0.6",
     "knitwork": "^1.2.0",
     "mlly": "^1.7.4",
@@ -43,21 +43,21 @@
     "tinyglobby": "^0.2.14",
     "ufo": "^1.6.1",
     "unctx": "^2.4.1",
-    "unimport": "^5.1.0",
+    "unimport": "^5.2.0",
     "untyped": "^2.0.0"
   },
   "devDependencies": {
-    "@rspack/core": "1.4.6",
+    "@rspack/core": "1.4.11",
     "@types/lodash-es": "4.17.12",
     "@types/semver": "7.7.0",
     "hookable": "5.5.3",
     "lodash-es": "4.17.21",
-    "nitropack": "2.11.13",
-    "unbuild": "3.5.0",
-    "vite": "6.3.5",
+    "nitropack": "2.12.4",
+    "unbuild": "3.6.0",
+    "vite": "7.0.6",
     "vitest": "3.2.4",
-    "webpack": "5.99.9",
-    "@nuxt/schema": "3.17.7"
+    "webpack": "5.101.0",
+    "@nuxt/schema": "3.18.1"
   },
   "engines": {
     "node": ">=18.12.0"