From 325d1f1a326a4ef5eaa070e56665c9b5680f1e36 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Fri, 7 Oct 2016 23:05:23 +0800 Subject: Create webpack config --- package.json | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 5 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 94b08eac..6ca67191 100644 --- a/package.json +++ b/package.json @@ -4,12 +4,18 @@ "description": "Realtime collaborative markdown notes on all platforms.", "main": "app.js", "license": "MIT", + "scripts": { + "build": "webpack --config webpack.config.js --progress --colors --watch" + }, "dependencies": { + "Idle.Js": "github:shawnmclean/Idle.js", "async": "^2.0.1", "blueimp-md5": "^2.3.0", "body-parser": "^1.15.2", + "bootstrap": "^3.3.7", "chance": "^1.0.4", "cheerio": "^0.20.0", + "codemirror": "^5.19.0", "compression": "^1.6.2", "connect-session-sequelize": "^3.1.0", "cookie": "0.3.1", @@ -19,14 +25,39 @@ "emojify.js": "^1.1.0", "express": ">=4.14", "express-session": "^1.14.0", + "file-saver": "^1.3.3", + "flowchart.js": "^1.6.3", "formidable": "^1.0.17", + "gist-embed": "github:yukaii/gist-embed", + "handlebars": "^4.0.5", "helmet": "^2.1.2", - "highlight.js": "^9.5.0", + "highlight.js": "^9.7.0", "i18n": "^0.8.3", "imgur": "git+https://github.com/hackmdio/node-imgur.git", + "jquery": "^3.1.1", + "jquery-mousewheel": "^3.1.13", + "jquery-textcomplete": "^1.7.3", + "jquery-ui": "^1.12.1", + "js-cookie": "^2.1.3", + "js-sequence-diagrams": "^1000000.0.6", + "js-url": "^2.3.0", "jsdom-nogyp": "^0.8.3", + "keymaster": "^1.6.2", + "list.js": "^1.2.0", + "lodash": "^4.16.4", "lz-string": "1.4.4", - "markdown-it": "^7.0.0", + "markdown-it": "^7.0.1", + "markdown-it-abbr": "^1.0.4", + "markdown-it-container": "^2.0.0", + "markdown-it-deflist": "^2.0.1", + "markdown-it-footnote": "^3.0.1", + "markdown-it-imsize": "^2.0.1", + "markdown-it-ins": "^2.0.0", + "markdown-it-mark": "^2.0.0", + "markdown-it-mathjax": "^1.0.3", + "markdown-it-regexp": "^0.4.0", + "markdown-it-sub": "^1.0.0", + "markdown-it-sup": "^1.0.0", "markdown-pdf": "^7.0.0", "meta-marked": "^0.4.1", "method-override": "^2.3.6", @@ -42,9 +73,12 @@ "passport-google-oauth20": "^1.0.0", "passport-twitter": "^1.0.4", "passport.socketio": "^3.6.2", + "pdfobject": "^2.0.201604172", "pg": "^6.0.3", "pg-hstore": "^2.3.2", + "prismjs": "^1.5.1", "randomcolor": "^0.4.4", + "raphael": "github:dmitrybaranovskiy/raphael", "request": "^2.74.0", "reveal.js": "3.3.0", "sequelize": "^3.23.6", @@ -52,20 +86,43 @@ "shortid": "2.2.6", "socket.io": "1.4.8", "sqlite3": "^3.1.4", + "store": "^1.3.20", "string": "^3.3.1", "tedious": "^1.14.0", + "to-markdown": "^3.0.1", "toobusy-js": "^0.5.1", - "winston": "^2.2.0" + "visibilityjs": "^1.2.4", + "viz.js": "^1.3.0", + "winston": "^2.2.0", + "xss": "^0.2.13" }, "engines": { "node": ">=4.x" }, "bugs": "https://github.com/hackmdio/hackmd/issues", - "keywords": ["Collaborative", "Markdown", "Notes"], + "keywords": [ + "Collaborative", + "Markdown", + "Notes" + ], "homepage": "https://hackmd.io", - "maintainers": [{"name": "Max Wu", "email": "jackymaxj@gmail.com"}], + "maintainers": [ + { + "name": "Max Wu", + "email": "jackymaxj@gmail.com" + } + ], "repository": { "type": "git", "url": "https://github.com/hackmdio/hackmd.git" + }, + "devDependencies": { + "babel-loader": "^6.2.5", + "bower-webpack-plugin": "^0.1.9", + "css-loader": "^0.25.0", + "extract-text-webpack-plugin": "^1.0.1", + "imports-loader": "^0.6.5", + "json-loader": "^0.5.4", + "webpack": "^1.13.2" } } -- cgit v1.2.3 From b8467a562c087a63c30d2cfe02494ab3229fa89b Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Sat, 8 Oct 2016 10:07:12 +0800 Subject: Remove Idle.Js dependency use vendor minified js for now --- package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 6ca67191..308d828d 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,6 @@ "build": "webpack --config webpack.config.js --progress --colors --watch" }, "dependencies": { - "Idle.Js": "github:shawnmclean/Idle.js", "async": "^2.0.1", "blueimp-md5": "^2.3.0", "body-parser": "^1.15.2", -- cgit v1.2.3 From ab2131116181a95e9eefa410bac25682396b2e05 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Sat, 8 Oct 2016 10:16:49 +0800 Subject: Change npm task 'build' to 'dev' --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 308d828d..4ff2d25e 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "app.js", "license": "MIT", "scripts": { - "build": "webpack --config webpack.config.js --progress --colors --watch" + "dev": "webpack --config webpack.config.js --progress --colors --watch" }, "dependencies": { "async": "^2.0.1", -- cgit v1.2.3 From ebee5a8d05a0282f5f584abc7d1eaa26d9d17ad8 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Sat, 8 Oct 2016 19:56:38 +0800 Subject: Use xss in script tag --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 4ff2d25e..5c71cd01 100644 --- a/package.json +++ b/package.json @@ -92,8 +92,7 @@ "toobusy-js": "^0.5.1", "visibilityjs": "^1.2.4", "viz.js": "^1.3.0", - "winston": "^2.2.0", - "xss": "^0.2.13" + "winston": "^2.2.0" }, "engines": { "node": ">=4.x" -- cgit v1.2.3 From 963a435ae1e9248b42b4665acf106dcffa549678 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Sat, 8 Oct 2016 20:02:30 +0800 Subject: Resolve dependency module requiring * es5 style module exports * remove script tag require * webpack config ProvidePlugin Note that this commit only fix JavaScript module loading runtime error. --- package.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 5c71cd01..3c7304ed 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,7 @@ "morgan": "^1.7.0", "mysql": "^2.11.1", "node-uuid": "^1.4.7", + "ot": "0.0.15", "passport": "^0.3.2", "passport-dropbox-oauth2": "^1.1.0", "passport-facebook": "^2.1.1", @@ -84,6 +85,7 @@ "sequelize-cli": "^2.4.0", "shortid": "2.2.6", "socket.io": "1.4.8", + "socket.io-client": "^1.4.8", "sqlite3": "^3.1.4", "store": "^1.3.20", "string": "^3.3.1", -- cgit v1.2.3 From 8e2b03cfd6d389df454d4baed68837c84e64ae66 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Sat, 8 Oct 2016 23:04:19 +0800 Subject: Config bootstrap with webpack --- package.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 3c7304ed..5fa71df9 100644 --- a/package.json +++ b/package.json @@ -121,8 +121,11 @@ "bower-webpack-plugin": "^0.1.9", "css-loader": "^0.25.0", "extract-text-webpack-plugin": "^1.0.1", + "file-loader": "^0.9.0", "imports-loader": "^0.6.5", "json-loader": "^0.5.4", + "style-loader": "^0.13.1", + "url-loader": "^0.5.7", "webpack": "^1.13.2" } } -- cgit v1.2.3 From 3e2905be13551a0cceeb18e72242be891db10db7 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Sun, 9 Oct 2016 17:54:51 +0800 Subject: Revert to customized codemirror --- package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 5fa71df9..db81d415 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "bootstrap": "^3.3.7", "chance": "^1.0.4", "cheerio": "^0.20.0", - "codemirror": "^5.19.0", "compression": "^1.6.2", "connect-session-sequelize": "^3.1.0", "cookie": "0.3.1", -- cgit v1.2.3 From a25889788443556703cf1f9b412b5d6dbf90febd Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Sun, 9 Oct 2016 21:35:56 +0800 Subject: Revert some bower assets --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index db81d415..d02ab36f 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "imgur": "git+https://github.com/hackmdio/node-imgur.git", "jquery": "^3.1.1", "jquery-mousewheel": "^3.1.13", + "jquery-scrollspy": "github:softwarespot/jquery-scrollspy", "jquery-textcomplete": "^1.7.3", "jquery-ui": "^1.12.1", "js-cookie": "^2.1.3", -- cgit v1.2.3 From e10203b7e9bb407fceee1f176dc8ff36b59a4acd Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Mon, 10 Oct 2016 08:24:58 +0800 Subject: More function expose workaround for reveal-markdown.js --- package.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index d02ab36f..52f646e6 100644 --- a/package.json +++ b/package.json @@ -124,6 +124,8 @@ "file-loader": "^0.9.0", "imports-loader": "^0.6.5", "json-loader": "^0.5.4", + "less": "^2.7.1", + "less-loader": "^2.2.3", "style-loader": "^0.13.1", "url-loader": "^0.5.7", "webpack": "^1.13.2" -- cgit v1.2.3 From 9c8752d4521c7cffccf4313eca5cd6ff4f88c305 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Tue, 11 Oct 2016 12:30:30 +0800 Subject: Split common vendor javascript into chunks --- package.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 52f646e6..ea83c7af 100644 --- a/package.json +++ b/package.json @@ -120,6 +120,8 @@ "babel-loader": "^6.2.5", "bower-webpack-plugin": "^0.1.9", "css-loader": "^0.25.0", + "exports-loader": "^0.6.3", + "expose-loader": "^0.7.1", "extract-text-webpack-plugin": "^1.0.1", "file-loader": "^0.9.0", "imports-loader": "^0.6.5", -- cgit v1.2.3 From 3368b57b89add8a11a2ac3c0a4061c46c98deb9e Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Tue, 11 Oct 2016 14:09:40 +0800 Subject: Remove ot from package.json --- package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index ea83c7af..b0e0605b 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,6 @@ "morgan": "^1.7.0", "mysql": "^2.11.1", "node-uuid": "^1.4.7", - "ot": "0.0.15", "passport": "^0.3.2", "passport-dropbox-oauth2": "^1.1.0", "passport-facebook": "^2.1.1", -- cgit v1.2.3 From 06437ccaa995afc48e30154c136c4e485ac04ae7 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Tue, 11 Oct 2016 14:52:45 +0800 Subject: Manage more packages with npm and webpack --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package.json') 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" -- cgit v1.2.3 From f9e7f482d307f89af8a4281a7bdb719297f07c21 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Tue, 11 Oct 2016 15:45:00 +0800 Subject: Setup webpack production config --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index af442d94..68a2e43b 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,8 @@ "main": "app.js", "license": "MIT", "scripts": { - "dev": "webpack --config webpack.config.js --progress --colors --watch" + "dev": "webpack --config webpack.config.js --progress --colors --watch", + "build": "webpack --config webpack.production.js --progress --colors" }, "dependencies": { "async": "^2.0.1", -- cgit v1.2.3 From 2e929879adeb5194df6bba799d0c4e01b87c19cb Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Wed, 12 Oct 2016 12:27:23 +0800 Subject: Fix engine.io-client webpack load dependency --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 1b2cc8d7..e0dd95ba 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git", "ejs": "^2.5.2", "emojify.js": "^1.1.0", + "engine.io-client": "^1.7.0", "express": ">=4.14", "express-session": "^1.14.1", "file-saver": "^1.3.3", @@ -81,12 +82,12 @@ "randomcolor": "^0.4.4", "raphael": "github:dmitrybaranovskiy/raphael", "request": "^2.75.0", - "reveal.js": "3.3.0", + "reveal.js": "^3.3.0", "sequelize": "^3.24.3", "sequelize-cli": "^2.4.0", "shortid": "2.2.6", "socket.io": "1.5.0", - "socket.io-client": "^1.4.8", + "socket.io-client": "^1.5.0", "sqlite3": "^3.1.6", "store": "^1.3.20", "string": "^3.3.1", -- cgit v1.2.3 From 02eef3f68ae83b9d101f92f2a92b608879ba0855 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Wed, 12 Oct 2016 13:18:29 +0800 Subject: Load customized vendor script through script-loader --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index e0dd95ba..ad6ae660 100644 --- a/package.json +++ b/package.json @@ -131,6 +131,7 @@ "json-loader": "^0.5.4", "less": "^2.7.1", "less-loader": "^2.2.3", + "script-loader": "^0.7.0", "style-loader": "^0.13.1", "url-loader": "^0.5.7", "webpack": "^1.13.2" -- cgit v1.2.3 From 91266f1cad25c5f19f332134dd82011f01ce7419 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Wed, 12 Oct 2016 17:03:47 +0800 Subject: Load more scripts using webpack --- package.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index ad6ae660..5ba9101f 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "build": "webpack --config webpack.production.js --progress --colors" }, "dependencies": { + "Idle.Js": "github:shawnmclean/Idle.js", "async": "^2.0.1", "blueimp-md5": "^2.4.0", "body-parser": "^1.15.2", @@ -88,6 +89,7 @@ "shortid": "2.2.6", "socket.io": "1.5.0", "socket.io-client": "^1.5.0", + "spin.js": "^2.3.2", "sqlite3": "^3.1.6", "store": "^1.3.20", "string": "^3.3.1", -- cgit v1.2.3 From 2cafe15e854b493d335652755b74674c7e2da4f6 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Wed, 12 Oct 2016 17:15:59 +0800 Subject: Enable production assets hash --- package.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 5ba9101f..03333fb8 100644 --- a/package.json +++ b/package.json @@ -122,13 +122,16 @@ "url": "https://github.com/hackmdio/hackmd.git" }, "devDependencies": { + "babel-core": "^6.17.0", "babel-loader": "^6.2.5", "bower-webpack-plugin": "^0.1.9", "css-loader": "^0.25.0", + "ejs-loader": "^0.3.0", "exports-loader": "^0.6.3", "expose-loader": "^0.7.1", "extract-text-webpack-plugin": "^1.0.1", "file-loader": "^0.9.0", + "html-webpack-plugin": "^2.22.0", "imports-loader": "^0.6.5", "json-loader": "^0.5.4", "less": "^2.7.1", -- cgit v1.2.3