Skip to content

Commit 47fd4df

Browse files
kcarannodiscc
authored andcommitted
Updated webpack config for version 5
1 parent 3c11bc1 commit 47fd4df

File tree

1 file changed

+23
-35
lines changed

1 file changed

+23
-35
lines changed

webpack.config.js

Lines changed: 23 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const TerserPlugin = require('terser-webpack-plugin');
1111
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
1212

1313
const extractCss = new MiniCssExtractPlugin({
14-
filename: "../css/[name].min.css",
14+
filename: "css/[name].min.css",
1515
});
1616

1717
module.exports = [
@@ -30,8 +30,8 @@ module.exports = [
3030
markdown: './assets/common/css/markdown.css',
3131
},
3232
output: {
33-
filename: '[name].min.js',
34-
path: path.resolve(__dirname, 'tpl/default/js/')
33+
filename: 'js/[name].min.js',
34+
path: path.resolve(__dirname, 'tpl/default/')
3535
},
3636
module: {
3737
rules: [
@@ -52,33 +52,30 @@ module.exports = [
5252
use: [
5353
{
5454
loader: MiniCssExtractPlugin.loader,
55-
options: {
56-
publicPath: 'tpl/default/css/',
57-
},
5855
},
5956
'css-loader',
6057
'sass-loader',
6158
],
6259
},
6360
{
6461
test: /\.(gif|png|jpe?g|svg|ico)$/i,
65-
use: [
66-
{
67-
loader: 'file-loader',
68-
options: {
69-
name: '../img/[name].[ext]',
70-
publicPath: 'tpl/default/img/',
71-
}
72-
}
73-
],
62+
type: 'asset/resource',
63+
generator: {
64+
filename: 'img/[name][ext]'
65+
}
66+
},
67+
{
68+
test: /webfont\.svg$/,
69+
type: 'asset/resource',
70+
generator: {
71+
filename: 'fonts/[name][ext]'
72+
}
7473
},
7574
{
7675
test: /\.(eot|ttf|woff|woff2)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
77-
loader: 'file-loader',
78-
options: {
79-
name: '../fonts/[name].[ext]',
80-
// do not add a publicPath here because it's already handled by CSS's publicPath
81-
publicPath: '../default/',
76+
type: 'asset/resource',
77+
generator: {
78+
filename: 'fonts/[name][ext]'
8279
}
8380
},
8481
],
@@ -105,8 +102,8 @@ module.exports = [
105102
thumbnails_update: './assets/common/js/thumbnails-update.js',
106103
},
107104
output: {
108-
filename: '[name].min.js',
109-
path: path.resolve(__dirname, 'tpl/vintage/js/')
105+
filename: 'js/[name].min.js',
106+
path: path.resolve(__dirname, 'tpl/vintage/')
110107
},
111108
module: {
112109
rules: [
@@ -127,26 +124,17 @@ module.exports = [
127124
use: [
128125
{
129126
loader: MiniCssExtractPlugin.loader,
130-
options: {
131-
publicPath: 'tpl/vintage/css/',
132-
},
133127
},
134128
'css-loader',
135129
'sass-loader',
136130
],
137131
},
138132
{
139133
test: /\.(gif|png|jpe?g|svg|ico)$/i,
140-
use: [
141-
{
142-
loader: 'file-loader',
143-
options: {
144-
name: '../img/[name].[ext]',
145-
// do not add a publicPath here because it's already handled by CSS's publicPath
146-
publicPath: '../vintage',
147-
}
148-
}
149-
],
134+
type: 'asset/resource',
135+
generator: {
136+
filename: 'img/[name][ext]'
137+
}
150138
},
151139
],
152140
},

0 commit comments

Comments
 (0)