From 2d272c1c11fe77b9e180ec5eb889c9c7a93d8ef1 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Fri, 4 Feb 2022 12:31:38 -0500
Subject: [PATCH] Major linkify/linkify-html upgrade (usage changed, separate
 packages for minimal bundles which is nice)

---
 client/package.json                           |  5 +++--
 .../components/Libraries/LibraryEditField.vue |  4 ++--
 .../Libraries/LibraryFolder/LibraryFolder.vue |  4 ++--
 client/yarn.lock                              | 21 ++++++++++++-------
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/client/package.json b/client/package.json
index 2e6b90f61da..f03123c8ffb 100644
--- a/client/package.json
+++ b/client/package.json
@@ -55,7 +55,8 @@
     "jquery-ui": "^1.13.1",
     "jquery.cookie": "^1.4.1",
     "jspdf": "^2.5.1",
-    "linkifyjs": "^2.1.9",
+    "linkify-html": "^3.0.5",
+    "linkifyjs": "^3.0.5",
     "markdown-it": "^12.3.2",
     "markdown-it-regexp": "^0.4.0",
     "moment": "2.29.1",
@@ -150,7 +151,7 @@
     "css-minimizer-webpack-plugin": "^3.4.1",
     "del": "^6.0.0",
     "eslint": "^8.8.0",
-    "eslint-plugin-vue": "^8.4.0",
+    "eslint-plugin-vue": "^8.4.1",
     "expose-loader": "^3.1.0",
     "gulp": "^4.0.2",
     "ignore-loader": "^0.1.2",
diff --git a/client/src/components/Libraries/LibraryEditField.vue b/client/src/components/Libraries/LibraryEditField.vue
index a556b7fe44a..8d9cbb1eb08 100644
--- a/client/src/components/Libraries/LibraryEditField.vue
+++ b/client/src/components/Libraries/LibraryEditField.vue
@@ -36,7 +36,7 @@ import { MAX_DESCRIPTION_LENGTH } from "components/Libraries/library-utils";
 import BootstrapVue from "bootstrap-vue";
 import Vue from "vue";
 
-import linkify from "linkifyjs/html";
+import linkifyHtml from "linkify-html";
 Vue.use(BootstrapVue);
 
 export default {
@@ -67,7 +67,7 @@ export default {
             this.$emit("toggleDescriptionExpand");
         },
         linkify(raw_text) {
-            return linkify(raw_text);
+            return linkifyHtml(raw_text);
         },
     },
 };
diff --git a/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue b/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue
index ed4738e5ef3..9d0a7853811 100644
--- a/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue
+++ b/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue
@@ -277,7 +277,7 @@ import UtcDate from "components/UtcDate";
 import BootstrapVue from "bootstrap-vue";
 import { Services } from "./services";
 import Utils from "utils/utils";
-import linkify from "linkifyjs/html";
+import linkifyHtml from "linkify-html";
 import { fields } from "./table-fields";
 import { Toast } from "ui/toast";
 import FolderTopBar from "./TopToolbar/FolderTopBar";
@@ -507,7 +507,7 @@ export default {
             this.isBusy = value;
         },
         linkify(raw_text) {
-            return linkify(raw_text);
+            return linkifyHtml(raw_text);
         },
         toggleEditMode(item) {
             item.editMode = !item.editMode;
diff --git a/client/yarn.lock b/client/yarn.lock
index cccb2c39a69..34265f13732 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -4229,10 +4229,10 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-plugin-vue@^8.4.0:
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-8.4.0.tgz#16e59b356386b4428fb7d886b6d8ee5df2bbc09d"
-  integrity sha512-Ga96QRG8GA9AyzKtEDxqYRCMt/VJM4SLkcNmm4FvUiFBE4jpaBr25unRBi9iVmHLYhA9EZ/4I+jD8n1vfWzyAA==
+eslint-plugin-vue@^8.4.1:
+  version "8.4.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-8.4.1.tgz#0a25493bbfee6baa21614e637e3fd390617c0bb4"
+  integrity sha512-nmWOhNmDx9TZ+yP9ZhezTkZUupSHsYA2TocRm+efPSXMOyFrVczVlaIuQcLBjCtI8CbkBiUQ3VcyQsjlIhDrhA==
   dependencies:
     eslint-utils "^3.0.0"
     natural-compare "^1.4.0"
@@ -6788,6 +6788,11 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
+linkify-html@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/linkify-html/-/linkify-html-3.0.5.tgz#317181f7603e17b7d38492b0f6fdf9cce14f1e6b"
+  integrity sha512-3O7HEYjkugX+C/G2C2wyBmIt8Mt0pmeaHNIxRHodCFeQQeSxSoZHR+5hC1pi0WrmoEvfnSemyZyYTM8w3lo9cA==
+
 linkify-it@^3.0.1:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e"
@@ -6795,10 +6800,10 @@ linkify-it@^3.0.1:
   dependencies:
     uc.micro "^1.0.1"
 
-linkifyjs@^2.1.9:
-  version "2.1.9"
-  resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-2.1.9.tgz#af06e45a2866ff06c4766582590d098a4d584702"
-  integrity sha512-74ivurkK6WHvHFozVaGtQWV38FzBwSTGNmJolEgFp7QgR2bl6ArUWlvT4GcHKbPe1z3nWYi+VUdDZk16zDOVug==
+linkifyjs@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-3.0.5.tgz#99e51a3a0c0e232fcb63ebb89eea3ff923378f34"
+  integrity sha512-1Y9XQH65eQKA9p2xtk+zxvnTeQBG7rdAXSkUG97DmuI/Xhji9uaUzaWxRj6rf9YC0v8KKHkxav7tnLX82Sz5Fg==
 
 load-json-file@^1.0.0:
   version "1.1.0"