Merge branch 'master' into bootstrap4

1 files changed, 23 insertions, 22 deletions

diff --git a/package.json b/package.json
index 8e8b9c1ec1e..596b7d019c6 100644
--- a/package.json
+++ b/package.json
@@ -16,11 +16,11 @@
     "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js"
   },
   "dependencies": {
-    "@gitlab-org/gitlab-svgs": "^1.18.0",
+    "@gitlab-org/gitlab-svgs": "^1.20.0",
     "autosize": "^4.0.0",
     "axios": "^0.17.1",
-    "babel-core": "^6.26.0",
-    "babel-loader": "^7.1.2",
+    "babel-core": "^6.26.3",
+    "babel-loader": "^7.1.4",
     "babel-plugin-transform-define": "^1.3.0",
     "babel-preset-latest": "^6.24.1",
     "babel-preset-stage-2": "^6.24.1",
@@ -31,11 +31,11 @@
     "chart.js": "1.0.2",
     "classlist-polyfill": "^1.2.0",
     "clipboard": "^1.7.1",
-    "compression-webpack-plugin": "^1.1.7",
-    "copy-webpack-plugin": "^4.4.1",
+    "compression-webpack-plugin": "^1.1.11",
+    "copy-webpack-plugin": "^4.5.1",
     "core-js": "^2.4.1",
     "cropper": "^2.3.0",
-    "css-loader": "^0.28.9",
+    "css-loader": "^0.28.11",
     "d3-array": "^1.2.1",
     "d3-axis": "^1.0.8",
     "d3-brush": "^1.0.4",
@@ -50,7 +50,7 @@
     "dropzone": "^4.2.0",
     "emoji-unicode-version": "^0.2.1",
     "exports-loader": "^0.7.0",
-    "file-loader": "^1.1.8",
+    "file-loader": "^1.1.11",
     "fuzzaldrin-plus": "^0.5.0",
     "glob": "^7.1.2",
     "imports-loader": "^0.8.0",
@@ -65,25 +65,24 @@
     "marked": "^0.3.12",
     "monaco-editor": "0.10.0",
     "mousetrap": "^1.4.6",
-    "name-all-modules-plugin": "^1.0.1",
     "pikaday": "^1.6.1",
     "popper.js": "^1.14.3",
     "prismjs": "^1.6.0",
     "raphael": "^2.2.7",
     "raven-js": "^3.22.1",
     "raw-loader": "^0.5.1",
-    "react-dev-utils": "^5.0.0",
     "sanitize-html": "^1.16.1",
     "select2": "3.5.2-browserify",
+    "sha1": "^1.1.1",
     "sql.js": "^0.4.0",
-    "style-loader": "^0.20.2",
+    "style-loader": "^0.21.0",
     "svg4everybody": "2.1.9",
     "three": "^0.84.0",
     "three-orbit-controls": "^82.1.0",
     "three-stl-loader": "^1.0.4",
     "timeago.js": "^3.0.2",
-    "underscore": "^1.8.3",
-    "url-loader": "^0.6.2",
+    "underscore": "^1.9.0",
+    "url-loader": "^1.0.1",
     "visibilityjs": "^1.2.4",
     "vue": "^2.5.16",
     "vue-loader": "^14.1.1",
@@ -92,18 +91,20 @@
     "vue-template-compiler": "^2.5.16",
     "vue-virtual-scroll-list": "^1.2.5",
     "vuex": "^3.0.1",
-    "webpack": "^3.11.0",
-    "webpack-bundle-analyzer": "^2.10.0",
-    "webpack-stats-plugin": "^0.1.5",
-    "worker-loader": "^1.1.0"
+    "webpack": "^4.7.0",
+    "webpack-bundle-analyzer": "^2.11.1",
+    "webpack-cli": "^2.1.2",
+    "webpack-stats-plugin": "^0.2.1",
+    "worker-loader": "^1.1.1"
   },
   "devDependencies": {
     "axios-mock-adapter": "^1.10.0",
     "babel-eslint": "^8.0.2",
-    "babel-plugin-istanbul": "^4.1.5",
+    "babel-plugin-istanbul": "^4.1.6",
     "babel-plugin-rewire": "^1.1.0",
     "babel-template": "^6.26.0",
     "babel-types": "^6.26.0",
+    "chalk": "^2.4.1",
     "commander": "^2.15.1",
     "eslint": "^3.18.0",
     "eslint-config-airbnb-base": "^10.0.1",
@@ -118,15 +119,15 @@
     "istanbul": "^0.4.5",
     "jasmine-core": "^2.9.0",
     "jasmine-jquery": "^2.1.1",
-    "karma": "^2.0.0",
+    "karma": "^2.0.2",
     "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage-istanbul-reporter": "^1.4.1",
+    "karma-coverage-istanbul-reporter": "^1.4.2",
     "karma-jasmine": "^1.1.1",
     "karma-mocha-reporter": "^2.2.5",
     "karma-sourcemap-loader": "^0.3.7",
-    "karma-webpack": "2.0.7",
-    "nodemon": "^1.15.1",
+    "karma-webpack": "3.0.0",
+    "nodemon": "^1.17.3",
     "prettier": "1.11.1",
-    "webpack-dev-server": "^2.11.2"
+    "webpack-dev-server": "^3.1.4"
   }
 }