diff --git a/app/global_errors.js b/app/global_errors.js index 7f97813d2..a640059fb 100644 --- a/app/global_errors.js +++ b/app/global_errors.js @@ -10,6 +10,9 @@ let quitText = 'Quit'; let copyErrorAndQuitText = 'Copy error and quit'; function handleError(prefix, error) { + if (console._error) { + console._error(`${prefix}:`, Errors.toLogFormat(error)); + } console.error(`${prefix}:`, Errors.toLogFormat(error)); if (app.isReady()) { diff --git a/package.json b/package.json index 578969791..02193da23 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "fs-xattr": "0.3.0" }, "dependencies": { - "@journeyapps/sqlcipher": "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#00fd0f8a6623c6683280976d2a92b41d09c744bc", + "@journeyapps/sqlcipher": "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#b10f232fac62ba7f8775c9e086bb5558fe7d948b", "@sindresorhus/is": "0.8.0", "array-move": "2.1.0", "backbone": "1.3.3", @@ -290,16 +290,6 @@ ], "target": [ "nsis" - ], - "extraFiles": [ - { - "from": "node_modules/@journeyapps/sqlcipher/build/Release/", - "to": ".", - "filter": [ - "msvcp140.dll", - "vcruntime140.dll" - ] - } ] }, "nsis": { @@ -387,9 +377,7 @@ "node_modules/sharp/build/**", "!node_modules/@journeyapps/sqlcipher/deps/*", "!node_modules/@journeyapps/sqlcipher/build/*", - "!node_modules/@journeyapps/sqlcipher/lib/binding/node-*", - "!node_modules/@journeyapps/sqlcipher/lib/binding/electron-*/msvcp140.dll", - "!node_modules/@journeyapps/sqlcipher/lib/binding/electron-*/vcruntime140.dll" + "!node_modules/@journeyapps/sqlcipher/lib/binding/node-*" ] } } diff --git a/yarn.lock b/yarn.lock index ee167eb68..99645a6f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1264,9 +1264,9 @@ resolved "https://registry.yarnpkg.com/@icons/material/-/material-0.2.4.tgz#e90c9f71768b3736e76d7dd6783fc6c2afa88bc8" integrity sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw== -"@journeyapps/sqlcipher@https://github.com/scottnonnenberg-signal/node-sqlcipher.git#00fd0f8a6623c6683280976d2a92b41d09c744bc": +"@journeyapps/sqlcipher@https://github.com/scottnonnenberg-signal/node-sqlcipher.git#b10f232fac62ba7f8775c9e086bb5558fe7d948b": version "4.0.0" - resolved "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#00fd0f8a6623c6683280976d2a92b41d09c744bc" + resolved "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#b10f232fac62ba7f8775c9e086bb5558fe7d948b" dependencies: nan "^2.12.1" node-pre-gyp "^0.11.0"