From 47ab061496a321daa3e7ca05ed9165572ddff333 Mon Sep 17 00:00:00 2001 From: thuhole Date: Tue, 23 Jun 2020 09:40:07 +0800 Subject: [PATCH] fix black screen bug --- package-lock.json | 251 ---------------------------------------------- package.json | 1 - src/Common.js | 7 +- 3 files changed, 5 insertions(+), 254 deletions(-) diff --git a/package-lock.json b/package-lock.json index db92134..93faca6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2191,11 +2191,6 @@ "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==" }, - "bail": { - "version": "1.0.5", - "resolved": "https://r.cnpmjs.org/bail/download/bail-1.0.5.tgz", - "integrity": "sha1-tvoTNASjksvB+MS/Y/WVM1Hnp3Y=" - }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -2655,21 +2650,6 @@ "supports-color": "^5.3.0" } }, - "character-entities": { - "version": "1.2.4", - "resolved": "https://r.cnpmjs.org/character-entities/download/character-entities-1.2.4.tgz", - "integrity": "sha1-4Sw5Obfq9OWxXnrUxeKOHUjFsWs=" - }, - "character-entities-legacy": { - "version": "1.1.4", - "resolved": "https://r.cnpmjs.org/character-entities-legacy/download/character-entities-legacy-1.1.4.tgz", - "integrity": "sha1-lLwYRdznClu50uzHSHJWYSk9j8E=" - }, - "character-reference-invalid": { - "version": "1.1.4", - "resolved": "https://r.cnpmjs.org/character-reference-invalid/download/character-reference-invalid-1.1.4.tgz", - "integrity": "sha1-CDMpzaDq4nKrPbvzfpo4LBOvFWA=" - }, "chardet": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", @@ -3341,11 +3321,6 @@ "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, - "collapse-white-space": { - "version": "1.0.6", - "resolved": "https://r.cnpmjs.org/collapse-white-space/download/collapse-white-space-1.0.6.tgz", - "integrity": "sha1-5jYpwAFmZXkgYNu+t5xCI50sUoc=" - }, "collection-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", @@ -6474,20 +6449,6 @@ "kind-of": "^3.0.2" } }, - "is-alphabetical": { - "version": "1.0.4", - "resolved": "https://r.cnpmjs.org/is-alphabetical/download/is-alphabetical-1.0.4.tgz", - "integrity": "sha1-nn1rlJFr4iFTdF0YTCmMv5hqaG0=" - }, - "is-alphanumerical": { - "version": "1.0.4", - "resolved": "https://r.cnpmjs.org/is-alphanumerical/download/is-alphanumerical-1.0.4.tgz", - "integrity": "sha1-frmiQx+FX2se8aeOMm31FWlsTb8=", - "requires": { - "is-alphabetical": "^1.0.0", - "is-decimal": "^1.0.0" - } - }, "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", @@ -6545,11 +6506,6 @@ "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=" }, - "is-decimal": { - "version": "1.0.4", - "resolved": "https://r.cnpmjs.org/is-decimal/download/is-decimal-1.0.4.tgz", - "integrity": "sha1-ZaOllYocW2OnBuGzM9fNn2MNP6U=" - }, "is-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", @@ -6600,11 +6556,6 @@ "is-extglob": "^2.1.1" } }, - "is-hexadecimal": { - "version": "1.0.4", - "resolved": "https://r.cnpmjs.org/is-hexadecimal/download/is-hexadecimal-1.0.4.tgz", - "integrity": "sha1-zDXJdYjaS9Saju3WvECC1E3LI6c=" - }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", @@ -6706,21 +6657,11 @@ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, - "is-whitespace-character": { - "version": "1.0.4", - "resolved": "https://r.cnpmjs.org/is-whitespace-character/download/is-whitespace-character-1.0.4.tgz", - "integrity": "sha1-CFjt2UqVWUx8ndC1wXTsbkXuSqc=" - }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" }, - "is-word-character": { - "version": "1.0.4", - "resolved": "https://r.cnpmjs.org/is-word-character/download/is-word-character-1.0.4.tgz", - "integrity": "sha1-zg5zIW+YWZBgWS9i/zE1TdvrAjA=" - }, "is-wsl": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", @@ -8309,11 +8250,6 @@ "object-visit": "^1.0.0" } }, - "markdown-escapes": { - "version": "1.0.4", - "resolved": "https://r.cnpmjs.org/markdown-escapes/download/markdown-escapes-1.0.4.tgz", - "integrity": "sha1-yVQV70UUmddgK5EJXzyOiXX3hTU=" - }, "markdown-it": { "version": "11.0.0", "resolved": "https://r.cnpmjs.org/markdown-it/download/markdown-it-11.0.0.tgz", @@ -8349,14 +8285,6 @@ "safe-buffer": "^5.1.2" } }, - "mdast-add-list-metadata": { - "version": "1.0.1", - "resolved": "https://r.cnpmjs.org/mdast-add-list-metadata/download/mdast-add-list-metadata-1.0.1.tgz", - "integrity": "sha1-lec2QM4vwfoty37EQ9CeK/59tM8=", - "requires": { - "unist-util-visit-parents": "1.1.2" - } - }, "mdn-data": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz", @@ -9266,19 +9194,6 @@ "safe-buffer": "^5.1.1" } }, - "parse-entities": { - "version": "1.2.2", - "resolved": "https://r.cnpmjs.org/parse-entities/download/parse-entities-1.2.2.tgz", - "integrity": "sha1-wxvw9lO2ZhNU+Jc1WcuG3R1e31A=", - "requires": { - "character-entities": "^1.0.0", - "character-entities-legacy": "^1.0.0", - "character-reference-invalid": "^1.0.0", - "is-alphanumerical": "^1.0.0", - "is-decimal": "^1.0.0", - "is-hexadecimal": "^1.0.0" - } - }, "parse-json": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", @@ -10740,33 +10655,6 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.9.0.tgz", "integrity": "sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw==" }, - "react-markdown": { - "version": "4.3.1", - "resolved": "https://r.cnpmjs.org/react-markdown/download/react-markdown-4.3.1.tgz", - "integrity": "sha1-OfBjO5SgJ0RbhsmBEULQU4EwDy8=", - "requires": { - "html-to-react": "^1.3.4", - "mdast-add-list-metadata": "1.0.1", - "prop-types": "^15.7.2", - "react-is": "^16.8.6", - "remark-parse": "^5.0.0", - "unified": "^6.1.5", - "unist-util-visit": "^1.3.0", - "xtend": "^4.0.1" - }, - "dependencies": { - "prop-types": { - "version": "15.7.2", - "resolved": "https://r.cnpmjs.org/prop-types/download/prop-types-15.7.2.tgz", - "integrity": "sha1-UsQedbjIfnK52TYOAga5ncv/psU=", - "requires": { - "loose-envify": "^1.4.0", - "object-assign": "^4.1.1", - "react-is": "^16.8.1" - } - } - } - }, "react-scripts": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-3.1.1.tgz", @@ -11000,28 +10888,6 @@ "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=" }, - "remark-parse": { - "version": "5.0.0", - "resolved": "https://r.cnpmjs.org/remark-parse/download/remark-parse-5.0.0.tgz", - "integrity": "sha1-TAd/nkmQRNHVwT+A16mM97koXZU=", - "requires": { - "collapse-white-space": "^1.0.2", - "is-alphabetical": "^1.0.0", - "is-decimal": "^1.0.0", - "is-whitespace-character": "^1.0.0", - "is-word-character": "^1.0.0", - "markdown-escapes": "^1.0.0", - "parse-entities": "^1.1.0", - "repeat-string": "^1.5.4", - "state-toggle": "^1.0.0", - "trim": "0.0.1", - "trim-trailing-lines": "^1.0.0", - "unherit": "^1.0.4", - "unist-util-remove-position": "^1.0.0", - "vfile-location": "^2.0.0", - "xtend": "^4.0.1" - } - }, "remove-trailing-separator": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", @@ -11084,11 +10950,6 @@ "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" }, - "replace-ext": { - "version": "1.0.0", - "resolved": "https://r.cnpmjs.org/replace-ext/download/replace-ext-1.0.0.tgz", - "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=" - }, "request": { "version": "2.88.0", "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", @@ -12023,11 +11884,6 @@ "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz", "integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==" }, - "state-toggle": { - "version": "1.0.3", - "resolved": "https://r.cnpmjs.org/state-toggle/download/state-toggle-1.0.3.tgz", - "integrity": "sha1-4SOxaojhQxObCcaFIiG8mBWRff4=" - }, "static-extend": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", @@ -12562,11 +12418,6 @@ "punycode": "^2.1.0" } }, - "trim": { - "version": "0.0.1", - "resolved": "https://r.cnpmjs.org/trim/download/trim-0.0.1.tgz", - "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=" - }, "trim-repeated": { "version": "1.0.0", "resolved": "https://registry.npm.taobao.org/trim-repeated/download/trim-repeated-1.0.0.tgz", @@ -12580,16 +12431,6 @@ "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=" }, - "trim-trailing-lines": { - "version": "1.1.3", - "resolved": "https://r.cnpmjs.org/trim-trailing-lines/download/trim-trailing-lines-1.1.3.tgz", - "integrity": "sha1-fwc5iB/3Zle3d24Qh0EoAEtiWpQ=" - }, - "trough": { - "version": "1.0.5", - "resolved": "https://r.cnpmjs.org/trough/download/trough-1.0.5.tgz", - "integrity": "sha1-uLY5zvrX0LsqvTfUM/+Ck++l9AY=" - }, "ts-pnp": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.1.2.tgz", @@ -12684,15 +12525,6 @@ } } }, - "unherit": { - "version": "1.1.3", - "resolved": "https://r.cnpmjs.org/unherit/download/unherit-1.1.3.tgz", - "integrity": "sha1-bJtQPytBsmIzDIDpHIYUq9qmnCI=", - "requires": { - "inherits": "^2.0.0", - "xtend": "^4.0.0" - } - }, "unicode-canonical-property-names-ecmascript": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz", @@ -12717,19 +12549,6 @@ "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz", "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==" }, - "unified": { - "version": "6.2.0", - "resolved": "https://r.cnpmjs.org/unified/download/unified-6.2.0.tgz", - "integrity": "sha1-f71jD3GRJtZ9QMZEt+P2FwNfbbo=", - "requires": { - "bail": "^1.0.0", - "extend": "^3.0.0", - "is-plain-obj": "^1.1.0", - "trough": "^1.0.0", - "vfile": "^2.0.0", - "x-is-string": "^0.1.0" - } - }, "union-value": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", @@ -12767,47 +12586,6 @@ "imurmurhash": "^0.1.4" } }, - "unist-util-is": { - "version": "3.0.0", - "resolved": "https://r.cnpmjs.org/unist-util-is/download/unist-util-is-3.0.0.tgz", - "integrity": "sha1-2ehDgcJGjoJinkpb6dfQWi3TJM0=" - }, - "unist-util-remove-position": { - "version": "1.1.4", - "resolved": "https://r.cnpmjs.org/unist-util-remove-position/download/unist-util-remove-position-1.1.4.tgz", - "integrity": "sha1-7ANzSLYQLIl3A+7m0ClMpHVaICA=", - "requires": { - "unist-util-visit": "^1.1.0" - } - }, - "unist-util-stringify-position": { - "version": "1.1.2", - "resolved": "https://r.cnpmjs.org/unist-util-stringify-position/download/unist-util-stringify-position-1.1.2.tgz", - "integrity": "sha1-Pzf881EnncvKdICrWIm7ioMu4cY=" - }, - "unist-util-visit": { - "version": "1.4.1", - "resolved": "https://r.cnpmjs.org/unist-util-visit/download/unist-util-visit-1.4.1.tgz", - "integrity": "sha1-RySqqEhububibX/zyGhZYNVgseM=", - "requires": { - "unist-util-visit-parents": "^2.0.0" - }, - "dependencies": { - "unist-util-visit-parents": { - "version": "2.1.2", - "resolved": "https://r.cnpmjs.org/unist-util-visit-parents/download/unist-util-visit-parents-2.1.2.tgz", - "integrity": "sha1-JeQ+VTEhZvM0jK5nQ1iHgdESwek=", - "requires": { - "unist-util-is": "^3.0.0" - } - } - } - }, - "unist-util-visit-parents": { - "version": "1.1.2", - "resolved": "https://r.cnpmjs.org/unist-util-visit-parents/download/unist-util-visit-parents-1.1.2.tgz", - "integrity": "sha1-9uOv7ovb+WHA5vAo6jwEgAKMPQY=" - }, "universalify": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", @@ -13011,30 +12789,6 @@ "extsprintf": "^1.2.0" } }, - "vfile": { - "version": "2.3.0", - "resolved": "https://r.cnpmjs.org/vfile/download/vfile-2.3.0.tgz", - "integrity": "sha1-5i2OcrIOg8MkvGxnJ47ickiL+Eo=", - "requires": { - "is-buffer": "^1.1.4", - "replace-ext": "1.0.0", - "unist-util-stringify-position": "^1.0.0", - "vfile-message": "^1.0.0" - } - }, - "vfile-location": { - "version": "2.0.6", - "resolved": "https://r.cnpmjs.org/vfile-location/download/vfile-location-2.0.6.tgz", - "integrity": "sha1-iidPOUEbhxnqVyiALhDZ4N/xUZ4=" - }, - "vfile-message": { - "version": "1.1.1", - "resolved": "https://r.cnpmjs.org/vfile-message/download/vfile-message-1.1.1.tgz", - "integrity": "sha1-WDOuB4od+i2W6WR4hs0ymTqzE+E=", - "requires": { - "unist-util-stringify-position": "^1.1.1" - } - }, "vm-browserify": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz", @@ -13671,11 +13425,6 @@ "async-limiter": "~1.0.0" } }, - "x-is-string": { - "version": "0.1.0", - "resolved": "https://r.cnpmjs.org/x-is-string/download/x-is-string-0.1.0.tgz", - "integrity": "sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=" - }, "xml-name-validator": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", diff --git a/package.json b/package.json index 6fc1cf8..f92322b 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,6 @@ "pressure": "^2.1.2", "react": "^16.9.0", "react-dom": "^16.9.0", - "react-markdown": "^4.3.1", "react-scripts": "^3.1.1", "react-timeago": "^4.1.9" }, diff --git a/src/Common.js b/src/Common.js index f66e2a2..f41ec39 100644 --- a/src/Common.js +++ b/src/Common.js @@ -118,8 +118,11 @@ export class HighlightedMarkdown extends Component { ] const renderedMarkdown = renderMd(this.props.text) const parser = new HtmlToReact.Parser() - - return parser.parseWithInstructions(renderedMarkdown, node => node.type !== 'script', processInstructions) + + let rtn = parser.parseWithInstructions(renderedMarkdown, node => node.type !== 'script', processInstructions) + if(rtn === undefined) + return null + return rtn; } }