Merge pull request #6298 from whymarrh/node-8.15.1

Node 8.15.x

2 files changed, 18 insertions, 18 deletions

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8435b8575..807ed042c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -82,13 +82,13 @@ workflows:
 jobs:
   prep-deps-npm:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - run:
-          name: Install npm 6 + deps via npm
+          name: Install deps via npm
           command: |
-           sudo npm install -g npm@6 && npm ci
+           npm ci
       - persist_to_workspace:
           root: .
           paths:
@@ -96,7 +96,7 @@ jobs:
 
   prep-build:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -115,7 +115,7 @@ jobs:
 
   prep-docs:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -130,7 +130,7 @@ jobs:
 
   prep-scss:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -149,7 +149,7 @@ jobs:
 
   test-lint:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -184,7 +184,7 @@ jobs:
   #         destination: test-artifacts
   test-e2e-chrome:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -198,7 +198,7 @@ jobs:
 
   test-e2e-firefox:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - run:
@@ -215,7 +215,7 @@ jobs:
 
   job-screens:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -230,7 +230,7 @@ jobs:
 
   job-publish-prerelease:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -250,7 +250,7 @@ jobs:
 
   job-publish-release:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -267,7 +267,7 @@ jobs:
 
   test-unit:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -277,7 +277,7 @@ jobs:
           command: npm run test:coverage
   test-mozilla-lint:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -288,7 +288,7 @@ jobs:
 
   test-integration-flat-firefox:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -304,7 +304,7 @@ jobs:
     environment:
       browsers: '["Chrome"]'
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -315,7 +315,7 @@ jobs:
 
   all-tests-pass:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - run:
           name: All Tests Passed
diff --git a/.nvmrc b/.nvmrc
index 812d970dc..9235dd0ad 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v8.13
+v8.15