refa: move app to console plugin

koishijs · May 20, 2023 · 288ece7 · 288ece7
1 parent 37b8c38
commit 288ece7
Show file tree

Hide file tree

Showing 24 changed files with 22 additions and 13 deletions.
diff --git 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
@@ -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
@@ -1 +1 @@
-../../client/app/assets
+../../../plugins/console/app/assets
diff --git a/packages/client/app/assets/koishi.png → plugins/console/app/assets/koishi.png b/packages/client/app/assets/koishi.png → plugins/console/app/assets/koishi.png
diff --git a/packages/client/app/index.html → plugins/console/app/index.html b/packages/client/app/index.html → plugins/console/app/index.html
diff --git a/packages/client/app/index.scss → plugins/console/app/index.scss b/packages/client/app/index.scss → plugins/console/app/index.scss
diff --git a/packages/client/app/index.ts → plugins/console/app/index.ts b/packages/client/app/index.ts → plugins/console/app/index.ts
diff --git a/...ges/client/app/layouts/activity/group.vue → ...ns/console/app/layouts/activity/group.vue b/...ges/client/app/layouts/activity/group.vue → ...ns/console/app/layouts/activity/group.vue
diff --git a/...ges/client/app/layouts/activity/index.vue → ...ns/console/app/layouts/activity/index.vue b/...ges/client/app/layouts/activity/index.vue → ...ns/console/app/layouts/activity/index.vue
diff --git a/...ages/client/app/layouts/activity/item.vue → ...ins/console/app/layouts/activity/item.vue b/...ages/client/app/layouts/activity/item.vue → ...ins/console/app/layouts/activity/item.vue
diff --git a/packages/client/app/layouts/blank.vue → plugins/console/app/layouts/blank.vue b/packages/client/app/layouts/blank.vue → plugins/console/app/layouts/blank.vue
diff --git a/packages/client/app/layouts/index.vue → plugins/console/app/layouts/index.vue b/packages/client/app/layouts/index.vue → plugins/console/app/layouts/index.vue
diff --git a/packages/client/app/layouts/status-bar.vue → plugins/console/app/layouts/status-bar.vue b/packages/client/app/layouts/status-bar.vue → plugins/console/app/layouts/status-bar.vue
diff --git a/...ges/client/app/layouts/status-loading.vue → ...ns/console/app/layouts/status-loading.vue b/...ges/client/app/layouts/status-loading.vue → ...ns/console/app/layouts/status-loading.vue
diff --git a/packages/client/app/layouts/utils.ts → plugins/console/app/layouts/utils.ts b/packages/client/app/layouts/utils.ts → plugins/console/app/layouts/utils.ts
diff --git a/packages/client/app/pages/home.vue → plugins/console/app/pages/home.vue b/packages/client/app/pages/home.vue → plugins/console/app/pages/home.vue
diff --git a/packages/client/app/pages/settings.vue → plugins/console/app/pages/settings.vue b/packages/client/app/pages/settings.vue → plugins/console/app/pages/settings.vue
diff --git a/packages/client/app/pages/welcome.en-US.yml → plugins/console/app/pages/welcome.en-US.yml b/packages/client/app/pages/welcome.en-US.yml → plugins/console/app/pages/welcome.en-US.yml
diff --git a/packages/client/app/pages/welcome.vue → plugins/console/app/pages/welcome.vue b/packages/client/app/pages/welcome.vue → plugins/console/app/pages/welcome.vue
diff --git a/packages/client/app/pages/welcome.zh-CN.yml → plugins/console/app/pages/welcome.zh-CN.yml b/packages/client/app/pages/welcome.zh-CN.yml → plugins/console/app/pages/welcome.zh-CN.yml
diff --git a/packages/client/app/tsconfig.json → plugins/console/app/tsconfig.json b/packages/client/app/tsconfig.json → 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
@@ -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 → plugins/console/scripts/client.ts b/packages/client/build/client.ts → 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
@@ -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() {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../../client/app/assets
		../../../plugins/console/app/assets