Merge remote-tracking branch 'origin/master' into 2.2

[github/wallabag/wallabag.git] / package.json

diff --git a/package.json b/package.json
index 4247fac659f245eab1296abaca782519f014db47..209c46c6ccbe35bbcef33d9d26a929401f6b4c70 100644 (file)
--- a/package.json
+++ b/package.json
@@ -66,8 +66,9 @@
     "browserify-shim": "^3.8.12",
     "cssnano": "^3.5.2",
     "es6-promise": "^3.2.1",
-    "eslint": "^2.13.1",
-    "eslint-config-airbnb": "^9.0.1",
+    "eslint": "^3.7.1",
+    "eslint-config-airbnb-base": "^8.0.0",
+    "eslint-plugin-import": "^1.16.0",
     "grunt": ">=0.4.0",
     "grunt-browserify": "^5.0.0",
     "grunt-cli": "^1.2.0",
@@ -76,6 +77,7 @@
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-symlink": "^1.0.0",
     "grunt-contrib-uglify": "^1.0.0",
+    "grunt-contrib-watch": "^1.0.0",
     "grunt-eslint": "^19.0.0",
     "grunt-postcss": "^0.8.0",
     "grunt-stylelint": "^0.6.0",
@@ -98,5 +100,9 @@
     "stylelint": "^7.3.1",
     "stylelint-config-standard": "^13.0.2",
     "through": "^2.3.8"
+  },
+  "dependencies": {
+    "jr-qrcode": "^1.0.5",
+    "mousetrap": "^1.6.0"
   }
 }