Skip to content

Commit

Permalink
Merge pull request #108 from UKHomeOffice/node6-npm5-migrate
Browse files Browse the repository at this point in the history
[DPS-992] Migrating to work with node6 and npm5
  • Loading branch information
davet1985 authored Oct 25, 2017
2 parents 801ea7b + 5847f1e commit 1924144
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ fpm/build/usr/share/evw-self-serve/*
npm-debug.log
.DS_Store
.idea
/reports
/reports
package-lock.json
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2.2
6.11.4
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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 &
Expand Down
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit 1924144

Please sign in to comment.