chore: fix import and config

cordiverse · Jul 18, 2024 · 01e05a0 · 01e05a0
1 parent 5f55653
commit 01e05a0
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 10 deletions.
diff --git a/packages/client/app/tsconfig.json b/packages/client/app/tsconfig.json
@@ -1,9 +1,9 @@
 {
-  "extends": "../../../tsconfig.client",
+  "extends": "../tsconfig.client",
   "compilerOptions": {
     "rootDir": "..",
   },
   "include": [
     ".",
   ],
-}
+}
diff --git a/packages/client/client/components/common/k-button.vue b/packages/client/client/components/common/k-button.vue
@@ -56,6 +56,12 @@ function onClick(event: MouseEvent) {
   padding: 0.4em 1em;
   transition: var(--color-transition);
   display: inline-block;
+
+  // default: transparent & framed
+  color: var(--el-button-text-color);
+  border: 1px solid var(--k-color-border);
+  background-color: transparent;
+
   &.round {
     border-radius: 50%;
   }
@@ -66,10 +72,6 @@ function onClick(event: MouseEvent) {
     cursor: default;
   }
 
-  // default: transparent & framed
-  color: var(--el-button-text-color);
-  border: 1px solid var(--k-color-border);
-  background-color: transparent;
   &.disabled {
     color: var(--k-color-disabled);
     border-color: var(--k-color-border);

diff --git a/packages/client/client/components/icons/index.ts b/packages/client/client/components/icons/index.ts
@@ -1,5 +1,5 @@
 import { App, Component, defineComponent, h, markRaw, reactive } from 'vue'
-import * as components from '@koishijs/components'
+import * as components from '@cordisjs/components'
 import Default from './activity/default.vue'
 import Ellipsis from './activity/ellipsis.vue'
 import Home from './activity/home.vue'

diff --git a/packages/client/client/tsconfig.json b/packages/client/client/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.client",
+  "extends": "../tsconfig.client",
   "compilerOptions": {
     "rootDir": ".",
   },

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -18,7 +18,8 @@
     "lib",
     "src",
     "bin.js",
-    "global.d.ts"
+    "global.d.ts",
+    "tsconfig.client.json"
   ],
   "bin": {
     "cordis-webui": "bin.js"

diff --git a/packages/client/tsconfig.client.json b/packages/client/tsconfig.client.json
@@ -0,0 +1,20 @@
+{
+  // We do not use "extends" here because dev mode cannot access the root tsconfig.
+  "compilerOptions": {
+    "target": "es2022",
+    "module": "esnext",
+    "declaration": true,
+    "jsx": "preserve",
+    "noEmit": true,
+    "composite": true,
+    "incremental": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "moduleResolution": "bundler",
+    "strict": true,
+    "noImplicitAny": false,
+    "types": [
+      "@cordisjs/client/global",
+    ],
+  },
+}
diff --git a/plugins/logger/client/logs.vue b/plugins/logger/client/logs.vue
@@ -32,8 +32,8 @@
 import { computed } from 'vue'
 import { Dict, Time, VirtualList, useContext, useRpc, send } from '@cordisjs/client'
 import {} from '@cordisjs/plugin-manager/client'
+import { AnsiUp } from 'ansi_up'
 import Logger from 'reggol'
-import AnsiUp from 'ansi_up'
 
 defineOptions({
   inheritAttrs: false,