From e475d99be3ed97a6d2650fc99786bb25b4ff036e Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Tue, 16 Jul 2019 15:39:18 -0700
Subject: [PATCH] Update yarn version in CI, resolve dependency conflict

---
 .travis.yml            |  2 ++
 appveyor.yml           |  1 +
 build/install-yarn.ps1 | 12 ++++++++++++
 package.json           |  3 +++
 yarn.lock              |  1 +
 5 files changed, 19 insertions(+)
 create mode 100644 build/install-yarn.ps1

diff --git a/.travis.yml b/.travis.yml
index bbc84e7fd..b156a049c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,8 @@ node_js:
 os:
   - linux
 dist: trusty
+before_install:
+  - npm install -g yarn@1.17.3
 install:
   - yarn install --frozen-lockfile
 script:
diff --git a/appveyor.yml b/appveyor.yml
index ff2074921..3d6bd32e1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,6 +9,7 @@ install:
   - systeminfo | findstr /C:"OS"
   - set PATH=C:\Ruby23-x64\bin;%PATH%
   - ps: Install-Product node 10.13.0 x64
+  - ps: .\build\install-yarn.ps1
   - yarn install --frozen-lockfile
 
 build_script:
diff --git a/build/install-yarn.ps1 b/build/install-yarn.ps1
new file mode 100644
index 000000000..30ed9c0e8
--- /dev/null
+++ b/build/install-yarn.ps1
@@ -0,0 +1,12 @@
+# via https://gist.github.com/FeodorFitsner/1056703ec92bd6a3012c15fe78a5e162
+
+Write-Host "Installing Yarn..." -ForegroundColor Cyan
+
+Write-Host "Downloading..."
+$msiPath = "$env:TEMP\yarn.msi"
+(New-Object Net.WebClient).DownloadFile('https://github.com/yarnpkg/yarn/releases/download/v1.17.3/yarn-1.17.3.msi', $msiPath)
+
+Write-Host "Installing..."
+cmd /c start /wait msiexec /i "$msiPath" /quiet
+
+Write-Host "Yarn installed" -ForegroundColor Green
diff --git a/package.json b/package.json
index 3296af57a..f5e10dc49 100644
--- a/package.json
+++ b/package.json
@@ -112,6 +112,9 @@
     "uuid": "3.3.2",
     "websocket": "1.0.28"
   },
+  "resolutions": {
+    "fbjs/isomorphic-fetch/node-fetch": "https://github.com/scottnonnenberg-signal/node-fetch.git#3e5f51e08c647ee5f20c43b15cf2d352d61c36b4"
+  },
   "devDependencies": {
     "@types/chai": "4.1.2",
     "@types/classnames": "2.2.3",
diff --git a/yarn.lock b/yarn.lock
index 7c34cc69b..aafea682c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6282,6 +6282,7 @@ node-dir@^0.1.10:
 
 node-fetch@^1.0.1, "node-fetch@https://github.com/scottnonnenberg-signal/node-fetch.git#3e5f51e08c647ee5f20c43b15cf2d352d61c36b4":
   version "1.7.3"
+  uid "3e5f51e08c647ee5f20c43b15cf2d352d61c36b4"
   resolved "https://github.com/scottnonnenberg-signal/node-fetch.git#3e5f51e08c647ee5f20c43b15cf2d352d61c36b4"
   dependencies:
     encoding "^0.1.11"