From da77e801dcef11a41914e2cb44422f6a2e1c965c Mon Sep 17 00:00:00 2001 From: Izumi Hoshino Date: Wed, 24 Apr 2024 22:09:30 +0900 Subject: [PATCH] Upgraded Electron --- package-lock.json | 146 ++++++++++++++++++----------- packages/api-react/package.json | 2 +- packages/api/package.json | 2 +- packages/core/package.json | 10 +- packages/gui/package.json | 8 +- packages/gui/src/electron/main.tsx | 4 +- packages/icons/package.json | 2 +- packages/wallets/package.json | 2 +- 8 files changed, 109 insertions(+), 67 deletions(-) diff --git a/package-lock.json b/package-lock.json index f065772553..f33ee7f83d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2407,13 +2407,33 @@ } }, "node_modules/@electron/remote": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.0.10.tgz", - "integrity": "sha512-3SFKKaQXcyWgwmibud+UqJl/XlHOgLcI3fwtB9pNelPSJAcTxocOJrF6FaxBIQaj1+R05Di6xuAswZpXAW7xhA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.2.tgz", + "integrity": "sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==", "peerDependencies": { "electron": ">= 13.0.0" } }, + "node_modules/@electron/windows-sign": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.1.2.tgz", + "integrity": "sha512-eXEiZjDtxW3QORCWfRUarANPRTlH9B6At4jqBZJ0NzokSGutXQUVLPA6WmGpIhDW6w2yCMdHW1EJd1HrXtU5sg==", + "dev": true, + "optional": true, + "dependencies": { + "cross-dirname": "^0.1.0", + "debug": "^4.3.4", + "fs-extra": "^11.1.1", + "minimist": "^1.2.8", + "postject": "^1.0.0-alpha.6" + }, + "bin": { + "electron-windows-sign": "bin/electron-windows-sign.js" + }, + "engines": { + "node": ">=14.14" + } + }, "node_modules/@emoji-mart/data": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@emoji-mart/data/-/data-1.1.2.tgz", @@ -10144,6 +10164,13 @@ "sha.js": "^2.4.8" } }, + "node_modules/cross-dirname": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/cross-dirname/-/cross-dirname-0.1.0.tgz", + "integrity": "sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==", + "dev": true, + "optional": true + }, "node_modules/cross-env": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", @@ -10995,14 +11022,14 @@ } }, "node_modules/electron": { - "version": "27.0.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-27.0.0.tgz", - "integrity": "sha512-mr3Zoy82l8XKK/TgguE5FeNeHZ9KHXIGIpUMjbjZWIREfAv+X2Q3vdX6RG0Pmi1K23AFAxANXQezIHBA2Eypwg==", + "version": "30.0.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-30.0.1.tgz", + "integrity": "sha512-iwxkI/n2wBd29NH7TH0ZY8aWGzCoKpzJz+D10u7aGSJi1TV6d4MSM3rWyKvT/UkAHkTKOEgYfUyCa2vWQm8L0g==", "dev": true, "hasInstallScript": true, "dependencies": { "@electron/get": "^2.0.0", - "@types/node": "^18.11.18", + "@types/node": "^20.9.0", "extract-zip": "^2.0.1" }, "bin": { @@ -11059,20 +11086,23 @@ } }, "node_modules/electron-winstaller": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/electron-winstaller/-/electron-winstaller-5.1.0.tgz", - "integrity": "sha512-4wlZzkUm5cJNiOtp5wL804+QpygdKTKkrZJXA3sSDEI2XnCVPv0kxmxUvVw4KHBwbNS+Yox89agEr+VkR7kxww==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/electron-winstaller/-/electron-winstaller-5.3.1.tgz", + "integrity": "sha512-oM8BW3a8NEqG0XW+Vx3xywhk0DyDV4T0jT0zZfWt0IczNT3jHAAvQWBorF8osQDplSsCyXXyxrsrQ8cY0Slb/A==", "dev": true, "hasInstallScript": true, "dependencies": { "@electron/asar": "^3.2.1", "debug": "^4.1.1", "fs-extra": "^7.0.1", - "lodash.template": "^4.2.2", + "lodash": "^4.17.21", "temp": "^0.9.0" }, "engines": { "node": ">=8.0.0" + }, + "optionalDependencies": { + "@electron/windows-sign": "^1.1.2" } }, "node_modules/electron-winstaller/node_modules/fs-extra": { @@ -11108,10 +11138,13 @@ } }, "node_modules/electron/node_modules/@types/node": { - "version": "18.17.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.7.tgz", - "integrity": "sha512-WJj/p/cIg6zUsxv1n2leZHpvn8hr9TYuLQxAZxZcK/7+5t5ukmJGelOLGOy3L1MLhAO/sapTJGd1V7kvoIuzUg==", - "dev": true + "version": "20.12.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz", + "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==", + "dev": true, + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/elliptic": { "version": "6.5.4", @@ -16450,12 +16483,6 @@ "webpack": "^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.1.0" } }, - "node_modules/lodash._reinterpolate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", - "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==", - "dev": true - }, "node_modules/lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", @@ -16494,25 +16521,6 @@ "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==", "dev": true }, - "node_modules/lodash.template": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz", - "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==", - "dev": true, - "dependencies": { - "lodash._reinterpolate": "^3.0.0", - "lodash.templatesettings": "^4.0.0" - } - }, - "node_modules/lodash.templatesettings": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz", - "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==", - "dev": true, - "dependencies": { - "lodash._reinterpolate": "^3.0.0" - } - }, "node_modules/log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -19235,6 +19243,32 @@ "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" }, + "node_modules/postject": { + "version": "1.0.0-alpha.6", + "resolved": "https://registry.npmjs.org/postject/-/postject-1.0.0-alpha.6.tgz", + "integrity": "sha512-b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A==", + "dev": true, + "optional": true, + "dependencies": { + "commander": "^9.4.0" + }, + "bin": { + "postject": "dist/cli.js" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/postject/node_modules/commander": { + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz", + "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==", + "dev": true, + "optional": true, + "engines": { + "node": "^12.20.0 || >=14" + } + }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -22751,6 +22785,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true + }, "node_modules/unicode-canonical-property-names-ecmascript": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", @@ -24337,7 +24377,7 @@ "typescript": "5.1.6" }, "engines": { - "node": ">=16.15.0" + "node": ">=18.18.2" } }, "packages/api-react": { @@ -24377,7 +24417,7 @@ "typescript": "5.1.6" }, "engines": { - "node": ">=16.15.0" + "node": ">=18.18.2" }, "peerDependencies": { "@chia-network/api": "^1.0.0", @@ -24431,7 +24471,7 @@ "@chia-network/api": "1.0.0", "@chia-network/api-react": "1.0.0", "@chia-network/icons": "1.0.0", - "@electron/remote": "2.0.10", + "@electron/remote": "2.1.2", "@emotion/react": "11.11.1", "@emotion/styled": "11.11.0", "@lingui/cli": "4.4.0", @@ -24461,7 +24501,7 @@ "babel-plugin-macros": "3.1.0", "babel-plugin-styled-components": "2.1.4", "babel-plugin-transform-imports": "2.0.0", - "electron": "27.0.0", + "electron": "30.0.1", "jest": "29.6.3", "react": "18.2.0", "react-dom": "18.2.0", @@ -24474,13 +24514,13 @@ "typescript": "5.1.6" }, "engines": { - "node": ">=16.15.0" + "node": ">=18.18.2" }, "peerDependencies": { "@chia-network/api": "1.0.0", "@chia-network/api-react": "1.0.0", "@chia-network/icons": "1.0.0", - "@electron/remote": "^2.0.10", + "@electron/remote": "^2.1.2", "@lingui/core": "^4.4.0", "@lingui/react": "^4.4.0", "@mui/icons-material": "^5.14.3", @@ -24488,7 +24528,7 @@ "@mui/material": "^5.14.5", "@mui/styled-engine-sc": "^5.12.0", "@mui/styles": "^5.14.5", - "electron": "^27.0.0", + "electron": "^30.0.1", "react": "^18.2.0", "react-dom": "^18.2.0", "react-hook-form": "^7.45.4", @@ -24507,7 +24547,7 @@ "@chia-network/core": "1.0.0", "@chia-network/icons": "1.0.0", "@chia-network/wallets": "1.0.0", - "@electron/remote": "2.0.10", + "@electron/remote": "2.1.2", "@lingui/core": "4.4.0", "@lingui/macro": "4.4.0", "@lingui/react": "4.4.0", @@ -24602,10 +24642,10 @@ "cross-env": "7.0.3", "css-loader": "6.8.1", "date-and-time": "2.4.3", - "electron": "27.0.0", + "electron": "30.0.1", "electron-devtools-assembler": "1.2.0", "electron-playwright-helpers": "^1.6.0", - "electron-winstaller": "5.1.0", + "electron-winstaller": "5.3.1", "html-webpack-plugin": "5.5.3", "jest": "29.6.3", "lodash-webpack-plugin": "0.11.6", @@ -24620,7 +24660,7 @@ "webpack-dev-server": "4.15.1" }, "engines": { - "node": ">=16.15.0" + "node": ">=18.18.2" }, "optionalDependencies": { "playwright": "1.37.1" @@ -24691,7 +24731,7 @@ "typescript": "5.1.6" }, "engines": { - "node": ">=16.15.0" + "node": ">=18.18.2" }, "peerDependencies": { "@mui/icons-material": "^5.14.3", @@ -24775,7 +24815,7 @@ "typescript": "5.1.6" }, "engines": { - "node": ">=16.15.0" + "node": ">=18.18.2" }, "peerDependencies": { "@chia-network/api": "^1.0.0", diff --git a/packages/api-react/package.json b/packages/api-react/package.json index 609e7b81a9..2c5ee55d4d 100644 --- a/packages/api-react/package.json +++ b/packages/api-react/package.json @@ -5,7 +5,7 @@ "productName": "Chia Blockchain", "version": "1.0.0", "engines": { - "node": ">=16.15.0" + "node": ">=18.18.2" }, "main": "dist/index.js", "module": "dist/esm.js", diff --git a/packages/api/package.json b/packages/api/package.json index a639c24c18..232aced46d 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -5,7 +5,7 @@ "productName": "Chia Blockchain", "version": "1.0.0", "engines": { - "node": ">=16.15.0" + "node": ">=18.18.2" }, "main": "dist/index.js", "module": "dist/esm.js", diff --git a/packages/core/package.json b/packages/core/package.json index 5c322982e4..0e663a63ae 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -5,7 +5,7 @@ "productName": "Chia Blockchain", "version": "1.0.0", "engines": { - "node": ">=16.15.0" + "node": ">=18.18.2" }, "main": "dist/index.js", "module": "dist/esm.js", @@ -63,7 +63,7 @@ "@chia-network/api": "1.0.0", "@chia-network/api-react": "1.0.0", "@chia-network/icons": "1.0.0", - "@electron/remote": "2.0.10", + "@electron/remote": "2.1.2", "@emotion/react": "11.11.1", "@emotion/styled": "11.11.0", "@lingui/cli": "4.4.0", @@ -93,7 +93,7 @@ "babel-plugin-macros": "3.1.0", "babel-plugin-styled-components": "2.1.4", "babel-plugin-transform-imports": "2.0.0", - "electron": "27.0.0", + "electron": "30.0.1", "jest": "29.6.3", "react": "18.2.0", "react-dom": "18.2.0", @@ -109,7 +109,7 @@ "@chia-network/api": "1.0.0", "@chia-network/api-react": "1.0.0", "@chia-network/icons": "1.0.0", - "@electron/remote": "^2.0.10", + "@electron/remote": "^2.1.2", "@lingui/core": "^4.4.0", "@lingui/react": "^4.4.0", "@mui/icons-material": "^5.14.3", @@ -117,7 +117,7 @@ "@mui/material": "^5.14.5", "@mui/styled-engine-sc": "^5.12.0", "@mui/styles": "^5.14.5", - "electron": "^27.0.0", + "electron": "^30.0.1", "react": "^18.2.0", "react-dom": "^18.2.0", "react-hook-form": "^7.45.4", diff --git a/packages/gui/package.json b/packages/gui/package.json index 5c30430765..efc91ec2e5 100644 --- a/packages/gui/package.json +++ b/packages/gui/package.json @@ -7,7 +7,7 @@ "homepage": "./", "main": "build/electron/main.js", "engines": { - "node": ">=16.15.0" + "node": ">=18.18.2" }, "jest": { "testPathIgnorePatterns": [ @@ -41,7 +41,7 @@ "@chia-network/core": "1.0.0", "@chia-network/icons": "1.0.0", "@chia-network/wallets": "1.0.0", - "@electron/remote": "2.0.10", + "@electron/remote": "2.1.2", "@lingui/core": "4.4.0", "@lingui/macro": "4.4.0", "@lingui/react": "4.4.0", @@ -136,10 +136,10 @@ "cross-env": "7.0.3", "date-and-time": "2.4.3", "css-loader": "6.8.1", - "electron": "27.0.0", + "electron": "30.0.1", "electron-devtools-assembler": "1.2.0", "electron-playwright-helpers": "^1.6.0", - "electron-winstaller": "5.1.0", + "electron-winstaller": "5.3.1", "html-webpack-plugin": "5.5.3", "jest": "29.6.3", "lodash-webpack-plugin": "0.11.6", diff --git a/packages/gui/src/electron/main.tsx b/packages/gui/src/electron/main.tsx index 36800a29bc..ad81dda064 100644 --- a/packages/gui/src/electron/main.tsx +++ b/packages/gui/src/electron/main.tsx @@ -435,6 +435,8 @@ if (ensureSingleInstance() && ensureCorrectEnvironment()) { await cacheManager.init(); + const initialBgColor = prefs.darkMode ? '#0F252A' : '#ffffff'; + mainWindow = new BrowserWindow({ x: mainWindowState.x, y: mainWindowState.y, @@ -442,7 +444,7 @@ if (ensureSingleInstance() && ensureCorrectEnvironment()) { height: mainWindowState.height, minWidth: 500, minHeight: 500, - backgroundColor: '#ffffff', + backgroundColor: initialBgColor, show: isPlaywrightTesting, webPreferences: { preload: `${__dirname}/preload.js`, diff --git a/packages/icons/package.json b/packages/icons/package.json index b538418678..095a70ad69 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -5,7 +5,7 @@ "productName": "Chia Blockchain", "version": "1.0.0", "engines": { - "node": ">=16.15.0" + "node": ">=18.18.2" }, "main": "dist/index.js", "module": "dist/esm.js", diff --git a/packages/wallets/package.json b/packages/wallets/package.json index 7448b36959..dc155ec89f 100644 --- a/packages/wallets/package.json +++ b/packages/wallets/package.json @@ -4,7 +4,7 @@ "description": "Chia wallets Library", "version": "1.0.0", "engines": { - "node": ">=16.15.0" + "node": ">=18.18.2" }, "main": "dist/index.js", "module": "dist/esm.js",