summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--public/js/extra.js32
-rw-r--r--public/js/index.js6
-rw-r--r--public/views/foot.ejs2
-rw-r--r--public/views/index.ejs2
-rw-r--r--public/views/pretty.ejs2
-rw-r--r--public/views/slide.ejs2
-rw-r--r--webpack.production.js9
-rw-r--r--webpackBaseConfig.js18
8 files changed, 37 insertions, 36 deletions
diff --git a/public/js/extra.js b/public/js/extra.js
index 329aa153..e133a810 100644
--- a/public/js/extra.js
+++ b/public/js/extra.js
@@ -288,21 +288,25 @@ function finishView(view) {
}
});
//graphviz
- var graphvizs = view.find(".graphviz.raw").removeClass("raw");
- graphvizs.each(function (key, value) {
- try {
- var $value = $(value);
- var $ele = $(value).parent().parent();
-
- var graphviz = Viz($value.text());
- $value.html(graphviz);
+ require.ensure(["viz.js"], function(require) {
+ var Viz = require("viz.js");
+ var graphvizs = view.find(".graphviz.raw").removeClass("raw");
+ graphvizs.each(function (key, value) {
+ try {
+ var $value = $(value);
+ var $ele = $(value).parent().parent();
+
+ var graphviz = Viz($value.text());
+ $value.html(graphviz);
+
+ $ele.addClass('graphviz');
+ $value.children().unwrap().unwrap();
+ } catch (err) {
+ console.warn(err);
+ }
+ });
- $ele.addClass('graphviz');
- $value.children().unwrap().unwrap();
- } catch (err) {
- console.warn(err);
- }
- });
+ })
//mermaid
var mermaids = view.find(".mermaid.raw").removeClass("raw");
mermaids.each(function (key, value) {
diff --git a/public/js/index.js b/public/js/index.js
index 4bce2ff0..2d3c2965 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -1,9 +1,3 @@
-/* include jquery ui */
-require('jquery-ui/ui/widgets/resizable');
-require('jquery-ui/ui/widgets/tooltip');
-require('jquery-ui/ui/widgets/controlgroup');
-require('jquery-ui/ui/widgets/autocomplete');
-
/* jquery and jquery plugins */
require('../vendor/showup/showup');
diff --git a/public/views/foot.ejs b/public/views/foot.ejs
index 4a9b1756..adab9d15 100644
--- a/public/views/foot.ejs
+++ b/public/views/foot.ejs
@@ -21,7 +21,7 @@
<script src="<%- url %>/vendor/mermaid/dist/mermaid.min.js" defer></script>
<% } %>
<script src="<%- url %>/vendor/Idle.Js/build/idle.min.js" defer></script>
-<script src="<%- url %>/build/vendor.bundle.js" defer></script>
+<script src="<%- url %>/build/vendor.js" defer></script>
<!--codemirror-->
<script src="<%- url %>/vendor/codemirror/codemirror.min.js" defer></script>
<script src="<%- url %>/vendor/inlineAttachment/inline-attachment.js" defer></script>
diff --git a/public/views/index.ejs b/public/views/index.ejs
index c7bea341..c00623c6 100644
--- a/public/views/index.ejs
+++ b/public/views/index.ejs
@@ -185,7 +185,7 @@
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
- <script src="<%- url %>/build/vendor.bundle.js" defer></script>
+ <script src="<%- url %>/build/vendor.js" defer></script>
<% if(useCDN) { %>
<script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js" defer></script>
<script src="//cdn.jsdelivr.net/velocity/1.2.3/velocity.min.js" defer></script>
diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs
index 6f13155a..4cfbdb04 100644
--- a/public/views/pretty.ejs
+++ b/public/views/pretty.ejs
@@ -90,7 +90,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.14.1/moment-with-locales.min.js" defer></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/mermaid/6.0.0/mermaid.min.js" defer></script>
<% } else { %>
-<script src="<%- url %>/build/vendor.bundle.js" defer></script>
+<script src="<%- url %>/build/vendor.js" defer></script>
<script src="<%- url %>/vendor/js-yaml/dist/js-yaml.min.js" defer></script>
<script type="text/javascript" src="<%- url %>/vendor/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML" defer></script>
<script src="<%- url %>/vendor/moment/min/moment-with-locales.js" defer></script>
diff --git a/public/views/slide.ejs b/public/views/slide.ejs
index b0c5ddbc..b3212f44 100644
--- a/public/views/slide.ejs
+++ b/public/views/slide.ejs
@@ -87,7 +87,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.14.1/moment-with-locales.min.js" defer></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/mermaid/6.0.0/mermaid.min.js" defer></script>
<% } else { %>
- <script src="<%- url %>/build/vendor.bundle.js" defer></script>
+ <script src="<%- url %>/build/vendor.js" defer></script>
<script src="<%- url %>/vendor/reveal.js/lib/js/head.min.js"></script>
<script src="<%- url %>/vendor/reveal.js/js/reveal.js"></script>
<script src="<%- url %>/vendor/velocity/velocity.min.js" defer></script>
diff --git a/webpack.production.js b/webpack.production.js
index f4125cec..1c54ae38 100644
--- a/webpack.production.js
+++ b/webpack.production.js
@@ -17,10 +17,11 @@ module.exports = Object.assign({}, baseConfig, {
}),
new ExtractTextPlugin("[name].css"),
new webpack.optimize.CommonsChunkPlugin({
- name: "vendor",
- filename: "vendor.bundle.js",
- minChunks: Infinity,
- }),
+ name: ["vendor", "public", "slide", "locale"],
+ async: true,
+ filename: '[name].js',
+ minChunks: Infinity
+ })
new webpack.DefinePlugin({
'process.env': {
'NODE_ENV': JSON.stringify('production')
diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js
index 6d99381c..e2d58f4d 100644
--- a/webpackBaseConfig.js
+++ b/webpackBaseConfig.js
@@ -17,9 +17,10 @@ module.exports = {
}),
new ExtractTextPlugin("[name].css"),
new webpack.optimize.CommonsChunkPlugin({
- name: "vendor",
- filename: "vendor.bundle.js",
- minChunks: Infinity,
+ name: ["vendor", "public", "slide", "locale"],
+ async: true,
+ filename: '[name].js',
+ minChunks: Infinity
})
],
@@ -33,9 +34,12 @@ module.exports = {
"jquery-textcomplete",
"jquery-mousewheel",
"jquery-scrollspy/jquery-scrollspy",
+ "jquery-ui/ui/widgets/resizable",
+ "jquery-ui/ui/widgets/tooltip",
+ "jquery-ui/ui/widgets/controlgroup",
+ "jquery-ui/ui/widgets/autocomplete",
"expose?LZString!lz-string",
"expose?filterXSS!xss",
- "expose?Viz!viz.js",
"js-url",
"bootstrap"
]
@@ -43,6 +47,7 @@ module.exports = {
output: {
path: path.join(__dirname, 'public/build'),
+ publicPath: '/build/',
filename: '[name].js'
},
@@ -51,10 +56,7 @@ module.exports = {
path.resolve(__dirname, 'src'),
path.resolve(__dirname, 'node_modules')
],
- extensions: ["", ".js"],
- alias: {
- 'jquery-ui': 'jquery-ui/ui/widgets'
- }
+ extensions: ["", ".js"]
},
module: {
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-02 22:23:56 +0000