From 5847f1e54dcc2923a1901643dcd888db5efd467b Mon Sep 17 00:00:00 2001 From: David Thompson Date: Fri, 13 Oct 2017 12:21:49 +0100 Subject: [PATCH] Migrating to work with node6 and npm5 * upgrading packages to and adding engines to `package.son` * amending travis file to use npm5 * adjusting the `.npmrc` file for node `6.11.4` --- .gitignore | 3 ++- .nvmrc | 2 +- .travis.yml | 3 +++ package.json | 6 +++++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3b67a67..c69b174 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ fpm/build/usr/share/evw-self-serve/* npm-debug.log .DS_Store .idea -/reports \ No newline at end of file +/reports +package-lock.json \ No newline at end of file diff --git a/.nvmrc b/.nvmrc index af8c8ec..8384713 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -4.2.2 +6.11.4 diff --git a/.travis.yml b/.travis.yml index 1159f86..e58e0e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,14 @@ language: node_js node_js: - '4' +- '6' services: - mongodb cache: directories: - node_modules +before_install: + - npm i -g npm@5 before_script: - npm run sass - NODE_ENV='ci' npm start & diff --git a/package.json b/package.json index 824c69f..206c8f2 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,10 @@ "type": "git", "url": "https://github.com/UKHomeOffice/evw-self-serve/" }, + "engines": { + "node": "^6.11.4", + "npm": "^5.4.2" + }, "scripts": { "start": "node .", "dev": "npm-run-all --parallel watch:app watch:scss watch:js watch:translations", @@ -41,7 +45,7 @@ "connect-mongo": "^1.3.2", "connect-redis": "^3.0.2", "cookie-parser": "^1.3.5", - "evw-ffs": "^1.0.0", + "evw-ffs": "^2.0.0", "evw-schemas": "^5.0.0", "express": "^4.12.4", "express-partial-templates": "^0.1.0",