diff --git a/package.json b/package.json index 4593ef9..ffa9f35 100644 --- a/package.json +++ b/package.json @@ -26,17 +26,15 @@ }, "devDependencies": { "@cordisjs/eslint-config": "^1.1.1", - "@types/chai": "^4.3.14", "@types/mocha": "^9.1.1", - "@types/node": "^20.11.30", + "@types/node": "^20.14.11", "c8": "^7.14.0", - "chai": "^4.4.1", - "esbuild": "^0.18.20", + "esbuild": "^0.23.0", "esbuild-register": "^3.5.0", "eslint": "^8.57.0", "mocha": "^9.2.2", "shx": "^0.3.4", - "typescript": "^5.4.3", + "typescript": "^5.5.3", "yakumo": "^1.0.0-beta.16", "yakumo-esbuild": "^1.0.0-beta.6", "yakumo-mocha": "^1.0.0-beta.2", diff --git a/packages/client/package.json b/packages/client/package.json index d2ec479..3924f8a 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -49,9 +49,9 @@ "@maikolib/vite-plugin-yaml": "^1.0.1", "@satorijs/protocol": "^1.4.1", "@vitejs/plugin-vue": "^4.6.2", - "@vueuse/core": "^10.9.0", + "@vueuse/core": "^10.11.0", "cac": "^6.7.14", - "cordis": "^3.17.5", + "cordis": "^3.17.6", "cosmokit": "^1.6.2", "element-plus": "2.7.7", "marked-vue": "^1.3.0", @@ -59,7 +59,7 @@ "sass": "^1.77.4", "unocss": "^0.60.4", "vite": "^5.3.4", - "vue": "^3.4.27", + "vue": "^3.4.32", "vue-i18n": "^9.13.1", "vue-router": "^4.3.2" }, diff --git a/packages/components/package.json b/packages/components/package.json index 5dc8df0..58c443d 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -24,6 +24,11 @@ "webui", "component" ], + "devDependencies": { + "@vueuse/core": "^10.11.0", + "element-plus": "^2.7.7", + "vue": "^3.4.32" + }, "peerDependencies": { "vue": "^3" }, diff --git a/packages/element/package.json b/packages/element/package.json index b01d127..5b6ec5f 100644 --- a/packages/element/package.json +++ b/packages/element/package.json @@ -44,7 +44,9 @@ "utilities" ], "devDependencies": { - "chai-shape": "^1.0.0" + "@types/chai": "^4.3.16", + "chai": "^5.1.1", + "chai-shape": "^1.1.0" }, "dependencies": { "cosmokit": "^1.6.2" diff --git a/packages/element/src/index.ts b/packages/element/src/index.ts index 43c2252..8d1b203 100644 --- a/packages/element/src/index.ts +++ b/packages/element/src/index.ts @@ -492,6 +492,10 @@ namespace Element { }))).flat(1) return typeof source === 'string' ? children.join('') : children } + + export function text(content: string) { + return Element('text', { content }) + } } export default Element diff --git a/plugins/insight/package.json b/plugins/insight/package.json index 178d302..533ddb3 100644 --- a/plugins/insight/package.json +++ b/plugins/insight/package.json @@ -44,7 +44,7 @@ }, "peerDependencies": { "@cordisjs/plugin-webui": "^0.1.11", - "cordis": "^3.17.5" + "cordis": "^3.17.6" }, "devDependencies": { "@cordisjs/client": "^0.1.11", diff --git a/plugins/insight/src/index.ts b/plugins/insight/src/index.ts index 232ad05..1765f54 100644 --- a/plugins/insight/src/index.ts +++ b/plugins/insight/src/index.ts @@ -1,7 +1,7 @@ import { Context, EffectScope, ForkScope, Plugin, Schema, ScopeStatus } from 'cordis' import { camelize, capitalize } from 'cosmokit' import {} from '@cordisjs/plugin-webui' -import {} from '@cordisjs/loader' +import {} from 'cordis/loader' import assert from 'node:assert' export interface Data { diff --git a/plugins/logger/package.json b/plugins/logger/package.json index 5e35a5a..ec8c254 100644 --- a/plugins/logger/package.json +++ b/plugins/logger/package.json @@ -51,12 +51,14 @@ }, "peerDependencies": { "@cordisjs/plugin-webui": "^0.1.11", - "cordis": "^3.17.5" + "cordis": "^3.17.6" }, "devDependencies": { "@cordisjs/client": "^0.1.11", "@cordisjs/plugin-manager": "^0.3.1", - "ansi_up": "^6.0.2" + "@cordisjs/plugin-webui": "^0.1.11", + "ansi_up": "^6.0.2", + "cordis": "^3.17.6" }, "dependencies": { "cosmokit": "^1.6.2" diff --git a/plugins/manager/package.json b/plugins/manager/package.json index 58b4bd2..8454e28 100644 --- a/plugins/manager/package.json +++ b/plugins/manager/package.json @@ -57,12 +57,13 @@ }, "peerDependencies": { "@cordisjs/plugin-webui": "^0.1.11", - "cordis": "^3.17.5" + "cordis": "^3.17.6" }, "devDependencies": { "@cordisjs/client": "^0.1.11", - "@cordisjs/loader": "^0.12.5", - "@cordisjs/plugin-hmr": "^0.2.4" + "@cordisjs/plugin-hmr": "^0.2.5", + "@cordisjs/plugin-webui": "^0.1.11", + "cordis": "^3.17.6" }, "dependencies": { "@cordisjs/registry": "^7.1.3", diff --git a/plugins/manager/src/shared.ts b/plugins/manager/src/shared.ts index b63cc76..8716487 100644 --- a/plugins/manager/src/shared.ts +++ b/plugins/manager/src/shared.ts @@ -1,11 +1,11 @@ import { Context, Inject, MainScope, Plugin, Schema, ScopeStatus, Service } from 'cordis' import { Dict, pick } from 'cosmokit' -import { EntryOptions } from '@cordisjs/loader' +import { EntryOptions } from 'cordis/loader' import { Entry as ClientEntry } from '@cordisjs/plugin-webui' import { LocalObject } from '@cordisjs/registry' import {} from '@cordisjs/plugin-hmr' -declare module '@cordisjs/loader' { +declare module 'cordis/loader' { interface EntryOptions { label?: string | null collapse?: boolean | null diff --git a/plugins/notifier/package.json b/plugins/notifier/package.json index 42d36af..52e00ec 100644 --- a/plugins/notifier/package.json +++ b/plugins/notifier/package.json @@ -55,11 +55,13 @@ }, "peerDependencies": { "@cordisjs/plugin-webui": "^0.1.11", - "cordis": "^3.17.5" + "cordis": "^3.17.6" }, "devDependencies": { "@cordisjs/client": "^0.1.11", - "@cordisjs/plugin-manager": "^0.3.1" + "@cordisjs/plugin-manager": "^0.3.1", + "@cordisjs/plugin-webui": "^0.1.11", + "cordis": "^3.17.6" }, "dependencies": { "@cordisjs/element": "^0.1.0", diff --git a/plugins/notifier/src/index.ts b/plugins/notifier/src/index.ts index 53ea29c..5c52e7e 100644 --- a/plugins/notifier/src/index.ts +++ b/plugins/notifier/src/index.ts @@ -1,7 +1,7 @@ import { Context, Schema, Service } from 'cordis' import { Dict, isNullable, remove } from 'cosmokit' import { h } from '@cordisjs/element' -import {} from '@cordisjs/loader' +import {} from 'cordis/loader' import type { Entry } from '@cordisjs/plugin-webui' declare module 'cordis' { diff --git a/plugins/webui/package.json b/plugins/webui/package.json index 478fa27..1920a1c 100644 --- a/plugins/webui/package.json +++ b/plugins/webui/package.json @@ -52,7 +52,7 @@ }, "peerDependencies": { "@cordisjs/client": "^0.1.11", - "cordis": "^3.17.5" + "cordis": "^3.17.6" }, "peerDependenciesMeta": { "@cordisjs/client": { @@ -61,13 +61,14 @@ }, "devDependencies": { "@cordisjs/client": "^0.1.11", - "@cordisjs/loader": "^0.12.5", "@cordisjs/plugin-server": "^0.2.3", "@maikolib/vite-plugin-yaml": "^1.0.1", "@types/uuid": "^8.3.4", "@vitejs/plugin-vue": "^4.6.2", + "cordis": "^3.17.6", "unocss": "^0.58.6", - "vite": "^5.3.4" + "vite": "^5.3.4", + "vue": "^3.4.32" }, "dependencies": { "cosmokit": "^1.6.2", diff --git a/plugins/webui/src/browser.ts b/plugins/webui/src/browser.ts index 31e1fba..12cd739 100644 --- a/plugins/webui/src/browser.ts +++ b/plugins/webui/src/browser.ts @@ -1,7 +1,7 @@ import { Schema } from 'cordis' import { makeArray } from 'cosmokit' import { Entry, Events, WebUI } from './shared/index.ts' -import {} from '@cordisjs/loader' +import {} from 'cordis/loader' export * from './shared/index.ts'