Skip to content

Commit 4c95824

Browse files
committed
Promote asset/resource rather than url-loader
1 parent 4bffefa commit 4c95824

File tree

2 files changed

+20
-24
lines changed

2 files changed

+20
-24
lines changed

build/webpack.config.js

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ module.exports = env => {
2121

2222
return {
2323
target: 'web',
24-
2524
context: path.join(__dirname, '../src'),
2625
entry: {
2726
app: path.join(__dirname, '../src/app.js'),
@@ -92,28 +91,25 @@ module.exports = env => {
9291
},
9392
{
9493
test: /\.(png|jpe?g|gif|svg|ico)(\?.*)?$/,
95-
loader: 'url-loader',
96-
options: {
97-
limit: 3000,
98-
name: 'assets/images/[name].[contenthash:7].[ext]'
94+
type: 'asset/resource',
95+
generator: {
96+
filename: 'assets/images/[name].[contenthash:7][ext]'
9997
}
10098
},
10199
{
102100
test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
103-
loader: 'url-loader',
104-
options: {
105-
limit: 5000,
106-
name: 'assets/fonts/[name].[contenthash:7].[ext]'
101+
type: 'asset/resource',
102+
generator: {
103+
filename: 'assets/fonts/[name].[contenthash:7][ext]'
107104
}
108105
},
109-
/* {
106+
/*{
110107
test: /\.(mp4)(\?.*)?$/,
111-
loader: 'url-loader',
112-
options: {
113-
limit: 10000,
114-
name: 'assets/videos/[name].[contenthash:7].[ext]'
115-
}
116-
} */
108+
type: 'asset/resource',
109+
generator: {
110+
filename: 'assets/videos/[name].[contenthash:7][ext]'
111+
},
112+
}*/
117113
]
118114
},
119115
experiments: {

src/views/layouts/master.pug

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ html(lang='en')
3535

3636

3737
//- Favicons
38-
link(rel='apple-touch-icon', sizes='180x180', href=require('images/favicons/apple-touch-icon.png').default)
39-
link(rel='icon', type='image/png', sizes='32x32', href=require('images/favicons/favicon-32x32.png').default)
40-
link(rel='icon', type='image/png', sizes='16x16', href=require('images/favicons/favicon-16x16.png').default)
41-
link(rel='shortcut icon', href=require('images/favicons/favicon.ico').default)
38+
link(rel='apple-touch-icon', sizes='180x180', href=require('images/favicons/apple-touch-icon.png'))
39+
link(rel='icon', type='image/png', sizes='32x32', href=require('images/favicons/favicon-32x32.png'))
40+
link(rel='icon', type='image/png', sizes='16x16', href=require('images/favicons/favicon-16x16.png'))
41+
link(rel='shortcut icon', href=require('images/favicons/favicon.ico'))
4242

4343
//- Preload fonts
44-
link(type='font/woff', href=require('source/assets/fonts/Quicksand-Bold.woff').default, rel='preload', as='font', crossorigin)
45-
link(type='font/woff', href=require('source/assets/fonts/Quicksand-Medium.woff').default, rel='preload', as='font', crossorigin)
46-
link(type='font/woff', href=require('source/assets/fonts/Quicksand-Regular.woff').default, rel='preload', as='font', crossorigin)
47-
link(type='font/woff', href=require('source/assets/fonts/Quicksand-Light.woff').default, rel='preload', as='font', crossorigin)
44+
link(type='font/woff', href=require('source/assets/fonts/Quicksand-Bold.woff'), rel='preload', as='font', crossorigin)
45+
link(type='font/woff', href=require('source/assets/fonts/Quicksand-Medium.woff'), rel='preload', as='font', crossorigin)
46+
link(type='font/woff', href=require('source/assets/fonts/Quicksand-Regular.woff'), rel='preload', as='font', crossorigin)
47+
link(type='font/woff', href=require('source/assets/fonts/Quicksand-Light.woff'), rel='preload', as='font', crossorigin)
4848

4949
//- Title
5050
block title

0 commit comments

Comments
 (0)