Skip to content

Commit

Permalink
chore: 更新依赖
Browse files Browse the repository at this point in the history
  • Loading branch information
aooiuu committed Jul 13, 2024
1 parent 8854f4e commit 834deee
Show file tree
Hide file tree
Showing 13 changed files with 511 additions and 1,098 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

- name: fix pnpm.cjs
if: matrix.os == 'windows-latest'
run: sed -i 's/\/usr\/bin\/env node/node/g' C:/Users/runneradmin/setup-pnpm/node_modules/.pnpm/pnpm@8.6.5/node_modules/pnpm/bin/pnpm.cjs
run: sed -i 's/\/usr\/bin\/env node/node/g' C:/Users/runneradmin/setup-pnpm/node_modules/.pnpm/pnpm@9.4.0/node_modules/pnpm/bin/pnpm.cjs
shell: bash

- run: pnpm install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

- name: fix pnpm.cjs
if: matrix.os == 'windows-latest'
run: sed -i 's/\/usr\/bin\/env node/node/g' C:/Users/runneradmin/setup-pnpm/node_modules/.pnpm/pnpm@8.6.5/node_modules/pnpm/bin/pnpm.cjs
run: sed -i 's/\/usr\/bin\/env node/node/g' C:/Users/runneradmin/setup-pnpm/node_modules/.pnpm/pnpm@9.4.0/node_modules/pnpm/bin/pnpm.cjs
shell: bash

- run: npx changelogithub
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ RUN apt-get update \
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/*

RUN corepack enable && corepack prepare pnpm@8.6.5 --activate
RUN corepack enable && corepack prepare pnpm@9.4.0 --activate

RUN \
echo 'use npm mirror' && \
Expand Down
4 changes: 1 addition & 3 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@
"esno": "^0.16.3",
"jest": "^29.7.0",
"ts-jest": "^29.1.1",
"typescript": "^5.1.6",
"vite": "^4.5.3",
"vitest": "^0.32.2"
"typescript": "^5.1.6"
}
}
8 changes: 4 additions & 4 deletions packages/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@
"@types/lodash-es": "^4.17.12",
"@types/node": "^20.11.16",
"@types/nprogress": "^0.2.3",
"@vitejs/plugin-vue": "^5.0.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"@vitejs/plugin-vue": "^5.0.5",
"@vitejs/plugin-vue-jsx": "^4.0.0",
"@vue/eslint-config-prettier": "^8.0.0",
"@vue/eslint-config-typescript": "^12.0.0",
"@vue/tsconfig": "^0.5.1",
Expand All @@ -97,10 +97,10 @@
"unocss": "^0.58.4",
"unplugin-auto-import": "^0.16.4",
"unplugin-vue-components": "^0.27.2",
"vite": "^4.5.3",
"vite": "^5.3.1",
"vite-bundle-analyzer": "^0.10.3",
"vite-plugin-electron": "^0.28.7",
"vite-plugin-mock": "^3.0.1",
"vue-tsc": "^1.8.27"
"vue-tsc": "^2.0.21"
}
}
2 changes: 1 addition & 1 deletion packages/web/src/pages/pc/chapter/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</div>
</template>

<script setup>
<script setup lang="ts">
import { useChapter } from '@/pages/common/chapter';
const { chaptersRef, showContent, loading, list, findHistory, isLastRead } = useChapter();
Expand Down
7 changes: 2 additions & 5 deletions packages/web/src/pages/pc/content/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,7 @@
}"
>
<div
:style="{
'-webkit-app-region': 'drag'
}"
class="p-10 cursor-pointer text-center overflow-hidden whitespace-nowrap text-ellipsis b-b-1 b-b-solid b-b-[#00000033] pb-4 mb-4"
class="app-region-drag p-10 cursor-pointer text-center overflow-hidden whitespace-nowrap text-ellipsis b-b-1 b-b-solid b-b-[#00000033] pb-4 mb-4"
@click="scrollIntoViewChapter"
>
{{ readStore.title || '-' }}
Expand All @@ -70,7 +67,7 @@
</div>
</template>

<script setup>
<script setup lang="ts">
import { onClickOutside } from '@vueuse/core';
import { useChaptersStore } from '@/stores/chapters';
import { useReadStore } from '@/stores/read';
Expand Down
8 changes: 8 additions & 0 deletions packages/web/src/pages/pc/layout/BaseLayout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ body {
}
}
.app-region-drag {
-webkit-app-region: drag;
* {
-webkit-app-region: drag;
}
}
::-webkit-scrollbar {
width: 6px;
height: 6px;
Expand Down
6 changes: 3 additions & 3 deletions packages/web/src/pages/vscode/chapter/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
</div>
</template>

<script setup>
import { StarOutlined, StarFilled } from '@ant-design/icons-vue';
<script setup lang="ts">
import { StarFilled, StarOutlined } from '@ant-design/icons-vue';
import TreeItem from '@/components/vsc/TreeItem.vue';
import { useChapter } from '@/pages/common/chapter';
const { chaptersRef, showContent, list, findHistory, isStarred, star, isLastRead } = useChapter();
const { ruleId, chaptersRef, showContent, list, findHistory, isStarred, star, isLastRead } = useChapter();
</script>
2 changes: 1 addition & 1 deletion packages/web/src/pages/vscode/content/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</div>
</template>

<script setup scoped>
<script setup lang="ts">
import { useContent } from '@/pages/common/content';
const contentRef = ref();
Expand Down
6 changes: 3 additions & 3 deletions packages/web/src/stores/setting.pc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import { alwaysOnTop } from '@/api/electron';

export type ReadStyle = {
// 字体大小
fontSize: Number;
fontSize: number;
// 行高
lineHeight: Number;
lineHeight: number;
// 文字间距
letterSpacing: Number;
letterSpacing: number;
// 文字颜色
textColor: string;
// 背景颜色
Expand Down
6 changes: 3 additions & 3 deletions packages/web/src/stores/setting.vsc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { readConfig, updateConfig } from '@/api';

export type ReadStyle = {
// 字体大小
fontSize: Number;
fontSize: number;
// 行高
lineHeight: Number;
lineHeight: number;
// 文字间距
letterSpacing: Number;
letterSpacing: number;
};

// 快捷键
Expand Down
Loading

0 comments on commit 834deee

Please sign in to comment.