From e17b6363ce274d2d976b0aaaebffbf1e1782d49a Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Sun, 30 Aug 2020 20:10:12 +0300 Subject: [PATCH] moved to electron v9, still have issues with RequireJS and electron v10... Signed-off-by: Alex A. Naanou --- Viewer/package-lock.json | 8 ++++---- Viewer/package.json | 7 +------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Viewer/package-lock.json b/Viewer/package-lock.json index 8745fe25..139b2e8b 100755 --- a/Viewer/package-lock.json +++ b/Viewer/package-lock.json @@ -1,6 +1,6 @@ { "name": "ImageGrid.Viewer.g4", - "version": "4.0.0-a", + "version": "4.0.0a", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -636,9 +636,9 @@ } }, "electron": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/electron/-/electron-7.3.3.tgz", - "integrity": "sha512-PrJEsuRiaAhTDHtbH3EM+RIne+nZ6ifGChUadmtmPqHUQ+rIhf4jSi2ZN768IgBDw4SidMJiCrvQRiuDha9+Ew==", + "version": "9.2.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-9.2.1.tgz", + "integrity": "sha512-ZsetaQjXB8+9/EFW1FnfK4ukpkwXCxMEaiKiUZhZ0ZLFlLnFCpe0Bg4vdDf7e4boWGcnlgN1jAJpBw7w0eXuqA==", "requires": { "@electron/get": "^1.0.1", "@types/node": "^12.0.12", diff --git a/Viewer/package.json b/Viewer/package.json index 1ae916dd..3e204ef2 100755 --- a/Viewer/package.json +++ b/Viewer/package.json @@ -20,7 +20,7 @@ "dependencies": { "app-module-path": "^1.0.6", "async-json": "0.0.2", - "electron": "^7.0.0", + "electron": "^9.0.0", "exiftool": "^0.0.3", "fs-extra": "^7.0.1", "fs-walk": "^0.0.1", @@ -48,11 +48,6 @@ "optionalDependencies": { "pica": "^3.0.6" }, - "optionalDependencies-disabled": { - "preact": "^8.2.7", - "react": "^15.6.2", - "react-dom": "^15.6.2" - }, "devDependencies": { "asar": "^3.0.1", "electron-rebuild": "^1.11.0",