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

1 files changed, 52 insertions, 4 deletions

diff --git a/package.json b/package.json
index 49b8210e427..7b6c4556e2c 100644
--- a/package.json
+++ b/package.json
@@ -1,16 +1,64 @@
 {
   "private": true,
   "scripts": {
-    "eslint": "eslint --max-warnings 0 --ext .js,.js.es6 .",
-    "eslint-fix": "npm run eslint -- --fix",
-    "eslint-report": "npm run eslint -- --format html --output-file ./eslint-report.html"
+    "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 .",
+    "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",
+    "webpack": "webpack --config config/webpack.config.js",
+    "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js"
+  },
+  "dependencies": {
+    "babel-core": "^6.22.1",
+    "babel-loader": "^6.2.10",
+    "babel-plugin-transform-define": "^1.2.0",
+    "babel-preset-latest": "^6.24.0",
+    "babel-preset-stage-2": "^6.22.0",
+    "bootstrap-sass": "^3.3.6",
+    "compression-webpack-plugin": "^0.3.2",
+    "core-js": "^2.4.1",
+    "d3": "^3.5.11",
+    "document-register-element": "^1.3.0",
+    "dropzone": "^4.2.0",
+    "emoji-unicode-version": "^0.2.1",
+    "jquery": "^2.2.1",
+    "jquery-ujs": "^1.2.1",
+    "js-cookie": "^2.1.3",
+    "mousetrap": "^1.4.6",
+    "pikaday": "^1.5.1",
+    "raphael": "^2.2.7",
+    "raw-loader": "^0.5.1",
+    "select2": "3.5.2-browserify",
+    "stats-webpack-plugin": "^0.4.3",
+    "timeago.js": "^2.0.5",
+    "underscore": "^1.8.3",
+    "visibilityjs": "^1.2.4",
+    "vue": "^2.2.4",
+    "vue-resource": "^0.9.3",
+    "webpack": "^2.2.1",
+    "webpack-bundle-analyzer": "^2.3.0"
   },
   "devDependencies": {
+    "babel-plugin-istanbul": "^4.0.0",
     "eslint": "^3.10.1",
     "eslint-config-airbnb-base": "^10.0.1",
+    "eslint-import-resolver-webpack": "^0.8.1",
     "eslint-plugin-filenames": "^1.1.0",
     "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-jasmine": "^2.1.0",
-    "istanbul": "^0.4.5"
+    "istanbul": "^0.4.5",
+    "jasmine-core": "^2.5.2",
+    "jasmine-jquery": "^2.1.1",
+    "karma": "^1.4.1",
+    "karma-coverage-istanbul-reporter": "^0.2.0",
+    "karma-jasmine": "^1.1.0",
+    "karma-mocha-reporter": "^2.2.2",
+    "karma-phantomjs-launcher": "^1.0.2",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-webpack": "^2.0.2",
+    "webpack-dev-server": "^2.3.0"
   }
 }