self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Desktop, Mobile: Fixes #3281: Prevent code highlighting from freezing the app in some cases

Browse Source
This commit is contained in:
Laurent Cozic 2020-06-28 18:31:43 +01:00
parent eb8841379c
commit 05acc51054
8 changed files with 17 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CliClient/package-lock.json generated
View File

@ -3039,9 +3039,9 @@
"integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=" "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0="
}, },
"highlight.js": { "highlight.js": {
"version": "9.18.1", "version": "10.1.1",
"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.1.tgz", "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.1.1.tgz",
"integrity": "sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg==" "integrity": "sha512-b4L09127uVa+9vkMgPpdUQP78ickGbHEQTWeBrQFTJZ4/n2aihWOGS0ZoUqAwjVmfjhq/C76HRzkqwZhK4sBbg=="
}, },
"homedir-polyfill": { "homedir-polyfill": {
"version": "1.0.3", "version": "1.0.3",

2
CliClient/package.json
View File

@ -49,7 +49,7 @@
"font-awesome-filetypes": "^2.1.0", "font-awesome-filetypes": "^2.1.0",
"form-data": "^2.1.4", "form-data": "^2.1.4",
"fs-extra": "^5.0.0", "fs-extra": "^5.0.0",
"highlight.js": "^9.17.1", "highlight.js": "10.1.1",
"html-entities": "^1.2.1", "html-entities": "^1.2.1",
"html-minifier": "^3.5.15", "html-minifier": "^3.5.15",
"htmlparser2": "^4.1.0", "htmlparser2": "^4.1.0",

6
ElectronClient/package-lock.json generated
View File

@ -6304,9 +6304,9 @@
"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
}, },
"highlight.js": { "highlight.js": {
"version": "9.18.1", "version": "10.1.1",
"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.1.tgz", "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.1.1.tgz",
"integrity": "sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg==" "integrity": "sha512-b4L09127uVa+9vkMgPpdUQP78ickGbHEQTWeBrQFTJZ4/n2aihWOGS0ZoUqAwjVmfjhq/C76HRzkqwZhK4sBbg=="
}, },
"hoist-non-react-statics": { "hoist-non-react-statics": {
"version": "2.5.0", "version": "2.5.0",

2
ElectronClient/package.json
View File

@ -118,7 +118,7 @@
"form-data": "^2.3.2", "form-data": "^2.3.2",
"formatcoords": "^1.1.3", "formatcoords": "^1.1.3",
"fs-extra": "^5.0.0", "fs-extra": "^5.0.0",
"highlight.js": "^9.17.1", "highlight.js": "^10.1.1",
"html-entities": "^1.2.1", "html-entities": "^1.2.1",
"html-minifier": "^4.0.0", "html-minifier": "^4.0.0",
"htmlparser2": "^4.1.0", "htmlparser2": "^4.1.0",

44
ReactNativeClient/lib/joplin-renderer/package-lock.json generated
View File

@ -444,29 +444,15 @@
"lodash": "^4.17.15" "lodash": "^4.17.15"
} }
}, },
"handlebars": {
"version": "4.5.3",
"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz",
"integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==",
"requires": {
"neo-async": "^2.6.0",
"optimist": "^0.6.1",
"source-map": "^0.6.1",
"uglify-js": "^3.1.4"
}
},
"he": { "he": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
}, },
"highlight.js": { "highlight.js": {
"version": "9.17.1", "version": "10.1.1",
"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.17.1.tgz", "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.1.1.tgz",
"integrity": "sha512-TA2/doAur5Ol8+iM3Ov7qy3jYcr/QiJ2eDTdRF4dfbjG7AaaB99J5G+zSl11ljbl6cIcahgPY6SKb3sC3EJ0fw==", "integrity": "sha512-b4L09127uVa+9vkMgPpdUQP78ickGbHEQTWeBrQFTJZ4/n2aihWOGS0ZoUqAwjVmfjhq/C76HRzkqwZhK4sBbg=="
"requires": {
"handlebars": "^4.5.3"
}
}, },
"html-entities": { "html-entities": {
"version": "1.2.1", "version": "1.2.1",
@ -734,11 +720,6 @@
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
}, },
"minimist": {
"version": "0.0.10",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
"integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
},
"moment-mini": { "moment-mini": {
"version": "2.22.1", "version": "2.22.1",
"resolved": "https://registry.npmjs.org/moment-mini/-/moment-mini-2.22.1.tgz", "resolved": "https://registry.npmjs.org/moment-mini/-/moment-mini-2.22.1.tgz",
@ -749,11 +730,6 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
}, },
"neo-async": {
"version": "2.6.1",
"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
"integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="
},
"no-case": { "no-case": {
"version": "2.3.2", "version": "2.3.2",
"resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
@ -771,15 +747,6 @@
"wrappy": "1" "wrappy": "1"
} }
}, },
"optimist": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
"integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
"requires": {
"minimist": "~0.0.1",
"wordwrap": "~0.0.2"
}
},
"param-case": { "param-case": {
"version": "2.1.1", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
@ -913,11 +880,6 @@
"unorm": ">= 1.0.0" "unorm": ">= 1.0.0"
} }
}, },
"wordwrap": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
"integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
},
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",

4
ReactNativeClient/lib/joplin-renderer/package.json
View File

@ -18,7 +18,7 @@
"base-64": "^0.1.0", "base-64": "^0.1.0",
"font-awesome-filetypes": "^2.1.0", "font-awesome-filetypes": "^2.1.0",
"fs-extra": "^8.1.0", "fs-extra": "^8.1.0",
"highlight.js": "^9.17.1", "highlight.js": "10.1.1",
"html-entities": "^1.2.1", "html-entities": "^1.2.1",
"json-stringify-safe": "^5.0.1", "json-stringify-safe": "^5.0.1",
"katex": "^0.11.1", "katex": "^0.11.1",
@ -36,8 +36,8 @@
"markdown-it-sup": "^1.0.0", "markdown-it-sup": "^1.0.0",
"markdown-it-toc-done-right": "^4.1.0", "markdown-it-toc-done-right": "^4.1.0",
"md5": "^2.2.1", "md5": "^2.2.1",
"mermaid": "^8.4.6",
"memory-cache": "^0.2.0", "memory-cache": "^0.2.0",
"mermaid": "^8.4.6",
"uslug": "^1.0.4" "uslug": "^1.0.4"
} }
} }

6
ReactNativeClient/package-lock.json generated
View File

@ -5537,9 +5537,9 @@
"integrity": "sha512-eNHUQHuadDMJARpaqvlCZoK/Nitpj6oywq3vQ3wCwEsww5morX34mW5PmKWQTO7aU0ck0hgulxR+EVDlXygGxQ==" "integrity": "sha512-eNHUQHuadDMJARpaqvlCZoK/Nitpj6oywq3vQ3wCwEsww5morX34mW5PmKWQTO7aU0ck0hgulxR+EVDlXygGxQ=="
}, },
"highlight.js": { "highlight.js": {
"version": "9.18.1", "version": "10.1.1",
"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.1.tgz", "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.1.1.tgz",
"integrity": "sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg==" "integrity": "sha512-b4L09127uVa+9vkMgPpdUQP78ickGbHEQTWeBrQFTJZ4/n2aihWOGS0ZoUqAwjVmfjhq/C76HRzkqwZhK4sBbg=="
}, },
"hoist-non-react-statics": { "hoist-non-react-statics": {
"version": "2.5.0", "version": "2.5.0",

2
ReactNativeClient/package.json
View File

@ -26,7 +26,7 @@
"events": "^1.1.1", "events": "^1.1.1",
"font-awesome-filetypes": "^2.1.0", "font-awesome-filetypes": "^2.1.0",
"form-data": "^2.1.4", "form-data": "^2.1.4",
"highlight.js": "^9.17.1", "highlight.js": "10.1.1",
"html-entities": "^1.2.1", "html-entities": "^1.2.1",
"htmlparser2": "^4.1.0", "htmlparser2": "^4.1.0",
"jsc-android": "241213.1.0", "jsc-android": "241213.1.0",