@hywax/cms 3.4.0 → 3.4.2

package/.nuxt/cms/prose/uplora-image.ts

@@ -1,5 +1,5 @@
 export default {
   "slots": {
-    "base": ""
+    "base": "rounded-lg"
   }
 }

package/.nuxt/cms.css

@@ -4,9 +4,10 @@
 @source "./cms/form-slug.ts";
 @source "./cms/form-uplora-image.ts";
 @source "./cms/uplora-image.ts";
+@source "./cms/button-delete-confirm.ts";
+@source "./cms/modal-confirm.ts";
 @source "./cms/form-seo.ts";
 @source "./cms/table-panel.ts";
-@source "./cms/modal-confirm.ts";
 @source "./cms/table-search-input.ts";
 
     

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@hywax/cms",
-  "version": "3.4.0",
+  "version": "3.4.2",
   "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.4.0";
+const version = "3.4.2";
 
 function createContext(options, nuxt) {
   const { resolve } = createResolver(import.meta.url);
@@ -219,7 +219,7 @@ function resolveComponentDependencies(component, dependencyGraph, resolved = /*
   }
   return resolved;
 }
-async function detectUsedComponents([dirs, type], 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) {
@@ -227,10 +227,16 @@ async function detectUsedComponents([dirs, type], prefix, componentDir, includeC
     }
   }
   const componentPattern = new RegExp(`<(?:Lazy)?${prefix}([A-Z][a-zA-Z]+)|\\b(?:Lazy)?${prefix}([A-Z][a-zA-Z]+)\\b`, "g");
-  if (type === "files") {
-    for (const file of dirs) {
+  const filesPattern = allowComponents.length ? `**/(${allowComponents.join("|")}).{vue,ts,js,tsx,jsx}` : "**/*.{vue,ts,js,tsx,jsx}";
+  for (const dir of dirs) {
+    const appFiles = globSync([filesPattern], {
+      cwd: dir,
+      ignore: ["node_modules/**", ".nuxt/**", "dist/**"]
+    });
+    for (const file of appFiles) {
       try {
-        const content = await readFile(file, "utf-8");
+        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];
@@ -241,27 +247,6 @@ async function detectUsedComponents([dirs, type], prefix, componentDir, includeC
       } catch {
       }
     }
-  } else if (type === "dirs") {
-    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;
@@ -269,7 +254,7 @@ async function detectUsedComponents([dirs, type], prefix, componentDir, includeC
   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);
     }
@@ -347,11 +332,12 @@ async function prepareMergeConfigs({ nuxt, options, resolve, detectedComponents:
       }
     }
   });
-  const detectedComponents = await detectUsedComponents(
-    [[...contextDetectedComponents].map((component) => resolve(`./runtime/components/${component}.vue`)), "files"],
-    "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,
@@ -574,7 +560,7 @@ const theme = {
 
 const uploraImage = {
   slots: {
-    base: ""
+    base: "rounded-lg"
   }
 };
 
@@ -624,12 +610,12 @@ async function getAppTemplates({ options, resolve, nuxt, detectedComponents: con
     const sources2 = [];
     const layers = getLayerDirectories(nuxt).map((layer) => layer.app);
     if (options.componentDetection) {
-      const detectedComponents = await detectUsedComponents(
-        [layers, "dirs"],
-        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(
@@ -650,8 +636,8 @@ async function getAppTemplates({ options, resolve, nuxt, detectedComponents: con
           const camelComponent = camelCase(component);
           if (theme[camelComponent]) {
             sources2.push(`@source "./cms/${kebabComponent}.ts";`);
-            contextDetectedComponents.add(component);
           }
+          contextDetectedComponents.add(component);
         }
       } else {
         if (!previousDetectedComponents || previousDetectedComponents.size > 0) {

package/dist/runtime/components/ButtonDeleteConfirm.d.vue.ts

@@ -4,10 +4,10 @@ import type { ComponentProps } from 'vue-component-type-helpers';
 import type { ComponentConfig } from '../types';
 import type { ModalConfirmEmits, ModalConfirmProps } from './ModalConfirm.vue';
 import theme from '#build/cms/button-delete-confirm';
-import ModalConfirm from './ModalConfirm.vue';
+import CModalConfirm from './ModalConfirm.vue';
 type ButtonDelete = ComponentConfig<typeof theme, AppConfig, 'buttonDelete'>;
 export interface ButtonDeleteProps extends Pick<ModalConfirmProps, 'onConfirm'> {
-    modalProps?: Omit<ModalProps & ComponentProps<typeof ModalConfirm>, 'title' | 'message' | 'onConfirm' | 'confirmButton'>;
+    modalProps?: Omit<ModalProps & ComponentProps<typeof CModalConfirm>, 'title' | 'message' | 'onConfirm' | 'confirmButton'>;
     confirmText?: string;
     confirmLabel?: string;
     title?: string;

package/dist/runtime/components/ButtonDeleteConfirm.vue

@@ -24,7 +24,7 @@ import theme from "#build/cms/button-delete-confirm";
 import { useAppConfig, useOverlay } from "#imports";
 import { computed } from "vue";
 import { tv } from "../tv";
-import ModalConfirm from "./ModalConfirm.vue";
+import CModalConfirm from "./ModalConfirm.vue";
 </script>
 
 <script setup>
@@ -46,7 +46,7 @@ const props = defineProps({
 });
 defineEmits(["confirm", "close"]);
 const appConfig = useAppConfig();
-const modal = useOverlay().create(ModalConfirm);
+const modal = useOverlay().create(CModalConfirm);
 function handleDeleteClick() {
   return modal.open({
     ...props.modalProps,

package/dist/runtime/components/ButtonDeleteConfirm.vue.d.ts

@@ -4,10 +4,10 @@ import type { ComponentProps } from 'vue-component-type-helpers';
 import type { ComponentConfig } from '../types';
 import type { ModalConfirmEmits, ModalConfirmProps } from './ModalConfirm.vue';
 import theme from '#build/cms/button-delete-confirm';
-import ModalConfirm from './ModalConfirm.vue';
+import CModalConfirm from './ModalConfirm.vue';
 type ButtonDelete = ComponentConfig<typeof theme, AppConfig, 'buttonDelete'>;
 export interface ButtonDeleteProps extends Pick<ModalConfirmProps, 'onConfirm'> {
-    modalProps?: Omit<ModalProps & ComponentProps<typeof ModalConfirm>, 'title' | 'message' | 'onConfirm' | 'confirmButton'>;
+    modalProps?: Omit<ModalProps & ComponentProps<typeof CModalConfirm>, 'title' | 'message' | 'onConfirm' | 'confirmButton'>;
     confirmText?: string;
     confirmLabel?: string;
     title?: string;

package/dist/runtime/components/EditorFull.vue

@@ -72,7 +72,7 @@
 }"
     >
       <template #link>
-        <EditorLinkPopover :editor="editor" />
+        <CEditorLinkPopover :editor="editor" />
       </template>
     </UEditorToolbar>
 
@@ -93,7 +93,7 @@ import { useEditorDragHandle } from "../composables/useEditorDragHandle";
 import { useEditorSuggestions } from "../composables/useEditorSuggestions";
 import { useEditorToolbar } from "../composables/useEditorToolbar";
 import { UploraImage as UploraImageExtension, UploraImageHandlers } from "../editor/uplora-image/EditorUploraImage";
-import EditorLinkPopover from "./EditorLinkPopover.vue";
+import CEditorLinkPopover from "./EditorLinkPopover.vue";
 </script>
 
 <script setup>

package/dist/runtime/components/FormUploraImage.vue

@@ -27,7 +27,7 @@
                   @click="resetState()"
                 />
 
-                <ButtonDeleteConfirm
+                <CButtonDeleteConfirm
                   color="error"
                   size="sm"
                   variant="ghost"
@@ -103,7 +103,7 @@ import { imagesExtensions } from "@uplora/formats";
 import { computed, useId } from "vue";
 import { z } from "zod";
 import { tv } from "../tv";
-import ButtonDeleteConfirm from "./ButtonDeleteConfirm.vue";
+import CButtonDeleteConfirm from "./ButtonDeleteConfirm.vue";
 </script>
 
 <script setup>

package/dist/runtime/components/TablePanel.vue

@@ -16,18 +16,18 @@
         <template #right>
           <slot name="toolbar-right" />
 
-          <TableColumnVisibility
+          <CTableColumnVisibility
             v-model:visibility="columnVisibility"
             v-model:order="columnOrder"
             :table="tableRef?.tableApi"
             :storage-key="storageKey"
           />
-          <TableColumnSorting
+          <CTableColumnSorting
             :model-value="sorting"
             :table="tableRef?.tableApi"
             @update:model-value="emit('update:sorting', $event)"
           />
-          <TableFilters
+          <CTableFilters
             v-if="props.filtersSource"
             :model-value="props.filters"
             :schema="props.filtersSchema"
@@ -43,7 +43,7 @@
             >
               <slot :name="pageTableSlot" v-bind="slotData" />
             </template>
-          </TableFilters>
+          </CTableFilters>
         </template>
       </UDashboardToolbar>
     </template>
@@ -137,9 +137,9 @@ import { useForwardProps } from "reka-ui";
 import { computed, h, ref, useTemplateRef, watch } from "vue";
 import { tv } from "../tv";
 import CModalConfirm from "./ModalConfirm.vue";
-import TableColumnSorting from "./TableColumnSorting.vue";
-import TableColumnVisibility from "./TableColumnVisibility.vue";
-import TableFilters from "./TableFilters.vue";
+import CTableColumnSorting from "./TableColumnSorting.vue";
+import CTableColumnVisibility from "./TableColumnVisibility.vue";
+import CTableFilters from "./TableFilters.vue";
 </script>
 
 <script setup>

package/dist/runtime/components/TablePreviewLink.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="relative flex items-center gap-2">
     <div v-if="image" class="overflow-hidden rounded-lg shrink-0">
-      <UploraImage
+      <CUploraImage
         v-bind="image"
         :sizes="[{ width: 32, height: 32, descriptor: '1x' }]"
         :ui="{ picture: 'aspect-square' }"
@@ -27,7 +27,7 @@
 </template>
 
 <script setup>
-import UploraImage from "./UploraImage.vue";
+import CUploraImage from "./UploraImage.vue";
 defineProps({
   to: { type: null, required: false },
   target: { type: [String, Object, null], required: false },

package/package.json

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