Merge pull request #2314 from wallabag/assets

Assets work

1 files changed, 21 insertions, 8 deletions

diff --git a/package.json b/package.json
index 39a10e9c..21664f37 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,8 @@
   "dependencies": {
     "annotator": "git://github.com/wallabag/annotator.git#0f076c7d371ed25eb0793346f46982d90f2c4c85",
     "autoprefixer": "^6.3.6",
-    "bower": "^1.7.7",
+    "babel-preset-es2015": "^6.14.0",
+    "babelify": "^7.3.0",
     "browserify": "^13.0.0",
     "browserify-shim": "^3.8.12",
     "cssnano": "^3.5.2",
@@ -25,17 +26,21 @@
     "grunt-contrib-uglify": "^1.0.0",
     "grunt-postcss": "^0.8.0",
     "hammerjs": "^2.0.6",
-    "jquery": "^2.2.1",
-    "jquery-ui": "^1.10.5",
+    "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": {
@@ -47,9 +52,14 @@
     "materialize": "./node_modules/materialize-css/bin/materialize.js"
   },
   "browserify-shim": {
-    "jquery": "$",
-    "jQuery": "jQuery",
-    "materialize": "materialize"
+    "jquery": {
+      "exports": "$"
+    },
+    "materialize": "materialize",
+    "jquery-ui": {
+      "depends": "jquery",
+      "exports": null
+    }
   },
   "browserify": {
     "transform": [
@@ -83,7 +93,10 @@
     "url": "https://github.com/wallabag/wallabag/issues"
   },
   "devDependencies": {
-    "eslint": "^2.11.1",
-    "eslint-config-airbnb": "^9.0.1"
+    "babel-eslint": "^6.1.2",
+    "eslint": "^2.13.1",
+    "eslint-config-airbnb": "^9.0.1",
+    "stylelint": "^7.3.1",
+    "stylelint-config-standard": "^13.0.2"
   }
 }