@hywax/cms 1.2.0 → 1.3.0

package/.nuxt/cms/config.ts

@@ -0,0 +1,7 @@
+const cmsConfig = {
+  "name": "cms",
+  "uploraUrl": "http://uplora.ru",
+  "fluxorUrl": "https://fluxor.uplora.ru"
+} as const
+
+export const getCmsConfig = () => cmsConfig

package/dist/module.json

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

package/dist/module.mjs

@@ -1,4 +1,4 @@
-import { createResolver, addComponentsDir, addPlugin, addImports, addImportsDir, addServerImports, addServerImportsDir, hasNuxtModule, installModule, addServerHandler, addTypeTemplate, addTemplate, addServerTemplate, defineNuxtModule } from '@nuxt/kit';
+import { createResolver, addComponentsDir, addPlugin, addImports, addImportsDir, addServerImports, addServerImportsDir, addServerHandler, addTypeTemplate, addTemplate, addServerTemplate, defineNuxtModule } from '@nuxt/kit';
 import { fileURLToPath } from 'node:url';
 import { dirname, join } from 'pathe';
 import { defu } from 'defu';
@@ -6,7 +6,7 @@ import { snakeCase, kebabCase } from 'scule';
 import { readFile, writeFile } from 'node:fs/promises';
 
 const name = "@hywax/cms";
-const version = "1.2.0";
+const version = "1.3.0";
 
 function createContext(options, nuxt) {
   const { resolve } = createResolver(import.meta.url);
@@ -53,6 +53,7 @@ function transformHttpCodes(httpCodes) {
 }
 
 function prepareAutoImports({ resolve, options, nuxt }) {
+  const cmsConfigPath = resolve(nuxt.options.buildDir, "cms/config");
   const httpCodesPath = resolve(nuxt.options.buildDir, "cms/http-codes");
   const httpCodesImports = transformHttpCodes(options.httpCodes).map(({ code }) => ({ name: code, from: httpCodesPath }));
   addComponentsDir({
@@ -70,7 +71,8 @@ function prepareAutoImports({ resolve, options, nuxt }) {
   addPlugin(resolve("./runtime/plugins/api"));
   addPlugin(resolve("./runtime/plugins/zod"));
   addImports([
-    ...httpCodesImports
+    ...httpCodesImports,
+    { name: "getCmsConfig", from: cmsConfigPath }
     // { name: 'docToMarkdown', from: resolve('./runtime/editor/markdown') },
     // { name: 'markdownToDoc', from: resolve('./runtime/editor/markdown') },
   ]);
@@ -79,7 +81,8 @@ function prepareAutoImports({ resolve, options, nuxt }) {
     resolve("./runtime/composables")
   ]);
   addServerImports([
-    ...httpCodesImports
+    ...httpCodesImports,
+    { name: "getCmsConfig", from: cmsConfigPath }
     // { name: 'docToMarkdown', from: resolve('./runtime/editor/markdown') },
     // { name: 'markdownToDoc', from: resolve('./runtime/editor/markdown') },
   ]);
@@ -110,21 +113,6 @@ async function prepareGenerateEnv({ nuxt }) {
   }
 }
 
-async function prepareInstallModules(_context) {
-  if (!hasNuxtModule("@nuxt/ui")) {
-    await installModule("@nuxt/ui");
-  }
-  if (!hasNuxtModule("@nuxtjs/mdc")) {
-    await installModule("@nuxtjs/mdc");
-  }
-  if (!hasNuxtModule("@vueuse/nuxt")) {
-    await installModule("@vueuse/nuxt");
-  }
-  if (!hasNuxtModule("nuxt-auth-utils")) {
-    await installModule("nuxt-auth-utils");
-  }
-}
-
 const icons = {
   calendar: "lucide:calendar",
   sort: "lucide:arrow-down-up",
@@ -161,6 +149,9 @@ function prepareMergeConfigs({ nuxt, options }) {
   nuxt.options.experimental = defu(nuxt.options.experimental || {}, {
     typedPages: true
   });
+  nuxt.options.future = defu(nuxt.options.future || {}, {
+    compatibilityVersion: 5
+  });
   nuxt.options.runtimeConfig.public = defu(nuxt.options.runtimeConfig.public || {}, {
     fluxorUrl: options.fluxorUrl,
     version: "develop"
@@ -208,7 +199,7 @@ function prepareMergeConfigs({ nuxt, options }) {
     fonts: true
   });
   nuxt.options.colorMode = defu(nuxt.options.colorMode || {}, {
-    storageKey: `${options.name}-color-mode`
+    storageKey: `${options.name}:color-mode`
   });
   nuxt.options.mdc = defu(nuxt.options.mdc || {}, {
     components: {
@@ -217,7 +208,7 @@ function prepareMergeConfigs({ nuxt, options }) {
       }
     }
   });
-  nuxt.options.auth = defu(nuxt.options.auth || {}, {
+  nuxt.options.runtimeConfig.session = defu(nuxt.options.runtimeConfig.session || {}, {
     name: `${options.name}-session`
   });
   nuxt.options.runtimeConfig.uplora = defu(nuxt.options.runtimeConfig.uplora || {}, {
@@ -452,6 +443,20 @@ export {}
 `;
     }
   });
+  templates.push({
+    filename: "cms/config.ts",
+    write: true,
+    getContents: () => {
+      const config = {
+        name: options.name,
+        uploraUrl: options.uploraUrl,
+        fluxorUrl: options.fluxorUrl
+      };
+      return `const cmsConfig = ${JSON.stringify(config, null, 2)} as const
+
+export const getCmsConfig = () => cmsConfig`;
+    }
+  });
   return templates;
 }
 function getServerTemplates(_context) {
@@ -483,11 +488,16 @@ const module$1 = defineNuxtModule({
     version,
     configKey: "cms"
   },
+  moduleDependencies: {
+    "@nuxt/ui": {},
+    "@nuxtjs/mdc": {},
+    "@vueuse/nuxt": {},
+    "nuxt-auth-utils": {}
+  },
   defaults: defaultModuleOptions,
   async setup(options, nuxt) {
     const context = createContext(options, nuxt);
     prepareMergeConfigs(context);
-    await prepareInstallModules();
     prepareTemplates(context);
     prepareAutoImports(context);
     prepareServerRoutes(context);

package/dist/runtime/composables/useTable.js

@@ -59,12 +59,12 @@ export default function useTable(initialFilters, options) {
     filters,
     updateFilters
   } = useTableFilters(initialFilters, options);
-  const { sorting } = useTableSort(options?.query?.enabled ?? true);
+  const { sort, sorting } = useTableSort();
   const { pagination } = useTablePagination(options);
   const query = computed(() => {
     return {
       ...filters.value,
-      ...sorting.value,
+      ...sort.value,
       ...pagination.value
     };
   });

package/dist/runtime/utils/storage.js

@@ -1,5 +1,6 @@
+import { getCmsConfig } from "#imports";
 import { kebabCase } from "scule";
-const storagePrefix = "cms:";
+const storagePrefix = `${getCmsConfig().name}:`;
 export const getCmsStorageKey = (key) => `${storagePrefix}${kebabCase(key)}`;
 export function clearCmsStorage() {
   for (const key in localStorage) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hywax/cms",
   "type": "module",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Hywax CMS. ⚠️ This package is intended for internal use only.",
   "repository": {
     "type": "git",