From 2a41f5dfecc2122edc1feb793daa36e0ebd1a6a6 Mon Sep 17 00:00:00 2001
From: Kimmo Puputti <git@kimmo.kpuputti.fi>
Date: Tue, 3 Apr 2018 13:38:20 +0300
Subject: [PATCH] Update Node.js to the latest LTS version

---
 .circleci/config.yml | 41 ++++++++++++++++-------------------------
 package.json         |  3 +--
 2 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1b924ef0..7983462f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,42 +2,33 @@ version: 2
 jobs:
   build:
     docker:
-      - image: node:6.11.5
-        environment:
-          YARN_VERSION: 1.2.1
+      - image: circleci/node:8.11
     steps:
       - checkout
       - restore_cache:
-          key: yarn-cache
+          name: Restore Yarn Package Cache
+          keys:
+            - yarn-packages-{{ .Branch }}-{{ checksum "yarn.lock" }}
+            - yarn-packages-{{ .Branch }}
+            - yarn-packages-master
+            - yarn-packages-
       - run:
-          name: set PATH
-          command: echo 'export PATH="${PATH}:${HOME}/.yarn/bin:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin"' >> $BASH_ENV
-      - run:
-          name: install yarn
-          command: |
-            if [[ ! -e ~/.yarn/bin/yarn || $(yarn --version) != "${YARN_VERSION}" ]]; then
-              echo "Downloading and installing Yarn"
-              curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version $YARN_VERSION
-            else
-              echo "The correct version of Yarn is already installed"
-            fi
-      - run:
-          name: yarn
-          command: yarn
+          name: Install Dependencies
+          command: yarn install
       - save_cache:
-          key: yarn-cache
+          name: Save Yarn Package Cache
+          key: yarn-packages-{{ .Branch }}-{{ checksum "yarn.lock" }}
           paths:
-            - ~/.cache/yarn
-            - ~/.yarn
+            - node_modules/
       - run:
-          name: audit
+          name: Audit deps for vulnerabilities
           command: yarn run audit
       - run:
-          name: format-ci
+          name: Check code formatting
           command: yarn run format-ci
       - run:
-          name: build
+          name: Build client app
           command: yarn run build
       - run:
-          name: test
+          name: Run test suite
           command: yarn run test-ci
diff --git a/package.json b/package.json
index eac2a128..bb76f462 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,6 @@
     "proseWrap": "always"
   },
   "engines": {
-    "node": "6.11.5",
-    "yarn": "^1.2.1"
+    "node": "8.11"
   }
 }