From 288ece79012e4187a8e76b37d846f7ebee463a5d Mon Sep 17 00:00:00 2001 From: Shigma Date: Sat, 20 May 2023 23:52:41 +0800 Subject: [PATCH] refa: move app to console plugin --- packages/client/client/tsconfig.json | 15 ++++++++++++++- packages/client/package.json | 7 +------ packages/online/app/assets | 2 +- .../console}/app/assets/koishi.png | Bin .../client => plugins/console}/app/index.html | 0 .../client => plugins/console}/app/index.scss | 0 .../client => plugins/console}/app/index.ts | 0 .../console}/app/layouts/activity/group.vue | 0 .../console}/app/layouts/activity/index.vue | 0 .../console}/app/layouts/activity/item.vue | 0 .../console}/app/layouts/blank.vue | 0 .../console}/app/layouts/index.vue | 0 .../console}/app/layouts/status-bar.vue | 0 .../console}/app/layouts/status-loading.vue | 0 .../console}/app/layouts/utils.ts | 0 .../console}/app/pages/home.vue | 0 .../console}/app/pages/settings.vue | 0 .../console}/app/pages/welcome.en-US.yml | 0 .../console}/app/pages/welcome.vue | 0 .../console}/app/pages/welcome.zh-CN.yml | 0 .../client => plugins/console}/app/tsconfig.json | 2 +- plugins/console/package.json | 3 +++ .../build => plugins/console/scripts}/client.ts | 2 +- plugins/console/src/node/index.ts | 4 +--- 24 files changed, 22 insertions(+), 13 deletions(-) rename {packages/client => plugins/console}/app/assets/koishi.png (100%) rename {packages/client => plugins/console}/app/index.html (100%) rename {packages/client => plugins/console}/app/index.scss (100%) rename {packages/client => plugins/console}/app/index.ts (100%) rename {packages/client => plugins/console}/app/layouts/activity/group.vue (100%) rename {packages/client => plugins/console}/app/layouts/activity/index.vue (100%) rename {packages/client => plugins/console}/app/layouts/activity/item.vue (100%) rename {packages/client => plugins/console}/app/layouts/blank.vue (100%) rename {packages/client => plugins/console}/app/layouts/index.vue (100%) rename {packages/client => plugins/console}/app/layouts/status-bar.vue (100%) rename {packages/client => plugins/console}/app/layouts/status-loading.vue (100%) rename {packages/client => plugins/console}/app/layouts/utils.ts (100%) rename {packages/client => plugins/console}/app/pages/home.vue (100%) rename {packages/client => plugins/console}/app/pages/settings.vue (100%) rename {packages/client => plugins/console}/app/pages/welcome.en-US.yml (100%) rename {packages/client => plugins/console}/app/pages/welcome.vue (100%) rename {packages/client => plugins/console}/app/pages/welcome.zh-CN.yml (100%) rename {packages/client => plugins/console}/app/tsconfig.json (66%) rename {packages/client/build => plugins/console/scripts}/client.ts (98%) diff --git a/packages/client/client/tsconfig.json b/packages/client/client/tsconfig.json index 44f19c0b..8815b7b3 100644 --- a/packages/client/client/tsconfig.json +++ b/packages/client/client/tsconfig.json @@ -1,7 +1,20 @@ { - "extends": "../tsconfig.client", "compilerOptions": { "rootDir": ".", + "target": "es2020", + "module": "esnext", + "declaration": true, + "jsx": "preserve", + "noEmit": true, + "composite": true, + "incremental": true, + "skipLibCheck": true, + "esModuleInterop": true, + "moduleResolution": "node", + "strictBindCallApply": true, + "types": [ + "@koishijs/client/global", + ], }, "include": [ ".", diff --git a/packages/client/package.json b/packages/client/package.json index 6957f44d..19df0f6a 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -4,12 +4,10 @@ "version": "5.8.3", "main": "client/index.ts", "files": [ - "app", "client", "lib", "bin.js", - "global.d.ts", - "tsconfig.client.json" + "global.d.ts" ], "bin": { "koishi-console": "bin.js" @@ -50,8 +48,5 @@ "vue": "^3.3.2", "vue-i18n": "^9.2.2", "vue-router": "^4.2.0" - }, - "yakumo": { - "client": "./build/client" } } diff --git a/packages/online/app/assets b/packages/online/app/assets index 90cbdb78..11d99898 120000 --- a/packages/online/app/assets +++ b/packages/online/app/assets @@ -1 +1 @@ -../../client/app/assets \ No newline at end of file +../../../plugins/console/app/assets \ No newline at end of file diff --git a/packages/client/app/assets/koishi.png b/plugins/console/app/assets/koishi.png similarity index 100% rename from packages/client/app/assets/koishi.png rename to plugins/console/app/assets/koishi.png diff --git a/packages/client/app/index.html b/plugins/console/app/index.html similarity index 100% rename from packages/client/app/index.html rename to plugins/console/app/index.html diff --git a/packages/client/app/index.scss b/plugins/console/app/index.scss similarity index 100% rename from packages/client/app/index.scss rename to plugins/console/app/index.scss diff --git a/packages/client/app/index.ts b/plugins/console/app/index.ts similarity index 100% rename from packages/client/app/index.ts rename to plugins/console/app/index.ts diff --git a/packages/client/app/layouts/activity/group.vue b/plugins/console/app/layouts/activity/group.vue similarity index 100% rename from packages/client/app/layouts/activity/group.vue rename to plugins/console/app/layouts/activity/group.vue diff --git a/packages/client/app/layouts/activity/index.vue b/plugins/console/app/layouts/activity/index.vue similarity index 100% rename from packages/client/app/layouts/activity/index.vue rename to plugins/console/app/layouts/activity/index.vue diff --git a/packages/client/app/layouts/activity/item.vue b/plugins/console/app/layouts/activity/item.vue similarity index 100% rename from packages/client/app/layouts/activity/item.vue rename to plugins/console/app/layouts/activity/item.vue diff --git a/packages/client/app/layouts/blank.vue b/plugins/console/app/layouts/blank.vue similarity index 100% rename from packages/client/app/layouts/blank.vue rename to plugins/console/app/layouts/blank.vue diff --git a/packages/client/app/layouts/index.vue b/plugins/console/app/layouts/index.vue similarity index 100% rename from packages/client/app/layouts/index.vue rename to plugins/console/app/layouts/index.vue diff --git a/packages/client/app/layouts/status-bar.vue b/plugins/console/app/layouts/status-bar.vue similarity index 100% rename from packages/client/app/layouts/status-bar.vue rename to plugins/console/app/layouts/status-bar.vue diff --git a/packages/client/app/layouts/status-loading.vue b/plugins/console/app/layouts/status-loading.vue similarity index 100% rename from packages/client/app/layouts/status-loading.vue rename to plugins/console/app/layouts/status-loading.vue diff --git a/packages/client/app/layouts/utils.ts b/plugins/console/app/layouts/utils.ts similarity index 100% rename from packages/client/app/layouts/utils.ts rename to plugins/console/app/layouts/utils.ts diff --git a/packages/client/app/pages/home.vue b/plugins/console/app/pages/home.vue similarity index 100% rename from packages/client/app/pages/home.vue rename to plugins/console/app/pages/home.vue diff --git a/packages/client/app/pages/settings.vue b/plugins/console/app/pages/settings.vue similarity index 100% rename from packages/client/app/pages/settings.vue rename to plugins/console/app/pages/settings.vue diff --git a/packages/client/app/pages/welcome.en-US.yml b/plugins/console/app/pages/welcome.en-US.yml similarity index 100% rename from packages/client/app/pages/welcome.en-US.yml rename to plugins/console/app/pages/welcome.en-US.yml diff --git a/packages/client/app/pages/welcome.vue b/plugins/console/app/pages/welcome.vue similarity index 100% rename from packages/client/app/pages/welcome.vue rename to plugins/console/app/pages/welcome.vue diff --git a/packages/client/app/pages/welcome.zh-CN.yml b/plugins/console/app/pages/welcome.zh-CN.yml similarity index 100% rename from packages/client/app/pages/welcome.zh-CN.yml rename to plugins/console/app/pages/welcome.zh-CN.yml diff --git a/packages/client/app/tsconfig.json b/plugins/console/app/tsconfig.json similarity index 66% rename from packages/client/app/tsconfig.json rename to plugins/console/app/tsconfig.json index 44f19c0b..2b4971d6 100644 --- a/packages/client/app/tsconfig.json +++ b/plugins/console/app/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../tsconfig.client", + "extends": "../../../tsconfig.client", "compilerOptions": { "rootDir": ".", }, diff --git a/plugins/console/package.json b/plugins/console/package.json index 4e6c91bc..a8a22fe8 100644 --- a/plugins/console/package.json +++ b/plugins/console/package.json @@ -65,5 +65,8 @@ "open": "^8.4.2", "uuid": "^8.3.2", "ws": "^8.13.0" + }, + "yakumo": { + "client": "./scripts/client" } } diff --git a/packages/client/build/client.ts b/plugins/console/scripts/client.ts similarity index 98% rename from packages/client/build/client.ts rename to plugins/console/scripts/client.ts index 4f3c3075..04f42169 100644 --- a/packages/client/build/client.ts +++ b/plugins/console/scripts/client.ts @@ -64,7 +64,7 @@ export async function build(root: string, config: vite.UserConfig = {}, isClient export default async function () { // build for console main - const { output } = await build(cwd + '/packages/client/app') + const { output } = await build(cwd + '/plugins/console/app') await Promise.all([ copyFile(findModulePath('vue') + '/dist/vue.runtime.esm-browser.prod.js', dist + '/vue.js'), diff --git a/plugins/console/src/node/index.ts b/plugins/console/src/node/index.ts index 9fe35089..1144d1f2 100644 --- a/plugins/console/src/node/index.ts +++ b/plugins/console/src/node/index.ts @@ -50,9 +50,7 @@ class NodeConsole extends Console { ctx.envData.clientCount = this.layer.clients.size }) - this.root = config.root || config.devMode - ? resolve(require.resolve('@koishijs/client/package.json'), '../app') - : resolve(__dirname, '../../dist') + this.root = config.root || (resolve(__dirname, config.devMode ? '../../app' : '../../dist')) } async start() {