diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-07-15 18:17:37 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-16 14:50:42 +0200 |
commit | f26f1145ac0fab4a657ee1fc784e824858601bd3 (patch) | |
tree | 3980b53a1440a8e6d4ee8c539668c3c190363017 /config/webpack/loaders/sass.js | |
parent | 8e8491e1dab5e2ed98770710e0a32484de8530b3 (diff) | |
parent | 7a686082370ad6d1c7a7d0ad331c22bf3e1fbede (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x
Diffstat (limited to 'config/webpack/loaders/sass.js')
-rw-r--r-- | config/webpack/loaders/sass.js | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/config/webpack/loaders/sass.js b/config/webpack/loaders/sass.js index 96ad7abe8..920d5350f 100644 --- a/config/webpack/loaders/sass.js +++ b/config/webpack/loaders/sass.js @@ -1,15 +1,27 @@ -const ExtractTextPlugin = require('extract-text-webpack-plugin'); +const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const { env } = require('../configuration.js'); module.exports = { - test: /\.(scss|sass|css)$/i, - use: ExtractTextPlugin.extract({ - fallback: 'style-loader', - use: [ - { loader: 'css-loader', options: { minimize: env.NODE_ENV === 'production' } }, - { loader: 'postcss-loader', options: { sourceMap: true } }, - 'resolve-url-loader', - { loader: 'sass-loader', options: { includePaths: ['app/javascript'] } }, - ], - }), + test: /\.s?css$/i, + use: [ + MiniCssExtractPlugin.loader, + { + loader: 'css-loader', + options: { + minimize: env.NODE_ENV === 'production', + }, + }, + { + loader: 'postcss-loader', + options: { + sourceMap: true, + }, + }, + { + loader: 'sass-loader', + options: { + includePaths: ['app/javascript'], + }, + }, + ], }; |