@@ -11,7 +11,7 @@ const TerserPlugin = require('terser-webpack-plugin');
11
11
const MiniCssExtractPlugin = require ( "mini-css-extract-plugin" ) ;
12
12
13
13
const extractCss = new MiniCssExtractPlugin ( {
14
- filename : "../ css/[name].min.css" ,
14
+ filename : "css/[name].min.css" ,
15
15
} ) ;
16
16
17
17
module . exports = [
@@ -30,8 +30,8 @@ module.exports = [
30
30
markdown : './assets/common/css/markdown.css' ,
31
31
} ,
32
32
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/' )
35
35
} ,
36
36
module : {
37
37
rules : [
@@ -52,33 +52,30 @@ module.exports = [
52
52
use : [
53
53
{
54
54
loader : MiniCssExtractPlugin . loader ,
55
- options : {
56
- publicPath : 'tpl/default/css/' ,
57
- } ,
58
55
} ,
59
56
'css-loader' ,
60
57
'sass-loader' ,
61
58
] ,
62
59
} ,
63
60
{
64
61
test : / \. ( g i f | p n g | j p e ? g | s v g | i c o ) $ / 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 : / w e b f o n t \. s v g $ / ,
69
+ type : 'asset/resource' ,
70
+ generator : {
71
+ filename : 'fonts/[name][ext]'
72
+ }
74
73
} ,
75
74
{
76
75
test : / \. ( e o t | t t f | w o f f | w o f f 2 ) ( \? 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]'
82
79
}
83
80
} ,
84
81
] ,
@@ -105,8 +102,8 @@ module.exports = [
105
102
thumbnails_update : './assets/common/js/thumbnails-update.js' ,
106
103
} ,
107
104
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/' )
110
107
} ,
111
108
module : {
112
109
rules : [
@@ -127,26 +124,17 @@ module.exports = [
127
124
use : [
128
125
{
129
126
loader : MiniCssExtractPlugin . loader ,
130
- options : {
131
- publicPath : 'tpl/vintage/css/' ,
132
- } ,
133
127
} ,
134
128
'css-loader' ,
135
129
'sass-loader' ,
136
130
] ,
137
131
} ,
138
132
{
139
133
test : / \. ( g i f | p n g | j p e ? g | s v g | i c o ) $ / 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
+ }
150
138
} ,
151
139
] ,
152
140
} ,
0 commit comments