From fb5d7e43592c1a14831067e28def9c4b9e2a97ca Mon Sep 17 00:00:00 2001 From: Wu Cheng-Han Date: Mon, 10 Oct 2016 21:14:28 +0800 Subject: [PATCH] Update npm and bower dependencies with related patch --- bower.json | 22 +++++++++++----------- package.json | 28 ++++++++++++++-------------- public/js/index.js | 2 -- public/views/foot.ejs | 8 ++++---- public/views/html.hbs | 4 ++-- public/views/index.ejs | 6 +++--- public/views/pretty.ejs | 4 ++-- public/views/slide.ejs | 6 +++--- 8 files changed, 39 insertions(+), 41 deletions(-) diff --git a/bower.json b/bower.json index 5009bc8f..e9042bfb 100644 --- a/bower.json +++ b/bower.json @@ -16,24 +16,24 @@ ], "dependencies": { "bootstrap": "~3.3.7", - "jquery": "~3.1.0", + "jquery": "~3.1.1", "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", + "moment": "~2.15.1", "handlebars": "~4.0.5", "js-url": "~2.3.0", - "socket.io-client": "~1.4.8", + "socket.io-client": "~1.5.0", "viz.js": "~1.3.0", "js-yaml": "~3.6.1", "to-markdown": "~3.0.1", "lz-string": "~1.4.4", - "raphael": "~2.2.1", + "raphael": "~2.2.6", "flowchart": "~1.6.3", "xss": "~0.2.13", - "markdown-it": "^7.0.0", + "markdown-it": "^8.0.0", "markdown-it-abbr": "^1.0.4", "markdown-it-footnote": "^3.0.1", "markdown-it-deflist": "^2.0.1", @@ -45,23 +45,23 @@ "mermaid": "^6.0.0", "MathJax": "^2.6.1", "octicons": "~3.5.0", - "velocity": "^1.2.3", - "highlightjs": "^9.5.0", - "lodash": "^4.14.1", + "velocity": "^1.3.1", + "highlightjs": "^9.7.0", + "lodash": "^4.16.4", "randomcolor": "randomColor#^0.4.4", "file-saver": "FileSaver#^1.3.1", "Idle.Js": "idle.js#^1.0.0", - "js-cookie": "^2.1.2", + "js-cookie": "^2.1.3", "list.js": "^1.2.0", "store-js": "store.js#^1.3.20", "string": "^3.3.1", - "visibilityjs": "^1.2.3", + "visibilityjs": "^1.2.4", "pdfobject": "pdfobject2#*", "gist-embed": "*", "keymaster": "^1.6.3", "prism": "^1.5.1" }, "resolutions": { - "jquery": "~3.1.0" + "jquery": "~3.1.1" } } diff --git a/package.json b/package.json index 345b40bf..68b3e368 100644 --- a/package.json +++ b/package.json @@ -6,30 +6,30 @@ "license": "MIT", "dependencies": { "async": "^2.0.1", - "blueimp-md5": "^2.3.0", + "blueimp-md5": "^2.4.0", "body-parser": "^1.15.2", "chance": "^1.0.4", - "cheerio": "^0.20.0", + "cheerio": "^0.22.0", "compression": "^1.6.2", - "connect-session-sequelize": "^3.1.0", + "connect-session-sequelize": "^3.2.0", "cookie": "0.3.1", "cookie-parser": "1.4.3", "diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git", - "ejs": "^2.5.1", + "ejs": "^2.5.2", "emojify.js": "^1.1.0", "express": ">=4.14", - "express-session": "^1.14.0", + "express-session": "^1.14.1", "formidable": "^1.0.17", - "helmet": "^2.1.2", + "helmet": "^2.3.0", "i18n": "^0.8.3", "imgur": "git+https://github.com/hackmdio/node-imgur.git", "jsdom-nogyp": "^0.8.3", "lz-string": "1.4.4", - "markdown-it": "^7.0.0", + "markdown-it": "^8.0.0", "markdown-pdf": "^7.0.0", - "meta-marked": "^0.4.1", + "meta-marked": "^0.4.2", "method-override": "^2.3.6", - "moment": "^2.14.1", + "moment": "^2.15.1", "morgan": "^1.7.0", "mysql": "^2.11.1", "node-uuid": "^1.4.7", @@ -41,16 +41,16 @@ "passport-google-oauth20": "^1.0.0", "passport-twitter": "^1.0.4", "passport.socketio": "^3.6.2", - "pg": "^6.0.3", + "pg": "^6.1.0", "pg-hstore": "^2.3.2", "randomcolor": "^0.4.4", - "request": "^2.74.0", + "request": "^2.75.0", "reveal.js": "3.3.0", - "sequelize": "^3.23.6", + "sequelize": "^3.24.3", "sequelize-cli": "^2.4.0", "shortid": "2.2.6", - "socket.io": "1.4.8", - "sqlite3": "^3.1.4", + "socket.io": "1.5.0", + "sqlite3": "^3.1.6", "string": "^3.3.1", "tedious": "^1.14.0", "toobusy-js": "^0.5.1", diff --git a/public/js/index.js b/public/js/index.js index 6b7efa68..eb89d9f8 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -2262,8 +2262,6 @@ socket.on('connect', function (data) { personalInfo['id'] = socket.id; showStatus(statusType.connected); socket.emit('version'); - if (socket.id.indexOf('/') == -1) - socket.id = socket.nsp + '#' + socket.id; }); socket.on('version', function (data) { if (version != data.version) { diff --git a/public/views/foot.ejs b/public/views/foot.ejs index 0397317d..80c08f63 100644 --- a/public/views/foot.ejs +++ b/public/views/foot.ejs @@ -3,14 +3,14 @@ <% if(useCDN) { %> - - + + - + - + <% } else { %> diff --git a/public/views/html.hbs b/public/views/html.hbs index 7213ff9f..3f25e5d7 100644 --- a/public/views/html.hbs +++ b/public/views/html.hbs @@ -19,7 +19,7 @@ - + @@ -47,7 +47,7 @@ - + - + + - + <% } else { %> diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs index cc6fb332..79652012 100644 --- a/public/views/pretty.ejs +++ b/public/views/pretty.ejs @@ -92,11 +92,11 @@ MathJax.Hub.Config({ messageStyle: "none", skipStartupTypeset: true ,tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']], processEscapes: true }}); <% if(useCDN) { %> - + - + <% } else { %> diff --git a/public/views/slide.ejs b/public/views/slide.ejs index fb3734bc..443e1468 100644 --- a/public/views/slide.ejs +++ b/public/views/slide.ejs @@ -87,11 +87,11 @@ MathJax.Hub.Config({ messageStyle: "none", skipStartupTypeset: true ,tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']], processEscapes: true }}); <% if(useCDN) { %> - - + + - + <% } else { %>