From e798cedfb4169a7f5782e53ef7ff46e9c4958535 Mon Sep 17 00:00:00 2001 From: PikachuEXE Date: Sat, 25 Jun 2022 13:18:34 +0800 Subject: [PATCH 1/5] ^ Upgrade electron 16.x > 17.x --- .babelrc | 2 +- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.babelrc b/.babelrc index f60bd75e8a6bd..1a56ed5bf19c3 100644 --- a/.babelrc +++ b/.babelrc @@ -4,7 +4,7 @@ "@babel/env", { "targets": { - "chrome": "96", + "chrome": "98", "node": 16 } } diff --git a/package.json b/package.json index daf4feacf11de..d697ee0658faa 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "babel-loader": "^8.2.5", "copy-webpack-plugin": "^9.0.1", "css-loader": "5.2.6", - "electron": "^16.2.7", + "electron": "^17.4.8", "electron-builder": "^23.0.3", "electron-builder-squirrel-windows": "^22.13.1", "electron-debug": "^3.2.0", diff --git a/yarn.lock b/yarn.lock index 66f84e7042901..e5274065d9fa6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3103,10 +3103,10 @@ electron-to-chromium@^1.4.118: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz#186180a45617283f1c012284458510cd99d6787f" integrity sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA== -electron@^16.2.7: - version "16.2.7" - resolved "https://registry.yarnpkg.com/electron/-/electron-16.2.7.tgz#945e35ad1625e604f10c124fb912d1e2b3018317" - integrity sha512-aZKF3b00+rqW/HGs8lJM5DhPNj+mOfCuhLSiFXV6J9dQCIRhctJTmToOrwXfbCxvXK8as8eQTNl5uSfnHmH6tA== +electron@^17.4.8: + version "17.4.8" + resolved "https://registry.yarnpkg.com/electron/-/electron-17.4.8.tgz#a7940d125c120d51aa0c737c10d17851dada295d" + integrity sha512-JUHTFcBCXols+REajy9YQNypcgRGu35u/8oDmLIvjvrfIL4/Z3YAiq8HN4mhclWfuSmznrLeZ8uMktZWmvPOAg== dependencies: "@electron/get" "^1.13.0" "@types/node" "^14.6.2" From a832abbbfac5d2dec353f5cd50cbfeda6b7ba3ed Mon Sep 17 00:00:00 2001 From: PikachuEXE Date: Sat, 25 Jun 2022 16:08:52 +0800 Subject: [PATCH 2/5] ^ Upgrade electron 17.x > 18.x --- .babelrc | 2 +- package.json | 2 +- yarn.lock | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.babelrc b/.babelrc index 1a56ed5bf19c3..5f154fba64cf8 100644 --- a/.babelrc +++ b/.babelrc @@ -4,7 +4,7 @@ "@babel/env", { "targets": { - "chrome": "98", + "chrome": "100", "node": 16 } } diff --git a/package.json b/package.json index d697ee0658faa..c36a8f3c54984 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "babel-loader": "^8.2.5", "copy-webpack-plugin": "^9.0.1", "css-loader": "5.2.6", - "electron": "^17.4.8", + "electron": "^18.3.5", "electron-builder": "^23.0.3", "electron-builder-squirrel-windows": "^22.13.1", "electron-debug": "^3.2.0", diff --git a/yarn.lock b/yarn.lock index e5274065d9fa6..bc30854e0b4fa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1307,10 +1307,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.33.tgz#3c1879b276dc63e73030bb91165e62a4509cd506" integrity sha512-miWq2m2FiQZmaHfdZNcbpp9PuXg34W5JZ5CrJ/BaS70VuhoJENBEQybeiYSaPBRNq6KQGnjfEnc/F3PN++D+XQ== -"@types/node@^14.6.2": - version "14.18.18" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.18.tgz#5c9503030df484ccffcbb935ea9a9e1d6fad1a20" - integrity sha512-B9EoJFjhqcQ9OmQrNorItO+OwEOORNn3S31WuiHvZY/dm9ajkB7AKD/8toessEtHHNL+58jofbq7hMMY9v4yig== +"@types/node@^16.11.26": + version "16.11.41" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.41.tgz#88eb485b1bfdb4c224d878b7832239536aa2f813" + integrity sha512-mqoYK2TnVjdkGk8qXAVGc/x9nSaTpSrFaGFm43BUH3IdoBV0nta6hYaGmdOvIMlbHJbUEVen3gvwpwovAZKNdQ== "@types/plist@^3.0.1": version "3.0.2" @@ -3103,13 +3103,13 @@ electron-to-chromium@^1.4.118: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz#186180a45617283f1c012284458510cd99d6787f" integrity sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA== -electron@^17.4.8: - version "17.4.8" - resolved "https://registry.yarnpkg.com/electron/-/electron-17.4.8.tgz#a7940d125c120d51aa0c737c10d17851dada295d" - integrity sha512-JUHTFcBCXols+REajy9YQNypcgRGu35u/8oDmLIvjvrfIL4/Z3YAiq8HN4mhclWfuSmznrLeZ8uMktZWmvPOAg== +electron@^18.3.5: + version "18.3.5" + resolved "https://registry.yarnpkg.com/electron/-/electron-18.3.5.tgz#a589c2bfa3fe807914a055f54f665999329b739b" + integrity sha512-/GJ39X3ijpyZiOtYQ1ha5Ly0hWiIzF19CGEapM9euaM2AZrmt79x+MckQDXqJxOaVA9YHXju5Ho6b9pB9a/2pQ== dependencies: "@electron/get" "^1.13.0" - "@types/node" "^14.6.2" + "@types/node" "^16.11.26" extract-zip "^1.0.3" emoji-regex@^8.0.0: From 9a2cf600e464071f936e8315f7b73ca1d7456000 Mon Sep 17 00:00:00 2001 From: PikachuEXE Date: Fri, 5 Aug 2022 19:29:47 +0800 Subject: [PATCH 3/5] 18.3.7 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index c36a8f3c54984..bbda390f18d64 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "babel-loader": "^8.2.5", "copy-webpack-plugin": "^9.0.1", "css-loader": "5.2.6", - "electron": "^18.3.5", + "electron": "^18.3.7", "electron-builder": "^23.0.3", "electron-builder-squirrel-windows": "^22.13.1", "electron-debug": "^3.2.0", diff --git a/yarn.lock b/yarn.lock index bc30854e0b4fa..8d2fca566d061 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3103,10 +3103,10 @@ electron-to-chromium@^1.4.118: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz#186180a45617283f1c012284458510cd99d6787f" integrity sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA== -electron@^18.3.5: - version "18.3.5" - resolved "https://registry.yarnpkg.com/electron/-/electron-18.3.5.tgz#a589c2bfa3fe807914a055f54f665999329b739b" - integrity sha512-/GJ39X3ijpyZiOtYQ1ha5Ly0hWiIzF19CGEapM9euaM2AZrmt79x+MckQDXqJxOaVA9YHXju5Ho6b9pB9a/2pQ== +electron@^18.3.7: + version "18.3.7" + resolved "https://registry.yarnpkg.com/electron/-/electron-18.3.7.tgz#a22a23d63811d067c8e33abc5674122408319265" + integrity sha512-SDvX0VYejR1xw9PrJyvnyiDcuIhdzFVaA1NaRN2LEWXr5R6mEFl8NVTM+i5dtxMm2SHP/FPnkvmsWZs6MHijqg== dependencies: "@electron/get" "^1.13.0" "@types/node" "^16.11.26" From 981cc8ec6a10ce6acd7fdfcb75aaf95167421a67 Mon Sep 17 00:00:00 2001 From: PikachuEXE Date: Thu, 11 Aug 2022 09:39:42 +0800 Subject: [PATCH 4/5] 18.3.8 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index bbda390f18d64..cae232941d753 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "babel-loader": "^8.2.5", "copy-webpack-plugin": "^9.0.1", "css-loader": "5.2.6", - "electron": "^18.3.7", + "electron": "^18.3.8", "electron-builder": "^23.0.3", "electron-builder-squirrel-windows": "^22.13.1", "electron-debug": "^3.2.0", diff --git a/yarn.lock b/yarn.lock index 8d2fca566d061..846d4121564e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3103,10 +3103,10 @@ electron-to-chromium@^1.4.118: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz#186180a45617283f1c012284458510cd99d6787f" integrity sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA== -electron@^18.3.7: - version "18.3.7" - resolved "https://registry.yarnpkg.com/electron/-/electron-18.3.7.tgz#a22a23d63811d067c8e33abc5674122408319265" - integrity sha512-SDvX0VYejR1xw9PrJyvnyiDcuIhdzFVaA1NaRN2LEWXr5R6mEFl8NVTM+i5dtxMm2SHP/FPnkvmsWZs6MHijqg== +electron@^18.3.8: + version "18.3.8" + resolved "https://registry.yarnpkg.com/electron/-/electron-18.3.8.tgz#394ae5f8c6133db4c5c5c166ef9167bb65249e56" + integrity sha512-x67LztfMFMR/oQ788PTHLl871tQ/As78+/esjXCv/MhbumgVbd+dWYHf1YU4FaZK7GnUHNK7W8b2BamOyIP5AA== dependencies: "@electron/get" "^1.13.0" "@types/node" "^16.11.26" From bfe6edfcada67421379b3afb8c213e20e0dd093a Mon Sep 17 00:00:00 2001 From: PikachuEXE Date: Thu, 25 Aug 2022 09:33:31 +0800 Subject: [PATCH 5/5] 18.3.9 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index cae232941d753..b01370a35d20e 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "babel-loader": "^8.2.5", "copy-webpack-plugin": "^9.0.1", "css-loader": "5.2.6", - "electron": "^18.3.8", + "electron": "^18.3.9", "electron-builder": "^23.0.3", "electron-builder-squirrel-windows": "^22.13.1", "electron-debug": "^3.2.0", diff --git a/yarn.lock b/yarn.lock index 846d4121564e5..42b5d5ec0cfd3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3103,10 +3103,10 @@ electron-to-chromium@^1.4.118: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz#186180a45617283f1c012284458510cd99d6787f" integrity sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA== -electron@^18.3.8: - version "18.3.8" - resolved "https://registry.yarnpkg.com/electron/-/electron-18.3.8.tgz#394ae5f8c6133db4c5c5c166ef9167bb65249e56" - integrity sha512-x67LztfMFMR/oQ788PTHLl871tQ/As78+/esjXCv/MhbumgVbd+dWYHf1YU4FaZK7GnUHNK7W8b2BamOyIP5AA== +electron@^18.3.9: + version "18.3.9" + resolved "https://registry.yarnpkg.com/electron/-/electron-18.3.9.tgz#a2e8301f0bdf5a7a867793bd64441ae49f42499e" + integrity sha512-59m2yyHNeFxMjbMyYoRxyNWhdEwK0UOzbhGXGbAoYx/f95cVd9AduWL1G2TSUNgpwugm5Ia7hRs6GlZSPbbJtQ== dependencies: "@electron/get" "^1.13.0" "@types/node" "^16.11.26"