diff --git a/web/package-lock.json b/web/package-lock.json index 2d2f036f5..e2798ea9f 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -31,13 +31,14 @@ "i18next": "^21.8.14", "i18next-http-backend": "^2.2.0", "immutable": "^3.8.3", + "linkify-react": "^4.3.3", + "linkifyjs": "4.3.3", "lodash-es": "^4.17.23", "murmurhash-js": "1.0.x", "react": "^17.0.1", "react-dom": "^17.0.1", "react-helmet": "^6.1.0", "react-i18next": "^11.8.11", - "react-linkify": "^0.2.2", "react-modal": "^3.12.1", "react-redux": "7.2.2", "react-router": "5.3.x", @@ -9609,15 +9610,22 @@ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", "license": "MIT" }, - "node_modules/linkify-it": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz", - "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==", + "node_modules/linkify-react": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/linkify-react/-/linkify-react-4.3.3.tgz", + "integrity": "sha512-bMWuN1YJ3hyDyojk4hzUugecN2RsTuibKAQBplUT2o+3uK33THdRL2qD0Zf3ibCXuBLBCyOE6Uj/S/1cY48Ygw==", "license": "MIT", - "dependencies": { - "uc.micro": "^1.0.1" + "peerDependencies": { + "linkifyjs": "==4.3.3", + "react": ">= 15.0.0" } }, + "node_modules/linkifyjs": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-4.3.3.tgz", + "integrity": "sha512-P8aEP5U/D1/IlTY2OeYsErdwh9bGuLE30NcXtKEjgdHcahveQoQwM2yZNsioQHsWFz0P7KKudisbrzCgR0sDHg==", + "license": "MIT" + }, "node_modules/listr2": { "version": "3.14.0", "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz", @@ -11804,17 +11812,6 @@ "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==", "license": "MIT" }, - "node_modules/react-linkify": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/react-linkify/-/react-linkify-0.2.2.tgz", - "integrity": "sha512-0S8cvUNtEgfJpIGDPKklyrnrTffJ63WuJAc4KaYLBihl5TjgH5cHUmYD+AXLpsV+CVmfoo/56SUNfrZcY4zYMQ==", - "license": "MIT", - "dependencies": { - "linkify-it": "^2.0.3", - "prop-types": "^15.5.8", - "tlds": "^1.57.0" - } - }, "node_modules/react-modal": { "version": "3.16.1", "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.16.1.tgz", @@ -13726,15 +13723,6 @@ "popper.js": "^1.16.0" } }, - "node_modules/tlds": { - "version": "1.233.0", - "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.233.0.tgz", - "integrity": "sha512-K05dY1r4lkXk+eE/j2UqHhGWp1bFn+17eYcJP7OepkmI3obLOgan3ZIpmml++wZ4LTIx4r9var373ztO2xb27A==", - "license": "MIT", - "bin": { - "tlds": "bin.js" - } - }, "node_modules/tmp": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz", @@ -14042,12 +14030,6 @@ "node": ">=4.2.0" } }, - "node_modules/uc.micro": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", - "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==", - "license": "MIT" - }, "node_modules/unbox-primitive": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", diff --git a/web/package.json b/web/package.json index 19e29f110..8dc3022df 100644 --- a/web/package.json +++ b/web/package.json @@ -61,13 +61,14 @@ "i18next": "^21.8.14", "i18next-http-backend": "^2.2.0", "immutable": "^3.8.3", + "linkify-react": "^4.3.3", + "linkifyjs": "4.3.3", "lodash-es": "^4.17.23", "murmurhash-js": "1.0.x", "react": "^17.0.1", "react-dom": "^17.0.1", "react-helmet": "^6.1.0", "react-i18next": "^11.8.11", - "react-linkify": "^0.2.2", "react-modal": "^3.12.1", "react-redux": "7.2.2", "react-router": "5.3.x", diff --git a/web/src/components/console/utils/link.tsx b/web/src/components/console/utils/link.tsx index 192096416..a8d14c1fa 100644 --- a/web/src/components/console/utils/link.tsx +++ b/web/src/components/console/utils/link.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import Linkify from 'react-linkify'; +import Linkify from 'linkify-react'; export const ExternalLink: React.FC = ({ href, text }) => ( @@ -9,7 +9,7 @@ export const ExternalLink: React.FC = ({ href, text }) => ( // Open links in a new window and set noopener/noreferrer. export const LinkifyExternal: React.FC<{ children: React.ReactNode }> = ({ children }) => ( - {children} + {children} ); type ExternalLinkProps = {