diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5836e8ea..932a585a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: strategy: fail-fast: false matrix: - node-version: [18, 20] + node-version: [18, 20, 22] steps: - name: Check out diff --git a/package.json b/package.json index 05d4fa44..55b63489 100644 --- a/package.json +++ b/package.json @@ -27,31 +27,27 @@ }, "devDependencies": { "@cordisjs/eslint-config": "^1.1.1", - "@koishijs/plugin-database-memory": "^3.4.0", + "@koishijs/plugin-database-memory": "^3.6.0", "@koishijs/plugin-help": "^2.4.4", "@koishijs/plugin-mock": "^2.6.6", "@sinonjs/fake-timers": "^6.0.1", - "@types/chai": "^4.3.14", - "@types/chai-as-promised": "^7.1.8", "@types/mocha": "^9.1.1", - "@types/node": "^20.11.30", + "@types/node": "^22.7.5", "@types/sinonjs__fake-timers": "^6.0.4", "c8": "^7.14.0", - "chai": "^4.4.1", - "chai-as-promised": "^7.1.1", - "esbuild": "^0.18.20", + "esbuild": "^0.23.1", "esbuild-register": "^3.5.0", "eslint": "^8.57.0", "eslint-plugin-mocha": "^10.4.1", - "koishi": "^4.17.9", + "koishi": "^4.18.0", "mocha": "^9.2.2", "shx": "^0.3.4", - "tsx": "^4.7.1", - "typescript": "^5.4.3", - "yakumo": "^1.0.0-beta.16", - "yakumo-esbuild": "^1.0.0-beta.6", + "tsx": "^4.16.2", + "typescript": "^5.6.2", + "yakumo": "^1.0.0-beta.18", + "yakumo-esbuild": "^1.0.0-beta.7", "yakumo-mocha": "^1.0.0-beta.2", - "yakumo-tsc": "^1.0.0-beta.4", + "yakumo-tsc": "^1.0.0-beta.5", "yml-register": "^1.2.5" } } diff --git a/packages/client/package.json b/packages/client/package.json index a0f84db8..7016f4ac 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,7 +1,7 @@ { "name": "@koishijs/client", "description": "Koishi Console Client", - "version": "5.29.2", + "version": "5.30.0", "main": "client/index.ts", "exports": { ".": "./client/index.ts", diff --git a/packages/console/package.json b/packages/console/package.json index 14b0a764..38dc6ecf 100644 --- a/packages/console/package.json +++ b/packages/console/package.json @@ -1,7 +1,7 @@ { "name": "@koishijs/console", "description": "Console Service for Koishi", - "version": "5.29.2", + "version": "5.30.0", "main": "lib/index.js", "module": "lib/index.mjs", "types": "lib/index.d.ts", @@ -31,6 +31,6 @@ "service" ], "peerDependencies": { - "koishi": "^4.17.9" + "koishi": "^4.18.0" } } diff --git a/packages/console/src/index.ts b/packages/console/src/index.ts index b59ba7f8..2ee39178 100644 --- a/packages/console/src/index.ts +++ b/packages/console/src/index.ts @@ -45,6 +45,7 @@ export class EntryProvider extends DataService> { export abstract class Console extends Service { static filter = false + static inject = { optional: ['console'] } private id = Math.random().toString(36).slice(2) diff --git a/packages/market/package.json b/packages/market/package.json index f7759573..fa44060b 100644 --- a/packages/market/package.json +++ b/packages/market/package.json @@ -36,7 +36,7 @@ }, "dependencies": { "@koishijs/components": "^1.5.13", - "cosmokit": "^1.6.2", + "cosmokit": "^1.6.3", "spark-md5": "^3.0.2" } } diff --git a/packages/online/app/index.ts b/packages/online/app/index.ts index fb3b3a08..85925096 100644 --- a/packages/online/app/index.ts +++ b/packages/online/app/index.ts @@ -1,10 +1,10 @@ import { connect, global, icons, root } from '@koishijs/client' import IconDocs from './icons/docs.vue' import IconForum from './icons/forum.vue' -import IconInstances from './icons/instances.vue' +import IconInstances from './icons/apps.vue' import IconShare from './icons/share.vue' import Home from './components/home.vue' -import Instances from './components/instances.vue' +import Instances from './components/apps.vue' import ClientWebSocket from './socket' import '@koishijs/client/app' @@ -24,7 +24,7 @@ root.page({ root.page({ id: 'instances', - path: '/instances', + path: '/apps', name: '实例管理', icon: 'activity:instances', order: 900, diff --git a/packages/online/package.json b/packages/online/package.json index 1e0465fe..7b3ab4ae 100644 --- a/packages/online/package.json +++ b/packages/online/package.json @@ -31,8 +31,8 @@ "@cordiverse/os": "^1.0.2", "@cordiverse/path": "^1.0.0", "@cordiverse/url": "^1.0.3", - "@koishijs/client": "^5.29.2", - "@koishijs/loader": "^4.5.9" + "@koishijs/client": "^5.30.0", + "@koishijs/loader": "^4.6.0" }, "yakumo": { "client": "./src/build.ts" diff --git a/packages/registry/package.json b/packages/registry/package.json index f7bccaef..d076dbee 100644 --- a/packages/registry/package.json +++ b/packages/registry/package.json @@ -33,8 +33,8 @@ "@types/semver": "^7.5.8" }, "dependencies": { - "cosmokit": "^1.6.2", + "cosmokit": "^1.6.3", "p-map": "^4.0.0", - "semver": "^7.6.0" + "semver": "^7.6.3" } } diff --git a/plugins/actions/package.json b/plugins/actions/package.json index e555bfcc..5af176ac 100644 --- a/plugins/actions/package.json +++ b/plugins/actions/package.json @@ -6,9 +6,9 @@ "types": "lib/index.d.ts", "exports": { ".": { + "types": "./lib/index.d.ts", "import": "./lib/index.mjs", - "require": "./lib/index.cjs", - "types": "./lib/index.d.ts" + "require": "./lib/index.cjs" }, "./package.json": "./package.json" }, @@ -53,13 +53,13 @@ } }, "peerDependencies": { - "@koishijs/plugin-console": "^5.29.2", - "koishi": "^4.17.9" + "@koishijs/plugin-console": "^5.30.0", + "koishi": "^4.18.0" }, "devDependencies": { - "@koishijs/client": "^5.29.2" + "@koishijs/client": "^5.30.0" }, "dependencies": { - "@koishijs/console": "^5.29.2" + "@koishijs/console": "^5.30.0" } } diff --git a/plugins/admin/package.json b/plugins/admin/package.json index 942050fc..e71a0136 100644 --- a/plugins/admin/package.json +++ b/plugins/admin/package.json @@ -50,8 +50,8 @@ } }, "peerDependencies": { - "@koishijs/plugin-console": "^5.29.2", - "koishi": "^4.17.9" + "@koishijs/plugin-console": "^5.30.0", + "koishi": "^4.18.0" }, "peerDependenciesMeta": { "@koishijs/plugin-console": { @@ -59,11 +59,15 @@ } }, "devDependencies": { - "@koishijs/client": "^5.29.2", - "@koishijs/plugin-console": "^5.29.2", + "@koishijs/client": "^5.30.0", + "@koishijs/plugin-console": "^5.30.0", "@koishijs/plugin-locales": "^2.5.3", "@koishijs/plugin-mock": "^2.6.6", - "@types/throttle-debounce": "^2.1.0" + "@types/chai": "^4.3.16", + "@types/chai-as-promised": "^7.1.8", + "@types/throttle-debounce": "^2.1.0", + "chai": "^5.1.1", + "chai-as-promised": "^7.1.1" }, "dependencies": { "throttle-debounce": "^3.0.1" diff --git a/plugins/analytics/package.json b/plugins/analytics/package.json index 6e96b43d..d92221b4 100644 --- a/plugins/analytics/package.json +++ b/plugins/analytics/package.json @@ -49,17 +49,17 @@ } }, "peerDependencies": { - "@koishijs/plugin-console": "^5.29.2", - "koishi": "^4.17.9" + "@koishijs/plugin-console": "^5.30.0", + "koishi": "^4.18.0" }, "devDependencies": { "@koishijs/assets": "^1.1.2", - "@koishijs/client": "^5.29.2", + "@koishijs/client": "^5.30.0", "echarts": "^5.5.0", - "koishi": "^4.17.9", + "koishi": "^4.18.0", "vue-echarts": "^6.6.9" }, "dependencies": { - "@koishijs/console": "^5.29.2" + "@koishijs/console": "^5.30.0" } } diff --git a/plugins/auth/package.json b/plugins/auth/package.json index fcd22f87..f2a6f7f2 100644 --- a/plugins/auth/package.json +++ b/plugins/auth/package.json @@ -48,13 +48,13 @@ } }, "peerDependencies": { - "@koishijs/plugin-console": "^5.29.2", - "koishi": "^4.17.9" + "@koishijs/plugin-console": "^5.30.0", + "koishi": "^4.18.0" }, "devDependencies": { - "@koishijs/client": "^5.29.2" + "@koishijs/client": "^5.30.0" }, "dependencies": { - "@koishijs/console": "^5.29.2" + "@koishijs/console": "^5.30.0" } } diff --git a/plugins/commands/package.json b/plugins/commands/package.json index fcd3f944..401dc112 100644 --- a/plugins/commands/package.json +++ b/plugins/commands/package.json @@ -45,8 +45,8 @@ } }, "peerDependencies": { - "@koishijs/plugin-console": "^5.29.2", - "koishi": "^4.17.9" + "@koishijs/plugin-console": "^5.30.0", + "koishi": "^4.18.0" }, "peerDependenciesMeta": { "@koishijs/plugin-console": { @@ -54,13 +54,13 @@ } }, "devDependencies": { - "@koishijs/client": "^5.29.2", + "@koishijs/client": "^5.30.0", "@koishijs/plugin-config": "^2.8.5", - "@koishijs/plugin-console": "^5.29.2", + "@koishijs/plugin-console": "^5.30.0", "@koishijs/plugin-locales": "^2.5.3", "@koishijs/plugin-mock": "^2.6.6" }, "dependencies": { - "@koishijs/console": "^5.29.2" + "@koishijs/console": "^5.30.0" } } diff --git a/plugins/config/package.json b/plugins/config/package.json index cc77f756..5db7a640 100644 --- a/plugins/config/package.json +++ b/plugins/config/package.json @@ -6,9 +6,9 @@ "types": "lib/index.d.ts", "exports": { ".": { + "types": "./lib/index.d.ts", "node": "./lib/node/index.js", - "browser": "./lib/browser/index.mjs", - "types": "./lib/index.d.ts" + "browser": "./lib/browser/index.mjs" }, "./shared": { "require": "./lib/shared/index.js", @@ -57,16 +57,16 @@ } }, "peerDependencies": { - "@koishijs/loader": "^4.5.9", - "@koishijs/plugin-console": "^5.29.2", - "koishi": "^4.17.9" + "@koishijs/loader": "^4.6.0", + "@koishijs/plugin-console": "^5.30.0", + "koishi": "^4.18.0" }, "devDependencies": { - "@koishijs/client": "^5.29.2", + "@koishijs/client": "^5.30.0", "@koishijs/plugin-hmr": "^1.2.9" }, "dependencies": { - "@koishijs/console": "^5.29.2", + "@koishijs/console": "^5.30.0", "@koishijs/registry": "^7.0.3" } } diff --git a/plugins/console/package.json b/plugins/console/package.json index c20c836c..40863546 100644 --- a/plugins/console/package.json +++ b/plugins/console/package.json @@ -1,17 +1,17 @@ { "name": "@koishijs/plugin-console", "description": "Web User Interface for Koishi", - "version": "5.29.2", + "version": "5.30.0", "main": "lib/node/index.js", "types": "lib/index.d.ts", "exports": { ".": { + "types": "./lib/index.d.ts", "node": { "require": "./lib/node/index.js", "import": "./lib/node/index.mjs" }, - "browser": "./lib/browser/index.mjs", - "types": "./lib/index.d.ts" + "browser": "./lib/browser/index.mjs" }, "./src/*": "./src/*", "./package.json": "./package.json" @@ -55,8 +55,8 @@ } }, "peerDependencies": { - "@koishijs/client": "^5.29.2", - "koishi": "^4.17.9" + "@koishijs/client": "^5.30.0", + "koishi": "^4.18.0" }, "peerDependenciesMeta": { "@koishijs/client": { @@ -64,18 +64,18 @@ } }, "devDependencies": { - "@koishijs/client": "^5.29.2", - "@koishijs/loader": "^4.5.9", - "@koishijs/plugin-server": "^3.2.3", + "@koishijs/client": "^5.30.0", + "@koishijs/loader": "^4.6.0", + "@koishijs/plugin-server": "^3.2.4", "@koishijs/plugin-server-proxy": "^1.2.0", "@maikolib/vite-plugin-yaml": "^1.0.1", "@types/uuid": "^8.3.4", - "@vitejs/plugin-vue": "^4.6.2", - "unocss": "^0.58.6", - "vite": "^4.5.3" + "@vitejs/plugin-vue": "^5.1.4", + "unocss": "^0.63.6", + "vite": "^5.4.10" }, "dependencies": { - "@koishijs/console": "^5.29.2", + "@koishijs/console": "^5.30.0", "open": "^8.4.2", "uuid": "^8.3.2", "ws": "^8.16.0" diff --git a/plugins/explorer/package.json b/plugins/explorer/package.json index c4a6069b..29425910 100644 --- a/plugins/explorer/package.json +++ b/plugins/explorer/package.json @@ -6,9 +6,9 @@ "types": "lib/index.d.ts", "exports": { ".": { + "types": "./lib/index.d.ts", "import": "./lib/index.mjs", - "require": "./lib/index.cjs", - "types": "./lib/index.d.ts" + "require": "./lib/index.cjs" }, "./package.json": "./package.json" }, @@ -59,16 +59,18 @@ "client": "./build/client.ts" }, "peerDependencies": { - "@koishijs/plugin-console": "^5.29.2", - "koishi": "^4.17.9" + "@koishijs/plugin-console": "^5.30.0", + "koishi": "^4.18.0" }, "devDependencies": { - "@koishijs/client": "^5.29.2", + "@koishijs/client": "^5.30.0", + "@koishijs/plugin-console": "^5.30.0", "@types/throttle-debounce": "^2.1.0", + "koishi": "^4.18.0", "monaco-editor": "~0.44.0" }, "dependencies": { - "@koishijs/console": "^5.29.2", + "@koishijs/console": "^5.30.0", "anymatch": "^3.1.3", "chardet": "^2.0.0", "chokidar": "^3.6.0", diff --git a/plugins/insight/package.json b/plugins/insight/package.json index b2d139c7..6e037d9e 100644 --- a/plugins/insight/package.json +++ b/plugins/insight/package.json @@ -6,9 +6,9 @@ "types": "lib/index.d.ts", "exports": { ".": { + "types": "./lib/index.d.ts", "import": "./lib/index.mjs", - "require": "./lib/index.cjs", - "types": "./lib/index.d.ts" + "require": "./lib/index.cjs" }, "./package.json": "./package.json" }, @@ -53,15 +53,17 @@ } }, "peerDependencies": { - "@koishijs/plugin-console": "^5.29.2", - "koishi": "^4.17.9" + "@koishijs/plugin-console": "^5.30.0", + "koishi": "^4.18.0" }, "devDependencies": { - "@koishijs/client": "^5.29.2", + "@koishijs/client": "^5.30.0", + "@koishijs/plugin-console": "^5.30.0", "@types/d3-force": "^3.0.9", - "d3-force": "^3.0.0" + "d3-force": "^3.0.0", + "koishi": "^4.18.0" }, "dependencies": { - "@koishijs/console": "^5.29.2" + "@koishijs/console": "^5.30.0" } } diff --git a/plugins/locales/package.json b/plugins/locales/package.json index b43dedc6..0a5604e7 100644 --- a/plugins/locales/package.json +++ b/plugins/locales/package.json @@ -45,8 +45,8 @@ } }, "peerDependencies": { - "@koishijs/plugin-console": "^5.29.2", - "koishi": "^4.17.9" + "@koishijs/plugin-console": "^5.30.0", + "koishi": "^4.18.0" }, "peerDependenciesMeta": { "@koishijs/plugin-console": { @@ -54,13 +54,14 @@ } }, "devDependencies": { - "@koishijs/client": "^5.29.2", - "@koishijs/plugin-console": "^5.29.2", + "@koishijs/client": "^5.30.0", + "@koishijs/plugin-console": "^5.30.0", "@koishijs/plugin-mock": "^2.6.6", - "@types/js-yaml": "^4.0.9" + "@types/js-yaml": "^4.0.9", + "koishi": "^4.18.0" }, "dependencies": { - "@koishijs/console": "^5.29.2", + "@koishijs/console": "^5.30.0", "js-yaml": "^4.1.0" } } diff --git a/plugins/logger/package.json b/plugins/logger/package.json index 1b1c261d..1e48df53 100644 --- a/plugins/logger/package.json +++ b/plugins/logger/package.json @@ -45,8 +45,8 @@ } }, "peerDependencies": { - "@koishijs/plugin-console": "^5.29.2", - "koishi": "^4.17.9" + "@koishijs/plugin-console": "^5.30.0", + "koishi": "^4.18.0" }, "peerDependenciesMeta": { "@koishijs/plugin-console": { @@ -54,12 +54,12 @@ } }, "devDependencies": { - "@koishijs/client": "^5.29.2", + "@koishijs/client": "^5.30.0", "ansi_up": "^5.2.1", - "koishi": "^4.17.9", - "reggol": "^1.7.0" + "koishi": "^4.18.0", + "reggol": "^1.7.1" }, "dependencies": { - "@koishijs/console": "^5.29.2" + "@koishijs/console": "^5.30.0" } } diff --git a/plugins/market/package.json b/plugins/market/package.json index fded2af6..996c8e8c 100644 --- a/plugins/market/package.json +++ b/plugins/market/package.json @@ -6,9 +6,9 @@ "types": "lib/index.d.ts", "exports": { ".": { + "types": "./lib/index.d.ts", "node": "./lib/node/index.js", - "browser": "./lib/browser/index.mjs", - "types": "./lib/index.d.ts" + "browser": "./lib/browser/index.mjs" }, "./shared": { "require": "./lib/shared/index.js", @@ -59,8 +59,8 @@ } }, "peerDependencies": { - "@koishijs/plugin-console": "^5.29.2", - "koishi": "^4.17.9" + "@koishijs/plugin-console": "^5.30.0", + "koishi": "^4.18.0" }, "peerDependenciesMeta": { "@koishijs/plugin-console": { @@ -68,20 +68,20 @@ } }, "devDependencies": { - "@koishijs/client": "^5.29.2", + "@koishijs/client": "^5.30.0", "@koishijs/market": "^4.2.5", "@koishijs/plugin-config": "^2.8.5", "@types/semver": "^7.5.8", "@types/which-pm-runs": "^1.0.2" }, "dependencies": { - "@koishijs/console": "^5.29.2", + "@koishijs/console": "^5.30.0", "@koishijs/registry": "^7.0.3", "execa": "^5.1.1", "get-registry": "^1.1.0", "ns-require": "^1.1.4", "p-map": "^4.0.0", - "semver": "^7.6.0", + "semver": "^7.6.3", "which-pm-runs": "^1.1.0" } } diff --git a/plugins/notifier/package.json b/plugins/notifier/package.json index 7966c0fe..67560927 100644 --- a/plugins/notifier/package.json +++ b/plugins/notifier/package.json @@ -6,9 +6,9 @@ "types": "lib/index.d.ts", "exports": { ".": { + "types": "./lib/index.d.ts", "import": "./lib/index.mjs", - "require": "./lib/index.cjs", - "types": "./lib/index.d.ts" + "require": "./lib/index.cjs" }, "./package.json": "./package.json" }, @@ -53,11 +53,11 @@ } }, "peerDependencies": { - "@koishijs/plugin-console": "^5.29.2", - "koishi": "^4.17.9" + "@koishijs/plugin-console": "^5.30.0", + "koishi": "^4.18.0" }, "devDependencies": { - "@koishijs/client": "^5.29.2", + "@koishijs/client": "^5.30.0", "@koishijs/plugin-config": "^2.8.5" } } diff --git a/plugins/oobe/package.json b/plugins/oobe/package.json index 5485abc6..c0eb494b 100644 --- a/plugins/oobe/package.json +++ b/plugins/oobe/package.json @@ -6,9 +6,9 @@ "types": "lib/index.d.ts", "exports": { ".": { + "types": "./lib/index.d.ts", "import": "./lib/index.mjs", - "require": "./lib/index.cjs", - "types": "./lib/index.d.ts" + "require": "./lib/index.cjs" }, "./package.json": "./package.json" }, @@ -53,13 +53,13 @@ } }, "peerDependencies": { - "@koishijs/plugin-console": "^5.29.2", - "koishi": "^4.17.9" + "@koishijs/plugin-console": "^5.30.0", + "koishi": "^4.18.0" }, "devDependencies": { - "@koishijs/client": "^5.29.2" + "@koishijs/client": "^5.30.0" }, "dependencies": { - "@koishijs/console": "^5.29.2" + "@koishijs/console": "^5.30.0" } } diff --git a/plugins/sandbox/package.json b/plugins/sandbox/package.json index 25b801d4..59010e31 100644 --- a/plugins/sandbox/package.json +++ b/plugins/sandbox/package.json @@ -52,16 +52,16 @@ } }, "peerDependencies": { - "@koishijs/plugin-console": "^5.29.2", - "koishi": "^4.17.9" + "@koishijs/plugin-console": "^5.30.0", + "koishi": "^4.18.0" }, "devDependencies": { - "@koishijs/assets": "^1.1.2", - "@koishijs/client": "^5.29.2", - "@koishijs/plugin-console": "^5.29.2", + "@koishijs/client": "^5.30.0", + "@koishijs/plugin-console": "^5.30.0", + "@koishijs/plugin-server": "^3.2.4", "@satorijs/components-vue": "^0.7.2" }, "dependencies": { - "@koishijs/console": "^5.29.2" + "@koishijs/console": "^5.30.0" } } diff --git a/plugins/status/package.json b/plugins/status/package.json index f27ad7f3..07ffcb9c 100644 --- a/plugins/status/package.json +++ b/plugins/status/package.json @@ -41,18 +41,18 @@ } }, "peerDependencies": { - "@koishijs/plugin-console": "^5.29.2", - "koishi": "^4.17.9" + "@koishijs/plugin-console": "^5.30.0", + "koishi": "^4.18.0" }, "devDependencies": { - "@koishijs/client": "^5.29.2", + "@koishijs/client": "^5.30.0", "@koishijs/plugin-analytics": "^2.0.6", "@koishijs/plugin-config": "^2.8.5", "@types/envinfo": "^7.8.3", - "koishi": "^4.17.9" + "koishi": "^4.18.0" }, "dependencies": { - "@koishijs/console": "^5.29.2", + "@koishijs/console": "^5.30.0", "envinfo": "^7.11.1", "which-pm-runs": "^1.1.0" }