Skip to content

Commit efd62bd

Browse files
jackycutejackycute
committed
Optimize slide page resource packing and load orders, fix possible wrong chunks orders and font awesome version
1 parent ad90643 commit efd62bd

4 files changed

Lines changed: 64 additions & 37 deletions

File tree

‎public/js/slide.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
require('../css/extra.css');
22
require('../css/site.css');
3-
require('../css/slide.css');
43

54
var extraModule = require('./extra');
65
var md = extraModule.md;

‎public/views/html.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<link rel="apple-touch-icon" href="{{{url}}}/apple-touch-icon.png">
1717

1818
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha256-916EbMg70RQy9LHiGkXzG8hSg9EdNy97GazNG/aiY1w=" crossorigin="anonymous" />
19-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css" integrity="sha256-AIodEDkC8V/bHBkfyxzolUMw57jeQ9CauwhVW6YJ9CA=" crossorigin="anonymous" />
19+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous" />
2020
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css" integrity="sha256-3iu9jgsy9TpTwXKb7bNQzqWekRX7pPK+2OLj3R922fo=" crossorigin="anonymous" />
2121
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/3.5.0/octicons.min.css" integrity="sha256-QiWfLIsCT02Sdwkogf6YMiQlj4NE84MKkzEMkZnMGdg=" crossorigin="anonymous" />
2222
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.5.1/themes/prism.min.css" integrity="sha256-vtR0hSWRc3Tb26iuN2oZHt3KRUomwTufNIf5/4oeCyg=" crossorigin="anonymous" />

‎public/views/slide.ejs‎

Lines changed: 17 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,23 @@
1515
<link rel="icon" type="image/png" href="<%- url %>/favicon.png">
1616
<link rel="apple-touch-icon" href="<%- url %>/apple-touch-icon.png">
1717
<% if(useCDN) { %>
18-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css" integrity="sha256-AIodEDkC8V/bHBkfyxzolUMw57jeQ9CauwhVW6YJ9CA=" crossorigin="anonymous" />
18+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous" />
1919
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css" integrity="sha256-3iu9jgsy9TpTwXKb7bNQzqWekRX7pPK+2OLj3R922fo=" crossorigin="anonymous" />
2020
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/3.5.0/octicons.min.css" integrity="sha256-QiWfLIsCT02Sdwkogf6YMiQlj4NE84MKkzEMkZnMGdg=" crossorigin="anonymous" />
21-
<link rel="stylesheet" href="<%- url %>/css/google-font.css">
21+
<link rel="stylesheet" href='<%- url %>/build/emojify.js/dist/css/basic/emojify.min.css'>
22+
<%- include build/slide-header %>
2223
<% } else { %>
23-
<link rel="stylesheet" href='<%- url %>/vendor/font-awesome/css/font-awesome.min.css'>
24-
<link rel="stylesheet" href="<%- url %>/vendor/Ionicons/css/ionicons.min.css">
25-
<link rel="stylesheet" href="<%- url %>/vendor/octicons/octicons/octicons.css">
26-
<link rel="stylesheet" href="<%- url %>/css/font.css">
24+
<link rel="stylesheet" href='<%- url %>/build/emojify.js/dist/css/basic/emojify.min.css'>
25+
<%- include build/slide-pack-header %>
2726
<% } %>
28-
<link rel="stylesheet" href='<%- url %>/vendor/bootstrap/tooltip.min.css'>
2927

28+
<!-- For reveal.js -->
3029
<link rel="stylesheet" href="<%- url %>/vendor/reveal.js/css/reveal.css">
3130
<link rel="stylesheet" href="<%- url %>/vendor/reveal.js/css/theme/black.css" id="theme">
32-
3331
<!-- For syntax highlighting -->
3432
<link rel="stylesheet" href="<%- url %>/vendor/reveal.js/lib/css/zenburn.css">
35-
36-
<link rel="stylesheet" href='<%- url %>/css/github-extract.css'>
37-
<link rel="stylesheet" href='<%- url %>/css/gist.css'>
38-
<link rel="stylesheet" href="<%- url %>/css/mermaid.css">
39-
<link rel="stylesheet" href='<%- url %>/css/markdown.css'>
40-
<link rel="stylesheet" href='<%- url %>/vendor/emojify.js/dist/css/basic/emojify.min.css'>
41-
42-
<%- include build/slide-header %>
33+
<!-- For overwrite reveal.js -->
34+
<link rel="stylesheet" href="<%- url %>/css/slide.css">
4335

4436
<!-- Printing and PDF exports -->
4537
<script>
@@ -96,33 +88,26 @@
9688
<% if(useCDN) { %>
9789
<script src="https://cdnjs.cloudflare.com/ajax/libs/reveal.js/3.3.0/lib/js/head.min.js" integrity="sha256-+09kLhwACKXFPDvqo4xMMvi4+uXFsRZ2uYGbeN1U8sI=" crossorigin="anonymous"></script>
9890
<script src="https://cdnjs.cloudflare.com/ajax/libs/reveal.js/3.3.0/js/reveal.min.js" integrity="sha256-lvaInSKflJWLPqf5N5oHr/UZFwXKD6gckerdwoHqECY=" crossorigin="anonymous"></script>
91+
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
9992
<script src="https://cdnjs.cloudflare.com/ajax/libs/velocity/1.3.1/velocity.min.js" integrity="sha256-zt0EvRuKYSkXKgIFLrJIYeZsBjIZLel9UThCm5GI6io=" crossorigin="anonymous" defer></script>
93+
<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha256-U5ZEeKfGNOja007MMD3YBI0A3OSZOQbeG6z2f2Y0hu8=" crossorigin="anonymous" defer></script>
94+
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.13/jquery.mousewheel.min.js" integrity="sha256-jnOjDTXIPqall8M0MyTSt98JetJuZ7Yu+1Jm7hLTF7U=" crossorigin="anonymous" defer></script>
10095
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-yaml/3.6.1/js-yaml.min.js" integrity="sha256-tvANaUGcQTLkCS9wHnLZhBFVfIWQJpm98WOpykjD+eo=" crossorigin="anonymous" defer></script>
10196
<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js" integrity="sha256-yYfngbEKv4RENfGDvNUqJTqGFcKf31NJEe9OTnnMH3Y=" crossorigin="anonymous" defer></script>
10297
<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/config/TeX-AMS-MML_HTMLorMML.js" integrity="sha256-immzXfCGLhnx3Zfi9F/dUcqxEM8K3o3oTFy9Bh6HCwg=" crossorigin="anonymous" defer></script>
10398
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.15.1/moment-with-locales.min.js" integrity="sha256-J5wam9fTysK5BqYlUUBjbomFslRxkLgwB9AhnVWsj1Q=" crossorigin="anonymous" defer></script>
10499
<script src="https://cdnjs.cloudflare.com/ajax/libs/mermaid/6.0.0/mermaid.min.js" integrity="sha256-Yabf6Mj1TPKd6h4F6z5xRR1/2son0Wg8NhvjYnhcQcY=" crossorigin="anonymous" defer></script>
105100
<script src="https://cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/js/emojify.min.js" integrity="sha256-VAB5tAlKBvgaxw8oJ1crWMVbdmBVl4mP/2M8MNRl+4E=" crossorigin="anonymous" defer></script>
106-
<% } else { %>
107-
<script src="<%- url %>/vendor/reveal.js/lib/js/head.min.js"></script>
108-
<script src="<%- url %>/vendor/reveal.js/js/reveal.js"></script>
109-
<script src="<%- url %>/vendor/velocity/velocity.min.js" defer></script>
110-
<script src="<%- url %>/vendor/js-yaml/dist/js-yaml.min.js" defer></script>
111-
<script src="<%- url %>/vendor/MathJax/MathJax.js" defer></script>
112-
<script src="<%- url %>/vendor/MathJax/config/TeX-AMS-MML_HTMLorMML.js" defer></script>
113-
<script src="<%- url %>/vendor/moment/min/moment-with-locales.js" defer></script>
114-
<script src="<%- url %>/vendor/mermaid/dist/mermaid.min.js" defer></script>
115-
<script src="<%- url %>/vendor/emojify.js/dist/js/emojify.min.js" defer></script>
116-
<% } %>
117-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
118-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" integrity="sha256-KM512VNnjElC30ehFwehXjx1YCHPiQkOPmqnrWtpccM=" crossorigin="anonymous"></script>
119-
<script src="<%- url %>/vendor/bootstrap/tooltip.min.js" defer></script>
120101
<script src="https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.5/handlebars.min.js" integrity="sha256-rMOSOM5HDzVEMoVZTv2189+RKSTSgY5ZKfTfap7q2zE=" crossorigin="anonymous" defer></script>
121102
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js" integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" crossorigin="anonymous" defer></script>
122-
<script src="https://cdnjs.cloudflare.com/ajax/libs/gist-embed/2.5/gist-embed.min.js" integrity="sha256-hmjTba0C6gzDF3N0+Opwd/Jxk4e8ypWrcBw/57rY0Dk=" crossorigin="anonymous" defer></script>
123-
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.16.4/lodash.min.js" integrity="sha256-KteOoEtQ75FeAFFOTJZlvNt0iJ8NMusVDESd5jlwKEQ=" crossorigin="anonymous" defer></script>
103+
<script src="https://cdnjs.cloudflare.com/ajax/libs/gist-embed/2.6.0/gist-embed.min.js" integrity="sha256-KyF2D6xPIJUW5sUDSs93vWyZm+1RzIpKCexxElmxl8g=" crossorigin="anonymous" defer></script>
124104
<script src="https://cdnjs.cloudflare.com/ajax/libs/viz.js/1.3.0/viz.js" integrity="sha256-FGmk+pMdOeRk4xTJ168rnGms1KjYi6jYMYaNEmSsvuQ=" crossorigin="anonymous" defer></script>
125105
<%- include build/slide-scripts %>
106+
<% } else { %>
107+
<script src="<%- url %>/build/MathJax/MathJax.js" defer></script>
108+
<script src="<%- url %>/build/MathJax/config/TeX-AMS-MML_HTMLorMML.js" defer></script>
109+
<%- include build/slide-pack-scripts %>
110+
<% } %>
126111
</body>
127112
</html>
128113

‎webpackBaseConfig.js‎

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ module.exports = {
1616
"moment": "moment",
1717
"Handlebars": "handlebars"
1818
}),
19+
new webpack.optimize.OccurrenceOrderPlugin(true),
1920
new webpack.optimize.CommonsChunkPlugin({
2021
names: ["cover", "index", "pretty", "slide", "vendor"],
2122
children: true,
@@ -95,14 +96,21 @@ module.exports = {
9596
filename: path.join(__dirname, 'public/views/build/pretty-pack-scripts.ejs'),
9697
inject: false
9798
}),
99+
new HtmlWebpackPlugin({
98100
template: 'public/views/includes/header.ejs',
99-
chunks: ['vendor', 'slide'],
101+
chunks: ['font', 'slide-styles', 'slide'],
100102
filename: path.join(__dirname, 'public/views/build/slide-header.ejs'),
101103
inject: false
102104
}),
105+
new HtmlWebpackPlugin({
106+
template: 'public/views/includes/header.ejs',
107+
chunks: ['font-pack', 'slide-styles-pack', 'slide-styles', 'slide'],
108+
filename: path.join(__dirname, 'public/views/build/slide-pack-header.ejs'),
109+
inject: false
110+
}),
103111
new HtmlWebpackPlugin({
104112
template: 'public/views/includes/scripts.ejs',
105-
chunks: ['vendor', 'slide'],
113+
chunks: ['slide'],
106114
filename: path.join(__dirname, 'public/views/build/slide-scripts.ejs'),
107115
inject: false
108116
}),
@@ -133,7 +141,6 @@ module.exports = {
133141
],
134142

135143
entry: {
136-
slide: path.join(__dirname, 'public/js/slide.js'),
137144
font: path.join(__dirname, 'public/css/google-font.css'),
138145
"font-pack": path.join(__dirname, 'public/css/font.css'),
139146
common: [
@@ -266,6 +273,40 @@ module.exports = {
266273
path.join(__dirname, 'public/js/reveal-markdown.js'),
267274
path.join(__dirname, 'public/js/pretty.js')
268275
],
276+
slide: [
277+
"expose?filterXSS!xss",
278+
"flowchart.js",
279+
"js-sequence-diagrams",
280+
path.join(__dirname, 'public/js/reveal-markdown.js'),
281+
path.join(__dirname, 'public/js/slide.js')
282+
],
283+
"slide-styles": [
284+
path.join(__dirname, 'public/css/github-extract.css'),
285+
path.join(__dirname, 'public/css/mermaid.css'),
286+
path.join(__dirname, 'public/css/markdown.css')
287+
],
288+
"slide-styles-pack": [
289+
path.join(__dirname, 'node_modules/font-awesome/css/font-awesome.min.css'),
290+
path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'),
291+
path.join(__dirname, 'node_modules/octicons/octicons/octicons.css'),
292+
path.join(__dirname, 'public/vendor/bootstrap/tooltip.min.css')
293+
],
294+
"slide-pack": [
295+
"expose?jsyaml!js-yaml",
296+
"script!mermaid",
297+
"expose?moment!moment",
298+
"script!handlebars",
299+
"expose?hljs!highlight.js",
300+
"expose?emojify!emojify.js",
301+
"expose?filterXSS!xss",
302+
"script!gist-embed",
303+
"flowchart.js",
304+
"js-sequence-diagrams",
305+
"expose?Viz!viz.js",
306+
"headjs",
307+
"expose?Reveal!reveal.js",
308+
path.join(__dirname, 'public/js/reveal-markdown.js'),
309+
path.join(__dirname, 'public/js/slide.js')
269310
]
270311
},
271312

@@ -293,6 +334,8 @@ module.exports = {
293334
handlebars: path.join(__dirname, 'node_modules/handlebars/dist/handlebars.min.js'),
294335
"jquery-ui-resizable": path.join(__dirname, 'public/vendor/jquery-ui/jquery-ui.min.js'),
295336
"gist-embed": path.join(__dirname, 'node_modules/gist-embed/gist-embed.min.js'),
337+
"bootstrap-tooltip": path.join(__dirname, 'public/vendor/bootstrap/tooltip.min.js'),
338+
"headjs": path.join(__dirname, 'node_modules/reveal.js/lib/js/head.min.js')
296339
}
297340
},
298341

0 commit comments

Comments
 (0)