@nuxt/kit-nightly 4.3.0-29436247.ecea7a86 → 4.3.0-29436286.4f0cb865

package/dist/index.mjs

@@ -561,6 +561,7 @@ function tryRequireModule(id, opts) {
 }
 
 const NODE_MODULES_RE = /[/\\]node_modules[/\\]/;
+const ignoredConfigKeys = /* @__PURE__ */ new Set(["components", "imports", "pages", "devtools", "telemetry"]);
 async function installModules(modulesToInstall, resolvedModulePaths, nuxt = useNuxt()) {
   const localLayerModuleDirs = [];
   for (const l of nuxt.options._layers) {
@@ -638,8 +639,8 @@ async function installModules(modulesToInstall, resolvedModulePaths, nuxt = useN
   if (error) {
     throw error;
   }
-  for (const { nuxtModule, meta, moduleToInstall, buildTimeModuleMeta, resolvedModulePath, inlineOptions } of resolvedModules) {
-    const configKey = meta?.configKey;
+  for (const { nuxtModule, meta = {}, moduleToInstall, buildTimeModuleMeta, resolvedModulePath, inlineOptions } of resolvedModules) {
+    const configKey = meta.configKey;
     const optionsFns = [
       ...nuxt._moduleOptionsFunctions.get(moduleToInstall) || [],
       ...meta?.name ? nuxt._moduleOptionsFunctions.get(meta.name) || [] : [],
@@ -658,8 +659,17 @@ async function installModules(modulesToInstall, resolvedModulePaths, nuxt = useN
         nuxt.options[configKey] = defu(...overrides, nuxt.options[configKey], ...defaults);
       }
     }
-    await callLifecycleHooks(nuxtModule, meta, inlineOptions, nuxt);
-    await callModule(nuxtModule, meta, inlineOptions, resolvedModulePath, moduleToInstall, localLayerModuleDirs, buildTimeModuleMeta, nuxt);
+    const isDisabled = configKey && !ignoredConfigKeys.has(configKey) && nuxt.options[configKey] === false;
+    if (!isDisabled) {
+      await callLifecycleHooks(nuxtModule, meta, inlineOptions, nuxt);
+    }
+    const path = typeof moduleToInstall === "string" ? moduleToInstall : void 0;
+    await callModule(nuxt, nuxtModule, inlineOptions, {
+      meta: defu({ disabled: isDisabled }, meta, buildTimeModuleMeta),
+      nameOrPath: path,
+      modulePath: resolvedModulePath || path,
+      localLayerModuleDirs
+    });
   }
   delete nuxt._moduleOptionsFunctions;
 }
@@ -691,8 +701,17 @@ async function installModule(moduleToInstall, inlineOptions, nuxt = useNuxt()) {
       nuxt.options[configKey] = mergedOptions;
     }
   }
-  await callLifecycleHooks(nuxtModule, meta, mergedOptions, nuxt);
-  await callModule(nuxtModule, meta, mergedOptions, resolvedModulePath, moduleToInstall, localLayerModuleDirs, buildTimeModuleMeta, nuxt);
+  const isDisabled = configKey && !ignoredConfigKeys.has(configKey) && nuxt.options[configKey] === false;
+  if (!isDisabled) {
+    await callLifecycleHooks(nuxtModule, meta, mergedOptions, nuxt);
+  }
+  const path = typeof moduleToInstall === "string" ? moduleToInstall : void 0;
+  await callModule(nuxt, nuxtModule, mergedOptions, {
+    meta: defu({ disabled: isDisabled }, meta, buildTimeModuleMeta),
+    nameOrPath: path,
+    modulePath: resolvedModulePath || path,
+    localLayerModuleDirs
+  });
 }
 function resolveModuleWithOptions(definition, nuxt) {
   const [module, options = {}] = Array.isArray(definition) ? definition : [definition, {}];
@@ -802,12 +821,12 @@ async function callLifecycleHooks(nuxtModule, meta = {}, inlineOptions, nuxt = u
     );
   }
 }
-async function callModule(nuxtModule, meta = {}, inlineOptions, resolvedModulePath, moduleToInstall, localLayerModuleDirs, buildTimeModuleMeta, nuxt = useNuxt()) {
-  const res = nuxt.options.experimental?.debugModuleMutation && nuxt._asyncLocalStorageModule ? await nuxt._asyncLocalStorageModule.run(nuxtModule, () => nuxtModule(inlineOptions || {}, nuxt)) ?? {} : await nuxtModule(inlineOptions || {}, nuxt) ?? {};
-  if (res === false) {
-    return;
-  }
-  const modulePath = resolvedModulePath || moduleToInstall;
+async function callModule(nuxt, nuxtModule, moduleOptions = {}, options) {
+  const modulePath = options.modulePath;
+  const nameOrPath = options.nameOrPath;
+  const localLayerModuleDirs = options.localLayerModuleDirs;
+  const fn = () => nuxt.options.experimental?.debugModuleMutation && nuxt._asyncLocalStorageModule ? nuxt._asyncLocalStorageModule.run(nuxtModule, () => nuxtModule(moduleOptions, nuxt)) : nuxtModule(moduleOptions, nuxt);
+  const res = options.meta.disabled ? false : await fn();
   let entryPath;
   if (typeof modulePath === "string") {
     const parsed = parseNodeModulePath(modulePath);
@@ -815,22 +834,26 @@ async function callModule(nuxtModule, meta = {}, inlineOptions, resolvedModulePa
       const subpath = await lookupNodeModuleSubpath(modulePath) || ".";
       entryPath = join(parsed.name, subpath === "./" ? "." : subpath);
     }
-    const moduleRoot = parsed.dir ? parsed.dir + parsed.name : await resolvePackageJSON(modulePath, { try: true }).then((r) => r ? dirname(r) : modulePath);
-    nuxt.options.build.transpile.push(normalizeModuleTranspilePath(moduleRoot));
-    const directory = moduleRoot.replace(/\/?$/, "/");
-    if (moduleRoot !== moduleToInstall && !localLayerModuleDirs.some((dir) => directory.startsWith(dir))) {
-      nuxt.options.modulesDir.push(join(moduleRoot, "node_modules"));
+    if (res !== false) {
+      const moduleRoot = parsed.dir ? parsed.dir + parsed.name : await resolvePackageJSON(modulePath, { try: true }).then((r) => r ? dirname(r) : modulePath);
+      nuxt.options.build.transpile.push(normalizeModuleTranspilePath(moduleRoot));
+      const directory = moduleRoot.replace(/\/?$/, "/");
+      if (moduleRoot !== nameOrPath && !localLayerModuleDirs.some((dir) => directory.startsWith(dir))) {
+        nuxt.options.modulesDir.push(join(moduleRoot, "node_modules"));
+      }
     }
   }
-  nuxt.options._installedModules ||= [];
-  entryPath ||= typeof moduleToInstall === "string" ? resolveAlias(moduleToInstall, nuxt.options.alias) : void 0;
-  if (typeof moduleToInstall === "string" && entryPath !== moduleToInstall) {
-    buildTimeModuleMeta.rawPath = moduleToInstall;
+  if (nameOrPath) {
+    entryPath ||= resolveAlias(nameOrPath, nuxt.options.alias);
+    if (entryPath !== nameOrPath) {
+      options.meta.rawPath = nameOrPath;
+    }
   }
+  nuxt.options._installedModules ||= [];
   nuxt.options._installedModules.push({
-    meta: defu(meta, buildTimeModuleMeta),
+    meta: options.meta,
     module: nuxtModule,
-    timings: res.timings,
+    timings: (res || {}).timings,
     entryPath
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit-nightly",
-  "version": "4.3.0-29436247.ecea7a86",
+  "version": "4.3.0-29436286.4f0cb865",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -45,7 +45,7 @@
     "untyped": "^2.0.0"
   },
   "devDependencies": {
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.3.0-29436247.ecea7a86",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.3.0-29436286.4f0cb865",
     "@rspack/core": "1.6.7",
     "@types/semver": "7.7.1",
     "hookable": "5.5.3",