Upgrade dependencies

jcsmorais · Dec 27, 2018 · 4fdb3c1 · 4fdb3c1
1 parent 2bd7570
commit 4fdb3c1
Show file tree

Hide file tree

Showing 3 changed files with 2,073 additions and 420 deletions.
diff --git a/build/webpack.themes.ts b/build/webpack.themes.ts
@@ -3,11 +3,21 @@ import * as webpack from 'webpack';
 
 // tslint:disable:no-var-requires
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const args = require('minimist')(process.argv.slice(2));
 // tslint:enable:no-var-requires
 
 const isProduction = args && args.mode === 'production';
 const filename = isProduction ? '[name].min.css' : '[name].css';
+const plugins = [
+    new ExtractTextPlugin({ filename }),
+];
+
+const optimization = isProduction ? {
+    minimizer: [
+        new OptimizeCssAssetsPlugin(),
+    ],
+} : {};
 
 const config: webpack.Configuration = {
     entry: {
@@ -26,12 +36,7 @@ const config: webpack.Configuration = {
                 test: /\.styl$/,
                 use: ExtractTextPlugin.extract({
                     use: [
-                        {
-                            loader: 'css-loader',
-                            options: {
-                                minimize: isProduction,
-                            },
-                        },
+                        'css-loader',
                         {
                             loader: 'postcss-loader',
                             options: {
@@ -46,15 +51,12 @@ const config: webpack.Configuration = {
             },
         ],
     },
+    optimization,
     output: {
         filename,
         path: path.resolve('dist/themes'),
     },
-    plugins: [
-        new ExtractTextPlugin({
-            filename,
-        }),
-    ],
+    plugins,
 };
 
 export default config;
diff --git a/package.json b/package.json
@@ -47,40 +47,41 @@
   "devDependencies": {
     "@types/expect.js": "^0.3.29",
     "@types/express": "^4.16.0",
-    "@types/jsdom": "^12.2.0",
+    "@types/jsdom": "^12.2.1",
     "@types/mocha": "^5.2.5",
-    "@types/node": "^10.11.7",
-    "@types/sinon": "^5.0.5",
+    "@types/node": "^10.12.18",
+    "@types/sinon": "^7.0.2",
     "@types/stylus": "^0.48.30",
     "@types/webdriverio": "^4.10.4",
-    "@types/webpack": "^4.4.16",
+    "@types/webpack": "^4.4.22",
     "autoprefixer-stylus": "^0.14.0",
     "coveralls": "3.0.2",
-    "css-loader": "^1.0.0",
+    "css-loader": "^2.1.0",
     "expect.js": "^0.3.1",
     "express": "^4.16.4",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "flatpickr": "4.5.1",
     "forever": "^0.15.3",
-    "jsdom": "^13.0.0",
+    "jsdom": "^13.1.0",
     "jsdom-global": "^3.0.2",
     "minimist": "^1.2.0",
     "mocha": "^5.2.0",
     "nyc": "^13.0.1",
-    "postcss-loader": "3.0.0",
+    "optimize-css-assets-webpack-plugin": "^5.0.1",
+    "postcss-loader": "^3.0.0",
     "selenium-standalone": "^6.15.3",
-    "sinon": "^7.1.1",
+    "sinon": "^7.2.2",
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.2",
-    "ts-loader": "^5.2.0",
+    "ts-loader": "^5.3.2",
     "ts-node": "^7.0.0",
-    "tslint": "5.11.0",
+    "tslint": "5.12.0",
     "tslint-loader": "^3.6.0",
-    "typescript": "^3.1.3",
+    "typescript": "^3.2.2",
     "wdio-mocha-framework": "^0.6.3",
     "wdio-spec-reporter": "^0.1.5",
-    "webdriverio": "^4.13.2",
-    "webpack": "^4.12.2",
+    "webdriverio": "4.14.1",
+    "webpack": "^4.28.2",
     "webpack-cli": "^3.0.8",
     "yarn-run-all": "^3.1.1"
   },