From eae7660074cf1406955e789fe38c91e54d51e372 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Fri, 5 Apr 2019 17:09:32 -0700
Subject: [PATCH] Downgrade to electron-builder@20.39.0 due to windows install
bug
https://github.com/electron-userland/electron-builder/issues/3813
---
package.json | 2 +-
ts/util/lint/exceptions.json | 40 ++++++++++++
yarn.lock | 122 +++++++++++++++++++++++------------
3 files changed, 121 insertions(+), 43 deletions(-)
diff --git a/package.json b/package.json
index da4a4c6ec..c9c1092bb 100644
--- a/package.json
+++ b/package.json
@@ -132,7 +132,7 @@
"chai": "4.1.2",
"dashdash": "1.14.1",
"electron": "4.1.2",
- "electron-builder": "20.40.0",
+ "electron-builder": "20.39.0",
"electron-icon-maker": "0.0.3",
"eslint": "4.14.0",
"eslint-config-airbnb-base": "12.1.0",
diff --git a/ts/util/lint/exceptions.json b/ts/util/lint/exceptions.json
index fbc723be0..2edda105d 100644
--- a/ts/util/lint/exceptions.json
+++ b/ts/util/lint/exceptions.json
@@ -2814,6 +2814,46 @@
"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-load(",
+ "path": "node_modules/dmg-builder/node_modules/debug/dist/debug.js",
+ "line": " createDebug.enable(createDebug.load());",
+ "lineNumber": 721,
+ "reasonCategory": "falseMatch",
+ "updated": "2019-04-06T00:07:44.427Z"
+ },
+ {
+ "rule": "jQuery-load(",
+ "path": "node_modules/dmg-builder/node_modules/debug/dist/debug.js",
+ "line": " function load() {",
+ "lineNumber": 855,
+ "reasonCategory": "falseMatch",
+ "updated": "2019-04-06T00:07:44.427Z"
+ },
+ {
+ "rule": "jQuery-load(",
+ "path": "node_modules/dmg-builder/node_modules/debug/src/browser.js",
+ "line": "function load() {",
+ "lineNumber": 211,
+ "reasonCategory": "falseMatch",
+ "updated": "2019-04-06T00:07:44.427Z"
+ },
+ {
+ "rule": "jQuery-load(",
+ "path": "node_modules/dmg-builder/node_modules/debug/src/common.js",
+ "line": "\tcreateDebug.enable(createDebug.load());",
+ "lineNumber": 261,
+ "reasonCategory": "falseMatch",
+ "updated": "2019-04-06T00:07:44.427Z"
+ },
+ {
+ "rule": "jQuery-load(",
+ "path": "node_modules/dmg-builder/node_modules/debug/src/node.js",
+ "line": "function load() {",
+ "lineNumber": 216,
+ "reasonCategory": "falseMatch",
+ "updated": "2019-04-06T00:07:44.427Z"
+ },
{
"rule": "jQuery-$(",
"path": "node_modules/dotenv-expand/lib/main.js",
diff --git a/yarn.lock b/yarn.lock
index 7ffc4d7f2..6951a6ccd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -463,39 +463,44 @@ anymatch@^2.0.0:
micromatch "^3.1.4"
normalize-path "^2.1.1"
+app-builder-bin@2.6.4:
+ version "2.6.4"
+ resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.6.4.tgz#011cd9e7e144d52b43fffa15aff8039804d3078a"
+ integrity sha512-wC9HYqiC1XqpunT/9y2VuF90KbarnIHL90Tv8BD3TITTgbVIdRTXAsvWvmaR/ImvAX0+l5Z3jZtXjdJ7Pw3bLQ==
+
app-builder-bin@2.6.6:
version "2.6.6"
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.6.6.tgz#904b0576a510047d03f63c8a02c38eef47871180"
integrity sha512-G0Ee6xkbxV+fvM/7xXWIgSDjWAD4E/d/aNbxerq/TVsCyBIau/0VPmrEqBMyZv0NbTwLDW5aF/yHG+0ZEY77kA==
-app-builder-lib@20.40.0, app-builder-lib@~20.40.0:
- version "20.40.0"
- resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.40.0.tgz#09756d28f15f45d4c4f9658ec142432cbcde377c"
- integrity sha512-F1asWqNAH1l5KJlrBZh85LFJck90zYP/9raOJTvF72WATesGg4h/LpCyWsz054n8/eP/mXxmog6D7PMfd1lz5w==
+app-builder-lib@20.39.0, app-builder-lib@~20.39.0:
+ version "20.39.0"
+ resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.39.0.tgz#197faba9cd7c32005d3882e6add051c4e182fdc3"
+ integrity sha512-lkxGyBrQwueYb3ViqHt5WjyzVVBQqXMXc7TF+JqkuuUWp5DF7SXAYZYd+rsR3gmCbdNxw4SPIEmWmm+I9LK2gw==
dependencies:
"7zip-bin" "~4.1.0"
- app-builder-bin "2.6.6"
+ app-builder-bin "2.6.4"
async-exit-hook "^2.0.1"
bluebird-lst "^1.0.7"
- builder-util "9.7.1"
- builder-util-runtime "8.2.1"
+ builder-util "9.7.0"
+ builder-util-runtime "8.2.0"
chromium-pickle-js "^0.2.0"
debug "^4.1.1"
ejs "^2.6.1"
electron-osx-sign "0.4.11"
- electron-publish "20.40.0"
+ electron-publish "20.39.0"
fs-extra-p "^7.0.1"
hosted-git-info "^2.7.1"
is-ci "^2.0.0"
isbinaryfile "^4.0.0"
- js-yaml "^3.13.0"
+ js-yaml "^3.12.1"
lazy-val "^1.0.4"
minimatch "^3.0.4"
normalize-package-data "^2.5.0"
plist "^3.0.1"
read-config-file "3.2.2"
sanitize-filename "^1.6.1"
- semver "^6.0.0"
+ semver "^5.6.0"
temp-file "^3.3.2"
append-transform@^0.4.0:
@@ -1214,7 +1219,17 @@ buffers@~0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"
-builder-util-runtime@8.2.1, builder-util-runtime@^8.2.1:
+builder-util-runtime@8.2.0:
+ version "8.2.0"
+ resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.2.0.tgz#e64c311b4f3643c8ccd8b8e5ba5bfb10801a6826"
+ integrity sha512-2Q3YrxANTrDs2NjSG5mbNGLPuUhPnSNYF9w5i4jWfHcNfQ3TgRrGXq4UfnkCiZVX8Axp4eAOSscaLLScKp/XLg==
+ dependencies:
+ bluebird-lst "^1.0.7"
+ debug "^4.1.1"
+ fs-extra-p "^7.0.1"
+ sax "^1.2.4"
+
+builder-util-runtime@^8.2.0, builder-util-runtime@^8.2.1:
version "8.2.1"
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.2.1.tgz#2d16be6cb040b3654d84b76487256158e60b6e3b"
integrity sha512-2TkeTcI9bDlK5azRZSJJNxhAgW1DK+JY3jHK0UWPxgJcan4GZSVDNNO3sXntNxrp+JAdPHMF14rzNd/G53lvqw==
@@ -1224,7 +1239,25 @@ builder-util-runtime@8.2.1, builder-util-runtime@^8.2.1:
fs-extra-p "^7.0.1"
sax "^1.2.4"
-builder-util@9.7.1, builder-util@~9.7.1:
+builder-util@9.7.0:
+ version "9.7.0"
+ resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-9.7.0.tgz#7aabec1136bf646023f2ebe231a26e82bb9d42cf"
+ integrity sha512-QA2RxbaSKvaFVNGcYsjmlkTn03tcdPxgIxHCOgw38G7NK91QWc76RBY9+T1sU8BLVEZJ4qNRWx+pd5rG9tTi+Q==
+ dependencies:
+ "7zip-bin" "~4.1.0"
+ app-builder-bin "2.6.4"
+ bluebird-lst "^1.0.7"
+ builder-util-runtime "^8.2.0"
+ chalk "^2.4.2"
+ debug "^4.1.1"
+ fs-extra-p "^7.0.1"
+ is-ci "^2.0.0"
+ js-yaml "^3.12.1"
+ source-map-support "^0.5.10"
+ stat-mode "^0.2.2"
+ temp-file "^3.3.2"
+
+builder-util@~9.7.0:
version "9.7.1"
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-9.7.1.tgz#31234b48ac574eb1cd4b4eaa982c0480571eae7a"
integrity sha512-txpzYIeuHFjrOQWPTJDvhJYisIVGJdSG9ppccE+y7agT0YNhBlVHGnd8+HgFTajYE34xzB5zf1/zxiiDqSKSpA==
@@ -2444,17 +2477,17 @@ dir-glob@^2.0.0:
arrify "^1.0.1"
path-type "^3.0.0"
-dmg-builder@6.6.1:
- version "6.6.1"
- resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-6.6.1.tgz#d1761e36e624ebe3f6c57a8c4d728b95b51fb255"
- integrity sha512-aIbpQG3es+gHTFtsBQE4fmSYVM60yewxJZsN6FhkAmAmNaoO45bEQNJZsRX0YE49+imiSC92mJmFAEP6iKE0Tg==
+dmg-builder@6.6.0:
+ version "6.6.0"
+ resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-6.6.0.tgz#301ae1239d3328864ae1419c1ff744b599a208d3"
+ integrity sha512-voodd3qdpdRiaciFZTfrFq/e82UPmUqSJq6R3Wc2Ql6XqXYLQcKo1h9rSZiivwls8PqE4Mk1IHTIOwmvJaq+MA==
dependencies:
- app-builder-lib "~20.40.0"
+ app-builder-lib "~20.39.0"
bluebird-lst "^1.0.7"
- builder-util "~9.7.1"
+ builder-util "~9.7.0"
fs-extra-p "^7.0.1"
iconv-lite "^0.4.24"
- js-yaml "^3.13.0"
+ js-yaml "^3.12.1"
parse-color "^1.0.0"
sanitize-filename "^1.6.1"
@@ -2566,24 +2599,24 @@ ejs@~2.5.6:
version "2.5.7"
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
-electron-builder@20.40.0:
- version "20.40.0"
- resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.40.0.tgz#8959e5dc3bfd4410b07770da11283b92b8237157"
- integrity sha512-xTUq9lMdqXzc+2h68l0MtESk6cErNye7n0zXKKUlBvun+KYiIzhzpIJyt1OW2Wb7K89KHP1aGuxLXQe8h/LQyg==
+electron-builder@20.39.0:
+ version "20.39.0"
+ resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.39.0.tgz#ab2f5b556f36dea3947eb43ef312a955ba7f9d16"
+ integrity sha512-50SNZ/G+iE9MpTwxzeHt1Cqg8jZKeFLuJ9wubR4e/8VIzAe0ERUmwAQw+77UrlwXZD/PKKoYblc0Sr08Vm4exg==
dependencies:
- app-builder-lib "20.40.0"
+ app-builder-lib "20.39.0"
bluebird-lst "^1.0.7"
- builder-util "9.7.1"
- builder-util-runtime "8.2.1"
+ builder-util "9.7.0"
+ builder-util-runtime "8.2.0"
chalk "^2.4.2"
- dmg-builder "6.6.1"
+ dmg-builder "6.6.0"
fs-extra-p "^7.0.1"
is-ci "^2.0.0"
lazy-val "^1.0.4"
read-config-file "3.2.2"
sanitize-filename "^1.6.1"
update-notifier "^2.5.0"
- yargs "^13.2.2"
+ yargs "^13.2.1"
electron-chromedriver@~3.0.0:
version "3.0.0"
@@ -2644,18 +2677,18 @@ electron-osx-sign@0.4.11:
minimist "^1.2.0"
plist "^3.0.1"
-electron-publish@20.40.0:
- version "20.40.0"
- resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.40.0.tgz#156eacd9b8bab563a3f8723e9b45214915a9681d"
- integrity sha512-mkjtsIgftRszuT/8do8TszmddokDnu254OyTeL8nE780o/A8t68oXHZzvlTJ4AQ8uBOYrA87JDO/BFCWjnVArA==
+electron-publish@20.39.0:
+ version "20.39.0"
+ resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.39.0.tgz#a945d871b469b4160933d4e027612710b653f006"
+ integrity sha512-PWrGUru994CSmtsA56GnjyLB3EnIS3zyEmrW0hDXtwuctZLGMnrxjK/7WEORYkgTQ/GufD5b/8T05Q2Kr42nqQ==
dependencies:
bluebird-lst "^1.0.7"
- builder-util "~9.7.1"
- builder-util-runtime "^8.2.1"
+ builder-util "~9.7.0"
+ builder-util-runtime "^8.2.0"
chalk "^2.4.2"
fs-extra-p "^7.0.1"
lazy-val "^1.0.4"
- mime "^2.4.1"
+ mime "^2.4.0"
electron-to-chromium@^1.2.7:
version "1.3.41"
@@ -5716,7 +5749,7 @@ mime@^1.5.0:
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
-mime@^2.4.1:
+mime@^2.4.0:
version "2.4.1"
resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.1.tgz#19eb7357bebbda37df585b14038347721558c715"
integrity sha512-VRUfmQO0rCd3hKwBymAn3kxYzBHr3I/wdVMywgG3HhXOwrCQgN84ZagpdTm2tZ4TNtwsSmyJWYO88mb5XvzGqQ==
@@ -8319,10 +8352,10 @@ semver@^5.0.1, semver@^5.5.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
-semver@^6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
- integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
+semver@^5.6.0:
+ version "5.7.0"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
+ integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
semver@~5.3.0:
version "5.3.0"
@@ -8586,7 +8619,7 @@ source-map-resolve@^0.5.0:
source-map-url "^0.4.0"
urix "^0.1.0"
-source-map-support@^0.5.11:
+source-map-support@^0.5.10, source-map-support@^0.5.11:
version "0.5.11"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.11.tgz#efac2ce0800355d026326a0ca23e162aeac9a4e2"
integrity sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==
@@ -8739,6 +8772,11 @@ ssri@^5.2.4:
dependencies:
safe-buffer "^5.1.1"
+stat-mode@^0.2.2:
+ version "0.2.2"
+ resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502"
+ integrity sha1-5sgLYjEj19gM8TLOU480YokHJQI=
+
stat-mode@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.3.0.tgz#69283b081f851582b328d2a4ace5f591ce52f54b"
@@ -10151,7 +10189,7 @@ yargs@^10.0.3:
y18n "^3.2.1"
yargs-parser "^8.0.0"
-yargs@^13.2.2:
+yargs@^13.2.1:
version "13.2.2"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==