@hywax/cms 2.0.1 → 2.0.2

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@hywax/cms",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "configKey": "cms",
   "builder": {
     "@nuxt/module-builder": "1.0.2",

package/dist/module.mjs

@@ -7,7 +7,7 @@ import { defu } from 'defu';
 import { globSync } from 'tinyglobby';
 
 const name = "@hywax/cms";
-const version = "2.0.1";
+const version = "2.0.2";
 
 function createContext(options, nuxt) {
   const { resolve } = createResolver(import.meta.url);
@@ -149,7 +149,86 @@ const icons = {
   editLine: "i-lucide-pen-line"
 };
 
-function prepareMergeConfigs({ nuxt, options }) {
+async function buildComponentDependencyGraph(componentDir, componentPattern) {
+  const dependencyGraph = /* @__PURE__ */ new Map();
+  const componentFiles = globSync(["**/*.vue"], {
+    cwd: componentDir,
+    absolute: true
+  });
+  for (const componentFile of componentFiles) {
+    try {
+      const content = await readFile(componentFile, "utf-8");
+      const componentName = pascalCase(componentFile.split("/").pop().replace(".vue", ""));
+      const dependencies = /* @__PURE__ */ new Set();
+      const matches = content.matchAll(componentPattern);
+      for (const match of matches) {
+        const depName = match[1] || match[2];
+        if (depName && depName !== componentName) {
+          dependencies.add(depName);
+        }
+      }
+      dependencyGraph.set(componentName, dependencies);
+    } catch {
+    }
+  }
+  return dependencyGraph;
+}
+function resolveComponentDependencies(component, dependencyGraph, resolved = /* @__PURE__ */ new Set()) {
+  if (resolved.has(component)) {
+    return resolved;
+  }
+  resolved.add(component);
+  const dependencies = dependencyGraph.get(component);
+  if (dependencies) {
+    for (const dep of dependencies) {
+      resolveComponentDependencies(dep, dependencyGraph, resolved);
+    }
+  }
+  return resolved;
+}
+async function detectUsedComponents(dirs, prefix, componentDir, includeComponents) {
+  const detectedComponents = /* @__PURE__ */ new Set();
+  if (includeComponents && includeComponents.length > 0) {
+    for (const component of includeComponents) {
+      detectedComponents.add(component);
+    }
+  }
+  const componentPattern = new RegExp(`<(?:Lazy)?${prefix}([A-Z][a-zA-Z]+)|\\b(?:Lazy)?${prefix}([A-Z][a-zA-Z]+)\\b`, "g");
+  for (const dir of dirs) {
+    const appFiles = globSync(["**/*.{vue,ts,js,tsx,jsx}"], {
+      cwd: dir,
+      ignore: ["node_modules/**", ".nuxt/**", "dist/**"]
+    });
+    for (const file of appFiles) {
+      try {
+        const filePath = join(dir, file);
+        const content = await readFile(filePath, "utf-8");
+        const matches = content.matchAll(componentPattern);
+        for (const match of matches) {
+          const componentName = match[1] || match[2];
+          if (componentName) {
+            detectedComponents.add(componentName);
+          }
+        }
+      } catch {
+      }
+    }
+  }
+  if (detectedComponents.size === 0) {
+    return void 0;
+  }
+  const dependencyGraph = await buildComponentDependencyGraph(componentDir, componentPattern);
+  const allComponents = /* @__PURE__ */ new Set();
+  for (const component of detectedComponents) {
+    const resolved = resolveComponentDependencies(component, dependencyGraph);
+    for (const resolvedComponent of resolved) {
+      allComponents.add(resolvedComponent);
+    }
+  }
+  return allComponents;
+}
+
+async function prepareMergeConfigs({ nuxt, options, resolve }) {
   nuxt.options.experimental = defu(nuxt.options.experimental || {}, {
     typedPages: true
   });
@@ -219,12 +298,17 @@ function prepareMergeConfigs({ nuxt, options }) {
       }
     }
   });
+  const detectedComponents = await detectUsedComponents(
+    [resolve("./runtime/components"), resolve("./runtime/composables")],
+    "U",
+    resolve("./runtime/components")
+  );
   nuxt.options.ui = defu(nuxt.options.ui || {}, {
     colorMode: true,
     fonts: true,
     mdc: true,
     experimental: {
-      componentDetection: true
+      componentDetection: [...detectedComponents || []]
     }
   });
   nuxt.options.colorMode = defu(nuxt.options.colorMode || {}, {
@@ -455,85 +539,6 @@ const themeProse = {
   uploraImage: uploraImage
 };
 
-async function buildComponentDependencyGraph(componentDir, componentPattern) {
-  const dependencyGraph = /* @__PURE__ */ new Map();
-  const componentFiles = globSync(["**/*.vue"], {
-    cwd: componentDir,
-    absolute: true
-  });
-  for (const componentFile of componentFiles) {
-    try {
-      const content = await readFile(componentFile, "utf-8");
-      const componentName = pascalCase(componentFile.split("/").pop().replace(".vue", ""));
-      const dependencies = /* @__PURE__ */ new Set();
-      const matches = content.matchAll(componentPattern);
-      for (const match of matches) {
-        const depName = match[1] || match[2];
-        if (depName && depName !== componentName) {
-          dependencies.add(depName);
-        }
-      }
-      dependencyGraph.set(componentName, dependencies);
-    } catch {
-    }
-  }
-  return dependencyGraph;
-}
-function resolveComponentDependencies(component, dependencyGraph, resolved = /* @__PURE__ */ new Set()) {
-  if (resolved.has(component)) {
-    return resolved;
-  }
-  resolved.add(component);
-  const dependencies = dependencyGraph.get(component);
-  if (dependencies) {
-    for (const dep of dependencies) {
-      resolveComponentDependencies(dep, dependencyGraph, resolved);
-    }
-  }
-  return resolved;
-}
-async function detectUsedComponents(dirs, prefix, componentDir, includeComponents) {
-  const detectedComponents = /* @__PURE__ */ new Set();
-  if (includeComponents && includeComponents.length > 0) {
-    for (const component of includeComponents) {
-      detectedComponents.add(component);
-    }
-  }
-  const componentPattern = new RegExp(`<(?:Lazy)?${prefix}([A-Z][a-zA-Z]+)|\\b(?:Lazy)?${prefix}([A-Z][a-zA-Z]+)\\b`, "g");
-  for (const dir of dirs) {
-    const appFiles = globSync(["**/*.{vue,ts,js,tsx,jsx}"], {
-      cwd: dir,
-      ignore: ["node_modules/**", ".nuxt/**", "dist/**"]
-    });
-    for (const file of appFiles) {
-      try {
-        const filePath = join(dir, file);
-        const content = await readFile(filePath, "utf-8");
-        const matches = content.matchAll(componentPattern);
-        for (const match of matches) {
-          const componentName = match[1] || match[2];
-          if (componentName) {
-            detectedComponents.add(componentName);
-          }
-        }
-      } catch {
-      }
-    }
-  }
-  if (detectedComponents.size === 0) {
-    return void 0;
-  }
-  const dependencyGraph = await buildComponentDependencyGraph(componentDir, componentPattern);
-  const allComponents = /* @__PURE__ */ new Set();
-  for (const component of detectedComponents) {
-    const resolved = resolveComponentDependencies(component, dependencyGraph);
-    for (const resolvedComponent of resolved) {
-      allComponents.add(resolvedComponent);
-    }
-  }
-  return allComponents;
-}
-
 function getAppTemplates({ options, resolve, nuxt }) {
   const templates = [];
   let previousDetectedComponents;
@@ -759,7 +764,7 @@ const module$1 = defineNuxtModule({
   defaults: defaultModuleOptions,
   async setup(options, nuxt) {
     const context = createContext(options, nuxt);
-    prepareMergeConfigs(context);
+    await prepareMergeConfigs(context);
     prepareTemplates(context);
     prepareAutoImports(context);
     prepareServerRoutes(context);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hywax/cms",
   "type": "module",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Hywax CMS. ⚠️ This package is intended for internal use only.",
   "imports": {
     "#build/cms/*": "./.nuxt/cms/*.ts",