From 42ce5337dbcf78debe41ec4d1f076b3ae1f9c42c Mon Sep 17 00:00:00 2001 From: sytolk Date: Mon, 30 Jan 2023 12:44:09 +0200 Subject: [PATCH] fix https://github.com/lovell/sharp/issues/3384 --- app/package.json | 2 +- package-lock.json | 14 +++++++------- package.json | 2 +- scripts/checkWSinstalled.js | 3 ++- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/package.json b/app/package.json index 04d498b363..e791d936d5 100644 --- a/app/package.json +++ b/app/package.json @@ -18,6 +18,6 @@ "nodeDependencies": { "@tagspaces/tagspaces-ws": "2.1.13", "@tagspaces/extensions": "1.0.68", - "sharp": "^0.30.7" + "sharp": "0.31.3" } } diff --git a/package-lock.json b/package-lock.json index 6221eccf5e..b9837428c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -132,7 +132,7 @@ "current-git-branch": "^1.1.0", "detect-port": "^1.3.0", "dotenv-webpack": "^8.0.1", - "electron": "21.3.3", + "electron": "21.3.5", "electron-builder": "^23.6.0", "electron-devtools-installer": "^3.2.0", "electron-notarize": "^1.2.2", @@ -20692,9 +20692,9 @@ } }, "node_modules/electron": { - "version": "21.3.3", - "resolved": "https://registry.npmjs.org/electron/-/electron-21.3.3.tgz", - "integrity": "sha512-2a9l8mUQlzXH/9WZrGYDJTyJOliLKbmEuCrQ8bfX1McAQOmI6PDQxfHV4qFUtyCDUp5SHrq5nuvg0c1pIkDBhg==", + "version": "21.3.5", + "resolved": "https://registry.npmjs.org/electron/-/electron-21.3.5.tgz", + "integrity": "sha512-KV/qACdMsppgrleKuPNKk2kynO/o+hCDbl6MfGFbqY3d8RnhLixCBuertBrcap04dQ5vspMiDHekMOpSDS3SaA==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -65040,9 +65040,9 @@ } }, "electron": { - "version": "21.3.3", - "resolved": "https://registry.npmjs.org/electron/-/electron-21.3.3.tgz", - "integrity": "sha512-2a9l8mUQlzXH/9WZrGYDJTyJOliLKbmEuCrQ8bfX1McAQOmI6PDQxfHV4qFUtyCDUp5SHrq5nuvg0c1pIkDBhg==", + "version": "21.3.5", + "resolved": "https://registry.npmjs.org/electron/-/electron-21.3.5.tgz", + "integrity": "sha512-KV/qACdMsppgrleKuPNKk2kynO/o+hCDbl6MfGFbqY3d8RnhLixCBuertBrcap04dQ5vspMiDHekMOpSDS3SaA==", "dev": true, "requires": { "@electron/get": "^1.14.1", diff --git a/package.json b/package.json index 8e5e674834..15a83e815e 100644 --- a/package.json +++ b/package.json @@ -270,7 +270,7 @@ "current-git-branch": "^1.1.0", "detect-port": "^1.3.0", "dotenv-webpack": "^8.0.1", - "electron": "21.3.3", + "electron": "21.3.5", "electron-builder": "^23.6.0", "electron-devtools-installer": "^3.2.0", "electron-notarize": "^1.2.2", diff --git a/scripts/checkWSinstalled.js b/scripts/checkWSinstalled.js index a30bfd3062..0679aa03a7 100644 --- a/scripts/checkWSinstalled.js +++ b/scripts/checkWSinstalled.js @@ -78,7 +78,8 @@ if (platform === 'node') { !isInstalled( '@tagspaces/tagspaces-ws', packageJson.nodeDependencies['@tagspaces/tagspaces-ws'] - ) + ) || + !isInstalled('sharp', packageJson.nodeDependencies['sharp']) ) { installCmd = 'npm run-script install-ext-node'; }