feature(package) webpack v5

This commit is contained in:
coderaiser 2020-01-03 11:41:59 +02:00
parent fcbe0e4bcb
commit 57e7e90197
3 changed files with 11 additions and 22 deletions

View file

@ -10,11 +10,12 @@ const {
const {env} = process; const {env} = process;
const isDev = env.NODE_ENV === 'development'; const isDev = env.NODE_ENV === 'development';
const ExtractTextPlugin = require('extract-text-webpack-plugin'); const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin'); const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
const extractCSS = (a) => new ExtractTextPlugin(`${a}.css`); const extractCSS = (a) => new MiniCssExtractPlugin({
const extractMain = extractCSS('[name]'); filename: `${a}.css`,
});
const cssNames = [ const cssNames = [
'nojs', 'nojs',
@ -30,18 +31,16 @@ const clean = (a) => a.filter(Boolean);
const plugins = clean([ const plugins = clean([
...cssPlugins, ...cssPlugins,
extractMain, new MiniCssExtractPlugin(),
!isDev && new OptimizeCssAssetsPlugin(), !isDev && new OptimizeCssAssetsPlugin(),
]); ]);
const rules = [{ const rules = [{
test: /\.css$/, test: /\.css$/,
exclude: /css\/(nojs|view|config|terminal|user-menu|columns.*)\.css/, exclude: /css\/(nojs|view|config|terminal|user-menu|columns.*)\.css/,
use: extractMain.extract([ use: [MiniCssExtractPlugin.loader, 'css-loader'],
'css-loader',
]),
}, },
...cssPlugins.map(extract), { ...cssNames.map(extract), {
test: /\.(png|gif|svg|woff|woff2|eot|ttf)$/, test: /\.(png|gif|svg|woff|woff2|eot|ttf)$/,
use: { use: {
loader: 'url-loader', loader: 'url-loader',
@ -68,14 +67,11 @@ function getCSSList(dir) {
.map(addDir); .map(addDir);
} }
function extract(extractPlugin) { function extract(filename) {
const {filename} = extractPlugin; console.log(':->', filename);
return { return {
test: RegExp(`css/${filename}`), test: RegExp(`css/${filename}`),
use: extractPlugin.extract([ use: [MiniCssExtractPlugin.loader, 'css-loader'],
'css-loader',
]),
}; };
} }

View file

@ -8,8 +8,6 @@ const {
const {EnvironmentPlugin} = require('webpack'); const {EnvironmentPlugin} = require('webpack');
const ServiceWorkerWebpackPlugin = require('serviceworker-webpack-plugin');
const dir = './client'; const dir = './client';
const dirModules = './client/modules'; const dirModules = './client/modules';
const modules = './modules'; const modules = './modules';
@ -52,11 +50,6 @@ const plugins = [
new EnvironmentPlugin({ new EnvironmentPlugin({
NODE_ENV, NODE_ENV,
}), }),
new ServiceWorkerWebpackPlugin({
entry: join(__dirname, '..', 'client', 'sw', 'sw.js'),
excludes: ['*'],
}),
]; ];
const splitChunks = { const splitChunks = {

View file

@ -182,7 +182,6 @@
"eslint": "^6.0.0-alpha", "eslint": "^6.0.0-alpha",
"eslint-plugin-node": "^11.0.0", "eslint-plugin-node": "^11.0.0",
"eslint-plugin-putout": "^3.0.0", "eslint-plugin-putout": "^3.0.0",
"extract-text-webpack-plugin": "^4.0.0-alpha.0",
"gritty": "^4.7.0", "gritty": "^4.7.0",
"gunzip-maybe": "^1.3.1", "gunzip-maybe": "^1.3.1",
"html-looks-like": "^1.0.2", "html-looks-like": "^1.0.2",
@ -193,6 +192,7 @@
"load.js": "^3.0.0", "load.js": "^3.0.0",
"madrun": "^5.0.0", "madrun": "^5.0.0",
"memfs": "^3.0.1", "memfs": "^3.0.1",
"mini-css-extract-plugin": "^0.9.0",
"minor": "^1.2.2", "minor": "^1.2.2",
"mkdirp": "^0.5.1", "mkdirp": "^0.5.1",
"mock-require": "^3.0.1", "mock-require": "^3.0.1",