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/shared.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/shared.js')
-rw-r--r-- | config/webpack/shared.js | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/config/webpack/shared.js b/config/webpack/shared.js index 35b9bbd1c..6b6629a37 100644 --- a/config/webpack/shared.js +++ b/config/webpack/shared.js @@ -1,9 +1,9 @@ // Note: You must restart bin/webpack-dev-server for changes to take effect const webpack = require('webpack'); -const { join, resolve } = require('path'); +const { basename, dirname, join, relative, resolve } = require('path'); const { sync } = require('glob'); -const ExtractTextPlugin = require('extract-text-webpack-plugin'); +const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const ManifestPlugin = require('webpack-manifest-plugin'); const { env, settings, core, flavours, output, loadersDir } = require('./configuration.js'); const localePacks = require('./generateLocalePacks'); @@ -59,6 +59,25 @@ module.exports = { publicPath: output.publicPath, }, + optimization: { + runtimeChunk: { + name: 'locales', + }, + splitChunks: { + cacheGroups: { + default: false, + vendors: false, + locales: { + name: 'locales', + chunks: 'all', + minChunks: Infinity, + minSize: 0, + }, + }, + }, + occurrenceOrder: true, + }, + module: { rules: sync(join(loadersDir, '*.js')).map(loader => require(loader)), }, @@ -72,17 +91,13 @@ module.exports = { resource.request = resource.request.replace(/^history/, 'history/es'); } ), - new ExtractTextPlugin({ + new MiniCssExtractPlugin({ filename: env.NODE_ENV === 'production' ? '[name]-[contenthash].css' : '[name].css', - allChunks: true, }), new ManifestPlugin({ publicPath: output.publicPath, writeToFileEmit: true, - }), - new webpack.optimize.CommonsChunkPlugin({ - name: 'locales', - minChunks: Infinity, // It doesn't make sense to use common chunks with multiple frontend support. + filter: file => !file.isAsset || file.isModuleAsset, }), ], |