From 0734f0faa849fa5ee6ffca138a19e3f353cdc0a5 Mon Sep 17 00:00:00 2001 From: BoHong Li Date: Wed, 10 Apr 2019 18:32:27 +0800 Subject: [PATCH] fix: js-sequence-diagram not found Signed-off-by: BoHong Li --- package.json | 2 +- webpack.common.js | 33 +++++++++++--------------- yarn.lock | 59 +++++++++++++---------------------------------- 3 files changed, 31 insertions(+), 63 deletions(-) diff --git a/package.json b/package.json index 647e28d..12e551b 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "doctoc": "doctoc --title='# Table of Contents' README.md" }, "dependencies": { + "@hackmd/js-sequence-diagrams": "^0.0.1-alpha.1", "@passport-next/passport-openid": "^1.0.0", "Idle.Js": "git+https://github.com/shawnmclean/Idle.js", "archiver": "^2.1.1", @@ -56,7 +57,6 @@ "jquery-mousewheel": "^3.1.13", "jquery-ui": "^1.12.1", "js-cookie": "^2.1.3", - "js-sequence-diagrams": "^1000000.0.6", "js-url": "^2.3.0", "js-yaml": "^3.7.0", "jsdom-nogyp": "^0.8.3", diff --git a/webpack.common.js b/webpack.common.js index 1e9c070..c749dcd 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -210,8 +210,8 @@ module.exports = { 'script-loader!codemirrorSpellChecker', 'script-loader!codemirrorInlineAttachment', 'script-loader!ot', - 'flowchart.js', - 'js-sequence-diagrams', + // 'flowchart.js', + 'script-loader!js-sequence-diagrams', 'expose-loader?RevealMarkdown!reveal-markdown', path.join(__dirname, 'public/js/index.js') ], @@ -261,8 +261,8 @@ module.exports = { 'script-loader!codemirrorSpellChecker', 'script-loader!codemirrorInlineAttachment', 'script-loader!ot', - 'flowchart.js', - 'js-sequence-diagrams', + //'flowchart.js', + 'script-loader!js-sequence-diagrams', 'expose-loader?Viz!viz.js', 'script-loader!abcjs', 'expose-loader?io!socket.io-client', @@ -271,8 +271,8 @@ module.exports = { ], pretty: [ 'babel-polyfill', - 'flowchart.js', - 'js-sequence-diagrams', + //'flowchart.js', + 'script-loader!js-sequence-diagrams', 'expose-loader?RevealMarkdown!reveal-markdown', path.join(__dirname, 'public/js/pretty.js') ], @@ -296,8 +296,8 @@ module.exports = { 'expose-loader?hljs!highlight.js', 'expose-loader?emojify!emojify.js', 'script-loader!gist-embed', - 'flowchart.js', - 'js-sequence-diagrams', + //'flowchart.js', + 'script-loader!js-sequence-diagrams', 'expose-loader?Viz!viz.js', 'script-loader!abcjs', 'expose-loader?RevealMarkdown!reveal-markdown', @@ -306,8 +306,8 @@ module.exports = { slide: [ 'babel-polyfill', 'bootstrap-tooltip', - 'flowchart.js', - 'js-sequence-diagrams', + //'flowchart.js', + 'script-loader!js-sequence-diagrams', 'expose-loader?RevealMarkdown!reveal-markdown', path.join(__dirname, 'public/js/slide.js') ], @@ -334,8 +334,8 @@ module.exports = { 'expose-loader?hljs!highlight.js', 'expose-loader?emojify!emojify.js', 'script-loader!gist-embed', - 'flowchart.js', - 'js-sequence-diagrams', + //'flowchart.js', + 'script-loader!js-sequence-diagrams', 'expose-loader?Viz!viz.js', 'script-loader!abcjs', 'headjs', @@ -369,7 +369,8 @@ module.exports = { 'headjs': path.join(__dirname, 'node_modules/reveal.js/lib/js/head.min.js'), 'reveal-markdown': path.join(__dirname, 'public/js/reveal-markdown.js'), abcjs: path.join(__dirname, 'public/vendor/abcjs_basic_3.1.1-min.js'), - raphael: path.join(__dirname, 'node_modules/raphael/raphael.no-deps.js') + raphael: path.join(__dirname, 'node_modules/raphael/raphael.no-deps.js'), + 'js-sequence-diagrams': path.join(__dirname, 'node_modules/@hackmd/js-sequence-diagrams/build/main.js') } }, @@ -418,12 +419,6 @@ module.exports = { }, 'less-loader' ] - }, { - test: require.resolve('js-sequence-diagrams'), - use: [{ - loader: 'imports-loader', - options: { _: 'lodash', Raphael: 'raphael', eve: 'eve' } - }] }, { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, use: [{ loader: 'file-loader' }] diff --git a/yarn.lock b/yarn.lock index 3d71960..2245346 100644 --- a/yarn.lock +++ b/yarn.lock @@ -18,13 +18,10 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@mlink/scrypt@^6.1.2": - version "6.1.2" - resolved "https://registry.yarnpkg.com/@mlink/scrypt/-/scrypt-6.1.2.tgz#74fa1d91f27d5e916d88773fda59a422ddab7cf4" - integrity sha512-7w1QoOih2eW0d0Lj5SK9mFV/8OhtZqYnT0IQiY/iCEcjdGAAt145YAAiq21iVV+H0Xe62fnF6VbZPMO3+qrSAQ== - dependencies: - bindings "^1.3.0" - nan "^2.10.0" +"@hackmd/js-sequence-diagrams@^0.0.1-alpha.1": + version "0.0.1-alpha.1" + resolved "https://registry.yarnpkg.com/@hackmd/js-sequence-diagrams/-/js-sequence-diagrams-0.0.1-alpha.1.tgz#36abc0c77a9fcaffbc11601b3b67d411ecb013a5" + integrity sha512-89DLk6V2Q4XotpmGTSqgm37lwuVFa8fbUQMFDyN7xhr4qbvRgS0m3N15iko0Vb4+GP2RxRDTpFCPquz7obMo6g== "@passport-next/passport-openid@^1.0.0": version "1.0.0" @@ -1428,13 +1425,6 @@ binary-extensions@^1.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.0.tgz#9523e001306a32444b907423f1de2164222f6ab1" integrity sha512-EgmjVLMn22z7eGGv3kcnHwSnJXmFHjISTY9E/S5lIcTD3Oxw05QTcBLNkJFzcb3cNueUdF/IN4U+d78V0zO8Hw== -bindings@^1.3.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" - integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== - dependencies: - file-uri-to-path "1.0.0" - bl@^1.0.0: version "1.2.2" resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c" @@ -3653,10 +3643,6 @@ eve-raphael@0.5.0: resolved "https://registry.yarnpkg.com/eve-raphael/-/eve-raphael-0.5.0.tgz#17c754b792beef3fa6684d79cf5a47c63c4cda30" integrity sha1-F8dUt5K+7z+maE15z1pHxjxM2jA= -"eve@git://github.com/adobe-webplatform/eve.git#eef80ed": - version "0.4.1" - resolved "git://github.com/adobe-webplatform/eve.git#eef80ed8d188423c2272746fb8ae5cc8dad84cb1" - event-emitter@^0.3.5: version "0.3.5" resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39" @@ -4022,11 +4008,6 @@ file-saver@^1.3.3: resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8" integrity sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg== -file-uri-to-path@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" - integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== - filename-regex@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" @@ -5718,14 +5699,6 @@ js-cookie@^2.1.3: resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.0.tgz#1b2c279a6eece380a12168b92485265b35b1effb" integrity sha1-Gywnmm7s44ChIWi5JIUmWzWx7/s= -js-sequence-diagrams@^1000000.0.6: - version "1000000.0.6" - resolved "https://registry.yarnpkg.com/js-sequence-diagrams/-/js-sequence-diagrams-1000000.0.6.tgz#e95db01420479c5ccbc12046af1da42fde649e5c" - integrity sha1-6V2wFCBHnFzLwSBGrx2kL95knlw= - dependencies: - raphael "~2.1.x" - underscore "~1.4.x" - js-string-escape@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef" @@ -7032,6 +7005,11 @@ mysql@^2.12.0: safe-buffer "5.1.2" sqlstring "2.3.1" +nan@^2.0.8: + version "2.13.2" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7" + integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw== + nan@^2.10.0, nan@^2.9.2: version "2.13.1" resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.1.tgz#a15bee3790bde247e8f38f1d446edcdaeb05f2dd" @@ -8707,13 +8685,6 @@ raphael@2.2.7: dependencies: eve-raphael "0.5.0" -raphael@~2.1.x: - version "2.1.4" - resolved "https://registry.yarnpkg.com/raphael/-/raphael-2.1.4.tgz#b09ca664ad048b814bb2ff5d4d1e75838cab9c97" - integrity sha1-sJymZK0Ei4FLsv9dTR51g4yrnJc= - dependencies: - eve "git://github.com/adobe-webplatform/eve.git#eef80ed" - raw-body@2.3.3: version "2.3.3" resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3" @@ -9361,6 +9332,13 @@ script-loader@^0.7.2: dependencies: raw-loader "~0.5.1" +scrypt@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/scrypt/-/scrypt-6.0.3.tgz#04e014a5682b53fa50c2d5cce167d719c06d870d" + integrity sha1-BOAUpWgrU/pQwtXM4WfXGcBthw0= + dependencies: + nan "^2.0.8" + select2@^3.5.2-browserify: version "3.5.2-browserify" resolved "https://registry.yarnpkg.com/select2/-/select2-3.5.2-browserify.tgz#dc4dafda38d67a734e8a97a46f0d3529ae05391d" @@ -10561,11 +10539,6 @@ underscore@^1.7.0: resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961" integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg== -underscore@~1.4.x: - version "1.4.4" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604" - integrity sha1-YaajIBBiKvoHljvzJSA88SI51gQ= - underscore@~1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"