Merge pull request #2353 from wallabag/assets-fix

Basically, fix everything

1 files changed, 40 insertions, 39 deletions

diff --git a/package.json b/package.json
index 21664f37..20afb425 100644
--- a/package.json
+++ b/package.json
@@ -7,42 +7,6 @@
   "directories": {
     "doc": "docs"
   },
-  "dependencies": {
-    "annotator": "git://github.com/wallabag/annotator.git#0f076c7d371ed25eb0793346f46982d90f2c4c85",
-    "autoprefixer": "^6.3.6",
-    "babel-preset-es2015": "^6.14.0",
-    "babelify": "^7.3.0",
-    "browserify": "^13.0.0",
-    "browserify-shim": "^3.8.12",
-    "cssnano": "^3.5.2",
-    "es6-promise": "^3.2.1",
-    "grunt": ">=0.4.0",
-    "grunt-browserify": "^5.0.0",
-    "grunt-cli": "^1.2.0",
-    "grunt-contrib-clean": "^1.0.0",
-    "grunt-contrib-concat": "^1.0.0",
-    "grunt-contrib-copy": "^1.0.0",
-    "grunt-contrib-symlink": "^1.0.0",
-    "grunt-contrib-uglify": "^1.0.0",
-    "grunt-postcss": "^0.8.0",
-    "hammerjs": "^2.0.6",
-    "icomoon-free-npm": "0.0.0",
-    "jquery": "^2.2.4",
-    "jquery-ui-browserify": "^1.11.0-pre-seelio",
-    "jquery.cookie": "^1.4.1",
-    "jquery.tinydot": "^0.2.1",
-    "load-grunt-tasks": "^3.4.1",
-    "material-design-icons-iconfont": "^3.0.0",
-    "materialize-css": "0.97.5",
-    "npm": "^3.8.3",
-    "pickadate": "^3.5.6",
-    "pixrem": "^3.0.0",
-    "postcss-cssnext": "^2.5.1",
-    "prismjs": "^1.4.1",
-    "ptsans-npm-webfont": "0.0.4",
-    "roboto-fontface": "^0.6.0",
-    "through": "^2.3.8"
-  },
   "engines": {
     "node": ">0.12"
   },
@@ -93,10 +57,47 @@
     "url": "https://github.com/wallabag/wallabag/issues"
   },
   "devDependencies": {
+    "annotator": "git://github.com/wallabag/annotator.git#0f076c7d371ed25eb0793346f46982d90f2c4c85",
+    "autoprefixer": "^6.3.6",
     "babel-eslint": "^6.1.2",
-    "eslint": "^2.13.1",
-    "eslint-config-airbnb": "^9.0.1",
+    "babel-preset-es2015": "^6.14.0",
+    "babelify": "^7.3.0",
+    "browserify": "^13.0.0",
+    "browserify-shim": "^3.8.12",
+    "cssnano": "^3.5.2",
+    "es6-promise": "^3.2.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",
+    "grunt-contrib-clean": "^1.0.0",
+    "grunt-contrib-concat": "^1.0.0",
+    "grunt-contrib-copy": "^1.0.0",
+    "grunt-contrib-symlink": "^1.0.0",
+    "grunt-contrib-uglify": "^1.0.0",
+    "grunt-eslint": "^19.0.0",
+    "grunt-postcss": "^0.8.0",
+    "grunt-stylelint": "^0.6.0",
+    "hammerjs": "^2.0.6",
+    "icomoon-free-npm": "0.0.0",
+    "jquery": "^2.2.4",
+    "jquery-ui-browserify": "^1.11.0-pre-seelio",
+    "jquery.cookie": "^1.4.1",
+    "jquery.tinydot": "^0.2.1",
+    "load-grunt-tasks": "^3.4.1",
+    "material-design-icons-iconfont": "^3.0.0",
+    "materialize-css": "0.97.5",
+    "npm": "^3.8.3",
+    "pickadate": "^3.5.6",
+    "pixrem": "^3.0.0",
+    "postcss-cssnext": "^2.5.1",
+    "prismjs": "^1.4.1",
+    "ptsans-npm-webfont": "0.0.4",
+    "roboto-fontface": "^0.6.0",
     "stylelint": "^7.3.1",
-    "stylelint-config-standard": "^13.0.2"
+    "stylelint-config-standard": "^13.0.2",
+    "through": "^2.3.8"
   }
 }