Skip to content

Commit c12ea7f

Browse files
authored
Merge pull request #21 from XiledCreator/19-fixed-asset-injection-in-subpages
Fixed Assest Injection
2 parents f7d51de + 2b5cfff commit c12ea7f

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

build/webpack.config.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ module.exports = env => {
2121
},
2222
output: {
2323
path: path.resolve(__dirname, '../dist'),
24-
publicPath: '/',
2524
filename: 'assets/js/[name].[hash:7].bundle.js'
2625
},
2726
devServer: {
@@ -95,7 +94,6 @@ module.exports = env => {
9594
test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
9695
loader: 'url-loader',
9796
options: {
98-
limit: 5000,
9997
name: 'assets/fonts/[name].[hash:7].[ext]'
10098
}
10199
},

src/views/layouts/master.pug

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,18 @@ html(lang='en')
4141
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'), 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)
44+
link(type='font/woff', href=require('source/assets/fonts/Quicksand-Bold.woff'), rel='prefetch', as='font', crossorigin)
45+
link(type='font/woff', href=require('source/assets/fonts/Quicksand-Medium.woff'), rel='prefetch', as='font', crossorigin)
46+
link(type='font/woff', href=require('source/assets/fonts/Quicksand-Regular.woff'), rel='prefetch', as='font', crossorigin)
47+
link(type='font/woff', href=require('source/assets/fonts/Quicksand-Light.woff'), rel='prefetch', as='font', crossorigin)
4848

4949
//- Title
5050
block title
5151
title Your project!
5252

5353
//- Manifest browserconfig files
5454
block manifestBrowserconfigFiles
55-
link(rel='manifest', href='./manifest.json')
55+
link(rel='manifest', href='./manifest.json' crossorigin)
5656
meta(name='msapplication-config' content='./browserconfig.xml')
5757

5858
body

0 commit comments

Comments
 (0)