From dea1360b906c0c15056865950f02674821a87684 Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Sat, 14 Jan 2023 21:33:09 +0900 Subject: [PATCH] Upgrade electron version to 20.3.9 --- package.json | 2 +- src/index.ejs | 10 ---------- src/main/preload.js | 5 ----- yarn.lock | 41 ++++++++--------------------------------- 4 files changed, 9 insertions(+), 49 deletions(-) diff --git a/package.json b/package.json index b59d0c62..92ed38ca 100644 --- a/package.json +++ b/package.json @@ -153,7 +153,7 @@ "css-loader": "^6.7.3", "del": "^6.1.1", "devtron": "^1.4.0", - "electron": "19.1.9", + "electron": "20.3.9", "electron-builder": "23.3.3", "electron-debug": "^3.2.0", "electron-devtools-installer": "^3.2.0", diff --git a/src/index.ejs b/src/index.ejs index d544ce03..33bb20f6 100644 --- a/src/index.ejs +++ b/src/index.ejs @@ -3,19 +3,9 @@ Whalebird - <% if (htmlWebpackPlugin.options.nodeModules) { %> - - - <% } %>
- - diff --git a/src/main/preload.js b/src/main/preload.js index 41dabf27..c0df2306 100644 --- a/src/main/preload.js +++ b/src/main/preload.js @@ -1,12 +1,7 @@ const electron = require('electron') -const path = require('path') -const mod = require('module') global.ipcRenderer = electron.ipcRenderer global.shell = electron.shell global.clipboard = electron.clipboard global.node_env = process.env.NODE_ENV global.platform = process.platform -global.path = path -global.mod = mod -global.static_path = path.join(__dirname, '/static').replace(/\\/g, '\\\\') diff --git a/yarn.lock b/yarn.lock index 444d0c40..b42c3721 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4187,16 +4187,6 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -concat-stream@^1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" - integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== - dependencies: - buffer-from "^1.0.0" - inherits "^2.0.3" - readable-stream "^2.2.2" - typedarray "^0.0.6" - config-chain@^1.1.11: version "1.1.12" resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa" @@ -5161,14 +5151,14 @@ electron-windows-store@^2.1.0: multiline "^2.0.0" path-exists "^3.0.0" -electron@19.1.9: - version "19.1.9" - resolved "https://registry.yarnpkg.com/electron/-/electron-19.1.9.tgz#01995eea4014f7cdb2f616f5f3492d4ed6f5e4f0" - integrity sha512-XT5LkTzIHB+ZtD3dTmNnKjVBWrDWReCKt9G1uAFLz6uJMEVcIUiYO+fph5pLXETiBw/QZBx8egduMEfIccLx+g== +electron@20.3.9: + version "20.3.9" + resolved "https://registry.yarnpkg.com/electron/-/electron-20.3.9.tgz#a2f53087658b3523825a7e21a969a61d8419e25b" + integrity sha512-CPThZ0Q0otIsFgwh2K6fMfrMX/3jsWt+fdjl1tiZh08MD8f74Az+dFB4NKpDHzqr4RFuRqh/W5CdGyGtvXXtFQ== dependencies: "@electron/get" "^1.14.1" "@types/node" "^16.11.26" - extract-zip "^1.0.3" + extract-zip "^2.0.1" elegant-spinner@^1.0.1: version "1.0.1" @@ -5833,17 +5823,7 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -extract-zip@^1.0.3: - version "1.7.0" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927" - integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA== - dependencies: - concat-stream "^1.6.2" - debug "^2.6.9" - mkdirp "^0.5.4" - yauzl "^2.10.0" - -extract-zip@^2.0.0: +extract-zip@^2.0.0, extract-zip@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== @@ -9054,7 +9034,7 @@ mkdirp@1.x, mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mkdirp@^0.5.1, mkdirp@^0.5.4: +mkdirp@^0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -10317,7 +10297,7 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -readable-stream@^2.0.1, readable-stream@^2.2.2, readable-stream@~2.3.6: +readable-stream@^2.0.1, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -12070,11 +12050,6 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -typedarray@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" - integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= - typescript@4.9.4, typescript@^4.9.4: version "4.9.4" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78"