summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bower.json30
-rw-r--r--package.json3
-rw-r--r--public/js/cover.js3
-rw-r--r--public/js/extra.js1
-rw-r--r--public/js/index.js7
-rw-r--r--public/js/public.js2
-rw-r--r--public/views/foot.ejs3
-rw-r--r--public/views/index.ejs8
-rw-r--r--public/views/pretty.ejs2
-rw-r--r--public/views/slide.ejs1
-rw-r--r--webpack.config.js8
11 files changed, 15 insertions, 53 deletions
diff --git a/bower.json b/bower.json
index 5009bc8f..728a220b 100644
--- a/bower.json
+++ b/bower.json
@@ -16,50 +16,22 @@
],
"dependencies": {
"bootstrap": "~3.3.7",
- "jquery": "~3.1.0",
"font-awesome": "~4.6.3",
"Ionicons": "ionicons#~2.0.1",
"reveal.js": "~3.3.0",
- "jquery-mousewheel": "~3.1.13",
"spin.js": "~2.3.2",
"moment": "~2.14.1",
"handlebars": "~4.0.5",
- "js-url": "~2.3.0",
- "socket.io-client": "~1.4.8",
- "viz.js": "~1.3.0",
"js-yaml": "~3.6.1",
- "to-markdown": "~3.0.1",
- "lz-string": "~1.4.4",
"raphael": "~2.2.1",
- "flowchart": "~1.6.3",
"xss": "~0.2.13",
- "markdown-it": "^7.0.0",
- "markdown-it-abbr": "^1.0.4",
- "markdown-it-footnote": "^3.0.1",
- "markdown-it-deflist": "^2.0.1",
- "markdown-it-mark": "^2.0.0",
- "markdown-it-ins": "^2.0.0",
- "markdown-it-sub": "^1.0.0",
- "markdown-it-sup": "^1.0.0",
- "markdown-it-container": "^2.0.0",
"mermaid": "^6.0.0",
"MathJax": "^2.6.1",
"octicons": "~3.5.0",
"velocity": "^1.2.3",
- "highlightjs": "^9.5.0",
- "lodash": "^4.14.1",
"randomcolor": "randomColor#^0.4.4",
- "file-saver": "FileSaver#^1.3.1",
"Idle.Js": "idle.js#^1.0.0",
- "js-cookie": "^2.1.2",
- "list.js": "^1.2.0",
- "store-js": "store.js#^1.3.20",
- "string": "^3.3.1",
- "visibilityjs": "^1.2.3",
- "pdfobject": "pdfobject2#*",
- "gist-embed": "*",
- "keymaster": "^1.6.3",
- "prism": "^1.5.1"
+ "gist-embed": "*"
},
"resolutions": {
"jquery": "~3.1.0"
diff --git a/package.json b/package.json
index b0e0605b..af442d94 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,8 @@
"toobusy-js": "^0.5.1",
"visibilityjs": "^1.2.4",
"viz.js": "^1.3.0",
- "winston": "^2.2.0"
+ "winston": "^2.2.0",
+ "xss": "^0.2.13"
},
"engines": {
"node": ">=4.x"
diff --git a/public/js/cover.js b/public/js/cover.js
index d3d3c10b..6346f144 100644
--- a/public/js/cover.js
+++ b/public/js/cover.js
@@ -12,6 +12,9 @@ var getHistory = historyModule.getHistory;
var saveHistory = historyModule.saveHistory;
var removeHistory = historyModule.removeHistory;
+var saveAs = require('file-saver').saveAs;
+var List = require('list.js');
+
var options = {
valueNames: ['id', 'text', 'timestamp', 'fromNow', 'time', 'tags', 'pinned'],
item: '<li class="col-xs-12 col-sm-6 col-md-6 col-lg-4">\
diff --git a/public/js/extra.js b/public/js/extra.js
index 4ec7e80f..329aa153 100644
--- a/public/js/extra.js
+++ b/public/js/extra.js
@@ -1,6 +1,7 @@
var hljs = require('highlight.js');
var PDFObject = require('pdfobject');
var S = require('string');
+var saveAs = require('file-saver').saveAs;
//auto update last change
var createtime = null;
diff --git a/public/js/index.js b/public/js/index.js
index 0c6bb03a..4bce2ff0 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -29,22 +29,19 @@ require('markdown-it-imsize');
/* other vendors plugin */
require('gist-embed');
require('string');
-require('highlight.js');
require('prismjs');
require('prismjs/components/prism-wiki');
-require('js-cookie');
require('to-markdown');
require('raphael');
require('js-sequence-diagrams');
require('flowchart.js');
-require('viz.js');
-require('file-saver');
+var saveAs = require('file-saver').saveAs;
require('store');
require('js-url');
require('visibilityjs');
-require('list.js');
+var List = require('list.js');
require('../vendor/md-toc');
require('randomcolor');
diff --git a/public/js/public.js b/public/js/public.js
index b6d4f7a0..69999de9 100644
--- a/public/js/public.js
+++ b/public/js/public.js
@@ -33,14 +33,12 @@ require('string');
require('highlight.js');
require('prismjs');
require('prismjs/components/prism-wiki');
-require('js-cookie');
require('to-markdown');
require('raphael');
require('js-sequence-diagrams');
require('flowchart.js');
-require('viz.js');
require('file-saver');
require('store');
require('js-url');
diff --git a/public/views/foot.ejs b/public/views/foot.ejs
index 9ce320bc..4a9b1756 100644
--- a/public/views/foot.ejs
+++ b/public/views/foot.ejs
@@ -15,14 +15,12 @@
<% } else { %>
<script src="<%- url %>/vendor/spin.js/spin.min.js" defer></script>
<script src="<%- url %>/vendor/velocity/velocity.min.js" defer></script>
-<script src="<%- url %>/vendor/socket.io-client/socket.io.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>
<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 %>/vendor/lz-string/libs/lz-string.min.js" defer></script>
<script src="<%- url %>/build/vendor.bundle.js" defer></script>
<!--codemirror-->
<script src="<%- url %>/vendor/codemirror/codemirror.min.js" defer></script>
@@ -30,7 +28,6 @@
<script src="<%- url %>/vendor/inlineAttachment/codemirror.inline-attachment.js" defer></script>
<script src="<%- url %>/vendor/codemirror-spell-checker/spell-checker.min.js" defer></script>
<script src="<%- url %>/vendor/ot/ot.min.js" defer></script>
-<script src="<%- url %>/vendor/xss/dist/xss.min.js" defer></script>
<script src="<%- url %>/build/index.js" defer></script>
<script src="<%- url %>/js/google-drive-upload.js" defer></script>
<script src="<%- url %>/js/google-drive-picker.js" defer></script>
diff --git a/public/views/index.ejs b/public/views/index.ejs
index 79ee5ddc..c7bea341 100644
--- a/public/views/index.ejs
+++ b/public/views/index.ejs
@@ -185,6 +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>
<% 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>
@@ -193,17 +194,10 @@
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.14.1/moment-with-locales.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/js-url/2.3.0/url.min.js" defer></script>
<% } else { %>
- <script src="<%- url %>/build/vendor.bundle.js" defer></script>
<script src="<%- url %>/vendor/velocity/velocity.min.js" defer></script>
<script src="<%- url %>/vendor/select2/select2.min.js" defer></script>
<script src="<%- url %>/vendor/moment/min/moment-with-locales.min.js" defer></script>
- <script src="<%- url %>/vendor/js-url/url.min.js" defer></script>
<% } %>
- <script src="<%- url %>/vendor/js-cookie/src/js.cookie.js" defer></script>
- <script src="<%- url %>/vendor/list.js/dist/list.min.js" defer></script>
- <script src="<%- url %>/vendor/file-saver/FileSaver.min.js" defer></script>
- <script src="<%- url %>/vendor/store-js/store.min.js" defer></script>
- <script src="<%- url %>/vendor/lz-string/libs/lz-string.min.js" defer></script>
<script src="<%- url %>/build/locale.js" defer></script>
</body>
diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs
index 346cb272..6f13155a 100644
--- a/public/views/pretty.ejs
+++ b/public/views/pretty.ejs
@@ -96,8 +96,6 @@
<script src="<%- url %>/vendor/moment/min/moment-with-locales.js" defer></script>
<script src="<%- url %>/vendor/mermaid/dist/mermaid.min.js" defer></script>
<% } %>
-<script src="<%- url %>/vendor/lz-string/libs/lz-string.min.js" defer></script>
-<script src="<%- url %>/vendor/xss/dist/xss.min.js" defer></script>
<script src="<%- url %>/js/reveal-markdown.js" defer></script>
<script src="<%- url %>/build/public.js" defer></script>
diff --git a/public/views/slide.ejs b/public/views/slide.ejs
index 8c248917..b0c5ddbc 100644
--- a/public/views/slide.ejs
+++ b/public/views/slide.ejs
@@ -96,7 +96,6 @@
<script src="<%- url %>/vendor/moment/min/moment-with-locales.js" defer></script>
<script src="<%- url %>/vendor/mermaid/dist/mermaid.min.js" defer></script>
<% } %>
- <script src="<%- url %>/vendor/xss/dist/xss.min.js" defer></script>
<script src="<%- url %>/build/slide.js" defer></script>
</body>
diff --git a/webpack.config.js b/webpack.config.js
index de2bb8b6..6d99381c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -10,9 +10,7 @@ module.exports = {
Cookies: "js-cookie",
emojify: "emojify.js",
io: "socket.io-client",
- LZString: "lz-string",
- key: "keymaster",
- Viz: "viz.js"
+ key: "keymaster"
}),
new webpack.DefinePlugin({
"require.specified": "require.resolve"
@@ -35,6 +33,10 @@ module.exports = {
"jquery-textcomplete",
"jquery-mousewheel",
"jquery-scrollspy/jquery-scrollspy",
+ "expose?LZString!lz-string",
+ "expose?filterXSS!xss",
+ "expose?Viz!viz.js",
+ "js-url",
"bootstrap"
]
},
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 14:38:34 +0000