Skip to content

Commit

Permalink
Revert electron-builder upgrade due to bugs
Browse files Browse the repository at this point in the history 
This reverts commit 8a3acc6
  • Loading branch information
@scottnonnenberg-signal
scottnonnenberg-signal committed Feb 14, 2019
1 parent 5b54c95 commit 3f8223f
Show file tree
Hide file tree
Showing 4 changed files with 334 additions and 531 deletions.
4 changes: 2 additions & 2 deletions package.json
View file
Expand Up @@ -52,7 +52,7 @@
"config": "1.28.1",
"electron-editor-context-menu": "1.1.1",
"electron-is-dev": "0.3.0",
"electron-updater": "4.0.6",
"electron-updater": "2.21.10",
"emoji-datasource": "4.0.0",
"emoji-datasource-apple": "4.0.0",
"emoji-js": "3.4.0",
Expand Down Expand Up @@ -113,7 +113,7 @@
"bower": "1.8.2",
"chai": "4.1.2",
"electron": "3.0.14",
"electron-builder": "20.38.5",
"electron-builder": "20.13.5",
"electron-icon-maker": "0.0.3",
"eslint": "4.14.0",
"eslint-config-airbnb-base": "12.1.0",
Expand Down
206 changes: 74 additions & 132 deletions ts/util/lint/exceptions.json
View file
Expand Up @@ -1758,78 +1758,6 @@
"reasonCategory": "falseMatch",
"updated": "2018-09-15T00:38:04.183Z"
},
{
"rule": "jQuery-load(",
"path": "node_modules/app-builder-lib/node_modules/debug/dist/debug.js",
"line": " createDebug.enable(createDebug.load());",
"lineNumber": 721,
"reasonCategory": "falseMatch",
"updated": "2019-01-26T01:47:58.953Z"
},
{
"rule": "jQuery-load(",
"path": "node_modules/app-builder-lib/node_modules/debug/dist/debug.js",
"line": " function load() {",
"lineNumber": 855,
"reasonCategory": "falseMatch",
"updated": "2019-01-26T01:47:58.953Z"
},
{
"rule": "jQuery-load(",
"path": "node_modules/app-builder-lib/node_modules/debug/src/browser.js",
"line": "function load() {",
"lineNumber": 211,
"reasonCategory": "falseMatch",
"updated": "2019-01-26T01:47:58.953Z"
},
{
"rule": "jQuery-load(",
"path": "node_modules/app-builder-lib/node_modules/debug/src/common.js",
"line": "\tcreateDebug.enable(createDebug.load());",
"lineNumber": 261,
"reasonCategory": "falseMatch",
"updated": "2019-01-26T01:47:58.953Z"
},
{
"rule": "jQuery-load(",
"path": "node_modules/app-builder-lib/node_modules/debug/src/node.js",
"line": "function load() {",
"lineNumber": 216,
"reasonCategory": "falseMatch",
"updated": "2019-01-26T01:47:58.953Z"
},
{
"rule": "jQuery-$(",
"path": "node_modules/app-builder-lib/out/frameworks/LibUiFramework.js",
"line": " DIR=$(dirname \"$0\")",
"lineNumber": 113,
"reasonCategory": "falseMatch",
"updated": "2019-01-26T01:47:58.953Z"
},
{
"rule": "jQuery-$(",
"path": "node_modules/app-builder-lib/out/frameworks/LibUiFramework.js",
"line": " DIR=$(dirname \"$0\")",
"lineNumber": 127,
"reasonCategory": "falseMatch",
"updated": "2019-01-26T01:47:58.953Z"
},
{
"rule": "jQuery-$(",
"path": "node_modules/app-builder-lib/out/targets/MsiTarget.js",
"line": " result += `\\n${fileSpace} <File Name=\"${fileName}\" Source=\"$(var.appDir)${path.sep}${packagePath}\" ReadOnly=\"yes\" KeyPath=\"yes\"`;",
"lineNumber": 352,
"reasonCategory": "falseMatch",
"updated": "2019-01-26T01:47:58.953Z"
},
{
"rule": "jQuery-$(",
"path": "node_modules/app-builder-lib/out/targets/nsis/nsisLicense.js",
"line": " licensePage.push('!insertmacro MUI_PAGE_LICENSE \"$(MUILicense)\"');",
"lineNumber": 100,
"reasonCategory": "falseMatch",
"updated": "2019-01-26T01:47:58.953Z"
},
{
"rule": "jQuery-append(",
"path": "node_modules/archiver/lib/core.js",
Expand Down Expand Up @@ -2099,85 +2027,69 @@
"reasonCategory": "falseMatch",
"updated": "2018-09-19T18:13:29.628Z"
},
{
"rule": "jQuery-load(",
"path": "node_modules/builder-util-runtime/node_modules/debug/dist/debug.js",
"line": " createDebug.enable(createDebug.load());",
"lineNumber": 721,
"reasonCategory": "falseMatch",
"updated": "2019-01-26T01:47:58.953Z"
},
{
"rule": "jQuery-load(",
"path": "node_modules/builder-util-runtime/node_modules/debug/dist/debug.js",
"line": " function load() {",
"lineNumber": 855,
"reasonCategory": "falseMatch",
"updated": "2019-01-26T01:47:58.953Z"
},
{
"rule": "jQuery-load(",
"path": "node_modules/builder-util-runtime/node_modules/debug/src/browser.js",
"line": "function load() {",
"lineNumber": 211,
"lineNumber": 160,
"reasonCategory": "falseMatch",
"updated": "2019-01-26T01:47:58.953Z"
"updated": "2018-09-15T00:38:04.183Z"
},
{
"rule": "jQuery-load(",
"path": "node_modules/builder-util-runtime/node_modules/debug/src/common.js",
"line": "\tcreateDebug.enable(createDebug.load());",
"lineNumber": 261,
"path": "node_modules/builder-util-runtime/node_modules/debug/src/browser.js",
"line": "exports.enable(load());",
"lineNumber": 178,
"reasonCategory": "falseMatch",
"updated": "2019-01-26T01:47:58.953Z"
"updated": "2018-09-15T00:38:04.183Z"
},
{
"rule": "jQuery-load(",
"path": "node_modules/builder-util-runtime/node_modules/debug/src/node.js",
"line": "function load() {",
"lineNumber": 216,
"lineNumber": 162,
"reasonCategory": "falseMatch",
"updated": "2019-01-26T01:47:58.953Z"
"updated": "2018-09-15T00:38:04.183Z"
},
{
"rule": "jQuery-load(",
"path": "node_modules/builder-util/node_modules/debug/dist/debug.js",
"line": " createDebug.enable(createDebug.load());",
"lineNumber": 721,
"path": "node_modules/builder-util-runtime/node_modules/debug/src/node.js",
"line": "exports.enable(load());",
"lineNumber": 186,
"reasonCategory": "falseMatch",
"updated": "2019-01-26T01:47:58.953Z"
"updated": "2018-09-15T00:38:04.183Z"
},
{
"rule": "jQuery-load(",
"path": "node_modules/builder-util/node_modules/debug/dist/debug.js",
"line": " function load() {",
"lineNumber": 855,
"path": "node_modules/builder-util/node_modules/debug/src/browser.js",
"line": "function load() {",
"lineNumber": 160,
"reasonCategory": "falseMatch",
"updated": "2019-01-26T01:47:58.953Z"
"updated": "2018-09-15T00:38:04.183Z"
},
{
"rule": "jQuery-load(",
"path": "node_modules/builder-util/node_modules/debug/src/browser.js",
"line": "function load() {",
"lineNumber": 211,
"line": "exports.enable(load());",
"lineNumber": 178,
"reasonCategory": "falseMatch",
"updated": "2019-01-26T01:47:58.953Z"
"updated": "2018-09-15T00:38:04.183Z"
},
{
"rule": "jQuery-load(",
"path": "node_modules/builder-util/node_modules/debug/src/common.js",
"line": "\tcreateDebug.enable(createDebug.load());",
"lineNumber": 261,
"path": "node_modules/builder-util/node_modules/debug/src/node.js",
"line": "function load() {",
"lineNumber": 162,
"reasonCategory": "falseMatch",
"updated": "2019-01-26T01:47:58.953Z"
"updated": "2018-09-15T00:38:04.183Z"
},
{
"rule": "jQuery-load(",
"path": "node_modules/builder-util/node_modules/debug/src/node.js",
"line": "function load() {",
"lineNumber": 216,
"line": "exports.enable(load());",
"lineNumber": 186,
"reasonCategory": "falseMatch",
"updated": "2019-01-26T01:47:58.953Z"
"updated": "2018-09-15T00:38:04.183Z"
},
{
"rule": "jQuery-$(",
Expand Down Expand Up @@ -2555,6 +2467,38 @@
"reasonCategory": "falseMatch",
"updated": "2018-09-19T18:13:29.628Z"
},
{
"rule": "jQuery-load(",
"path": "node_modules/electron-download-tf/node_modules/debug/src/browser.js",
"line": "function load() {",
"lineNumber": 160,
"reasonCategory": "falseMatch",
"updated": "2018-09-15T00:38:04.183Z"
},
{
"rule": "jQuery-load(",
"path": "node_modules/electron-download-tf/node_modules/debug/src/browser.js",
"line": "exports.enable(load());",
"lineNumber": 178,
"reasonCategory": "falseMatch",
"updated": "2018-09-15T00:38:04.183Z"
},
{
"rule": "jQuery-load(",
"path": "node_modules/electron-download-tf/node_modules/debug/src/node.js",
"line": "function load() {",
"lineNumber": 153,
"reasonCategory": "falseMatch",
"updated": "2018-09-15T00:38:04.183Z"
},
{
"rule": "jQuery-load(",
"path": "node_modules/electron-download-tf/node_modules/debug/src/node.js",
"line": "exports.enable(load());",
"lineNumber": 177,
"reasonCategory": "falseMatch",
"updated": "2018-09-15T00:38:04.183Z"
},
{
"rule": "eval",
"path": "node_modules/electron/electron.d.ts",
Expand Down Expand Up @@ -4092,17 +4036,17 @@
"rule": "jQuery-load(",
"path": "node_modules/js-yaml/dist/js-yaml.js",
"line": "function load(input, options) {",
"lineNumber": 2545,
"lineNumber": 2537,
"reasonCategory": "falseMatch",
"updated": "2019-01-26T01:47:58.953Z"
"updated": "2018-09-15T00:38:04.183Z"
},
{
"rule": "jQuery-load(",
"path": "node_modules/js-yaml/dist/js-yaml.js",
"line": " return load(input, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));",
"lineNumber": 2568,
"lineNumber": 2560,
"reasonCategory": "falseMatch",
"updated": "2019-01-26T01:47:58.953Z"
"updated": "2018-09-15T00:38:04.183Z"
},
{
"rule": "jQuery-$(",
Expand Down Expand Up @@ -5876,35 +5820,33 @@
"rule": "eval",
"path": "node_modules/source-map-support/source-map-support.js",
"line": " // Most eval() calls are in this format",
"lineNumber": 234,
"reasonCategory": "exampleCode",
"updated": "2019-01-26T01:47:58.953Z"
"lineNumber": 235,
"reasonCategory": "falseMatch",
"updated": "2018-09-15T00:38:04.183Z"
},
{
"rule": "eval",
"path": "node_modules/source-map-support/source-map-support.js",
"line": " // Parse nested eval() calls using recursion",
"lineNumber": 246,
"reasonCategory": "exampleCode",
"updated": "2019-01-26T01:47:58.953Z"
"lineNumber": 247,
"reasonCategory": "falseMatch",
"updated": "2018-09-15T00:38:04.183Z"
},
{
"rule": "eval",
"path": "node_modules/source-map-support/source-map-support.js",
"line": " // passed to eval() ending in \"//# sourceURL=...\" will return the source file",
"lineNumber": 344,
"reasonCategory": "falseMatch|testCode|exampleCode|otherUtilityCode|regexMatchedSafeCode|notExercisedByOurApp|ruleNeeded|usageTrusted",
"updated": "2019-01-26T01:47:58.953Z",
"reasonDetail": "<optional>"
"lineNumber": 345,
"reasonCategory": "falseMatch",
"updated": "2018-09-15T00:38:04.183Z"
},
{
"rule": "eval",
"path": "node_modules/source-map-support/source-map-support.js",
"line": " // Code called using eval() needs special handling",
"lineNumber": 373,
"reasonCategory": "falseMatch|testCode|exampleCode|otherUtilityCode|regexMatchedSafeCode|notExercisedByOurApp|ruleNeeded|usageTrusted",
"updated": "2019-01-26T01:47:58.953Z",
"reasonDetail": "<optional>"
"lineNumber": 372,
"reasonCategory": "falseMatch",
"updated": "2018-09-15T00:38:04.183Z"
},
{
"rule": "jQuery-prepend(",
Expand Down
1 change: 0 additions & 1 deletion ts/util/lint/linter.ts
View file
Expand Up @@ -85,7 +85,6 @@ const excludedFiles = [
'^node_modules/body-parser/*',
'^node_modules/bower/*',
'^node_modules/buble/*',
'^node_modules/cacache/*',
'^node_modules/chai/*',
'^node_modules/cli-table2/*',
'^node_modules/codemirror/*',
Expand Down

0 comments on commit 3f8223f

Please sign in to comment.