Merge branch 'upgrade-client-build' into develop

package.json

@@ -10,13 +10,13 @@
     "amplitude": "^3.5.0",
     "apidoc": "^0.17.5",
     "apn": "^1.7.6",
-    "autoprefixer": "^6.4.0",
+    "autoprefixer": "^8.0.0",
     "aws-sdk": "^2.0.25",
     "axios": "^0.16.0",
     "axios-progress-bar": "^0.1.7",
     "babel-core": "^6.0.0",
+    "babel-loader": "^7.1.2",
     "babel-eslint": "^8.2.1",
-    "babel-loader": "^6.0.0",
     "babel-plugin-syntax-async-functions": "^6.13.0",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-plugin-transform-async-to-module-method": "^6.8.0",
@@ -42,7 +42,7 @@
     "express": "^4.16.2",
     "express-basic-auth": "^1.0.1",
     "express-validator": "^2.18.0",
-    "extract-text-webpack-plugin": "^2.0.0-rc.3",
+    "extract-text-webpack-plugin": "^3.0.2",
     "glob": "^7.1.2",
     "got": "^6.1.1",
     "gulp": "^4.0.0",
@@ -77,7 +77,7 @@
     "paypal-ipn": "3.0.0",
     "paypal-rest-sdk": "^1.8.1",
     "popper.js": "^1.13.0",
-    "postcss-easy-import": "^2.0.0",
+    "postcss-easy-import": "^3.0.0",
     "ps-tree": "^1.0.0",
     "pug": "^2.0.0-rc.4",
     "push-notify": "git://github.com/habitrpg/push-notify.git#6bc2b5fdb1bdc9649b9ec1964d79ca50187fc8a9",
@@ -88,24 +88,25 @@
     "shelljs": "^0.8.1",
     "stripe": "^5.4.0",
     "superagent": "^3.4.3",
-    "svg-inline-loader": "^0.7.1",
+    "svg-inline-loader": "^0.8.0",
     "svg-url-loader": "^2.0.2",
-    "svgo-loader": "^1.2.1",
+    "svgo": "^1.0.4",
+    "svgo-loader": "^2.1.0",
     "universal-analytics": "^0.4.16",
-    "url-loader": "^0.5.7",
+    "url-loader": "^0.6.2",
     "useragent": "^2.1.9",
     "uuid": "^3.0.1",
     "validator": "^4.9.0",
     "vinyl-buffer": "^1.0.1",
     "vue": "^2.5.2",
-    "vue-loader": "^13.3.0",
+    "vue-loader": "^14.1.1",
     "vue-mugen-scroll": "^0.2.1",
     "vue-router": "^3.0.0",
     "vue-style-loader": "^3.0.0",
     "vue-template-compiler": "^2.5.2",
     "vuedraggable": "^2.15.0",
     "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#5d237615463a84a23dd6f3f77c6ab577d68593ec",
-    "webpack": "^2.2.1",
+    "webpack": "^3.11.0",
     "webpack-merge": "^4.0.0",
     "winston": "^2.1.0",
     "winston-loggly-bulk": "^2.0.2",
@@ -182,7 +183,7 @@
     "sinon-chai": "^2.8.0",
     "sinon-stub-promise": "^4.0.0",
     "webpack-bundle-analyzer": "^2.2.1",
-    "webpack-dev-middleware": "^1.10.0",
+    "webpack-dev-middleware": "^2.0.5",
     "webpack-hot-middleware": "^2.6.1"
   }
 }

webpack/webpack.base.conf.js

@@ -98,7 +98,14 @@ const baseConfig = {
         test: /\.svg$/,
         use: [
           { loader: 'svg-inline-loader' },
-          { loader: 'svgo-loader' },
+          {
+            loader: 'svgo-loader',
+            options: {
+              plugins: [
+                {removeViewBox: false},
+              ],
+            },
+          },
         ],
         exclude: [path.resolve(projectRoot, 'website/client/assets/svg/for-css')],
       },
@@ -112,7 +119,14 @@ const baseConfig = {
               name: utils.assetsPath('svg/[name].[hash:7].[ext]'),
             },
           },
-          { loader: 'svgo-loader' },
+          {
+            loader: 'svgo-loader',
+            options: {
+              plugins: [
+                {removeViewBox: false},
+              ],
+            },
+          },
         ],
         include: [path.resolve(projectRoot, 'website/client/assets/svg/for-css')],
       },