From 8a6a0a40413b0ffc86375cd51b9046bb8991ea76 Mon Sep 17 00:00:00 2001 From: Colin Berry Date: Sat, 30 Jul 2022 21:47:28 +0100 Subject: [PATCH 1/2] fix: Address render issue in Electron 17 --- package-lock.json | 54 +++++++++++++++++++++++++++++------------------ package.json | 4 ++-- 2 files changed, 36 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 289ce65c1..cffb4b02e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@fortawesome/free-solid-svg-icons": "5.15.4", "@fortawesome/react-fontawesome": "0.1.18", "axios": "0.21.4", - "better-sqlite3": "7.5.3", + "better-sqlite3": "7.6.2", "connected-react-router": "6.9.2", "electron-updater": "4.3.1", "electron-util": "0.14.2", @@ -72,7 +72,7 @@ "chokidar": "^3.5.3", "coveralls": "3.1.0", "cross-env": "7.0.2", - "electron": "17.1.2", + "electron": "19.0.10", "electron-builder": "22.14.13", "electron-devtools-installer": "3.1.1", "eslint": "7.2.0", @@ -2574,7 +2574,8 @@ "node_modules/@types/node": { "version": "14.14.31", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.31.tgz", - "integrity": "sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g==" + "integrity": "sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g==", + "devOptional": true }, "node_modules/@types/prettier": { "version": "2.6.1", @@ -4156,9 +4157,9 @@ } }, "node_modules/better-sqlite3": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.5.3.tgz", - "integrity": "sha512-tNIrDsThpWT8j1mg+svI1pqCYROqNOWMbB2qXVg+TJqH9UR5XnbAHyRsLZoJagldGTTqJPj/sUPVOkW0GRpYqw==", + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.6.2.tgz", + "integrity": "sha512-S5zIU1Hink2AH4xPsN0W43T1/AJ5jrPh7Oy07ocuW/AKYYY02GWzz9NH0nbSMn/gw6fDZ5jZ1QsHt1BXAwJ6Lg==", "hasInstallScript": true, "dependencies": { "bindings": "^1.5.0", @@ -6459,13 +6460,13 @@ } }, "node_modules/electron": { - "version": "17.1.2", - "resolved": "https://registry.npmjs.org/electron/-/electron-17.1.2.tgz", - "integrity": "sha512-hqKQaUIRWX5Y2eAD8FZINWD/e5TKdpkbBYbkcZmJS4Bd1PKQsaDVc9h5xoA8zZQkPymE9rss+swjRpAFurOPGQ==", + "version": "19.0.10", + "resolved": "https://registry.npmjs.org/electron/-/electron-19.0.10.tgz", + "integrity": "sha512-EiWtPWdD7CzkRkp1cw7t0N9W2qhI5XZOudHX7daOh5wI076nsdV2dtlAf/XyTHhPNoKR5qhTWrSnYL9PY6D1vg==", "hasInstallScript": true, "dependencies": { - "@electron/get": "^1.13.0", - "@types/node": "^14.6.2", + "@electron/get": "^1.14.1", + "@types/node": "^16.11.26", "extract-zip": "^1.0.3" }, "bin": { @@ -6872,6 +6873,11 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/electron/node_modules/@types/node": { + "version": "16.11.46", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.46.tgz", + "integrity": "sha512-x+sfpb2dMrhCQPL4NAGs64Z9hh0t72aP0dg+PuZidmPr/0Gj5ELQTjD/t46dq3DF/8ZvSHOaIyDIbAsdPshyVQ==" + }, "node_modules/emittery": { "version": "0.10.2", "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz", @@ -22348,7 +22354,8 @@ "@types/node": { "version": "14.14.31", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.31.tgz", - "integrity": "sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g==" + "integrity": "sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g==", + "devOptional": true }, "@types/prettier": { "version": "2.6.1", @@ -23606,9 +23613,9 @@ } }, "better-sqlite3": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.5.3.tgz", - "integrity": "sha512-tNIrDsThpWT8j1mg+svI1pqCYROqNOWMbB2qXVg+TJqH9UR5XnbAHyRsLZoJagldGTTqJPj/sUPVOkW0GRpYqw==", + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.6.2.tgz", + "integrity": "sha512-S5zIU1Hink2AH4xPsN0W43T1/AJ5jrPh7Oy07ocuW/AKYYY02GWzz9NH0nbSMn/gw6fDZ5jZ1QsHt1BXAwJ6Lg==", "requires": { "bindings": "^1.5.0", "prebuild-install": "^7.1.0" @@ -25351,13 +25358,20 @@ } }, "electron": { - "version": "17.1.2", - "resolved": "https://registry.npmjs.org/electron/-/electron-17.1.2.tgz", - "integrity": "sha512-hqKQaUIRWX5Y2eAD8FZINWD/e5TKdpkbBYbkcZmJS4Bd1PKQsaDVc9h5xoA8zZQkPymE9rss+swjRpAFurOPGQ==", + "version": "19.0.10", + "resolved": "https://registry.npmjs.org/electron/-/electron-19.0.10.tgz", + "integrity": "sha512-EiWtPWdD7CzkRkp1cw7t0N9W2qhI5XZOudHX7daOh5wI076nsdV2dtlAf/XyTHhPNoKR5qhTWrSnYL9PY6D1vg==", "requires": { - "@electron/get": "^1.13.0", - "@types/node": "^14.6.2", + "@electron/get": "^1.14.1", + "@types/node": "^16.11.26", "extract-zip": "^1.0.3" + }, + "dependencies": { + "@types/node": { + "version": "16.11.46", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.46.tgz", + "integrity": "sha512-x+sfpb2dMrhCQPL4NAGs64Z9hh0t72aP0dg+PuZidmPr/0Gj5ELQTjD/t46dq3DF/8ZvSHOaIyDIbAsdPshyVQ==" + } } }, "electron-builder": { diff --git a/package.json b/package.json index 4afe52174..bc5660e25 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@fortawesome/free-solid-svg-icons": "5.15.4", "@fortawesome/react-fontawesome": "0.1.18", "axios": "0.21.4", - "better-sqlite3": "7.5.3", + "better-sqlite3": "7.6.2", "connected-react-router": "6.9.2", "electron-updater": "4.3.1", "electron-util": "0.14.2", @@ -95,7 +95,7 @@ "chokidar": "^3.5.3", "coveralls": "3.1.0", "cross-env": "7.0.2", - "electron": "17.2.0", + "electron": "19.0.10", "electron-builder": "22.14.13", "electron-devtools-installer": "3.1.1", "eslint": "7.2.0", From 27a401b29067511d941b30fccad879e6401ab3e6 Mon Sep 17 00:00:00 2001 From: Colin Berry Date: Sat, 30 Jul 2022 21:53:21 +0100 Subject: [PATCH 2/2] chore: Bump version number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bc5660e25..d8910573e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "flashpoint-launcher", - "version": "10.1.3", + "version": "10.1.4", "description": "A desktop application used to browse, manage and play games from BlueMaxima's Flashpoint", "main": "build/main/index.js", "config": {