From ba23ade295ebd8e937b175e915e879da24c9d161 Mon Sep 17 00:00:00 2001 From: Johannes Weberhofer Date: Thu, 2 Jul 2020 15:44:11 +0200 Subject: [PATCH 1/2] Updated tool-chain Signed-off-by: Johannes Weberhofer --- package.json | 22 +++++++++++----------- webpack.config.js | 21 +++++++-------------- 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index 049c45b..91819ff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ttskch/select2-bootstrap4-theme", - "version": "1.3.3", + "version": "1.4.0", "description": "Select2 v4 theme for Bootstrap4", "main": "", "style": "select2-bootstrap4.css", @@ -30,19 +30,19 @@ }, "homepage": "https://github.com/ttskch/select2-bootstrap4-theme#readme", "devDependencies": { - "autoprefixer": "^9.4.2", - "bootstrap": "^4.1.3", - "css-loader": "^1.0.1", - "cssnano": "^4.1.7", - "extract-text-webpack-plugin": "^4.0.0-beta.0", - "node-sass": "^4.10.0", - "postcss": "^7.0.6", + "autoprefixer": "^9.8.4", + "bootstrap": "^4.5.0", + "css-loader": "^3.6.0", + "cssnano": "^4.1.10", + "mini-css-extract-plugin": "^0.9.0", + "node-sass": "^4.14.1", + "postcss": "^7.0.32", "postcss-loader": "^3.0.0", "precss": "^4.0.0", "sass-loader": "^8.0.2", - "style-loader": "^0.23.1", - "webpack": "^4.27.0", - "webpack-cli": "^3.1.2" + "style-loader": "^1.2.1", + "webpack": "^4.43.0", + "webpack-cli": "^3.3.12" }, "jsdelivr": "dist/select2-bootstrap4.min.css", "browserslist": [ diff --git a/webpack.config.js b/webpack.config.js index 9c87fd6..78e3430 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,18 +1,11 @@ const path = require('path'); -const ProvidePlugin = require('webpack/lib/ProvidePlugin'); -const ExtractTextPlugin = require('extract-text-webpack-plugin'); +const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const isProd = process.env.NODE_ENV === 'production'; let plugins = [ - new ProvidePlugin({ - $: 'jquery', - jQuery: 'jquery', - 'window.jQuery': 'jquery', - Popper: ['popper.js', 'default'], - }), - new ExtractTextPlugin({ + new MiniCssExtractPlugin({ filename: '[name]' + (isProd ? '.min' : '') + '.css', allChunks: true, }), @@ -32,9 +25,10 @@ module.exports = { rules: [ { test: /\.scss$/, - use: ExtractTextPlugin.extract({ - fallback: 'style-loader', - use: [ + use: [ + { + loader: MiniCssExtractPlugin.loader, + }, { loader: 'css-loader', }, @@ -66,8 +60,7 @@ module.exports = { ` } }, - ], - }), + ] }, ], }, From 61f4ee487011ac8650955076b94d204fb4b9ca58 Mon Sep 17 00:00:00 2001 From: Johannes Weberhofer Date: Thu, 2 Jul 2020 15:48:56 +0200 Subject: [PATCH 2/2] Keep old version number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 91819ff..f87397f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ttskch/select2-bootstrap4-theme", - "version": "1.4.0", + "version": "1.3.3", "description": "Select2 v4 theme for Bootstrap4", "main": "", "style": "select2-bootstrap4.css",