@nocobase/plugin-theme-editor 0.14.0-alpha.6 → 0.14.0-alpha.8

package/dist/externalVersion.js

@@ -1,12 +1,13 @@
 module.exports = {
-  "@nocobase/client": "0.14.0-alpha.6",
+  "@nocobase/client": "0.14.0-alpha.8",
   "react": "18.2.0",
   "antd": "5.8.6",
   "lodash": "4.17.21",
-  "@nocobase/server": "0.14.0-alpha.6",
+  "@nocobase/server": "0.14.0-alpha.8",
   "@ant-design/cssinjs": "1.13.2",
   "@ant-design/icons": "5.1.4",
-  "@nocobase/utils": "0.14.0-alpha.6",
+  "@nocobase/utils": "0.14.0-alpha.8",
   "react-i18next": "11.18.6",
+  "@nocobase/database": "0.14.0-alpha.8",
   "@emotion/css": "11.11.2"
 };

package/dist/locale/zh-CN.d.ts

@@ -15,7 +15,6 @@ declare const locale: {
     'Add new theme': string;
     'Edit based on current theme': string;
     'Create a brand new theme': string;
-    'Default theme of antd': string;
     Dark: string;
     Compact: string;
     'Compact dark': string;

package/dist/locale/zh-CN.js

@@ -37,8 +37,6 @@ const locale = {
   "Add new theme": "\u6DFB\u52A0\u65B0\u4E3B\u9898",
   "Edit based on current theme": "\u57FA\u4E8E\u5F53\u524D\u4E3B\u9898\u8FDB\u884C\u7F16\u8F91",
   "Create a brand new theme": "\u521B\u5EFA\u4E00\u4E2A\u5168\u65B0\u7684\u4E3B\u9898",
-  // 内置主题的名字
-  "Default theme of antd": "antd \u9ED8\u8BA4\u4E3B\u9898",
   Dark: "\u6697\u9ED1",
   Compact: "\u7D27\u51D1",
   "Compact dark": "\u7D27\u51D1\u6697\u9ED1",

package/dist/server/builtinThemes.d.ts

@@ -1,6 +1,6 @@
 import { ThemeItem } from '../types';
 /** antd 默认主题 */
-export declare const antd: Omit<ThemeItem, 'id'>;
+export declare const defaultTheme: Omit<ThemeItem, 'id'>;
 export declare const dark: Omit<ThemeItem, 'id'>;
 export declare const compact: Omit<ThemeItem, 'id'>;
 /** 同时包含 `紧凑` 和 `暗黑` 两种模式 */

package/dist/server/builtinThemes.js

@@ -17,18 +17,19 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var builtinThemes_exports = {};
 __export(builtinThemes_exports, {
-  antd: () => antd,
   compact: () => compact,
   compactDark: () => compactDark,
-  dark: () => dark
+  dark: () => dark,
+  defaultTheme: () => defaultTheme
 });
 module.exports = __toCommonJS(builtinThemes_exports);
-const antd = {
+const defaultTheme = {
   config: {
-    name: "Default theme of antd"
+    name: "Default"
   },
   optional: true,
-  isBuiltIn: true
+  isBuiltIn: true,
+  uid: "default"
 };
 const dark = {
   config: {
@@ -37,7 +38,8 @@ const dark = {
     algorithm: "darkAlgorithm"
   },
   optional: true,
-  isBuiltIn: true
+  isBuiltIn: true,
+  uid: "dark"
 };
 const compact = {
   config: {
@@ -46,7 +48,8 @@ const compact = {
     algorithm: "compactAlgorithm"
   },
   optional: true,
-  isBuiltIn: true
+  isBuiltIn: true,
+  uid: "compact"
 };
 const compactDark = {
   config: {
@@ -55,12 +58,13 @@ const compactDark = {
     algorithm: ["compactAlgorithm", "darkAlgorithm"]
   },
   optional: true,
-  isBuiltIn: true
+  isBuiltIn: true,
+  uid: "compact_dark"
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  antd,
   compact,
   compactDark,
-  dark
+  dark,
+  defaultTheme
 });

package/dist/server/migrations/202307250853-theme-editor.d.ts

@@ -0,0 +1,5 @@
+import { Migration } from '@nocobase/server';
+export default class ThemeEditorMigration extends Migration {
+    up(): Promise<void>;
+    down(): Promise<void>;
+}

package/dist/server/migrations/202307250853-theme-editor.js

@@ -0,0 +1,79 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var theme_editor_exports = {};
+__export(theme_editor_exports, {
+  default: () => ThemeEditorMigration
+});
+module.exports = __toCommonJS(theme_editor_exports);
+var import_server = require("@nocobase/server");
+var import_utils = require("@nocobase/utils");
+var import_builtinThemes = require("../builtinThemes");
+class ThemeEditorMigration extends import_server.Migration {
+  async up() {
+    const result = await this.app.version.satisfies("<0.14.0-alpha.8");
+    if (!result) {
+      return;
+    }
+    const repository = this.db.getRepository("themeConfig");
+    if (!repository) {
+      return;
+    }
+    const collection = this.db.getCollection("themeConfig");
+    await collection.sync();
+    const themes = {
+      [import_builtinThemes.defaultTheme.uid]: import_builtinThemes.defaultTheme,
+      [import_builtinThemes.dark.uid]: import_builtinThemes.dark,
+      [import_builtinThemes.compact.uid]: import_builtinThemes.compact,
+      [import_builtinThemes.compactDark.uid]: import_builtinThemes.compactDark
+    };
+    const items = await repository.find();
+    for (const item of items) {
+      if (item.uid) {
+        if (themes[item.uid]) {
+          delete themes[item.uid];
+        }
+        continue;
+      }
+      const config = item.get("config");
+      if (config.name === "Default theme of antd") {
+        item.set("uid", import_builtinThemes.defaultTheme.uid);
+        config.name = import_builtinThemes.defaultTheme.config.name;
+        item.set("config", config);
+        item.changed("config", true);
+        delete themes[import_builtinThemes.defaultTheme.uid];
+      } else if (config.name === import_builtinThemes.dark.config.name) {
+        item.set("uid", import_builtinThemes.dark.uid);
+        delete themes[import_builtinThemes.dark.uid];
+      } else if (config.name === import_builtinThemes.compact.config.name) {
+        item.set("uid", import_builtinThemes.compact.uid);
+        delete themes[import_builtinThemes.compact.uid];
+      } else if (config.name === import_builtinThemes.compactDark.config.name) {
+        item.set("uid", import_builtinThemes.compactDark.uid);
+        delete themes[import_builtinThemes.compactDark.uid];
+      } else {
+        item.set("uid", (0, import_utils.uid)());
+      }
+      await item.save();
+    }
+    if (Object.values(themes).length > 0) {
+      await repository.create({ values: Object.values(themes) });
+    }
+  }
+  async down() {
+  }
+}

package/dist/server/plugin.d.ts

@@ -2,7 +2,7 @@ import { InstallOptions, Plugin } from '@nocobase/server';
 export declare class ThemeEditorPlugin extends Plugin {
     theme: any;
     afterAdd(): void;
-    beforeLoad(): void;
+    beforeLoad(): Promise<void>;
     load(): Promise<void>;
     install(options?: InstallOptions): Promise<void>;
     afterEnable(): Promise<void>;

package/dist/server/plugin.js

@@ -22,12 +22,20 @@ __export(plugin_exports, {
 });
 module.exports = __toCommonJS(plugin_exports);
 var import_server = require("@nocobase/server");
+var import_path = require("path");
 var import_builtinThemes = require("./builtinThemes");
 class ThemeEditorPlugin extends import_server.Plugin {
   theme;
   afterAdd() {
   }
-  beforeLoad() {
+  async beforeLoad() {
+    this.db.addMigrations({
+      namespace: "theme-editor",
+      directory: (0, import_path.resolve)(__dirname, "./migrations"),
+      context: {
+        plugin: this
+      }
+    });
   }
   async load() {
     this.db.collection({
@@ -46,10 +54,14 @@ class ThemeEditorPlugin extends import_server.Plugin {
         {
           type: "boolean",
           name: "isBuiltIn"
+        },
+        {
+          type: "uid",
+          name: "uid"
         }
       ]
     });
-    this.app.acl.allow("themeConfig", "list", "loggedIn");
+    this.app.acl.allow("themeConfig", "list", "public");
     this.app.acl.registerSnippet({
       name: `pm.${this.name}.themeConfig`,
       actions: ["themeConfig:*"]
@@ -62,7 +74,7 @@ class ThemeEditorPlugin extends import_server.Plugin {
     }
     if (await themeRepo.count() === 0) {
       await themeRepo.create({
-        values: [import_builtinThemes.antd, import_builtinThemes.dark, import_builtinThemes.compact, import_builtinThemes.compactDark]
+        values: [import_builtinThemes.defaultTheme, import_builtinThemes.dark, import_builtinThemes.compact, import_builtinThemes.compactDark]
       });
     }
   }

package/dist/types.d.ts

@@ -10,6 +10,7 @@ export interface ThemeItem {
     /** 主题是否可选 */
     optional: boolean;
     isBuiltIn?: boolean;
+    uid?: string;
 }
 export type Theme = {
     name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-theme-editor",
-  "version": "0.14.0-alpha.6",
+  "version": "0.14.0-alpha.8",
   "main": "dist/server/index.js",
   "displayName": "Theme editor",
   "displayName.zh-CN": "主题编辑器",
@@ -30,5 +30,5 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "7f2858222231c207030b57704a0bb6ebc98e4e45"
+  "gitHead": "59c82fef6e34707802b5841f5ec4d9b3b6b68abb"
 }