From 6da5da7c382e5ec80013d19456019bd18d568bda Mon Sep 17 00:00:00 2001 From: Ray Schamp Date: Tue, 8 May 2018 18:53:36 -0400 Subject: [PATCH 1/6] Bump Travis to Node 8 Tests fail otherwise, with the new version of webpack? --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a30fee73a..46c6bebed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js node_js: -- 6 +- 8 - node env: - NPM_SCRIPT="tap:unit -- --jobs=4" From c705be4cfaec2f2e80f861ff9aa9e53aa6812b0d Mon Sep 17 00:00:00 2001 From: Ray Schamp Date: Tue, 8 May 2018 19:27:26 -0400 Subject: [PATCH 2/6] Update expose-loader dependency instead It doesn't make sense that webpack 4 has made Node 6 builds. Maybe it's due to peer dependencies on the install step? --- .travis.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 46c6bebed..a30fee73a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js node_js: -- 8 +- 6 - node env: - NPM_SCRIPT="tap:unit -- --jobs=4" diff --git a/package.json b/package.json index cdebb7cfd..a772b44d0 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "escape-html": "1.0.3", "eslint": "^4.5.0", "eslint-config-scratch": "^5.0.0", - "expose-loader": "0.7.4", + "expose-loader": "0.7.5", "file-loader": "^1.1.6", "format-message": "5.2.1", "format-message-cli": "5.2.1", From aad5131f93229a132e37f8ef7f56fb25c03f0108 Mon Sep 17 00:00:00 2001 From: Ray Schamp Date: Tue, 8 May 2018 19:35:29 -0400 Subject: [PATCH 3/6] Update remaining peer dependency --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a772b44d0..eaba65786 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "adm-zip": "0.4.7", "arraybuffer-loader": "^1.0.3", "babel-core": "^6.24.1", - "babel-eslint": "^7.1.1", + "babel-eslint": "^8.0.1", "babel-loader": "^7.0.0", "babel-preset-env": "^1.6.1", "canvas-toBlob": "1.0.0", From a12e4dfbae9ad45de9f9abb8183f383d719bb390 Mon Sep 17 00:00:00 2001 From: Ray Schamp Date: Tue, 8 May 2018 19:36:01 -0400 Subject: [PATCH 4/6] Update Travis Node to 8 The peer dependency fix seemed to work, but we want to be up to 8 on all our repos anyway so do that. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a30fee73a..46c6bebed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js node_js: -- 6 +- 8 - node env: - NPM_SCRIPT="tap:unit -- --jobs=4" From 4dca1b29aac36bd42d1ec82aeb7721bf9fbdb53b Mon Sep 17 00:00:00 2001 From: Ray Schamp Date: Tue, 8 May 2018 19:37:09 -0400 Subject: [PATCH 5/6] Don't use NODE_ENV=production for the matrix This is something we want enabled for all builds, so it should be a global. This should simplify the matrix. The builds without an NPM_SCRIPT didn't do anything anyway. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 46c6bebed..07f794fb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,11 @@ node_js: - 8 - node env: + global: + - NODE_ENV=production + matrix: - NPM_SCRIPT="tap:unit -- --jobs=4" - NPM_SCRIPT="tap:integration -- --jobs=4" - - NODE_ENV=production sudo: false cache: directories: From bfde3f476c968bb541fbc226249d8ba7580bb763 Mon Sep 17 00:00:00 2001 From: Ray Schamp Date: Tue, 8 May 2018 19:38:05 -0400 Subject: [PATCH 6/6] Specify Node 8 in build stages --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 07f794fb1..364d2f03a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,9 +19,9 @@ script: npm run $NPM_SCRIPT jobs: include: - env: NPM_SCRIPT=lint - node_js: 6 + node_js: 8 - stage: release - node_js: 6 + node_js: 8 env: NPM_SCRIPT=build before_deploy: - npm --no-git-tag-version version $($(npm bin)/json -f package.json version)-prerelease.$(date +%s)