From e783032eb453a782bbefac22fd2bc945781bfa2b Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Thu, 19 Jan 2017 17:39:29 +0000 Subject: [PATCH] Updates --- .eslintrc | 12 ++++++++++-- package.json | 7 +++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.eslintrc b/.eslintrc index 22121b5..0d868e4 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,8 +1,16 @@ { - "extends": "./node_modules/eslint-config/.eslintrc", + "extends": "eslint-config-dabapps/base/.eslintrc", "env": { "node": true, "browser": false, - "mocha": true + "mocha": true, + "es6": true + }, + "parserOptions": { + "sourceType": "module", + "ecmaVersion": 6 + }, + "rules": { + "no-console": 0 } } diff --git a/package.json b/package.json index f367bad..9f29e66 100644 --- a/package.json +++ b/package.json @@ -29,13 +29,12 @@ "connect-static-file": "=1.1.2", "express": "=4.14.0", "express-winston": "=2.1.2", - "helmet": "=3.3.0", - "opbeat": "=4.4.0", + "helmet": "=3.4.0", + "opbeat": "=4.7.0", "winston": "=2.3.0" }, "devDependencies": { - "eslint": "=1.9.0", - "eslint-config": "git://github.com/dabapps/eslint-config.git#1.1.4", + "eslint-config": "dabapps/eslint-config#2.0.5", "mocha": "=3.2.0", "nsp": "=2.6.2", "supertest": "=2.0.1"