nuxt-nightly 4.1.0-29278578.7c5efacf → 4.1.0-29278670.a74035ee

package/dist/index.mjs

@@ -5,7 +5,7 @@ import { AsyncLocalStorage } from 'node:async_hooks';
 import { dirname, resolve, normalize, basename, extname, relative, isAbsolute, join } from 'pathe';
 import { createHooks, createDebugger } from 'hookable';
 import ignore from 'ignore';
-import { useLogger, tryUseNuxt, useNuxt, directoryToURL, resolveFiles, resolvePath, defineNuxtModule, findPath, addPlugin, addTemplate, addTypeTemplate, addComponent, useNitro, addBuildPlugin, isIgnored, resolveAlias as resolveAlias$1, addPluginTemplate, addImportsSources, addVitePlugin, createIsIgnored, updateTemplates, tryResolveModule, normalizeModuleTranspilePath, resolveNuxtModule, resolveIgnorePatterns, logger as logger$1, createResolver, importModule, tryImportModule, runWithNuxtContext, nuxtCtx, loadNuxtConfig, addWebpackPlugin, addServerPlugin, installModule, addServerTemplate, addServerHandler, addRouteMiddleware, normalizeTemplate, normalizePlugin } from '@nuxt/kit';
+import { useLogger, tryUseNuxt, useNuxt, directoryToURL, resolveFiles, resolvePath, defineNuxtModule, findPath, addPlugin, addTemplate, addTypeTemplate, addComponent, useNitro, addBuildPlugin, isIgnored, resolveAlias as resolveAlias$1, addPluginTemplate, addImportsSources, addVitePlugin, createIsIgnored, updateTemplates, tryResolveModule, normalizeModuleTranspilePath, resolveNuxtModule, resolveIgnorePatterns, logger as logger$1, createResolver, importModule, tryImportModule, runWithNuxtContext, nuxtCtx, loadNuxtConfig, addWebpackPlugin, addServerPlugin, installModules, addServerTemplate, addServerHandler, addRouteMiddleware, resolveModuleWithOptions, normalizeTemplate, normalizePlugin } from '@nuxt/kit';
 import { resolvePackageJSON, readPackageJSON } from 'pkg-types';
 import { hash, isEqual, serialize } from 'ohash';
 import consola, { consola as consola$1 } from 'consola';
@@ -19,13 +19,13 @@ import defu$1, { defu } from 'defu';
 import { satisfies, coerce } from 'semver';
 import { isCI, provider, isWindows, hasTTY } from 'std-env';
 import { genArrayFromRaw, genSafeVariableName, genImport, genDynamicImport, genObjectFromRawEntries, genString, genExport } from 'knitwork';
-import { resolveModulePath } from 'exsolve';
 import { addDependency } from 'nypm';
 import { reverseResolveAlias, filename, resolveAlias } from 'pathe/utils';
 import { createRoutesContext } from 'unplugin-vue-router';
 import { resolveOptions } from 'unplugin-vue-router/options';
 import { toRouteMatcher, createRouter, exportMatcher } from 'radix3';
 import { fileURLToPath, pathToFileURL } from 'node:url';
+import { resolveModulePath } from 'exsolve';
 import { runInNewContext } from 'node:vm';
 import { klona } from 'klona';
 import { parseAndWalk, ScopeTracker, walk, isBindingIdentifier, getUndeclaredIdentifiersInFunction } from 'oxc-walker';
@@ -3765,7 +3765,7 @@ function addDeclarationTemplates(ctx, options) {
   });
 }
 
-const version = "4.1.0-29278578.7c5efacf";
+const version = "4.1.0-29278670.a74035ee";
 
 const createImportProtectionPatterns = (nuxt, options) => {
   const patterns = [];
@@ -5626,8 +5626,8 @@ Using \`${fallbackCompatibilityDate}\` as fallback. More info at: ${colors.under
   const locallyScannedLayersDirs = nuxt.options._layers.map((l) => resolve(l.cwd, "layers").replace(/\/?$/, "/"));
   nuxt.options.modulesDir.push(...nuxt.options._layers.filter((l) => l.cwd !== nuxt.options.rootDir && locallyScannedLayersDirs.every((dir) => !l.cwd.startsWith(dir))).map((l) => resolve(l.cwd, "node_modules")));
   await nuxt.callHook("modules:before");
-  const { paths: modulePaths, modules } = await resolveModules(nuxt);
-  nuxt.options.watch.push(...modulePaths);
+  const { paths: watchedModulePaths, resolvedModulePaths, modules } = await resolveModules(nuxt);
+  nuxt.options.watch.push(...watchedModulePaths);
   const islandsConfig = nuxt.options.experimental.componentIslands;
   if (nuxt.options.dev || !(typeof islandsConfig === "object" && islandsConfig.selectiveClient === "deep")) {
     addComponent({
@@ -5729,9 +5729,7 @@ Using \`${fallbackCompatibilityDate}\` as fallback. More info at: ${colors.under
   if (nuxt.options.experimental.browserDevtoolsTiming) {
     addPlugin(resolve(nuxt.options.appDir, "plugins/browser-devtools-timing.client"));
   }
-  for (const [key, options] of modules) {
-    await installModule(key, options);
-  }
+  await installModules(modules, resolvedModulePaths, nuxt);
   nuxt._ignore = ignore(nuxt.options.ignoreOptions);
   nuxt._ignore.add(resolveIgnorePatterns());
   await nuxt.callHook("modules:done");
@@ -5815,7 +5813,7 @@ export default defineNuxtPlugin({
   }
   nuxt.hooks.hook("builder:watch", (event, relativePath) => {
     const path = resolve(nuxt.options.srcDir, relativePath);
-    if (modulePaths.has(path)) {
+    if (watchedModulePaths.has(path)) {
       return nuxt.callHook("restart", { hard: true });
     }
     const layerRelativePaths = new Set(nuxt.options._layers.map((l) => relative(l.config.srcDir || l.cwd, path)));
@@ -5980,30 +5978,6 @@ function createPortalProperties(sourceValue, options, paths) {
     });
   }
 }
-function resolveModule(definition, nuxt) {
-  const [module, options = {}] = Array.isArray(definition) ? definition : [definition, {}];
-  if (!module) {
-    return;
-  }
-  if (typeof module !== "string") {
-    return {
-      module,
-      options
-    };
-  }
-  const modAlias = resolveAlias$1(module);
-  const modPath = resolveModulePath(modAlias, {
-    try: true,
-    from: nuxt.options.modulesDir.map((m) => directoryToURL(m.replace(/\/node_modules\/?$/, "/"))),
-    suffixes: ["nuxt", "nuxt/index", "module", "module/index", "", "index"],
-    extensions: [".js", ".mjs", ".cjs", ".ts", ".mts", ".cts"]
-  });
-  return {
-    module,
-    resolvedPath: modPath || modAlias,
-    options
-  };
-}
 async function resolveModules(nuxt) {
   const modules = /* @__PURE__ */ new Map();
   const paths = /* @__PURE__ */ new Set();
@@ -6012,10 +5986,10 @@ async function resolveModules(nuxt) {
   for (const config of configs) {
     const definedModules = config.modules ?? [];
     for (const module of definedModules) {
-      const resolvedModule = resolveModule(module, nuxt);
+      const resolvedModule = resolveModuleWithOptions(module, nuxt);
       if (resolvedModule && (!resolvedModule.resolvedPath || !resolvedModulePaths.has(resolvedModule.resolvedPath))) {
         modules.set(resolvedModule.module, resolvedModule.options);
-        const path = resolvedModule.resolvedPath || typeof resolvedModule.module;
+        const path = resolvedModule.resolvedPath || resolvedModule.module;
         if (typeof path === "string") {
           resolvedModulePaths.add(path);
         }
@@ -6035,10 +6009,10 @@ async function resolveModules(nuxt) {
   }
   for (const key of ["modules", "_modules"]) {
     for (const module of nuxt.options[key]) {
-      const resolvedModule = resolveModule(module, nuxt);
+      const resolvedModule = resolveModuleWithOptions(module, nuxt);
       if (resolvedModule && !modules.has(resolvedModule.module) && (!resolvedModule.resolvedPath || !resolvedModulePaths.has(resolvedModule.resolvedPath))) {
         modules.set(resolvedModule.module, resolvedModule.options);
-        const path = resolvedModule.resolvedPath || typeof resolvedModule.module;
+        const path = resolvedModule.resolvedPath || resolvedModule.module;
         if (typeof path === "string") {
           resolvedModulePaths.add(path);
         }
@@ -6047,6 +6021,7 @@ async function resolveModules(nuxt) {
   }
   return {
     paths,
+    resolvedModulePaths,
     modules
   };
 }
@@ -6312,9 +6287,15 @@ const schemaNodeTemplate = {
       }),
       modules.length > 0 && options.unresolved ? `    modules?: (undefined | null | false | NuxtModule<any> | string | [NuxtModule | string, Record<string, any>] | ${modules.map(([configKey, importName, mod]) => `[${genString(mod.meta?.rawPath || importName)}, Exclude<NuxtConfig[${configKey}], boolean>]`).join(" | ")})[],` : ""
     ].filter(Boolean);
+    const moduleDependencies = modules.flatMap(([_configKey, importName]) => [
+      `    [${genString(importName)}]?: ModuleDependencyMeta<typeof ${genDynamicImport(importName, { wrapper: false })}.default extends NuxtModule<infer O> ? O : Record<string, unknown>>`
+    ]).join("\n");
     return [
-      "import { NuxtModule } from '@nuxt/schema'",
+      "import { NuxtModule, ModuleDependencyMeta } from '@nuxt/schema'",
       "declare module '@nuxt/schema' {",
+      "  interface ModuleDependencies {",
+      moduleDependencies,
+      "  }",
       "  interface NuxtOptions {",
       ...moduleOptionsInterface({ addJSDocTags: false, unresolved: false }),
       "  }",
@@ -6325,6 +6306,9 @@ const schemaNodeTemplate = {
       "  }",
       "}",
       "declare module 'nuxt/schema' {",
+      "  interface ModuleDependencies {",
+      moduleDependencies,
+      "  }",
       "  interface NuxtOptions {",
       ...moduleOptionsInterface({ addJSDocTags: true, unresolved: false }),
       "  }",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-nightly",
-  "version": "4.1.0-29278578.7c5efacf",
+  "version": "4.1.0-29278670.a74035ee",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -67,10 +67,10 @@
     "@nuxt/cli": "npm:@nuxt/cli-nightly@latest",
     "@nuxt/devalue": "^2.0.2",
     "@nuxt/devtools": "^2.6.3",
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.1.0-29278578.7c5efacf",
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.1.0-29278578.7c5efacf",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.1.0-29278670.a74035ee",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.1.0-29278670.a74035ee",
     "@nuxt/telemetry": "^2.6.6",
-    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.1.0-29278578.7c5efacf",
+    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.1.0-29278670.a74035ee",
     "@unhead/vue": "^2.0.14",
     "@vue/shared": "^3.5.20",
     "c12": "^3.2.0",