From 042a6b58c43696f4d0cca4b23cbb74a9fb08729f Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Thu, 25 Aug 2016 12:14:49 +0100 Subject: [PATCH 1/2] Remove redundant whatwg import This has been rewritten to use browser-request rather than whatwg, so remove the import, which was causing the build to fail on npm 2. (It worked, for the wrong reasons, on npm 3.) --- src/components/views/dialogs/ChangelogDialog.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/views/dialogs/ChangelogDialog.js b/src/components/views/dialogs/ChangelogDialog.js index 823c205b8c..ea32a756a1 100644 --- a/src/components/views/dialogs/ChangelogDialog.js +++ b/src/components/views/dialogs/ChangelogDialog.js @@ -16,7 +16,6 @@ import React from 'react'; import sdk from 'matrix-react-sdk'; -import 'whatwg-fetch'; import request from 'browser-request'; const REPOS = ['vector-im/vector-web', 'matrix-org/matrix-react-sdk', 'matrix-org/matrix-js-sdk']; From df026aede2982ffd6ffa710396d61915551a46f9 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Thu, 25 Aug 2016 14:25:05 +0100 Subject: [PATCH 2/2] Switch to node 6 ... because 4 is ooold, and I'd like to use the same version on travis. --- jenkins.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins.sh b/jenkins.sh index f60bec38b2..2f9d8ce52f 100755 --- a/jenkins.sh +++ b/jenkins.sh @@ -4,7 +4,7 @@ set -e export NVM_DIR="/home/jenkins/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" -nvm use 4 +nvm use 6 set -x