@hywax/cms 3.3.0 → 3.4.1

package/dist/module.json

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

package/dist/module.mjs

@@ -7,7 +7,7 @@ import { pascalCase, kebabCase, camelCase } from 'scule';
 import { globSync } from 'tinyglobby';
 
 const name = "@hywax/cms";
-const version = "3.3.0";
+const version = "3.4.1";
 
 function createContext(options, nuxt) {
   const { resolve } = createResolver(import.meta.url);
@@ -18,7 +18,8 @@ function createContext(options, nuxt) {
     resolve,
     distDir,
     runtimeDir,
-    nuxt
+    nuxt,
+    detectedComponents: /* @__PURE__ */ new Set()
   };
 }
 
@@ -92,7 +93,7 @@ const defaultModuleOptions = {
   }
 };
 
-function prepareAutoImports({ resolve, options, nuxt }) {
+async function prepareAutoImports({ resolve, options, nuxt }) {
   const cmsConfigPath = resolve(nuxt.options.buildDir, "cms/config");
   const httpStatusesPath = resolve(nuxt.options.buildDir, "cms/http-statuses");
   addComponentsDir({
@@ -218,7 +219,7 @@ function resolveComponentDependencies(component, dependencyGraph, resolved = /*
   }
   return resolved;
 }
-async function detectUsedComponents(dirs, prefix, componentDir, includeComponents) {
+async function detectUsedComponents({ dirs, prefix, componentDir, includeComponents = [], allowComponents = [] }) {
   const detectedComponents = /* @__PURE__ */ new Set();
   if (includeComponents && includeComponents.length > 0) {
     for (const component of includeComponents) {
@@ -226,8 +227,9 @@ async function detectUsedComponents(dirs, prefix, componentDir, includeComponent
     }
   }
   const componentPattern = new RegExp(`<(?:Lazy)?${prefix}([A-Z][a-zA-Z]+)|\\b(?:Lazy)?${prefix}([A-Z][a-zA-Z]+)\\b`, "g");
+  const filesPattern = allowComponents.length ? `**/(${allowComponents.join("|")}).{vue,ts,js,tsx,jsx}` : "**/*.{vue,ts,js,tsx,jsx}";
   for (const dir of dirs) {
-    const appFiles = globSync(["**/*.{vue,ts,js,tsx,jsx}"], {
+    const appFiles = globSync([filesPattern], {
       cwd: dir,
       ignore: ["node_modules/**", ".nuxt/**", "dist/**"]
     });
@@ -252,7 +254,7 @@ async function detectUsedComponents(dirs, prefix, componentDir, includeComponent
   const dependencyGraph = await buildComponentDependencyGraph(componentDir, componentPattern);
   const allComponents = /* @__PURE__ */ new Set();
   for (const component of detectedComponents) {
-    const resolved = resolveComponentDependencies(component, dependencyGraph);
+    const resolved = resolveComponentDependencies(component, dependencyGraph, /* @__PURE__ */ new Set());
     for (const resolvedComponent of resolved) {
       allComponents.add(resolvedComponent);
     }
@@ -260,7 +262,7 @@ async function detectUsedComponents(dirs, prefix, componentDir, includeComponent
   return allComponents;
 }
 
-async function prepareMergeConfigs({ nuxt, options, resolve }) {
+async function prepareMergeConfigs({ nuxt, options, resolve, detectedComponents: contextDetectedComponents }) {
   nuxt.options.experimental = defu(nuxt.options.experimental || {}, {
     typedPages: true
   });
@@ -330,11 +332,12 @@ async function prepareMergeConfigs({ nuxt, options, resolve }) {
       }
     }
   });
-  const detectedComponents = await detectUsedComponents(
-    [resolve("./runtime/components"), resolve("./runtime/composables")],
-    "U",
-    resolve("./runtime/components")
-  );
+  const detectedComponents = await detectUsedComponents({
+    dirs: [resolve("./runtime/components"), resolve("./runtime/composables")],
+    prefix: "U",
+    componentDir: resolve("./runtime/components"),
+    allowComponents: [...contextDetectedComponents]
+  });
   nuxt.options.ui = defu(nuxt.options.ui || {}, {
     colorMode: true,
     fonts: true,
@@ -363,7 +366,7 @@ async function prepareMergeConfigs({ nuxt, options, resolve }) {
   nuxt.options.vite = defu(nuxt.options.vite || {}, {
     optimizeDeps: {
       include: [
-        "@unovis/vue",
+        ...options.unovis ? ["@unovis/vue"] : [],
         "@tanstack/vue-table",
         "@uplora/formats",
         "@nuxt/ui/utils/editor",
@@ -395,7 +398,7 @@ async function prepareMergeConfigs({ nuxt, options, resolve }) {
   });
 }
 
-function prepareServerRoutes({ resolve }) {
+async function prepareServerRoutes({ resolve }) {
   addServerHandler({
     route: "/api/_uplora",
     method: "post",
@@ -566,7 +569,7 @@ const themeProse = {
   uploraImage: uploraImage
 };
 
-function getAppTemplates({ options, resolve, nuxt }) {
+async function getAppTemplates({ options, resolve, nuxt, detectedComponents: contextDetectedComponents }) {
   const templates = [];
   let previousDetectedComponents;
   function writeThemeTemplate(theme2, path) {
@@ -604,15 +607,15 @@ function getAppTemplates({ options, resolve, nuxt }) {
     }
   }
   async function generateSources() {
-    const sources = [];
+    const sources2 = [];
     const layers = getLayerDirectories(nuxt).map((layer) => layer.app);
     if (options.componentDetection) {
-      const detectedComponents = await detectUsedComponents(
-        layers,
-        options.componentsPrefix,
-        resolve("./runtime/components"),
-        Array.isArray(options.componentDetection) ? options.componentDetection : void 0
-      );
+      const detectedComponents = await detectUsedComponents({
+        dirs: layers,
+        prefix: options.componentsPrefix,
+        componentDir: resolve("./runtime/components"),
+        includeComponents: Array.isArray(options.componentDetection) ? options.componentDetection : void 0
+      });
       if (detectedComponents && detectedComponents.size > 0) {
         if (previousDetectedComponents) {
           const newComponents = Array.from(detectedComponents).filter(
@@ -626,26 +629,27 @@ function getAppTemplates({ options, resolve, nuxt }) {
         }
         previousDetectedComponents = detectedComponents;
         if (options.prose?.enabled) {
-          sources.push('@source "./cms/prose";');
+          sources2.push('@source "./cms/prose";');
         }
         for (const component of detectedComponents) {
           const kebabComponent = kebabCase(component);
           const camelComponent = camelCase(component);
           if (theme[camelComponent]) {
-            sources.push(`@source "./cms/${kebabComponent}.ts";`);
+            sources2.push(`@source "./cms/${kebabComponent}.ts";`);
           }
+          contextDetectedComponents.add(component);
         }
       } else {
         if (!previousDetectedComponents || previousDetectedComponents.size > 0) {
           logger.info("CMS detected no components in use, including all components");
         }
         previousDetectedComponents = /* @__PURE__ */ new Set();
-        sources.push('@source "./cms";');
+        sources2.push('@source "./cms";');
       }
     } else {
-      sources.push('@source "./cms";');
+      sources2.push('@source "./cms";');
     }
-    return sources.join("\n");
+    return sources2.join("\n");
   }
   if (options.prose?.enabled) {
     templates.push({
@@ -656,11 +660,11 @@ function getAppTemplates({ options, resolve, nuxt }) {
     writeThemeTemplate(themeProse, "prose");
   }
   writeThemeTemplate(theme);
+  const sources = await generateSources();
   templates.push({
     filename: "cms.css",
     write: true,
     getContents: async () => {
-      const sources = await generateSources();
       return `${sources}
 ${options.unovis ? `
     @layer components {
@@ -753,8 +757,8 @@ function getServerTemplates(_context) {
   const templates = [];
   return templates;
 }
-function prepareTemplates(context) {
-  const appTemplates = getAppTemplates(context);
+async function prepareTemplates(context) {
+  const appTemplates = await getAppTemplates(context);
   const serverTemplates = getServerTemplates();
   for (const template of appTemplates) {
     if (template.filename.endsWith(".d.ts")) {
@@ -794,11 +798,16 @@ const module$1 = defineNuxtModule({
   defaults: defaultModuleOptions,
   async setup(options, nuxt) {
     const context = createContext(options, nuxt);
-    await prepareMergeConfigs(context);
-    prepareTemplates(context);
-    prepareAutoImports(context);
-    prepareServerRoutes(context);
-    await prepareGenerateEnv(context);
+    const prepareHandlers = [
+      prepareTemplates,
+      prepareMergeConfigs,
+      prepareAutoImports,
+      prepareServerRoutes,
+      prepareGenerateEnv
+    ];
+    for (const handler of prepareHandlers) {
+      await handler(context);
+    }
   }
 });
 

package/package.json

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