diff --git a/package.json b/package.json index 45b71ed9c2..468a0a6e23 100644 --- a/package.json +++ b/package.json @@ -206,8 +206,8 @@ "cross-env": "5.2.0", "css-loader": "3.2.0", "dashdash": "1.14.1", - "electron": "8.0.1", - "electron-builder": "22.3.2", + "electron": "8.0.2", + "electron-builder": "22.3.5", "electron-icon-maker": "0.0.3", "eslint": "4.14.0", "eslint-config-airbnb-base": "12.1.0", diff --git a/preload.js b/preload.js index f5ba01cf38..22876cceb8 100644 --- a/preload.js +++ b/preload.js @@ -412,7 +412,14 @@ try { /* eslint-enable global-require, import/no-extraneous-dependencies */ } } catch (error) { - window.log.info('preload error!', error.stack); + /* eslint-disable no-console */ + if (console._log) { + console._log('preload error!', error.stack); + } else { + console.log('preload error!', error.stack); + } + /* eslint-enable no-console */ + throw error; } diff --git a/ts/util/lint/exceptions.json b/ts/util/lint/exceptions.json index f30a45ff90..55b55150c5 100644 --- a/ts/util/lint/exceptions.json +++ b/ts/util/lint/exceptions.json @@ -2909,126 +2909,6 @@ "updated": "2018-09-18T19:19:27.699Z", "reasonDetail": "What's being eval'd is a static string, with one variable: args. Args is of the form arg1, arg2, generated programmatically." }, - { - "rule": "jQuery-wrap(", - "path": "node_modules/dmg-builder/node_modules/ansi-styles/index.js", - "line": "\t\t\tstyles[name] = wrap(identity, offset);", - "lineNumber": 52, - "reasonCategory": "falseMatch", - "updated": "2020-02-19T16:21:00.217Z" - }, - { - "rule": "jQuery-wrap(", - "path": "node_modules/dmg-builder/node_modules/ansi-styles/index.js", - "line": "\t\t\tstyles[name] = wrap(suite[targetSpace], offset);", - "lineNumber": 54, - "reasonCategory": "falseMatch", - "updated": "2020-02-19T16:21:00.217Z" - }, - { - "rule": "jQuery-$(", - "path": "node_modules/dmg-builder/node_modules/app-builder-lib/out/frameworks/LibUiFramework.js", - "line": " DIR=$(dirname \"$0\")", - "lineNumber": 100, - "reasonCategory": "falseMatch", - "updated": "2020-02-19T16:21:00.217Z" - }, - { - "rule": "jQuery-$(", - "path": "node_modules/dmg-builder/node_modules/app-builder-lib/out/frameworks/LibUiFramework.js", - "line": " DIR=$(dirname \"$0\")", - "lineNumber": 110, - "reasonCategory": "falseMatch", - "updated": "2020-02-19T16:21:00.217Z" - }, - { - "rule": "jQuery-$(", - "path": "node_modules/dmg-builder/node_modules/app-builder-lib/out/targets/MsiTarget.js", - "line": " result += `\\n${fileSpace}