From fae015971d738234bf2f1884a9425fd4a2fc5f5f Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 7 May 2023 21:51:42 +0800 Subject: [PATCH 1/2] :fire: Remove readme under appearance folder --- app/appearance/README.md | 8 -------- app/appearance/README_en_US.md | 8 -------- 2 files changed, 16 deletions(-) delete mode 100644 app/appearance/README.md delete mode 100644 app/appearance/README_en_US.md diff --git a/app/appearance/README.md b/app/appearance/README.md deleted file mode 100644 index 42a1499d1..000000000 --- a/app/appearance/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# 思源笔记外观 - -[English](https://github.com/siyuan-note/appearance/blob/master/README_en_US.md) - -* emojis：Emoji 表情 -* langs：多语言配置 -* themes：主题 -* icons：图标 diff --git a/app/appearance/README_en_US.md b/app/appearance/README_en_US.md deleted file mode 100644 index 7a80ae7fa..000000000 --- a/app/appearance/README_en_US.md +++ /dev/null @@ -1,8 +0,0 @@ -# SiYuan appearance - -[中文](https://github.com/siyuan-note/appearance/blob/master/README.md) - -* emojis: Emoji assets -* langs: Multi-language configuration -* themes: Appearance themes -* icons: Appearance icons From 5543f593a30155f8c915a43ebce0e3437f9734b6 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 7 May 2023 21:55:22 +0800 Subject: [PATCH 2/2] :arrow_up: Upgrade Electron Fix https://github.com/siyuan-note/siyuan/issues/8197 --- .github/CONTRIBUTING.md | 6 +++--- .github/CONTRIBUTING_zh_CN.md | 6 +++--- app/package.json | 2 +- app/pnpm-lock.yaml | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 520a7c8c1..9b431ea54 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -14,10 +14,10 @@ Install pnpm: `npm install -g pnpm` Set the Electron mirror environment variable and install Electron: -* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@21.4.2 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@21.4.4 -D` * Windows: * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/` - * `pnpm install electron@21.4.2 -D` + * `pnpm install electron@21.4.4 -D` NPM mirror: @@ -28,7 +28,7 @@ NPM mirror: On the desktop, go to the app folder to run: -* `pnpm install electron@21.4.2 -D` +* `pnpm install electron@21.4.4 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index 5d947a9a0..da0b826a0 100644 --- a/.github/CONTRIBUTING_zh_CN.md +++ b/.github/CONTRIBUTING_zh_CN.md @@ -16,11 +16,11 @@ * macOS/Linux: ``` - ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@21.4.2 -D + ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@21.4.4 -D ``` * Windows: * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/` - * `pnpm install electron@21.4.2 -D` + * `pnpm install electron@21.4.4 -D` NPM 镜像： @@ -30,7 +30,7 @@ NPM 镜像： 桌面端进入 app 文件夹运行： -* `pnpm install electron@21.4.2 -D` +* `pnpm install electron@21.4.4 -D` * `pnpm run dev` * `pnpm run start` diff --git a/app/package.json b/app/package.json index d15752227..22641108f 100644 --- a/app/package.json +++ b/app/package.json @@ -53,7 +53,7 @@ "clean-webpack-plugin": "^4.0.0", "css-loader": "^6.7.1", "dayjs": "^1.11.5", - "electron": "21.4.2", + "electron": "21.4.4", "electron-builder": "^23.6.0", "encoding": "^0.1.13", "esbuild-loader": "^3.0.1", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index 5f385fb85..f68eeb906 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -3,7 +3,7 @@ lockfileVersion: '6.0' dependencies: '@electron/remote': specifier: ^2.0.9 - version: 2.0.9(electron@21.4.2) + version: 2.0.9(electron@21.4.4) electron-fetch: specifier: ^1.7.4 version: 1.7.4 @@ -31,8 +31,8 @@ devDependencies: specifier: ^1.11.5 version: 1.11.5 electron: - specifier: 21.4.2 - version: 21.4.2 + specifier: 21.4.4 + version: 21.4.4 electron-builder: specifier: ^23.6.0 version: 23.6.0 @@ -121,12 +121,12 @@ packages: transitivePeerDependencies: - supports-color - /@electron/remote@2.0.9(electron@21.4.2): + /@electron/remote@2.0.9(electron@21.4.4): resolution: {integrity: sha512-LR0W0ID6WAKHaSs0x5LX9aiG+5pFBNAJL6eQAJfGkCuZPUa6nZz+czZLdlTDETG45CgF/0raSvCtYOYUpr6c+A==} peerDependencies: electron: '>= 13.0.0' dependencies: - electron: 21.4.2 + electron: 21.4.4 dev: false /@electron/universal@1.2.1: @@ -1675,8 +1675,8 @@ packages: resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==} dev: true - /electron@21.4.2: - resolution: {integrity: sha512-AM2MbPUB7el/9O1UXL3xYA8pTDOPDxiT0HrLuXKkX8Oe0yCvjozNRzEac27gIUd1V/hg0BBvQuYjaRU1Rcxhyg==} + /electron@21.4.4: + resolution: {integrity: sha512-N5O7y7Gtt7mDgkJLkW49ETiT8M3myZ9tNIEvGTKhpBduX4WdgMj6c3hYeYBD6XW7SvbRkWEQaTl25RNday8Xpw==} engines: {node: '>= 10.17.0'} hasBin: true requiresBuild: true