mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-05-21 03:21:21 +08:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
Vanessa
commit
e7fcb8b822
2
.github/CONTRIBUTING.md
vendored
2
.github/CONTRIBUTING.md
vendored
@ -13,7 +13,7 @@ Install pnpm: `npm install -g pnpm`
|
||||
<summary>For China mainland</summary>
|
||||
Set the Electron mirror environment variable:
|
||||
|
||||
* macOS/Linux: ELECTRON_MIRROR="https://cnpmjs.org/mirrors/electron/" pnpm install electron@14.2.5 -D
|
||||
* macOS/Linux: ELECTRON_MIRROR="https://cnpmjs.org/mirrors/electron/" pnpm install electron@19.0.8 -D
|
||||
* Windows: `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
|
||||
|
||||
NPM mirror:
|
||||
|
||||
2
.github/CONTRIBUTING_zh_CN.md
vendored
2
.github/CONTRIBUTING_zh_CN.md
vendored
@ -13,7 +13,7 @@
|
||||
<summary>适用于中国大陆</summary>
|
||||
设置 Electron 镜像环境变量：
|
||||
|
||||
* macOS/Linux：ELECTRON_MIRROR="https://cnpmjs.org/mirrors/electron/" pnpm install electron@14.2.5 -D
|
||||
* macOS/Linux：ELECTRON_MIRROR="https://cnpmjs.org/mirrors/electron/" pnpm install electron@19.0.8 -D
|
||||
* Windows: `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
|
||||
|
||||
NPM 镜像：
|
||||
|
||||
@ -59,7 +59,7 @@
|
||||
"clean-webpack-plugin": "^4.0.0",
|
||||
"css-loader": "^6.3.0",
|
||||
"dayjs": "^1.10.7",
|
||||
"electron": "14.2.5",
|
||||
"electron": "19.0.8",
|
||||
"electron-builder": "^23.3.1",
|
||||
"encoding": "^0.1.13",
|
||||
"eslint": "^8.16.0",
|
||||
|
||||
@ -15,7 +15,7 @@ specifiers:
|
||||
clean-webpack-plugin: ^4.0.0
|
||||
css-loader: ^6.3.0
|
||||
dayjs: ^1.10.7
|
||||
electron: 14.2.5
|
||||
electron: 19.0.8
|
||||
electron-builder: ^23.3.1
|
||||
electron-fetch: ^1.7.4
|
||||
encoding: ^0.1.13
|
||||
@ -39,7 +39,7 @@ specifiers:
|
||||
webpack-cli: ^4.8.0
|
||||
|
||||
dependencies:
|
||||
'@electron/remote': 2.0.8_electron@14.2.5
|
||||
'@electron/remote': 2.0.8_electron@19.0.8
|
||||
electron-fetch: 1.7.4
|
||||
pnpm: 7.5.0
|
||||
|
||||
@ -57,7 +57,7 @@ devDependencies:
|
||||
clean-webpack-plugin: 4.0.0_webpack@5.70.0
|
||||
css-loader: 6.7.1_webpack@5.70.0
|
||||
dayjs: 1.11.0
|
||||
electron: 14.2.5
|
||||
electron: 19.0.8
|
||||
electron-builder: 23.3.1
|
||||
encoding: 0.1.13
|
||||
eslint: 8.16.0
|
||||
@ -1265,12 +1265,12 @@ packages:
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
/@electron/remote/2.0.8_electron@14.2.5:
|
||||
/@electron/remote/2.0.8_electron@19.0.8:
|
||||
resolution: {integrity: sha512-P10v3+iFCIvEPeYzTWWGwwHmqWnjoh8RYnbtZAb3RlQefy4guagzIwcWtfftABIfm6JJTNQf4WPSKWZOpLmHXw==}
|
||||
peerDependencies:
|
||||
electron: '>= 13.0.0'
|
||||
dependencies:
|
||||
electron: 14.2.5
|
||||
electron: 19.0.8
|
||||
dev: false
|
||||
|
||||
/@electron/universal/1.2.1:
|
||||
@ -1460,8 +1460,8 @@ packages:
|
||||
resolution: {integrity: sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==}
|
||||
dev: true
|
||||
|
||||
/@types/node/14.18.12:
|
||||
resolution: {integrity: sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A==}
|
||||
/@types/node/16.11.43:
|
||||
resolution: {integrity: sha512-GqWykok+3uocgfAJM8imbozrqLnPyTrpFlrryURQlw1EesPUCx5XxTiucWDSFF9/NUEXDuD4bnvHm8xfVGWTpQ==}
|
||||
|
||||
/@types/node/17.0.35:
|
||||
resolution: {integrity: sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==}
|
||||
@ -2112,7 +2112,7 @@ packages:
|
||||
dev: true
|
||||
|
||||
/buffer-crc32/0.2.13:
|
||||
resolution: {integrity: sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=}
|
||||
resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
|
||||
|
||||
/buffer-equal/1.0.0:
|
||||
resolution: {integrity: sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ==}
|
||||
@ -2780,14 +2780,14 @@ packages:
|
||||
resolution: {integrity: sha512-CoOKsuACoa0PAG3hQXxbh/XDiFcjGuSyGKUi09cjMHOt6RCi7/EXgXhaFF3I+aC89Omudqmkzd0YOQKxwtf/Bg==}
|
||||
dev: true
|
||||
|
||||
/electron/14.2.5:
|
||||
resolution: {integrity: sha512-L5Y0s3LOAKtHYFQanxULZxfZzxkldNvCyfsFiiNwo7rMi1M+THKfSHCgDarHluSIGc4NvOEomV7P1RL97qpr6A==}
|
||||
/electron/19.0.8:
|
||||
resolution: {integrity: sha512-OWK3P/NbDFfBUv+wbYv1/OV4jehY5DQPT7n1maQJfN9hsnrWTMktXS/bmS05eSUAjNAzHmKPKfiKH2c1Yr7nGw==}
|
||||
engines: {node: '>= 8.6'}
|
||||
hasBin: true
|
||||
requiresBuild: true
|
||||
dependencies:
|
||||
'@electron/get': 1.14.1
|
||||
'@types/node': 14.18.12
|
||||
'@types/node': 16.11.43
|
||||
extract-zip: 1.7.0
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
@ -2802,7 +2802,7 @@ packages:
|
||||
dev: true
|
||||
|
||||
/encodeurl/1.0.2:
|
||||
resolution: {integrity: sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=}
|
||||
resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==}
|
||||
engines: {node: '>= 0.8'}
|
||||
optional: true
|
||||
|
||||
@ -3055,7 +3055,7 @@ packages:
|
||||
dev: true
|
||||
|
||||
/fd-slicer/1.1.0:
|
||||
resolution: {integrity: sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=}
|
||||
resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
|
||||
dependencies:
|
||||
pend: 1.2.0
|
||||
|
||||
@ -3690,7 +3690,7 @@ packages:
|
||||
dev: true
|
||||
|
||||
/isarray/1.0.0:
|
||||
resolution: {integrity: sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=}
|
||||
resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
|
||||
|
||||
/isbinaryfile/3.0.3:
|
||||
resolution: {integrity: sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==}
|
||||
@ -3771,7 +3771,7 @@ packages:
|
||||
dev: true
|
||||
|
||||
/json-stringify-safe/5.0.1:
|
||||
resolution: {integrity: sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=}
|
||||
resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
|
||||
optional: true
|
||||
|
||||
/json5/1.0.1:
|
||||
@ -4225,7 +4225,7 @@ packages:
|
||||
dev: true
|
||||
|
||||
/pend/1.2.0:
|
||||
resolution: {integrity: sha1-elfrVQpng/kRUzH89GY9XI4AelA=}
|
||||
resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==}
|
||||
|
||||
/picocolors/1.0.0:
|
||||
resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
|
||||
@ -4242,7 +4242,7 @@ packages:
|
||||
dev: true
|
||||
|
||||
/pify/3.0.0:
|
||||
resolution: {integrity: sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=}
|
||||
resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==}
|
||||
engines: {node: '>=4'}
|
||||
optional: true
|
||||
|
||||
@ -4370,7 +4370,7 @@ packages:
|
||||
engines: {node: '>=0.4.0'}
|
||||
|
||||
/proto-list/1.2.4:
|
||||
resolution: {integrity: sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=}
|
||||
resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}
|
||||
optional: true
|
||||
|
||||
/pump/3.0.0:
|
||||
@ -4672,7 +4672,7 @@ packages:
|
||||
dev: true
|
||||
|
||||
/semver-compare/1.0.0:
|
||||
resolution: {integrity: sha1-De4hahyUGrN+nvsXiPavxf9VN/w=}
|
||||
resolution: {integrity: sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==}
|
||||
optional: true
|
||||
|
||||
/semver-diff/3.1.1:
|
||||
@ -5056,7 +5056,7 @@ packages:
|
||||
dev: true
|
||||
|
||||
/typedarray/0.0.6:
|
||||
resolution: {integrity: sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=}
|
||||
resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
|
||||
|
||||
/typescript/4.6.3:
|
||||
resolution: {integrity: sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==}
|
||||
@ -5381,7 +5381,7 @@ packages:
|
||||
dev: true
|
||||
|
||||
/yauzl/2.10.0:
|
||||
resolution: {integrity: sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=}
|
||||
resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
|
||||
dependencies:
|
||||
buffer-crc32: 0.2.13
|
||||
fd-slicer: 1.1.0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user