From 8a62dd49914af83c31a858b3a0b5875dcb895a78 Mon Sep 17 00:00:00 2001 From: Constance Chen Date: Tue, 22 Feb 2022 09:28:38 -0800 Subject: [PATCH 1/4] Upgrade url-parse to latest --- package.json | 4 ++-- yarn.lock | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 4e471c21f8f..5732df2a946 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "text-diff": "^1.0.1", "unified": "^9.2.0", "unist-util-visit": "^2.0.3", - "url-parse": "^1.5.6", + "url-parse": "^1.5.10", "uuid": "^8.3.0", "vfile": "^4.2.0" }, @@ -132,7 +132,7 @@ "@types/react-is": "^17.0.3", "@types/react-router-dom": "^5.1.5", "@types/tabbable": "^3.1.0", - "@types/url-parse": "^1.4.3", + "@types/url-parse": "^1.4.8", "@types/uuid": "^8.3.0", "@typescript-eslint/eslint-plugin": "^5.10.2", "@typescript-eslint/parser": "^5.10.2", diff --git a/yarn.lock b/yarn.lock index f3d8c44b43c..b91b61623fd 100755 --- a/yarn.lock +++ b/yarn.lock @@ -3492,10 +3492,10 @@ resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e" integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ== -"@types/url-parse@^1.4.3": - version "1.4.3" - resolved "https://registry.yarnpkg.com/@types/url-parse/-/url-parse-1.4.3.tgz#fba49d90f834951cb000a674efee3d6f20968329" - integrity sha512-4kHAkbV/OfW2kb5BLVUuUMoumB3CP8rHqlw48aHvFy5tf9ER0AfOonBlX29l/DD68G70DmyhRlSYfQPSYpC5Vw== +"@types/url-parse@^1.4.8": + version "1.4.8" + resolved "https://registry.yarnpkg.com/@types/url-parse/-/url-parse-1.4.8.tgz#c3825047efbca1295b7f1646f38203d9145130d6" + integrity sha512-zqqcGKyNWgTLFBxmaexGUKQyWqeG7HjXj20EuQJSJWwXe54BjX0ihIo5cJB9yAQzH8dNugJ9GvkBYMjPXs/PJw== "@types/uuid@^8.3.0": version "8.3.0" @@ -19898,7 +19898,7 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" -url-parse@^1.4.3, url-parse@^1.5.3, url-parse@^1.5.6: +url-parse@^1.4.3, url-parse@^1.5.3: version "1.5.6" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.6.tgz#b2a41d5a233645f3c31204cc8be60e76a15230a2" integrity sha512-xj3QdUJ1DttD1LeSfvJlU1eiF1RvBSBfUu8GplFGdUzSO28y5yUtEl7wb//PI4Af6qh0o/K8545vUmucRrfWsw== @@ -19906,6 +19906,14 @@ url-parse@^1.4.3, url-parse@^1.5.3, url-parse@^1.5.6: querystringify "^2.1.1" requires-port "^1.0.0" +url-parse@^1.5.10: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + url-to-options@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" From 882bec7fd1688c0e51e722bc283b9f3708bfcc65 Mon Sep 17 00:00:00 2001 From: Constance Chen Date: Tue, 22 Feb 2022 09:31:10 -0800 Subject: [PATCH 2/4] Upgrade prismjs subdependency to latest --- yarn.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/yarn.lock b/yarn.lock index b91b61623fd..39fc195209d 100755 --- a/yarn.lock +++ b/yarn.lock @@ -3329,9 +3329,9 @@ integrity sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw== "@types/prismjs@*": - version "1.16.3" - resolved "https://registry.yarnpkg.com/@types/prismjs/-/prismjs-1.16.3.tgz#73ae78b3e339777a1a1b7a8df89dcd6b8fe750c5" - integrity sha512-7lbX0Odbg9rnzXRdYdgPQZFkjd38QHpD6tvWxbLi6VXGQbXr054doixIS+TwftHP6afffA1zxCZrIcJRS/MkYQ== + version "1.26.0" + resolved "https://registry.yarnpkg.com/@types/prismjs/-/prismjs-1.26.0.tgz#a1c3809b0ad61c62cac6d4e0c56d610c910b7654" + integrity sha512-ZTaqn/qSqUuAq1YwvOFQfVW1AR/oQJlLSZVustdjwI+GZ8kr0MSHBj0tsXPW1EqHubx50gtBEjbPGsdZwQwCjQ== "@types/prop-types@*": version "15.7.3" @@ -15792,10 +15792,10 @@ prism-react-renderer@^1.0.2: resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.2.0.tgz#5ad4f90c3e447069426c8a53a0eafde60909cdf4" integrity sha512-GHqzxLYImx1iKN1jJURcuRoA/0ygCcNhfGw1IT8nPIMzarmKQ3Nc+JcG0gi8JXQzuh0C5ShE4npMIoqNin40hg== -prismjs@~1.25.0: - version "1.25.0" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.25.0.tgz#6f822df1bdad965734b310b315a23315cf999756" - integrity sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg== +prismjs@~1.27.0: + version "1.27.0" + resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.27.0.tgz#bb6ee3138a0b438a3653dd4d6ce0cc6510a45057" + integrity sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA== process-nextick-args@^1.0.6: version "1.0.7" From f3e91f936daebb4cddafbf9c394472ef8ad515f6 Mon Sep 17 00:00:00 2001 From: Constance Chen Date: Tue, 22 Feb 2022 10:19:28 -0800 Subject: [PATCH 3/4] Force prismjs to resolve to 1.27.0 --- package.json | 1 + yarn.lock | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 5732df2a946..c9a0d1eeeb3 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "url": "https://github.com/elastic/eui.git" }, "resolutions": { + "**/prismjs": "1.27.0", "**/trim": "0.0.3", "**/node-sass": "^6.0.1", "**/react": "^17.0.0" diff --git a/yarn.lock b/yarn.lock index 39fc195209d..67bc6a5ba84 100755 --- a/yarn.lock +++ b/yarn.lock @@ -15792,7 +15792,7 @@ prism-react-renderer@^1.0.2: resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.2.0.tgz#5ad4f90c3e447069426c8a53a0eafde60909cdf4" integrity sha512-GHqzxLYImx1iKN1jJURcuRoA/0ygCcNhfGw1IT8nPIMzarmKQ3Nc+JcG0gi8JXQzuh0C5ShE4npMIoqNin40hg== -prismjs@~1.27.0: +prismjs@1.27.0, prismjs@~1.25.0: version "1.27.0" resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.27.0.tgz#bb6ee3138a0b438a3653dd4d6ce0cc6510a45057" integrity sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA== From 0d6bbd986c0ff995ad7d2a01212b3738e38fa5d0 Mon Sep 17 00:00:00 2001 From: Constance Chen Date: Tue, 22 Feb 2022 10:19:57 -0800 Subject: [PATCH 4/4] Resolve all url-parse instances to 1.5.10 --- yarn.lock | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/yarn.lock b/yarn.lock index 67bc6a5ba84..bed329cf379 100755 --- a/yarn.lock +++ b/yarn.lock @@ -19898,15 +19898,7 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" -url-parse@^1.4.3, url-parse@^1.5.3: - version "1.5.6" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.6.tgz#b2a41d5a233645f3c31204cc8be60e76a15230a2" - integrity sha512-xj3QdUJ1DttD1LeSfvJlU1eiF1RvBSBfUu8GplFGdUzSO28y5yUtEl7wb//PI4Af6qh0o/K8545vUmucRrfWsw== - dependencies: - querystringify "^2.1.1" - requires-port "^1.0.0" - -url-parse@^1.5.10: +url-parse@^1.4.3, url-parse@^1.5.10, url-parse@^1.5.3: version "1.5.10" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==