From a1c409548b61b818589d4cda41740bff9f4875cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Dec 2023 16:11:22 +0000 Subject: [PATCH] chore(deps): Bump markdown-it from 13.0.2 to 14.0.0 (#16349) * chore(deps): Bump markdown-it from 13.0.2 to 14.0.0 Bumps [markdown-it](https://github.com/markdown-it/markdown-it) from 13.0.2 to 14.0.0. - [Changelog](https://github.com/markdown-it/markdown-it/blob/master/CHANGELOG.md) - [Commits](https://github.com/markdown-it/markdown-it/compare/13.0.2...14.0.0) --- updated-dependencies: - dependency-name: markdown-it dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * dedup * fix escapeHTML --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Thomas Belin --- package.json | 2 +- src/script/util/messageRenderer.ts | 3 +- yarn.lock | 158 +++++++---------------------- 3 files changed, 38 insertions(+), 125 deletions(-) diff --git a/package.json b/package.json index af999043c8d..671d9b18c47 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "libsodium-wrappers": "0.7.13", "linkify-it": "5.0.0", "long": "5.2.3", - "markdown-it": "13.0.2", + "markdown-it": "14.0.0", "murmurhash": "2.0.1", "oidc-client-ts": "^2.4.0", "platform": "1.3.6", diff --git a/src/script/util/messageRenderer.ts b/src/script/util/messageRenderer.ts index 4a35deafbe3..29138ac32a4 100644 --- a/src/script/util/messageRenderer.ts +++ b/src/script/util/messageRenderer.ts @@ -20,7 +20,6 @@ import {QualifiedId} from '@wireapp/api-client/lib/user'; import hljs from 'highlight.js'; import MarkdownIt from 'markdown-it'; -import {escapeHtml} from 'markdown-it/lib/common/utils'; import {escape} from 'underscore'; import {replaceInRange} from './StringUtil'; @@ -137,7 +136,7 @@ export const renderMessage = (message: string, selfId?: QualifiedId, mentionEnti }; markdownit.renderer.rules.text = (tokens, idx) => { - const escapedText = escapeHtml(tokens[idx].content); + const escapedText = markdownit.utils.escapeHtml(tokens[idx].content); return renderMentions(escapedText); }; diff --git a/yarn.lock b/yarn.lock index 6e3b012bdee..7b111fe69a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -361,7 +361,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.6": +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.6, @babel/parser@npm:^7.9.4": version: 7.23.6 resolution: "@babel/parser@npm:7.23.6" bin: @@ -370,15 +370,6 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.9.4": - version: 7.23.5 - resolution: "@babel/parser@npm:7.23.5" - bin: - parser: ./bin/babel-parser.js - checksum: ea763629310f71580c4a3ea9d3705195b7ba994ada2cc98f9a584ebfdacf54e92b2735d351672824c2c2b03c7f19206899f4d95650d85ce514a822b19a8734c7 - languageName: node - linkType: hard - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.23.3": version: 7.23.3 resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.23.3" @@ -1468,16 +1459,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": - version: 7.23.2 - resolution: "@babel/runtime@npm:7.23.2" - dependencies: - regenerator-runtime: ^0.14.0 - checksum: 6c4df4839ec75ca10175f636d6362f91df8a3137f86b38f6cd3a4c90668a0fe8e9281d320958f4fbd43b394988958585a17c3aab2a4ea6bf7316b22916a371fb - languageName: node - linkType: hard - -"@babel/runtime@npm:^7.15.4": +"@babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": version: 7.23.5 resolution: "@babel/runtime@npm:7.23.5" dependencies: @@ -4162,20 +4144,13 @@ __metadata: languageName: node linkType: hard -"@types/libsodium-wrappers@npm:*": +"@types/libsodium-wrappers@npm:*, @types/libsodium-wrappers@npm:^0": version: 0.7.13 resolution: "@types/libsodium-wrappers@npm:0.7.13" checksum: 94d608bed8ccd364754c3a7bf5d4c770b229efa33f0c475061b1b82bb8d5da8d57a72df0b8876b887077edbb6ff9594b7a1183029de4d1ad679821d1013f3db9 languageName: node linkType: hard -"@types/libsodium-wrappers@npm:^0": - version: 0.7.12 - resolution: "@types/libsodium-wrappers@npm:0.7.12" - checksum: 8f25b4ffe6b60c36f3c59b3dea2e952b8790c9b8375ee5235e6d294c1519a578b7882d773f168005eb0f3fdb4f11e06ba27b30b89d2c3b8be3f985c7eedd0491 - languageName: node - linkType: hard - "@types/linkify-it@npm:*, @types/linkify-it@npm:3.0.5": version: 3.0.5 resolution: "@types/linkify-it@npm:3.0.5" @@ -4219,7 +4194,7 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:^20.10.5": +"@types/node@npm:*, @types/node@npm:>=13.7.0, @types/node@npm:^20.10.5": version: 20.10.5 resolution: "@types/node@npm:20.10.5" dependencies: @@ -4235,15 +4210,6 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:>=13.7.0": - version: 20.10.1 - resolution: "@types/node@npm:20.10.1" - dependencies: - undici-types: ~5.26.4 - checksum: 9dfdcd2496ce535dba0ae496985d6e991a8a5d70a180db3a94c947a2123d99318a95dce4aa2a192f7e57c3afa3fdb44d6fd63e18efd49568950d6c239dadcc39 - languageName: node - linkType: hard - "@types/node@npm:~14": version: 14.18.63 resolution: "@types/node@npm:14.18.63" @@ -7697,13 +7663,6 @@ __metadata: languageName: node linkType: hard -"entities@npm:~3.0.1": - version: 3.0.1 - resolution: "entities@npm:3.0.1" - checksum: aaf7f12033f0939be91f5161593f853f2da55866db55ccbf72f45430b8977e2b79dbd58c53d0fdd2d00bd7d313b75b0968d09f038df88e308aa97e39f9456572 - languageName: node - linkType: hard - "env-paths@npm:^2.2.0, env-paths@npm:^2.2.1": version: 2.2.1 resolution: "env-paths@npm:2.2.1" @@ -8555,20 +8514,7 @@ __metadata: languageName: node linkType: hard -"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0, fast-glob@npm:^3.3.1": - version: 3.3.1 - resolution: "fast-glob@npm:3.3.1" - dependencies: - "@nodelib/fs.stat": ^2.0.2 - "@nodelib/fs.walk": ^1.2.3 - glob-parent: ^5.1.2 - merge2: ^1.3.0 - micromatch: ^4.0.4 - checksum: b6f3add6403e02cf3a798bfbb1183d0f6da2afd368f27456010c0bc1f9640aea308243d4cb2c0ab142f618276e65ecb8be1661d7c62a7b4e5ba774b9ce5432e5 - languageName: node - linkType: hard - -"fast-glob@npm:^3.3.2": +"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0, fast-glob@npm:^3.3.1, fast-glob@npm:^3.3.2": version: 3.3.2 resolution: "fast-glob@npm:3.3.2" dependencies: @@ -8782,18 +8728,7 @@ __metadata: languageName: node linkType: hard -"flat-cache@npm:^3.0.4": - version: 3.1.1 - resolution: "flat-cache@npm:3.1.1" - dependencies: - flatted: ^3.2.9 - keyv: ^4.5.3 - rimraf: ^3.0.2 - checksum: 4958cfe0f46acf84953d4e16676ef5f0d38eab3a92d532a1e8d5f88f11eea8b36d5d598070ff2aeae15f1fde18f8d7d089eefaf9db10b5a587cc1c9072325c7a - languageName: node - linkType: hard - -"flat-cache@npm:^3.2.0": +"flat-cache@npm:^3.0.4, flat-cache@npm:^3.2.0": version: 3.2.0 resolution: "flat-cache@npm:3.2.0" dependencies: @@ -9733,14 +9668,7 @@ __metadata: languageName: node linkType: hard -"ignore@npm:^5.2.0, ignore@npm:^5.2.4": - version: 5.2.4 - resolution: "ignore@npm:5.2.4" - checksum: 3d4c309c6006e2621659311783eaea7ebcd41fe4ca1d78c91c473157ad6666a57a2df790fe0d07a12300d9aac2888204d7be8d59f9aaf665b1c7fcdb432517ef - languageName: node - linkType: hard - -"ignore@npm:^5.3.0": +"ignore@npm:^5.2.0, ignore@npm:^5.2.4, ignore@npm:^5.3.0": version: 5.3.0 resolution: "ignore@npm:5.3.0" checksum: 2736da6621f14ced652785cb05d86301a66d70248597537176612bd0c8630893564bd5f6421f8806b09e8472e75c591ef01672ab8059c07c6eb2c09cefe04bf9 @@ -11674,7 +11602,7 @@ __metadata: languageName: node linkType: hard -"linkify-it@npm:5.0.0": +"linkify-it@npm:5.0.0, linkify-it@npm:^5.0.0": version: 5.0.0 resolution: "linkify-it@npm:5.0.0" dependencies: @@ -11692,15 +11620,6 @@ __metadata: languageName: node linkType: hard -"linkify-it@npm:^4.0.1": - version: 4.0.1 - resolution: "linkify-it@npm:4.0.1" - dependencies: - uc.micro: ^1.0.1 - checksum: 3e0a29921269c14eb7ac6f5db2da68d4854ea9acca6e9014a323f75f2dd39b197ffab57c1fbd6a906ceb021aad3ee6d7ba7d0181236dd9630ffc452b392f7f71 - languageName: node - linkType: hard - "lint-staged@npm:15.2.0": version: 15.2.0 resolution: "lint-staged@npm:15.2.0" @@ -12098,18 +12017,19 @@ __metadata: languageName: node linkType: hard -"markdown-it@npm:13.0.2": - version: 13.0.2 - resolution: "markdown-it@npm:13.0.2" +"markdown-it@npm:14.0.0": + version: 14.0.0 + resolution: "markdown-it@npm:14.0.0" dependencies: argparse: ^2.0.1 - entities: ~3.0.1 - linkify-it: ^4.0.1 - mdurl: ^1.0.1 - uc.micro: ^1.0.5 + entities: ^4.4.0 + linkify-it: ^5.0.0 + mdurl: ^2.0.0 + punycode.js: ^2.3.1 + uc.micro: ^2.0.0 bin: - markdown-it: bin/markdown-it.js - checksum: bb4bf2cb3e5d77a7f3dc9cf48e17d050fbcd26d37992204eaa5812220752858fe9debe439b2ae1de06e749a3bba537c0baf6ce7510307cf7163a70f04fafe672 + markdown-it: bin/markdown-it.mjs + checksum: f63bd8b39b2232ad686ec49f046bbf51c34253e38295f5d44a8e5dc6ec5401e9a9fbed0bb88cbc1635608e2bb21c5a3c2336a2a9f52548c24be5abd06001bc01 languageName: node linkType: hard @@ -12182,6 +12102,13 @@ __metadata: languageName: node linkType: hard +"mdurl@npm:^2.0.0": + version: 2.0.0 + resolution: "mdurl@npm:2.0.0" + checksum: 880bc289ef668df0bb34c5b2b5aaa7b6ea755052108cdaf4a5e5968ad01cf27e74927334acc9ebcc50a8628b65272ae6b1fd51fae1330c130e261c0466e1a3b2 + languageName: node + linkType: hard + "memfs@npm:^3.4.12": version: 3.5.3 resolution: "memfs@npm:3.5.3" @@ -12468,7 +12395,7 @@ __metadata: languageName: node linkType: hard -"nanoid@npm:^3.3.6, nanoid@npm:^3.3.7": +"nanoid@npm:^3.3.7": version: 3.3.7 resolution: "nanoid@npm:3.3.7" bin: @@ -14178,7 +14105,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:8.4.32, postcss@npm:^8.4.32": +"postcss@npm:8.4.32, postcss@npm:^8.4.21, postcss@npm:^8.4.32": version: 8.4.32 resolution: "postcss@npm:8.4.32" dependencies: @@ -14199,17 +14126,6 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.4.21": - version: 8.4.31 - resolution: "postcss@npm:8.4.31" - dependencies: - nanoid: ^3.3.6 - picocolors: ^1.0.0 - source-map-js: ^1.0.2 - checksum: 1d8611341b073143ad90486fcdfeab49edd243377b1f51834dc4f6d028e82ce5190e4f11bb2633276864503654fb7cab28e67abdc0fbf9d1f88cad4a0ff0beea - languageName: node - linkType: hard - "prelude-ls@npm:^1.2.1": version: 1.2.1 resolution: "prelude-ls@npm:1.2.1" @@ -14233,16 +14149,7 @@ __metadata: languageName: node linkType: hard -"prettier@npm:*, prettier@npm:^3": - version: 3.0.3 - resolution: "prettier@npm:3.0.3" - bin: - prettier: bin/prettier.cjs - checksum: e10b9af02b281f6c617362ebd2571b1d7fc9fb8a3bd17e371754428cda992e5e8d8b7a046e8f7d3e2da1dcd21aa001e2e3c797402ebb6111b5cd19609dd228e0 - languageName: node - linkType: hard - -"prettier@npm:^3.1.1": +"prettier@npm:*, prettier@npm:^3, prettier@npm:^3.1.1": version: 3.1.1 resolution: "prettier@npm:3.1.1" bin: @@ -14417,6 +14324,13 @@ __metadata: languageName: node linkType: hard +"punycode.js@npm:^2.3.1": + version: 2.3.1 + resolution: "punycode.js@npm:2.3.1" + checksum: 13466d7ed5e8dacdab8c4cc03837e7dd14218a59a40eb14a837f1f53ca396e18ef2c4ee6d7766b8ed2fc391d6a3ac489eebf2de83b3596f5a54e86df4a251b72 + languageName: node + linkType: hard + "punycode@npm:^2.1.0, punycode@npm:^2.1.1": version: 2.3.0 resolution: "punycode@npm:2.3.0" @@ -17632,7 +17546,7 @@ __metadata: linkify-it: 5.0.0 lint-staged: 15.2.0 long: 5.2.3 - markdown-it: 13.0.2 + markdown-it: 14.0.0 murmurhash: 2.0.1 node-fetch: 2.7.0 oidc-client-ts: ^2.4.0