Merge branch 'main' of https://github.com/halo-sigs/plugin-template

.github/workflows/workflow.yaml

@@ -35,7 +35,7 @@ jobs:
         name: Setup pnpm cache
         with:
           path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/admin-frontend/pnpm-lock.yaml') }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/console/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
       - name: Install Frontend Dependencies

.gitignore

@@ -69,3 +69,5 @@ nbdist/
 application-local.yml
 application-local.yaml
 application-local.properties
+
+/admin-frontend/node_modules/

README.md

@@ -8,7 +8,7 @@ Halo 2.0 插件开发快速开始模板（WIP）
 .
 ├── LICENSE
 ├── README.md
-├── admin-frontend
+├── console 
 │   ├── README.md
 │   ├── env.d.ts
 │   ├── package.json
@@ -18,7 +18,7 @@ Halo 2.0 插件开发快速开始模板（WIP）
 │   │   │   └── logo.svg
 │   │   ├── components
 │   │   │   └── HelloWorld.vue
-│   │   ├── index.ts                                        # Admin Frontend Entry file
+│   │   ├── index.ts                                        # Console Frontend Entry file
 │   │   ├── styles
 │   │   │   └── index.css
 │   │   └── views
@@ -48,8 +48,8 @@ Halo 2.0 插件开发快速开始模板（WIP）
         │               ├── ApplesController.java
         │               └── TemplatePlugin.java                     # Main Class
         └── resources
-            ├── admin
-            │   ├── main.js                                         # Admin Frontend Entry file(production build)
+            ├── console
+            │   ├── main.js                                         # Console Frontend Entry file(production build)
             │   └── style.css
             ├── extensions
             │   ├── apple.yaml                                  
@@ -65,7 +65,7 @@ Halo 2.0 插件开发快速开始模板（WIP）
 
 对于以上目录树：
 
-- `admin-frontend`： 插件前端项目目录，为一个 Vue 项目，技术栈为 Vue 3 + Vite，其中已经预配置好了构建策略。
+- `console`： 插件前端项目目录，为一个 Vue 项目，技术栈为 Vue 3 + Vite，其中已经预配置好了构建策略。
 - `build`：插件后端构建目录，`build/libs` 下的 jar 包为最终插件产物。
 - `lib`：为临时的 Halo 依赖，为了使用 Halo 中提供的类在 `build.gradle`
   中作为编译时依赖引入 `compileOnly files("lib/halo-2.0.0-SNAPSHOT-plain.jar")`
@@ -184,7 +184,7 @@ Halo 2.0 插件开发快速开始模板（WIP）
   ```
 
 - `resources`：目录为插件资源目录
-    - `admin` 目录下为插件前端打包后的产物存放目录，固定为 `main.js` 和 `style.css `两个文件
+    - `console` 目录下为插件前端打包后的产物存放目录，固定为 `main.js` 和 `style.css `两个文件
     - `extensions` 存放自定义模型资源配置
     - `plugin.yaml`为插件描述配置
     - `static` 为静态资源示例目录
@@ -283,11 +283,11 @@ mkdir ./halo-dev/dev-plugins # 存放插件源码
 ```bash
 cd ./halo-dev
 
-git clone https://github.com/halo-dev/halo --branch next
+git clone https://github.com/halo-dev/halo --branch main
 ```
 
 ```bash
-git clone https://github.com/halo-dev/halo-admin --branch next
+git clone https://github.com/halo-dev/console --branch main
 ```
 
 ```bash
@@ -360,10 +360,10 @@ cd ./halo-dev/halo
 
 或者在 IntelliJ IDEA 中运行 Application 启动类。但注意需要配置好 `spring.profiles.active` 为 dev。
 
-### 启动 Halo Admin
+### 启动 Console 
 
 ```bash
-cd ./halo-dev/halo-admin
+cd ./halo-dev/console
 
 pnpm install
 

build.gradle

@@ -51,7 +51,7 @@ test {
 }
 
 node {
-    nodeProjectDir = file("${project.projectDir}/admin-frontend")
+    nodeProjectDir = file("${project.projectDir}/console")
 }
 
 task buildFrontend(type: NpxTask) {

console/package.json

@@ -11,8 +11,8 @@
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore"
   },
   "dependencies": {
-    "@halo-dev/admin-shared": "*",
-    "@halo-dev/components": "*",
+    "@halo-dev/console-shared": "^0.0.0-alpha.5",
+    "@halo-dev/components": "^0.0.0-alpha.4",
     "vue": "^3.2.37"
   },
   "devDependencies": {

console/pnpm-lock.yaml

@@ -1,8 +1,8 @@
 lockfileVersion: 5.4
 
 specifiers:
-  '@halo-dev/admin-shared': '*'
-  '@halo-dev/components': '*'
+  '@halo-dev/components': ^0.0.0-alpha.4
+  '@halo-dev/console-shared': ^0.0.0-alpha.5
   '@rushstack/eslint-patch': ^1.1.4
   '@types/jsdom': ^16.2.14
   '@types/node': ^16.11.44
@@ -24,8 +24,8 @@ specifiers:
   vue-tsc: ^0.35.2
 
 dependencies:
-  '@halo-dev/admin-shared': 0.0.0-alpha.3_vue@3.2.37
-  '@halo-dev/components': 0.0.0-alpha.2_vue@3.2.37
+  '@halo-dev/components': 0.0.0-alpha.4_vue@3.2.37
+  '@halo-dev/console-shared': 0.0.0-alpha.5_vue@3.2.37
   vue: 3.2.37
 
 devDependencies:
@@ -342,6 +342,73 @@ packages:
       '@babel/helper-validator-identifier': 7.16.7
       to-fast-properties: 2.0.0
 
+  /@codemirror/autocomplete/6.3.0_ns4lkgy3plcpdn5wn7powl4wzy:
+    resolution: {integrity: sha512-4jEvh3AjJZTDKazd10J6ZsCIqaYxDMCeua5ouQxY8hlFIml+nr7le0SgBhT3SIytFBmdzPK3AUhXGuW3T79nVg==}
+    peerDependencies:
+      '@codemirror/language': ^6.0.0
+      '@codemirror/state': ^6.0.0
+      '@codemirror/view': ^6.0.0
+    dependencies:
+      '@codemirror/language': 6.2.1
+      '@codemirror/state': 6.1.2
+      '@codemirror/view': 6.3.0
+      '@lezer/common': 1.0.1
+    dev: false
+
+  /@codemirror/commands/6.1.1:
+    resolution: {integrity: sha512-ibDohwkk7vyu3VsnZNlQhwk0OETBtlkYV+6AHfn5Zgq0sxa+yGVX+apwtC3M4wh6AH7yU5si/NysoECs5EGS3Q==}
+    dependencies:
+      '@codemirror/language': 6.2.1
+      '@codemirror/state': 6.1.2
+      '@codemirror/view': 6.3.0
+      '@lezer/common': 1.0.1
+    dev: false
+
+  /@codemirror/language/6.2.1:
+    resolution: {integrity: sha512-MC3svxuvIj0MRpFlGHxLS6vPyIdbTr2KKPEW46kCoCXw2ktb4NTkpkPBI/lSP/FoNXLCBJ0mrnUi1OoZxtpW1Q==}
+    dependencies:
+      '@codemirror/state': 6.1.2
+      '@codemirror/view': 6.3.0
+      '@lezer/common': 1.0.1
+      '@lezer/highlight': 1.1.1
+      '@lezer/lr': 1.2.3
+      style-mod: 4.0.0
+    dev: false
+
+  /@codemirror/legacy-modes/6.1.0:
+    resolution: {integrity: sha512-V/PgGpndkZeTn3Hdlg/gd8MLFdyvTCIX+iwJzjUw5iNziWiNsAY8X0jvf7m3gSfxnKkNzmid6l0g4rYSpiDaCw==}
+    dependencies:
+      '@codemirror/language': 6.2.1
+    dev: false
+
+  /@codemirror/lint/6.0.0:
+    resolution: {integrity: sha512-nUUXcJW1Xp54kNs+a1ToPLK8MadO0rMTnJB8Zk4Z8gBdrN0kqV7uvUraU/T2yqg+grDNR38Vmy/MrhQN/RgwiA==}
+    dependencies:
+      '@codemirror/state': 6.1.2
+      '@codemirror/view': 6.3.0
+      crelt: 1.0.5
+    dev: false
+
+  /@codemirror/search/6.2.1:
+    resolution: {integrity: sha512-Q1JgUSBjQZRPIddlXzad/AVDigdhriLxQNFyP0gfrDTq6LDHNhr95U/tW3bpVssGenkaLzujtu/7XoK4kyvL3g==}
+    dependencies:
+      '@codemirror/state': 6.1.2
+      '@codemirror/view': 6.3.0
+      crelt: 1.0.5
+    dev: false
+
+  /@codemirror/state/6.1.2:
+    resolution: {integrity: sha512-Mxff85Hp5va+zuj+H748KbubXjrinX/k28lj43H14T2D0+4kuvEFIEIO7hCEcvBT8ubZyIelt9yGOjj2MWOEQA==}
+    dev: false
+
+  /@codemirror/view/6.3.0:
+    resolution: {integrity: sha512-jMN9OGKmzRPJ+kksfMrB5e/A9heQncirHsz8XNBpgEbYONCk5tWHMKVWKTNwznkUGD5mnigXI1i5YIcWpscSPg==}
+    dependencies:
+      '@codemirror/state': 6.1.2
+      style-mod: 4.0.0
+      w3c-keyname: 2.2.6
+    dev: false
+
   /@eslint/eslintrc/1.3.0:
     resolution: {integrity: sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -359,30 +426,28 @@ packages:
       - supports-color
     dev: true
 
-  /@halo-dev/admin-shared/0.0.0-alpha.3_vue@3.2.37:
-    resolution: {integrity: sha512-rizOLAzAcmcedZN9gwnhGFmKKf7p4byik7m68sqFFBGmFma0nxUtMf9YMjAEky85bCeeZApyVLB80Mxu1KGU9A==}
+  /@halo-dev/components/0.0.0-alpha.4_vue@3.2.37:
+    resolution: {integrity: sha512-1MK1I4WkumQ5PuS6IcfBWkikGXY+uh3WU+1beZT2mocXA2nLxOPF3tdxTI6Lp4Q8xMRTzuYhP2/guom4PYNZMA==}
     peerDependencies:
       vue: ^3.2.37
       vue-router: ^4.0.16
     dependencies:
-      '@halo-dev/api-client': 0.0.3
-      '@halo-dev/components': 0.0.0-alpha.2_vue@3.2.37
-      axios: 0.27.2
+      '@codemirror/commands': 6.1.1
+      '@codemirror/language': 6.2.1
+      '@codemirror/legacy-modes': 6.1.0
+      '@codemirror/state': 6.1.2
+      '@codemirror/view': 6.3.0
+      codemirror: 6.0.1
       vue: 3.2.37
-    transitivePeerDependencies:
-      - debug
     dev: false
 
-  /@halo-dev/api-client/0.0.3:
-    resolution: {integrity: sha512-ybtVcjeeFqOldPIKRrm3socfGtbSR5GL+MXVmkSJwD2fCwT9OiXEvs3cgceWceIZI0Ug7AEKwxbcO+ZfOmDlYA==}
-    dev: false
-
-  /@halo-dev/components/0.0.0-alpha.2_vue@3.2.37:
-    resolution: {integrity: sha512-0dfzvWLR83wv8AI59vrukExRS4xRtbKKEN9jOxuO83Lr/rlKuc36bQzUbWruHSI9Ceu+LflnPdbOWrjwWRZYKg==}
+  /@halo-dev/console-shared/0.0.0-alpha.5_vue@3.2.37:
+    resolution: {integrity: sha512-4i4OjzLTD80It1nStkEhxrO7CnLxhYEB/a/cWDMDmhcZPz7SCtNMWdFle8FzRxl2KpP5b+xojLCqjQEWxCrw6Q==}
     peerDependencies:
       vue: ^3.2.37
       vue-router: ^4.0.16
     dependencies:
+      '@halo-dev/components': 0.0.0-alpha.4_vue@3.2.37
       vue: 3.2.37
     dev: false
 
@@ -439,6 +504,22 @@ packages:
       '@jridgewell/sourcemap-codec': 1.4.13
     dev: true
 
+  /@lezer/common/1.0.1:
+    resolution: {integrity: sha512-8TR5++Q/F//tpDsLd5zkrvEX5xxeemafEaek7mUp7Y+bI8cKQXdSqhzTOBaOogETcMOVr0pT3BBPXp13477ciw==}
+    dev: false
+
+  /@lezer/highlight/1.1.1:
+    resolution: {integrity: sha512-duv9D23O9ghEDnnUDmxu+L8pJy4nYo4AbCOHIudUhscrLSazqeJeK1V50EU6ZufWF1zv0KJwu/frFRyZWXxHBQ==}
+    dependencies:
+      '@lezer/common': 1.0.1
+    dev: false
+
+  /@lezer/lr/1.2.3:
+    resolution: {integrity: sha512-qpB7rBzH8f6Mzjv2AVZRahcm+2Cf7nbIH++uXbvVOL1yIRvVWQ3HAM/saeBLCyz/togB7LGo76qdJYL1uKQlqA==}
+    dependencies:
+      '@lezer/common': 1.0.1
+    dev: false
+
   /@nodelib/fs.scandir/2.1.5:
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
@@ -926,15 +1007,7 @@ packages:
 
   /asynckit/0.4.0:
     resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
-
-  /axios/0.27.2:
-    resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
-    dependencies:
-      follow-redirects: 1.15.1
-      form-data: 4.0.0
-    transitivePeerDependencies:
-      - debug
-    dev: false
+    dev: true
 
   /balanced-match/1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
@@ -1029,6 +1102,18 @@ packages:
     resolution: {integrity: sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==}
     dev: true
 
+  /codemirror/6.0.1:
+    resolution: {integrity: sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==}
+    dependencies:
+      '@codemirror/autocomplete': 6.3.0_ns4lkgy3plcpdn5wn7powl4wzy
+      '@codemirror/commands': 6.1.1
+      '@codemirror/language': 6.2.1
+      '@codemirror/lint': 6.0.0
+      '@codemirror/search': 6.2.1
+      '@codemirror/state': 6.1.2
+      '@codemirror/view': 6.3.0
+    dev: false
+
   /color-convert/1.9.3:
     resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
     dependencies:
@@ -1055,6 +1140,7 @@ packages:
     engines: {node: '>= 0.8'}
     dependencies:
       delayed-stream: 1.0.0
+    dev: true
 
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
@@ -1066,6 +1152,10 @@ packages:
       safe-buffer: 5.1.2
     dev: true
 
+  /crelt/1.0.5:
+    resolution: {integrity: sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==}
+    dev: false
+
   /cross-spawn/6.0.5:
     resolution: {integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==}
     engines: {node: '>=4.8'}
@@ -1157,6 +1247,7 @@ packages:
   /delayed-stream/1.0.0:
     resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
     engines: {node: '>=0.4.0'}
+    dev: true
 
   /dir-glob/3.0.1:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
@@ -1692,16 +1783,6 @@ packages:
     resolution: {integrity: sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==}
     dev: true
 
-  /follow-redirects/1.15.1:
-    resolution: {integrity: sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-    dev: false
-
   /form-data/4.0.0:
     resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
     engines: {node: '>= 6'}
@@ -1709,6 +1790,7 @@ packages:
       asynckit: 0.4.0
       combined-stream: 1.0.8
       mime-types: 2.1.35
+    dev: true
 
   /fs.realpath/1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
@@ -2209,12 +2291,14 @@ packages:
   /mime-db/1.52.0:
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
+    dev: true
 
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
     dependencies:
       mime-db: 1.52.0
+    dev: true
 
   /minimatch/3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
@@ -2664,6 +2748,10 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /style-mod/4.0.0:
+    resolution: {integrity: sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw==}
+    dev: false
+
   /supports-color/5.5.0:
     resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
     engines: {node: '>=4'}
@@ -2913,6 +3001,10 @@ packages:
       browser-process-hrtime: 1.0.0
     dev: true
 
+  /w3c-keyname/2.2.6:
+    resolution: {integrity: sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg==}
+    dev: false
+
   /w3c-xmlserializer/3.0.0:
     resolution: {integrity: sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==}
     engines: {node: '>=12'}

console/src/index.ts

@@ -1,4 +1,4 @@
-import { definePlugin, BasicLayout } from "@halo-dev/admin-shared";
+import { definePlugin, BasicLayout } from "@halo-dev/console-shared";
 import DefaultView from "./views/DefaultView.vue";
 import { IconGrid } from "@halo-dev/components";
 import "./styles/index.css";

console/vite.config.ts

@@ -14,7 +14,7 @@ export default defineConfig({
   },
   build: {
     outDir: fileURLToPath(
-      new URL("../src/main/resources/admin", import.meta.url)
+      new URL("../src/main/resources/console", import.meta.url)
     ),
     emptyOutDir: true,
     lib: {
@@ -35,7 +35,7 @@ export default defineConfig({
           vue: "Vue",
           "vue-router": "VueRouter",
           "@halo-dev/components": "HaloComponents",
-          "@halo-dev/admin-shared": "HaloAdminShared",
+          "@halo-dev/console-shared": "HaloConsoleShared",
         },
       },
     },