Merge pull request #3 from icebob/ice-services

Fix webpack issues (from upstream)
swyxio · Jun 5, 2017 · 49a77bf · 49a77bf
2 parents 7a5d56a + bf22745
commit 49a77bf
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 42 deletions.
diff --git a/build/webpack.prod.config.js b/build/webpack.prod.config.js
@@ -11,10 +11,7 @@ let BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlug
 let ExtractTextPlugin = require("extract-text-webpack-plugin");
 
 let extractLoaders = [{
-	loader: "css-loader",
-	options: {
-		modules: true
-	}
+	loader: "css-loader"
 }, {
 	loader: "postcss-loader"
 }, {
@@ -26,17 +23,17 @@ module.exports = merge(baseWpConfig, {
 		rules: [{
 			test: /\.scss$/,
 			loader: ExtractTextPlugin.extract({
-				fallbackLoader: "style-loader",
-				loader: extractLoaders
+				fallback: "style-loader",
+				use: extractLoaders
 			})
 		}, {
 			test: /\.vue$/,
 			loader: "vue-loader",
 			options: {
 				loaders: {
 					sass: ExtractTextPlugin.extract({
-						fallbackLoader: "vue-style-loader",
-						loader: extractLoaders
+						fallback: "vue-style-loader",
+						use: extractLoaders
 					})
 				}
 			}

diff --git a/package.json b/package.json
@@ -43,11 +43,11 @@
   "license": "MIT",
   "dependencies": {
     "agenda": "0.9.1",
-    "async": "2.4.0",
-    "axios": "0.16.1",
+    "async": "2.4.1",
+    "axios": "0.16.2",
     "bcrypt-nodejs": "0.0.3",
     "bluebird": "3.5.0",
-    "body-parser": "1.17.1",
+    "body-parser": "1.17.2",
     "chalk": "1.1.3",
     "cli-table2": "0.2.0",
     "clui": "0.3.1",
@@ -60,34 +60,34 @@
     "express-flash": "0.0.2",
     "express-list-endpoints": "3.0.0",
     "express-rate-limit": "2.8.0",
-    "express-session": "1.15.2",
+    "express-session": "1.15.3",
     "express-status-monitor": "0.1.9",
     "express-validator": "3.2.0",
     "fakerator": "0.3.0",
-    "glob": "7.1.1",
-    "graphql": "0.9.6",
-    "graphql-server-express": "0.7.2",
-    "graphql-subscriptions": "0.3.1",
-    "graphql-tools": "0.11.0",
+    "glob": "7.1.2",
+    "graphql": "0.10.1",
+    "graphql-server-express": "0.8.0",
+    "graphql-subscriptions": "0.4.2",
+    "graphql-tools": "1.0.0",
     "hashids": "1.1.1",
-    "helmet": "3.6.0",
+    "helmet": "3.6.1",
     "helmet-crossdomain": "0.1.0",
-    "i18next": "8.2.1",
+    "i18next": "8.4.0",
     "i18next-express-middleware": "1.0.5",
     "i18next-node-fs-backend": "1.0.0",
-    "ioredis": "2.5.0",
+    "ioredis": "3.1.1",
     "le_node": "1.7.0",
     "lodash": "4.17.4",
-    "method-override": "2.3.8",
+    "method-override": "2.3.9",
     "mkdirp": "0.5.1",
-    "moleculer": "0.7.2",
+    "moleculer": "0.7.6",
     "moment": "2.18.1",
-    "mongoose": "4.9.9",
+    "mongoose": "4.10.4",
     "mongoose-auto-increment": "5.0.1",
-    "morgan": "1.8.1",
+    "morgan": "1.8.2",
     "netjet": "1.1.3",
     "node-sass": "4.5.3",
-    "nodemailer": "2.7.0",
+    "nodemailer": "4.0.1",
     "nodemailer-html-to-text": "2.1.0",
     "nodemailer-mailgun-transport": "1.3.5",
     "nodemailer-sendgrid-transport": "0.2.0",
@@ -102,9 +102,9 @@
     "pug": "2.0.0-beta6",
     "require-webpack-compat": "3.0.0",
     "serve-favicon": "2.4.3",
-    "snyk": "1.30.1",
-    "socket.io": "2.0.1",
-    "socket.io-client": "2.0.1",
+    "snyk": "1.33.0",
+    "socket.io": "2.0.2",
+    "socket.io-client": "2.0.2",
     "uuid-token-generator": "1.0.0",
     "winston": "2.3.1",
     "winston-daily-rotate-file": "1.4.6",
@@ -115,61 +115,61 @@
     "winston-papertrail": "1.0.5"
   },
   "devDependencies": {
-    "apollo-client": "1.2.2",
-    "autoprefixer": "7.1.0",
+    "apollo-client": "1.4.0",
+    "autoprefixer": "7.1.1",
     "babel": "6.23.0",
     "babel-core": "6.24.1",
     "babel-loader": "7.0.0",
     "babel-plugin-transform-runtime": "6.23.0",
     "babel-preset-es2015": "6.24.1",
     "babel-preset-stage-0": "6.24.1",
     "babel-runtime": "6.23.0",
-    "chai": "3.5.0",
+    "chai": "4.0.1",
     "chromedriver": "2.29.0",
     "cross-spawn": "5.1.0",
-    "css-loader": "0.28.1",
+    "css-loader": "0.28.4",
     "del": "2.2.2",
     "es6-promise": "4.1.0",
     "eslint": "3.19.0",
     "eslint-friendly-formatter": "3.0.0",
     "eslint-loader": "1.7.1",
     "eslint-plugin-html": "2.0.3",
     "extract-text-webpack-plugin": "2.1.0",
-    "file-loader": "0.11.1",
-    "graphql-tag": "2.1.0",
+    "file-loader": "0.11.2",
+    "graphql-tag": "2.2.1",
     "i18next-browser-languagedetector": "1.0.1",
-    "i18next-xhr-backend": "1.4.1",
+    "i18next-xhr-backend": "1.4.2",
     "jquery": "3.2.1",
     "json-loader": "0.5.4",
     "marked": "0.3.6",
-    "mocha": "3.4.1",
+    "mocha": "3.4.2",
     "nightwatch": "0.9.15",
     "npm-check": "5.4.4",
-    "postcss-loader": "1.3.3",
+    "postcss-loader": "2.0.5",
     "precss": "1.4.0",
     "raw-loader": "0.5.1",
     "request": "2.81.0",
     "sass-loader": "6.0.5",
     "selenium-server": "3.4.0",
-    "sinon": "2.2.0",
+    "sinon": "2.3.2",
     "sinon-chai": "2.10.0",
     "slugify": "1.1.0",
     "stats-webpack-plugin": "0.6.0",
-    "style-loader": "0.17.0",
+    "style-loader": "0.18.2",
     "toastr": "2.1.2",
     "typings": "2.1.1",
     "url-loader": "0.5.8",
     "uuid": "3.0.1",
     "vue": "2.3.3",
     "vue-form-generator": "2.0.0-beta5",
     "vue-html-loader": "1.2.4",
-    "vue-loader": "12.0.4",
+    "vue-loader": "12.2.1",
     "vue-router": "2.5.3",
     "vue-template-compiler": "2.3.3",
     "vue-websocket": "0.2.2",
     "vuex": "2.3.1",
-    "webpack": "2.5.1",
-    "webpack-bundle-analyzer": "2.8.1",
+    "webpack": "2.6.1",
+    "webpack-bundle-analyzer": "2.8.2",
     "webpack-dev-middleware": "1.10.2",
     "webpack-dev-server": "2.4.5",
     "webpack-hot-middleware": "2.18.0",