Merge branch 'master' into 'add-sentry-js-again-with-vue'

# Conflicts:
#   app/views/layouts/_head.html.haml
#   config/webpack.config.js

1 files changed, 19 insertions, 7 deletions

diff --git a/package.json b/package.json
index d05ae8f7658..cf66d7ec58e 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
   "private": true,
   "scripts": {
-    "dev-server": "webpack-dev-server --config config/webpack.config.js",
-    "eslint": "eslint --max-warnings 0 --ext .js .",
-    "eslint-fix": "eslint --max-warnings 0 --ext .js --fix .",
-    "eslint-report": "eslint --max-warnings 0 --ext .js --format html --output-file ./eslint-report.html .",
+    "dev-server": "nodemon --watch config/webpack.config.js -- ./node_modules/.bin/webpack-dev-server --config config/webpack.config.js",
+    "eslint": "eslint --max-warnings 0 --ext .js,.vue .",
+    "eslint-fix": "eslint --max-warnings 0 --ext .js,.vue --fix .",
+    "eslint-report": "eslint --max-warnings 0 --ext .js,.vue --format html --output-file ./eslint-report.html .",
     "karma": "karma start config/karma.config.js --single-run",
     "karma-coverage": "BABEL_ENV=coverage karma start config/karma.config.js --single-run",
     "karma-start": "karma start config/karma.config.js",
@@ -20,26 +20,37 @@
     "bootstrap-sass": "^3.3.6",
     "compression-webpack-plugin": "^0.3.2",
     "core-js": "^2.4.1",
+    "css-loader": "^0.28.0",
     "d3": "^3.5.11",
     "document-register-element": "^1.3.0",
     "dropzone": "^4.2.0",
     "emoji-unicode-version": "^0.2.1",
+    "eslint-plugin-html": "^2.0.1",
+    "file-loader": "^0.11.1",
     "jquery": "^2.2.1",
     "jquery-ujs": "^1.2.1",
     "js-cookie": "^2.1.3",
+    "jszip": "^3.1.3",
+    "jszip-utils": "^0.0.2",
     "mousetrap": "^1.4.6",
     "pikaday": "^1.5.1",
     "raphael": "^2.2.7",
     "raven-js": "^3.14.0",
     "raw-loader": "^0.5.1",
+    "react-dev-utils": "^0.5.2",
     "select2": "3.5.2-browserify",
     "stats-webpack-plugin": "^0.4.3",
+    "three": "^0.84.0",
+    "three-orbit-controls": "^82.1.0",
+    "three-stl-loader": "^1.0.4",
     "timeago.js": "^2.0.5",
     "underscore": "^1.8.3",
     "visibilityjs": "^1.2.4",
-    "vue": "^2.2.4",
+    "vue": "^2.2.6",
+    "vue-loader": "^11.3.4",
     "vue-resource": "^0.9.3",
-    "webpack": "^2.2.1",
+    "vue-template-compiler": "^2.2.6",
+    "webpack": "^2.3.3",
     "webpack-bundle-analyzer": "^2.3.0"
   },
   "devDependencies": {
@@ -61,6 +72,7 @@
     "karma-phantomjs-launcher": "^1.0.2",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^2.0.2",
-    "webpack-dev-server": "^2.3.0"
+    "nodemon": "^1.11.0",
+    "webpack-dev-server": "^2.4.2"
   }
 }