nuxt-nightly 4.1.2-29293212.eb8d7797 → 4.1.2-29293260.327ba8f5

package/dist/index.mjs

@@ -3355,7 +3355,7 @@ const componentsModule = defineNuxtModule({
   defaults: {
     dirs: []
   },
-  async setup(componentOptions, nuxt) {
+  async setup(moduleOptions, nuxt) {
     let componentDirs = [];
     const context = {
       components: []
@@ -3367,52 +3367,40 @@ const componentsModule = defineNuxtModule({
       addBuildPlugin(ComponentNamePlugin({ sourcemap: !!nuxt.options.sourcemap.client, getComponents }), { server: false });
       addBuildPlugin(ComponentNamePlugin({ sourcemap: !!nuxt.options.sourcemap.server, getComponents }), { client: false });
     }
-    const normalizeDirs = (dir, cwd, options) => {
-      if (Array.isArray(dir)) {
-        return dir.map((dir2) => normalizeDirs(dir2, cwd, options)).flat().sort(compareDirByPathLength);
-      }
-      if (dir === true || dir === void 0) {
-        return [
-          { priority: options?.priority || 0, path: resolve(cwd, "components/islands"), island: true },
-          { priority: options?.priority || 0, path: resolve(cwd, "components/global"), global: true },
-          { priority: options?.priority || 0, path: resolve(cwd, "components") }
-        ];
-      }
-      if (typeof dir === "string") {
-        return [
-          { priority: options?.priority || 0, path: resolve(cwd, resolveAlias$1(dir)) }
-        ];
-      }
-      if (!dir) {
-        return [];
-      }
-      const dirs = (dir.dirs || [dir]).map((dir2) => typeof dir2 === "string" ? { path: dir2 } : dir2).filter((_dir) => _dir.path);
-      return dirs.map((_dir) => ({
-        priority: options?.priority || 0,
-        ..._dir,
-        path: resolve(cwd, resolveAlias$1(_dir.path))
-      }));
-    };
     nuxt.hook("app:resolve", async () => {
-      const allDirs = nuxt.options._layers.map((layer) => normalizeDirs(layer.config.components, layer.config.srcDir, { priority: layer.config.srcDir === nuxt.options.srcDir ? 1 : 0 })).flat();
+      const allDirs = [];
+      for (const layer of nuxt.options._layers) {
+        const layerDirs = normalizeDirs(layer.config.components, layer.config.srcDir, { priority: layer.config.srcDir === nuxt.options.srcDir ? 1 : 0 });
+        allDirs.push(...layerDirs);
+      }
       await nuxt.callHook("components:dirs", allDirs);
-      componentDirs = allDirs.filter(isPureObjectOrString).map((dir) => {
+      const userComponentDirs = [];
+      const libraryComponentDirs = [];
+      for (const dir of allDirs) {
+        if (!isPureObjectOrString(dir)) {
+          continue;
+        }
         const dirOptions = typeof dir === "object" ? dir : { path: dir };
         const dirPath = resolveAlias$1(dirOptions.path);
-        const transpile = typeof dirOptions.transpile === "boolean" ? dirOptions.transpile : "auto";
         const extensions = (dirOptions.extensions || nuxt.options.extensions).map((e) => e.replace(STARTER_DOT_RE, ""));
+        const _transpile = typeof dirOptions.transpile === "boolean" ? dirOptions.transpile : "auto";
+        const transpile = _transpile === "auto" ? dirPath.includes("node_modules") : _transpile;
+        if (transpile) {
+          nuxt.options.build.transpile.push(dirPath);
+        }
         const present = isDirectory(dirPath);
         if (!present && !DEFAULT_COMPONENTS_DIRS_RE.test(dirOptions.path)) {
           logger.warn("Components directory not found: `" + dirPath + "`");
         }
-        return {
-          global: componentOptions.global,
+        const dirs = dirPath.includes("node_modules") ? libraryComponentDirs : userComponentDirs;
+        dirs.push({
+          global: moduleOptions.global,
           ...dirOptions,
           // TODO: https://github.com/nuxt/framework/pull/251
           enabled: true,
           path: dirPath,
           extensions,
-          pattern: dirOptions.pattern || `**/*.{${extensions.join(",")},}`,
+          pattern: dirOptions.pattern || (extensions.length > 1 ? `**/*.{${extensions.join(",")}}` : `**/*.${extensions[0] || "*"}`),
           ignore: [
             "**/*{M,.m,-m}ixin.{js,ts,jsx,tsx}",
             // ignore mixins
@@ -3420,21 +3408,20 @@ const componentsModule = defineNuxtModule({
             // .d.ts files
             ...dirOptions.ignore || []
           ],
-          transpile: transpile === "auto" ? dirPath.includes("node_modules") : transpile
-        };
-      }).filter((d) => d.enabled);
+          transpile
+        });
+      }
       componentDirs = [
-        ...componentDirs.filter((dir) => !dir.path.includes("node_modules")),
-        ...componentDirs.filter((dir) => dir.path.includes("node_modules"))
+        ...userComponentDirs,
+        ...libraryComponentDirs
       ];
-      nuxt.options.build.transpile.push(...componentDirs.filter((dir) => dir.transpile).map((dir) => dir.path));
     });
     addTemplate(componentsDeclarationTemplate);
     addTypeTemplate(componentsTypeTemplate);
     addPluginTemplate(componentsPluginTemplate);
     addTemplate(componentNamesTemplate);
     addTemplate({ ...componentsIslandsTemplate, filename: "components.islands.mjs" });
-    if (componentOptions.generateMetadata) {
+    if (moduleOptions.generateMetadata) {
       addTemplate(componentsMetadataTemplate);
     }
     const serverComponentRuntime = await findPath(join(distDir, "components/runtime/server-component")) ?? join(distDir, "components/runtime/server-component");
@@ -3543,6 +3530,39 @@ const componentsModule = defineNuxtModule({
     }
   }
 });
+function normalizeDirs(dir, cwd, options) {
+  if (Array.isArray(dir)) {
+    return dir.map((dir2) => normalizeDirs(dir2, cwd, options)).flat().sort(compareDirByPathLength);
+  }
+  if (dir === true || dir === void 0) {
+    return [
+      { priority: options?.priority || 0, path: resolve(cwd, "components/islands"), island: true },
+      { priority: options?.priority || 0, path: resolve(cwd, "components/global"), global: true },
+      { priority: options?.priority || 0, path: resolve(cwd, "components") }
+    ];
+  }
+  if (typeof dir === "string") {
+    return [
+      { priority: options?.priority || 0, path: resolve(cwd, resolveAlias$1(dir)) }
+    ];
+  }
+  if (!dir) {
+    return [];
+  }
+  const normalizedDirs = [];
+  for (const d of "dirs" in dir ? dir.dirs || [] : [dir]) {
+    const normalizedDir = typeof d === "string" ? { path: d } : d;
+    if (!normalizedDir.path) {
+      continue;
+    }
+    normalizedDirs.push({
+      priority: options?.priority || 0,
+      ...normalizedDir,
+      path: resolve(cwd, resolveAlias$1(normalizedDir.path))
+    });
+  }
+  return normalizedDirs.sort(compareDirByPathLength);
+}
 
 const NODE_MODULES_RE$1 = /[\\/]node_modules[\\/]/;
 const IMPORTS_RE = /(['"])#imports\1/;
@@ -3769,7 +3789,7 @@ function addDeclarationTemplates(ctx, options) {
   });
 }
 
-const version = "4.1.2-29293212.eb8d7797";
+const version = "4.1.2-29293260.327ba8f5";
 
 const createImportProtectionPatterns = (nuxt, options) => {
   const patterns = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-nightly",
-  "version": "4.1.2-29293212.eb8d7797",
+  "version": "4.1.2-29293260.327ba8f5",
   "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.2-29293212.eb8d7797",
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.1.2-29293212.eb8d7797",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.1.2-29293260.327ba8f5",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.1.2-29293260.327ba8f5",
     "@nuxt/telemetry": "^2.6.6",
-    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.1.2-29293212.eb8d7797",
+    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.1.2-29293260.327ba8f5",
     "@unhead/vue": "^2.0.14",
     "@vue/shared": "^3.5.21",
     "c12": "^3.2.0",