Skip to content

Commit 5e608a9

Browse files
committed
Fix font loading when urlpath is set
Use copy webpack plugin instead. In the old fasion Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
1 parent 70de439 commit 5e608a9

File tree

6 files changed

+48
-35
lines changed

6 files changed

+48
-35
lines changed

public/css/font.css

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,206 +3,206 @@
33
font-family: 'Source Code Pro';
44
font-style: normal;
55
font-weight: 300;
6-
src: local('Source Code Pro Light'), local('SourceCodePro-Light'), url('/fonts/SourceCodePro-Light.woff') format('woff');
6+
src: local('Source Code Pro Light'), local('SourceCodePro-Light'), url('../fonts/SourceCodePro-Light.woff') format('woff');
77
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
88
}
99
/* latin */
1010
@font-face {
1111
font-family: 'Source Code Pro';
1212
font-style: normal;
1313
font-weight: 300;
14-
src: local('Source Code Pro Light'), local('SourceCodePro-Light'), url('/fonts/SourceCodePro-Light.woff') format('woff');
14+
src: local('Source Code Pro Light'), local('SourceCodePro-Light'), url('../fonts/SourceCodePro-Light.woff') format('woff');
1515
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
1616
}
1717
/* latin-ext */
1818
@font-face {
1919
font-family: 'Source Code Pro';
2020
font-style: normal;
2121
font-weight: 400;
22-
src: local('Source Code Pro'), local('SourceCodePro-Regular'), url('/fonts/SourceCodePro-Regular.woff') format('woff');
22+
src: local('Source Code Pro'), local('SourceCodePro-Regular'), url('../fonts/SourceCodePro-Regular.woff') format('woff');
2323
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
2424
}
2525
/* latin */
2626
@font-face {
2727
font-family: 'Source Code Pro';
2828
font-style: normal;
2929
font-weight: 400;
30-
src: local('Source Code Pro'), local('SourceCodePro-Regular'), url('/fonts/SourceCodePro-Regular.woff') format('woff');
30+
src: local('Source Code Pro'), local('SourceCodePro-Regular'), url('../fonts/SourceCodePro-Regular.woff') format('woff');
3131
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
3232
}
3333
/* latin-ext */
3434
@font-face {
3535
font-family: 'Source Code Pro';
3636
font-style: normal;
3737
font-weight: 500;
38-
src: local('Source Code Pro Medium'), local('SourceCodePro-Medium'), url('/fonts/SourceCodePro-Medium.woff') format('woff');
38+
src: local('Source Code Pro Medium'), local('SourceCodePro-Medium'), url('../fonts/SourceCodePro-Medium.woff') format('woff');
3939
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
4040
}
4141
/* latin */
4242
@font-face {
4343
font-family: 'Source Code Pro';
4444
font-style: normal;
4545
font-weight: 500;
46-
src: local('Source Code Pro Medium'), local('SourceCodePro-Medium'), url('/fonts/SourceCodePro-Medium.woff') format('woff');
46+
src: local('Source Code Pro Medium'), local('SourceCodePro-Medium'), url('../fonts/SourceCodePro-Medium.woff') format('woff');
4747
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
4848
}
4949
/* vietnamese */
5050
@font-face {
5151
font-family: 'Source Sans Pro';
5252
font-style: normal;
5353
font-weight: 300;
54-
src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url('/fonts/SourceCodePro-Medium.woff') format('woff');
54+
src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url('../fonts/SourceCodePro-Medium.woff') format('woff');
5555
unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB;
5656
}
5757
/* latin-ext */
5858
@font-face {
5959
font-family: 'Source Sans Pro';
6060
font-style: normal;
6161
font-weight: 300;
62-
src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url('/fonts/SourceSansPro-Light.woff') format('woff');
62+
src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url('../fonts/SourceSansPro-Light.woff') format('woff');
6363
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
6464
}
6565
/* latin */
6666
@font-face {
6767
font-family: 'Source Sans Pro';
6868
font-style: normal;
6969
font-weight: 300;
70-
src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url('/fonts/SourceSansPro-Light.woff') format('woff');
70+
src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url('../fonts/SourceSansPro-Light.woff') format('woff');
7171
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
7272
}
7373
/* vietnamese */
7474
@font-face {
7575
font-family: 'Source Sans Pro';
7676
font-style: normal;
7777
font-weight: 400;
78-
src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('/fonts/SourceSansPro-Regular.woff') format('woff');
78+
src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('../fonts/SourceSansPro-Regular.woff') format('woff');
7979
unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB;
8080
}
8181
/* latin-ext */
8282
@font-face {
8383
font-family: 'Source Sans Pro';
8484
font-style: normal;
8585
font-weight: 400;
86-
src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('/fonts/SourceSansPro-Regular.woff') format('woff');
86+
src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('../fonts/SourceSansPro-Regular.woff') format('woff');
8787
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
8888
}
8989
/* latin */
9090
@font-face {
9191
font-family: 'Source Sans Pro';
9292
font-style: normal;
9393
font-weight: 400;
94-
src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('/fonts/SourceSansPro-Regular.woff') format('woff');
94+
src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('../fonts/SourceSansPro-Regular.woff') format('woff');
9595
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
9696
}
9797
/* vietnamese */
9898
@font-face {
9999
font-family: 'Source Sans Pro';
100100
font-style: normal;
101101
font-weight: 600;
102-
src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url('/fonts/SourceSansPro-Semibold.woff') format('woff');
102+
src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url('../fonts/SourceSansPro-Semibold.woff') format('woff');
103103
unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB;
104104
}
105105
/* latin-ext */
106106
@font-face {
107107
font-family: 'Source Sans Pro';
108108
font-style: normal;
109109
font-weight: 600;
110-
src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url('/fonts/SourceSansPro-Semibold.woff') format('woff');
110+
src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url('../fonts/SourceSansPro-Semibold.woff') format('woff');
111111
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
112112
}
113113
/* latin */
114114
@font-face {
115115
font-family: 'Source Sans Pro';
116116
font-style: normal;
117117
font-weight: 600;
118-
src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url('/fonts/SourceSansPro-Semibold.woff') format('woff');
118+
src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url('../fonts/SourceSansPro-Semibold.woff') format('woff');
119119
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
120120
}
121121
/* vietnamese */
122122
@font-face {
123123
font-family: 'Source Sans Pro';
124124
font-style: italic;
125125
font-weight: 300;
126-
src: local('Source Sans Pro Light Italic'), local('SourceSansPro-LightIt'), url('/fonts/SourceSansPro-LightItalic.woff') format('woff');
126+
src: local('Source Sans Pro Light Italic'), local('SourceSansPro-LightIt'), url('../fonts/SourceSansPro-LightItalic.woff') format('woff');
127127
unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB;
128128
}
129129
/* latin-ext */
130130
@font-face {
131131
font-family: 'Source Sans Pro';
132132
font-style: italic;
133133
font-weight: 300;
134-
src: local('Source Sans Pro Light Italic'), local('SourceSansPro-LightIt'), url('/fonts/SourceSansPro-LightItalic.woff') format('woff');
134+
src: local('Source Sans Pro Light Italic'), local('SourceSansPro-LightIt'), url('../fonts/SourceSansPro-LightItalic.woff') format('woff');
135135
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
136136
}
137137
/* latin */
138138
@font-face {
139139
font-family: 'Source Sans Pro';
140140
font-style: italic;
141141
font-weight: 300;
142-
src: local('Source Sans Pro Light Italic'), local('SourceSansPro-LightIt'), url('/fonts/SourceSansPro-LightItalic.woff') format('woff');
142+
src: local('Source Sans Pro Light Italic'), local('SourceSansPro-LightIt'), url('../fonts/SourceSansPro-LightItalic.woff') format('woff');
143143
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
144144
}
145145
/* vietnamese */
146146
@font-face {
147147
font-family: 'Source Sans Pro';
148148
font-style: italic;
149149
font-weight: 400;
150-
src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('/fonts/SourceSansPro-Italic.woff') format('woff');
150+
src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('../fonts/SourceSansPro-Italic.woff') format('woff');
151151
unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB;
152152
}
153153
/* latin-ext */
154154
@font-face {
155155
font-family: 'Source Sans Pro';
156156
font-style: italic;
157157
font-weight: 400;
158-
src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('/fonts/SourceSansPro-Italic.woff') format('woff');
158+
src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('../fonts/SourceSansPro-Italic.woff') format('woff');
159159
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
160160
}
161161
/* latin */
162162
@font-face {
163163
font-family: 'Source Sans Pro';
164164
font-style: italic;
165165
font-weight: 400;
166-
src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('/fonts/SourceSansPro-Italic.woff') format('woff');
166+
src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('../fonts/SourceSansPro-Italic.woff') format('woff');
167167
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
168168
}
169169
/* vietnamese */
170170
@font-face {
171171
font-family: 'Source Sans Pro';
172172
font-style: italic;
173173
font-weight: 600;
174-
src: local('Source Sans Pro Semibold Italic'), local('SourceSansPro-SemiboldIt'), url('/fonts/SourceSansPro-SemiboldItalic.woff') format('woff');
174+
src: local('Source Sans Pro Semibold Italic'), local('SourceSansPro-SemiboldIt'), url('../fonts/SourceSansPro-SemiboldItalic.woff') format('woff');
175175
unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB;
176176
}
177177
/* latin-ext */
178178
@font-face {
179179
font-family: 'Source Sans Pro';
180180
font-style: italic;
181181
font-weight: 600;
182-
src: local('Source Sans Pro Semibold Italic'), local('SourceSansPro-SemiboldIt'), url('/fonts/SourceSansPro-SemiboldItalic.woff') format('woff');
182+
src: local('Source Sans Pro Semibold Italic'), local('SourceSansPro-SemiboldIt'), url('../fonts/SourceSansPro-SemiboldItalic.woff') format('woff');
183183
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
184184
}
185185
/* latin */
186186
@font-face {
187187
font-family: 'Source Sans Pro';
188188
font-style: italic;
189189
font-weight: 600;
190-
src: local('Source Sans Pro Semibold Italic'), local('SourceSansPro-SemiboldIt'), url('/fonts/SourceSansPro-SemiboldItalic.woff') format('woff');
190+
src: local('Source Sans Pro Semibold Italic'), local('SourceSansPro-SemiboldIt'), url('../fonts/SourceSansPro-SemiboldItalic.woff') format('woff');
191191
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
192192
}
193193
/* latin-ext */
194194
@font-face {
195195
font-family: 'Source Serif Pro';
196196
font-style: normal;
197197
font-weight: 400;
198-
src: local('Source Serif Pro'), local('SourceSerifPro-Regular'), url('/fonts/SourceSerifPro-Regular.woff') format('woff');
198+
src: local('Source Serif Pro'), local('SourceSerifPro-Regular'), url('../fonts/SourceSerifPro-Regular.woff') format('woff');
199199
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
200200
}
201201
/* latin */
202202
@font-face {
203203
font-family: 'Source Serif Pro';
204204
font-style: normal;
205205
font-weight: 400;
206-
src: local('Source Serif Pro'), local('SourceSerifPro-Regular'), url('/fonts/SourceSerifPro-Regular.woff') format('woff');
206+
src: local('Source Serif Pro'), local('SourceSerifPro-Regular'), url('../fonts/SourceSerifPro-Regular.woff') format('woff');
207207
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
208208
}

public/views/codimd/head.ejs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@
1818
<%- include ../shared/polyfill %>
1919
<% } else { %>
2020
<link rel="stylesheet" href='<%- serverURL %>/build/emojify.js/dist/css/basic/emojify.min.css'>
21+
<link rel="stylesheet" href='<%- serverURL %>/css/font.css'>
22+
<link rel="stylesheet" href='<%- serverURL %>/build/fork-awesome/css/fork-awesome.min.css'>
2123
<%- include ../build/index-pack-header %>
2224
<% } %>

public/views/index/head.ejs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@
1818
<%- include ../build/cover-header %>
1919
<%- include ../shared/polyfill %>
2020
<% } else { %>
21+
<link rel="stylesheet" href='<%- serverURL %>/css/font.css'>
22+
<link rel="stylesheet" href='<%- serverURL %>/build/fork-awesome/css/fork-awesome.min.css'>
2123
<%- include ../build/cover-pack-header %>
2224
<% } %>

public/views/pretty.ejs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
<%- include shared/polyfill %>
3131
<% } else { %>
3232
<link rel="stylesheet" href='<%- serverURL %>/build/emojify.js/dist/css/basic/emojify.min.css'>
33+
<link rel="stylesheet" href='<%- serverURL %>/css/font.css'>
34+
<link rel="stylesheet" href='<%- serverURL %>/build/fork-awesome/css/fork-awesome.min.css'>
3335
<%- include build/pretty-pack-header %>
3436
<% } %>
3537
</head>

public/views/slide.ejs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
<% } else { %>
2727
<link rel="stylesheet" href="<%- serverURL %>/build/reveal.js/css/reveal.css">
2828
<link rel="stylesheet" href='<%- serverURL %>/build/emojify.js/dist/css/basic/emojify.min.css'>
29+
<link rel="stylesheet" href='<%- serverURL %>/css/font.css'>
30+
<link rel="stylesheet" href='<%- serverURL %>/build/fork-awesome/css/fork-awesome.min.css'>
2931
<%- include build/slide-pack-header %>
3032
<% } %>
3133

webpack.common.js

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module.exports = {
3131
}),
3232
new HtmlWebpackPlugin({
3333
template: 'public/views/includes/header.ejs',
34-
chunks: ['font-pack', 'index-styles-pack', 'index-styles', 'index'],
34+
chunks: ['index-styles-pack', 'index-styles', 'index'],
3535
filename: path.join(__dirname, 'public/views/build/index-pack-header.ejs'),
3636
inject: false,
3737
chunksSortMode: 'manual'
@@ -58,7 +58,7 @@ module.exports = {
5858
}),
5959
new HtmlWebpackPlugin({
6060
template: 'public/views/includes/header.ejs',
61-
chunks: ['font-pack', 'cover-styles-pack', 'cover'],
61+
chunks: ['cover-styles-pack', 'cover'],
6262
filename: path.join(__dirname, 'public/views/build/cover-pack-header.ejs'),
6363
inject: false,
6464
chunksSortMode: 'manual'
@@ -85,7 +85,7 @@ module.exports = {
8585
}),
8686
new HtmlWebpackPlugin({
8787
template: 'public/views/includes/header.ejs',
88-
chunks: ['font-pack', 'pretty-styles-pack', 'pretty-styles', 'pretty'],
88+
chunks: ['pretty-styles-pack', 'pretty-styles', 'pretty'],
8989
filename: path.join(__dirname, 'public/views/build/pretty-pack-header.ejs'),
9090
inject: false,
9191
chunksSortMode: 'manual'
@@ -112,7 +112,7 @@ module.exports = {
112112
}),
113113
new HtmlWebpackPlugin({
114114
template: 'public/views/includes/header.ejs',
115-
chunks: ['font-pack', 'slide-styles-pack', 'slide-styles', 'slide'],
115+
chunks: ['slide-styles-pack', 'slide-styles', 'slide'],
116116
filename: path.join(__dirname, 'public/views/build/slide-pack-header.ejs'),
117117
inject: false,
118118
chunksSortMode: 'manual'
@@ -185,14 +185,23 @@ module.exports = {
185185
context: path.join(__dirname, 'node_modules/leaflet'),
186186
from: 'dist',
187187
to: 'leaflet'
188+
},
189+
{
190+
context: path.join(__dirname, 'node_modules/fork-awesome'),
191+
from: 'fonts',
192+
to: 'fork-awesome/fonts'
193+
},
194+
{
195+
context: path.join(__dirname, 'node_modules/fork-awesome'),
196+
from: 'css',
197+
to: 'fork-awesome/css'
188198
}
189199
]),
190200
new MiniCssExtractPlugin()
191201
],
192202

193203
entry: {
194204
font: path.join(__dirname, 'public/css/google-font.css'),
195-
'font-pack': path.join(__dirname, 'public/css/font.css'),
196205
common: [
197206
'expose-loader?jQuery!expose-loader?$!jquery',
198207
'velocity-animate',
@@ -205,7 +214,6 @@ module.exports = {
205214
],
206215
'cover-styles-pack': [
207216
path.join(__dirname, 'node_modules/bootstrap/dist/css/bootstrap.min.css'),
208-
path.join(__dirname, 'node_modules/fork-awesome/css/fork-awesome.min.css'),
209217
path.join(__dirname, 'public/css/bootstrap-social.css'),
210218
path.join(__dirname, 'node_modules/select2/select2.css'),
211219
path.join(__dirname, 'node_modules/select2/select2-bootstrap.css')
@@ -260,7 +268,6 @@ module.exports = {
260268
],
261269
'index-styles-pack': [
262270
path.join(__dirname, 'node_modules/bootstrap/dist/css/bootstrap.min.css'),
263-
path.join(__dirname, 'node_modules/fork-awesome/css/fork-awesome.min.css'),
264271
path.join(__dirname, 'public/css/bootstrap-social.css'),
265272
path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'),
266273
path.join(__dirname, 'node_modules/leaflet/dist/leaflet.css')
@@ -309,7 +316,6 @@ module.exports = {
309316
],
310317
'pretty-styles-pack': [
311318
path.join(__dirname, 'node_modules/bootstrap/dist/css/bootstrap.min.css'),
312-
path.join(__dirname, 'node_modules/fork-awesome/css/fork-awesome.min.css'),
313319
path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'),
314320
path.join(__dirname, 'node_modules/leaflet/dist/leaflet.css')
315321
],
@@ -349,7 +355,6 @@ module.exports = {
349355
path.join(__dirname, 'public/css/markdown.css')
350356
],
351357
'slide-styles-pack': [
352-
path.join(__dirname, 'node_modules/fork-awesome/css/fork-awesome.min.css'),
353358
path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'),
354359
path.join(__dirname, 'node_modules/leaflet/dist/leaflet.css')
355360
],

0 commit comments

Comments
 (0)