Skip to content

Commit ad9f29a

Browse files
a60814billya60814billy
authored
Merge pull request #1188 from hackmdio/fix/js-sequence-diagram
Fix/js sequence diagram
2 parents d032b37 + c69d91b commit ad9f29a

File tree

4 files changed

+27
-59
lines changed

4 files changed

+27
-59
lines changed

‎lib/models/user.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict'
22
// external modules
33
var Sequelize = require('sequelize')
4-
var scrypt = require('@mlink/scrypt')
4+
var scrypt = require('scrypt')
55

66
// core
77
var logger = require('../logger')

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"doctoc": "doctoc --title='# Table of Contents' README.md"
1717
},
1818
"dependencies": {
19+
"@hackmd/js-sequence-diagrams": "^0.0.1-alpha.2",
1920
"@passport-next/passport-openid": "^1.0.0",
2021
"Idle.Js": "git+https://github.com/shawnmclean/Idle.js",
2122
"archiver": "^2.1.1",
@@ -56,7 +57,6 @@
5657
"jquery-mousewheel": "^3.1.13",
5758
"jquery-ui": "^1.12.1",
5859
"js-cookie": "^2.1.3",
59-
"js-sequence-diagrams": "^1000000.0.6",
6060
"js-url": "^2.3.0",
6161
"js-yaml": "^3.7.0",
6262
"jsdom-nogyp": "^0.8.3",
@@ -109,7 +109,7 @@
109109
"readline-sync": "^1.4.7",
110110
"request": "^2.88.0",
111111
"reveal.js": "~3.7.0",
112-
"@mlink/scrypt": "^6.1.2",
112+
"scrypt": "^6.0.3",
113113
"select2": "^3.5.2-browserify",
114114
"sequelize": "^3.28.0",
115115
"sequelize-cli": "^2.5.1",

‎webpack.common.js

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ module.exports = {
211211
'script-loader!codemirrorInlineAttachment',
212212
'script-loader!ot',
213213
'flowchart.js',
214-
'js-sequence-diagrams',
214+
'script-loader!js-sequence-diagrams',
215215
'expose-loader?RevealMarkdown!reveal-markdown',
216216
path.join(__dirname, 'public/js/index.js')
217217
],
@@ -262,7 +262,7 @@ module.exports = {
262262
'script-loader!codemirrorInlineAttachment',
263263
'script-loader!ot',
264264
'flowchart.js',
265-
'js-sequence-diagrams',
265+
'script-loader!js-sequence-diagrams',
266266
'expose-loader?Viz!viz.js',
267267
'script-loader!abcjs',
268268
'expose-loader?io!socket.io-client',
@@ -272,7 +272,7 @@ module.exports = {
272272
pretty: [
273273
'babel-polyfill',
274274
'flowchart.js',
275-
'js-sequence-diagrams',
275+
'script-loader!js-sequence-diagrams',
276276
'expose-loader?RevealMarkdown!reveal-markdown',
277277
path.join(__dirname, 'public/js/pretty.js')
278278
],
@@ -297,7 +297,7 @@ module.exports = {
297297
'expose-loader?emojify!emojify.js',
298298
'script-loader!gist-embed',
299299
'flowchart.js',
300-
'js-sequence-diagrams',
300+
'script-loader!js-sequence-diagrams',
301301
'expose-loader?Viz!viz.js',
302302
'script-loader!abcjs',
303303
'expose-loader?RevealMarkdown!reveal-markdown',
@@ -307,7 +307,7 @@ module.exports = {
307307
'babel-polyfill',
308308
'bootstrap-tooltip',
309309
'flowchart.js',
310-
'js-sequence-diagrams',
310+
'script-loader!js-sequence-diagrams',
311311
'expose-loader?RevealMarkdown!reveal-markdown',
312312
path.join(__dirname, 'public/js/slide.js')
313313
],
@@ -335,7 +335,7 @@ module.exports = {
335335
'expose-loader?emojify!emojify.js',
336336
'script-loader!gist-embed',
337337
'flowchart.js',
338-
'js-sequence-diagrams',
338+
'script-loader!js-sequence-diagrams',
339339
'expose-loader?Viz!viz.js',
340340
'script-loader!abcjs',
341341
'headjs',
@@ -369,7 +369,8 @@ module.exports = {
369369
'headjs': path.join(__dirname, 'node_modules/reveal.js/lib/js/head.min.js'),
370370
'reveal-markdown': path.join(__dirname, 'public/js/reveal-markdown.js'),
371371
abcjs: path.join(__dirname, 'public/vendor/abcjs_basic_3.1.1-min.js'),
372-
raphael: path.join(__dirname, 'node_modules/raphael/raphael.no-deps.js')
372+
raphael: path.join(__dirname, 'node_modules/raphael/raphael.min.js'),
373+
'js-sequence-diagrams': path.join(__dirname, 'node_modules/@hackmd/js-sequence-diagrams/build/main.js')
373374
}
374375
},
375376

@@ -418,12 +419,6 @@ module.exports = {
418419
},
419420
'less-loader'
420421
]
421-
}, {
422-
test: require.resolve('js-sequence-diagrams'),
423-
use: [{
424-
loader: 'imports-loader',
425-
options: { _: 'lodash', Raphael: 'raphael', eve: 'eve' }
426-
}]
427422
}, {
428423
test: /\.eot(\?v=\d+\.\d+\.\d+)?$/,
429424
use: [{ loader: 'file-loader' }]

‎yarn.lock

Lines changed: 16 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,10 @@
1818
esutils "^2.0.2"
1919
js-tokens "^4.0.0"
2020

21-
"@mlink/scrypt@^6.1.2":
22-
version "6.1.2"
23-
resolved "https://registry.yarnpkg.com/@mlink/scrypt/-/scrypt-6.1.2.tgz#74fa1d91f27d5e916d88773fda59a422ddab7cf4"
24-
integrity sha512-7w1QoOih2eW0d0Lj5SK9mFV/8OhtZqYnT0IQiY/iCEcjdGAAt145YAAiq21iVV+H0Xe62fnF6VbZPMO3+qrSAQ==
25-
dependencies:
26-
bindings "^1.3.0"
27-
nan "^2.10.0"
21+
"@hackmd/js-sequence-diagrams@^0.0.1-alpha.2":
22+
version "0.0.1-alpha.2"
23+
resolved "https://registry.yarnpkg.com/@hackmd/js-sequence-diagrams/-/js-sequence-diagrams-0.0.1-alpha.2.tgz#dec87c02b0483a18be6725c4bb7a53df1c701e36"
24+
integrity sha512-UCkaIuvpi5mDyxGXPaJIM8LJLR9X8yAZk0c58Byjx/bVPvMcFOT+Kyft7LjAbO5ct6MFAVNrhs/6jqY2RfRhLA==
2825

2926
"@passport-next/passport-openid@^1.0.0":
3027
version "1.0.0"
@@ -1428,13 +1425,6 @@ binary-extensions@^1.0.0:
14281425
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.0.tgz#9523e001306a32444b907423f1de2164222f6ab1"
14291426
integrity sha512-EgmjVLMn22z7eGGv3kcnHwSnJXmFHjISTY9E/S5lIcTD3Oxw05QTcBLNkJFzcb3cNueUdF/IN4U+d78V0zO8Hw==
14301427

1431-
bindings@^1.3.0:
1432-
version "1.5.0"
1433-
resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
1434-
integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
1435-
dependencies:
1436-
file-uri-to-path "1.0.0"
1437-
14381428
bl@^1.0.0:
14391429
version "1.2.2"
14401430
resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
@@ -3653,10 +3643,6 @@ eve-raphael@0.5.0:
36533643
resolved "https://registry.yarnpkg.com/eve-raphael/-/eve-raphael-0.5.0.tgz#17c754b792beef3fa6684d79cf5a47c63c4cda30"
36543644
integrity sha1-F8dUt5K+7z+maE15z1pHxjxM2jA=
36553645

3656-
"eve@git://github.com/adobe-webplatform/eve.git#eef80ed":
3657-
version "0.4.1"
3658-
resolved "git://github.com/adobe-webplatform/eve.git#eef80ed8d188423c2272746fb8ae5cc8dad84cb1"
3659-
36603646
event-emitter@^0.3.5:
36613647
version "0.3.5"
36623648
resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
@@ -4022,11 +4008,6 @@ file-saver@^1.3.3:
40224008
resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8"
40234009
integrity sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==
40244010

4025-
file-uri-to-path@1.0.0:
4026-
version "1.0.0"
4027-
resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
4028-
integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
4029-
40304011
filename-regex@^2.0.0:
40314012
version "2.0.1"
40324013
resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
@@ -5718,14 +5699,6 @@ js-cookie@^2.1.3:
57185699
resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.0.tgz#1b2c279a6eece380a12168b92485265b35b1effb"
57195700
integrity sha1-Gywnmm7s44ChIWi5JIUmWzWx7/s=
57205701

5721-
js-sequence-diagrams@^1000000.0.6:
5722-
version "1000000.0.6"
5723-
resolved "https://registry.yarnpkg.com/js-sequence-diagrams/-/js-sequence-diagrams-1000000.0.6.tgz#e95db01420479c5ccbc12046af1da42fde649e5c"
5724-
integrity sha1-6V2wFCBHnFzLwSBGrx2kL95knlw=
5725-
dependencies:
5726-
raphael "~2.1.x"
5727-
underscore "~1.4.x"
5728-
57295702
js-string-escape@1.0.1:
57305703
version "1.0.1"
57315704
resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
@@ -7032,6 +7005,11 @@ mysql@^2.12.0:
70327005
safe-buffer "5.1.2"
70337006
sqlstring "2.3.1"
70347007

7008+
nan@^2.0.8:
7009+
version "2.13.2"
7010+
resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
7011+
integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
7012+
70357013
nan@^2.10.0, nan@^2.9.2:
70367014
version "2.13.1"
70377015
resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.1.tgz#a15bee3790bde247e8f38f1d446edcdaeb05f2dd"
@@ -8707,13 +8685,6 @@ raphael@2.2.7:
87078685
dependencies:
87088686
eve-raphael "0.5.0"
87098687

8710-
raphael@~2.1.x:
8711-
version "2.1.4"
8712-
resolved "https://registry.yarnpkg.com/raphael/-/raphael-2.1.4.tgz#b09ca664ad048b814bb2ff5d4d1e75838cab9c97"
8713-
integrity sha1-sJymZK0Ei4FLsv9dTR51g4yrnJc=
8714-
dependencies:
8715-
eve "git://github.com/adobe-webplatform/eve.git#eef80ed"
8716-
87178688
raw-body@2.3.3:
87188689
version "2.3.3"
87198690
resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
@@ -9361,6 +9332,13 @@ script-loader@^0.7.2:
93619332
dependencies:
93629333
raw-loader "~0.5.1"
93639334

9335+
scrypt@^6.0.3:
9336+
version "6.0.3"
9337+
resolved "https://registry.yarnpkg.com/scrypt/-/scrypt-6.0.3.tgz#04e014a5682b53fa50c2d5cce167d719c06d870d"
9338+
integrity sha1-BOAUpWgrU/pQwtXM4WfXGcBthw0=
9339+
dependencies:
9340+
nan "^2.0.8"
9341+
93649342
select2@^3.5.2-browserify:
93659343
version "3.5.2-browserify"
93669344
resolved "https://registry.yarnpkg.com/select2/-/select2-3.5.2-browserify.tgz#dc4dafda38d67a734e8a97a46f0d3529ae05391d"
@@ -10561,11 +10539,6 @@ underscore@^1.7.0:
1056110539
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
1056210540
integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==
1056310541

10564-
underscore@~1.4.x:
10565-
version "1.4.4"
10566-
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604"
10567-
integrity sha1-YaajIBBiKvoHljvzJSA88SI51gQ=
10568-
1056910542
underscore@~1.6.0:
1057010543
version "1.6.0"
1057110544
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"

0 commit comments

Comments
 (0)