From b04790566fb0e0d39051aeba350ccb3e596137eb Mon Sep 17 00:00:00 2001
From: Alex <49969959+alexzhang1030@users.noreply.github.com>
Date: Wed, 20 Dec 2023 14:17:12 +0800
Subject: [PATCH 1/3] build(client): cleanup existing bundle file
---
packages/client/vite.config.ts | 4 +++-
packages/client/vite.lib.config.ts | 6 ++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/packages/client/vite.config.ts b/packages/client/vite.config.ts
index 91a69f5fa..86b305dd7 100644
--- a/packages/client/vite.config.ts
+++ b/packages/client/vite.config.ts
@@ -17,7 +17,9 @@ export default defineConfig(mergeConfig(baseConfig, {
// Removed `browser-extension` and `electron` on `build:lib`
// Remove `vite/dist/client` on building
;['../vite/dist/client'].forEach((dir) => {
- fse.rmSync(resolve(__dirname, dir), { recursive: true, force: true })
+ const absoluteDir = resolve(__dirname, dir)
+ if (fse.existsSync(absoluteDir))
+ fse.removeSync(absoluteDir)
})
;['../browser-extension/client', '../electron/client', '../vite/dist/client'].forEach((dir) => {
diff --git a/packages/client/vite.lib.config.ts b/packages/client/vite.lib.config.ts
index 4414ebbbb..aba23d8de 100644
--- a/packages/client/vite.lib.config.ts
+++ b/packages/client/vite.lib.config.ts
@@ -45,8 +45,10 @@ export default defineConfig(mergeConfig(baseConfig, {
;['../browser-extension/client', '../electron/client'].forEach((dir) => {
// NOTE: remember the order of `build:lib` and `build`,
// if change the order, rmSync must set in `build` stage
- fse.rmSync(resolve(__dirname, dir), { recursive: true, force: true })
- fse.copySync(clientFile, resolve(__dirname, dir))
+ const absoluteDir = resolve(__dirname, dir)
+ if (fse.existsSync(absoluteDir))
+ fse.removeSync(absoluteDir)
+ fse.copySync(clientFile, absoluteDir)
})
},
},
From f32de9994e17d365e9cf9d52164732d2cba1ce06 Mon Sep 17 00:00:00 2001
From: Alex <49969959+alexzhang1030@users.noreply.github.com>
Date: Wed, 20 Dec 2023 14:18:12 +0800
Subject: [PATCH 2/3] refactor(ui): rem based (#90)
---
packages/client/src/App.vue | 2 +-
packages/client/src/pages/settings.vue | 9 +++++----
packages/ui/src/components/Button.vue | 8 ++++----
packages/ui/src/components/Checkbox.vue | 4 ++--
packages/ui/src/components/Confirm.vue | 4 ++--
packages/ui/src/components/Dialog.vue | 14 +++++++-------
packages/ui/src/components/Drawer.vue | 2 +-
packages/ui/src/components/FormField.vue | 2 +-
packages/ui/src/components/Input.vue | 4 ++--
packages/ui/src/components/LoadingIndicator.vue | 2 +-
packages/ui/src/components/Select.vue | 2 +-
packages/ui/src/components/Switch.vue | 6 +++---
12 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/packages/client/src/App.vue b/packages/client/src/App.vue
index 847dd4341..6981e6d1a 100644
--- a/packages/client/src/App.vue
+++ b/packages/client/src/App.vue
@@ -23,7 +23,7 @@ const sidebarExpanded = computed(() => clientState.value.expandSidebar)
watchEffect(() => {
const scale = devtoolsClientState.value.scale
- document.body.style.fontSize = `${scale * 15}px`
+ document.documentElement.style.fontSize = `${scale * 15}px`
})
watch(connected, (v) => {
diff --git a/packages/client/src/pages/settings.vue b/packages/client/src/pages/settings.vue
index 4ad2db819..5f3c1626c 100644
--- a/packages/client/src/pages/settings.vue
+++ b/packages/client/src/pages/settings.vue
@@ -166,12 +166,13 @@ const minimizePanelInteractiveLabel = computed(() => {
Switch to Overlay Mode
-
-
+