From 8f78b3f1cac4c6e396f923cfa7e7320849bfa265 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 25 Mar 2025 09:29:09 -0400 Subject: [PATCH] fix(deps): update dependency marked to v15 (#1249) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [marked](https://marked.js.org) ([source](https://redirect.github.com/markedjs/marked)) | [`^12.0.2` -> `^15.0.0`](https://renovatebot.com/diffs/npm/marked/12.0.2/15.0.7) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes markedjs/marked (marked) ### [`v15.0.7`](https://redirect.github.com/markedjs/marked/releases/tag/v15.0.7) [Compare Source](https://redirect.github.com/markedjs/marked/compare/v15.0.6...v15.0.7) ##### Bug Fixes - fix table rendered as heading ([#3612](https://redirect.github.com/markedjs/marked/issues/3612)) ([9ae87de](https://redirect.github.com/markedjs/marked/commit/9ae87de7cbaa49c53b046072c8b2423ea14e3527)) ### [`v15.0.6`](https://redirect.github.com/markedjs/marked/releases/tag/v15.0.6) [Compare Source](https://redirect.github.com/markedjs/marked/compare/v15.0.5...v15.0.6) ##### Bug Fixes - fix strikethrough inside strong and em to follow gfm ([#3577](https://redirect.github.com/markedjs/marked/issues/3577)) ([7712a53](https://redirect.github.com/markedjs/marked/commit/7712a5324f255c76509de81870c01b4c411979c7)) ### [`v15.0.5`](https://redirect.github.com/markedjs/marked/releases/tag/v15.0.5) [Compare Source](https://redirect.github.com/markedjs/marked/compare/v15.0.4...v15.0.5) ##### Bug Fixes - allow strikethrough inside strong and em to follow gfm ([#3569](https://redirect.github.com/markedjs/marked/issues/3569)) ([8a01658](https://redirect.github.com/markedjs/marked/commit/8a01658cac1211a6bf102c465812402358a6fe3f)) ### [`v15.0.4`](https://redirect.github.com/markedjs/marked/releases/tag/v15.0.4) [Compare Source](https://redirect.github.com/markedjs/marked/compare/v15.0.3...v15.0.4) ##### Bug Fixes - fix list with no items looping forever ([#3560](https://redirect.github.com/markedjs/marked/issues/3560)) ([e4198ed](https://redirect.github.com/markedjs/marked/commit/e4198ed70dce5a361901c009299b566541fc628e)) ### [`v15.0.3`](https://redirect.github.com/markedjs/marked/releases/tag/v15.0.3) [Compare Source](https://redirect.github.com/markedjs/marked/compare/v15.0.2...v15.0.3) ##### Bug Fixes - update punctuation regex syntax to fix babel mistaken transpile ([#3547](https://redirect.github.com/markedjs/marked/issues/3547)) ([9b988c4](https://redirect.github.com/markedjs/marked/commit/9b988c47bd01869914ae891b6dd62932b05a6418)) ### [`v15.0.2`](https://redirect.github.com/markedjs/marked/releases/tag/v15.0.2) [Compare Source](https://redirect.github.com/markedjs/marked/compare/v15.0.1...v15.0.2) ##### Bug Fixes - update punctuation regex syntax for compatibility ([#3540](https://redirect.github.com/markedjs/marked/issues/3540)) ([fd015f1](https://redirect.github.com/markedjs/marked/commit/fd015f147da064c40940491495cd06fc4476d178)) ### [`v15.0.1`](https://redirect.github.com/markedjs/marked/releases/tag/v15.0.1) [Compare Source](https://redirect.github.com/markedjs/marked/compare/v15.0.0...v15.0.1) ##### Bug Fixes - Remove unused plus typescript tightening ([#3527](https://redirect.github.com/markedjs/marked/issues/3527)) ([1f579f7](https://redirect.github.com/markedjs/marked/commit/1f579f76289f2c4a350d0954d343bef08f8e4658)) ### [`v15.0.0`](https://redirect.github.com/markedjs/marked/releases/tag/v15.0.0) [Compare Source](https://redirect.github.com/markedjs/marked/compare/v14.1.4...v15.0.0) ##### Bug Fixes - escape html in renderer ([#3495](https://redirect.github.com/markedjs/marked/issues/3495)) ([58d66e5](https://redirect.github.com/markedjs/marked/commit/58d66e59d1ad1a149bed2da6553d49642f75aa86)) - Move all regexps to rules ([#3519](https://redirect.github.com/markedjs/marked/issues/3519)) ([1f88deb](https://redirect.github.com/markedjs/marked/commit/1f88deb58a0c593745a4201c42fa6aa6e5f8a99c)) ##### BREAKING CHANGES - escape html in renderers instead of tokenizers for all tokens. ### [`v14.1.4`](https://redirect.github.com/markedjs/marked/releases/tag/v14.1.4) [Compare Source](https://redirect.github.com/markedjs/marked/compare/v14.1.3...v14.1.4) ##### Bug Fixes - fix del with escaped tilde ([#3517](https://redirect.github.com/markedjs/marked/issues/3517)) ([0afe87d](https://redirect.github.com/markedjs/marked/commit/0afe87d7fb72063a04b3a010aece6efed283a062)) - fix html comment after list ([#3518](https://redirect.github.com/markedjs/marked/issues/3518)) ([a612576](https://redirect.github.com/markedjs/marked/commit/a612576ff647b4124e8fa80f608cc23c908a1861)) ### [`v14.1.3`](https://redirect.github.com/markedjs/marked/releases/tag/v14.1.3) [Compare Source](https://redirect.github.com/markedjs/marked/compare/v14.1.2...v14.1.3) ##### Bug Fixes - include single nested parens in emStrong link mask ([#3475](https://redirect.github.com/markedjs/marked/issues/3475)) ([2b7efa8](https://redirect.github.com/markedjs/marked/commit/2b7efa8dda034181932c9c3810fef7d73a81eb9b)) - kill SIGINT signal at man for marked --help ([#3483](https://redirect.github.com/markedjs/marked/issues/3483)) ([b1fd3ea](https://redirect.github.com/markedjs/marked/commit/b1fd3eafd8c4e2236b30cab42efc8981e204f063)) ### [`v14.1.2`](https://redirect.github.com/markedjs/marked/releases/tag/v14.1.2) [Compare Source](https://redirect.github.com/markedjs/marked/compare/v14.1.1...v14.1.2) ##### Bug Fixes - fix html following list ([#3444](https://redirect.github.com/markedjs/marked/issues/3444)) ([9d7b728](https://redirect.github.com/markedjs/marked/commit/9d7b7287495d719e0a9c5d4def403a6d0284a20d)) ### [`v14.1.1`](https://redirect.github.com/markedjs/marked/releases/tag/v14.1.1) [Compare Source](https://redirect.github.com/markedjs/marked/compare/v14.1.0...v14.1.1) ##### Bug Fixes - Don't replace tabs with spaces ([#3438](https://redirect.github.com/markedjs/marked/issues/3438)) ([9ed6456](https://redirect.github.com/markedjs/marked/commit/9ed6456a37648d6944e549e04e7e441686dd6c6f)) ### [`v14.1.0`](https://redirect.github.com/markedjs/marked/releases/tag/v14.1.0) [Compare Source](https://redirect.github.com/markedjs/marked/compare/v14.0.0...v14.1.0) ##### Bug Fixes - don't export block or inline ([#3427](https://redirect.github.com/markedjs/marked/issues/3427)) ([3f0430a](https://redirect.github.com/markedjs/marked/commit/3f0430a45e14808bcf894323c8b680135e68f139)) ##### Features - add provideLexer and provideParser hooks ([#3424](https://redirect.github.com/markedjs/marked/issues/3424)) ([447f5af](https://redirect.github.com/markedjs/marked/commit/447f5af7e46665de28da711fc7887b56bc38715e)) ### [`v14.0.0`](https://redirect.github.com/markedjs/marked/releases/tag/v14.0.0) [Compare Source](https://redirect.github.com/markedjs/marked/compare/v13.0.3...v14.0.0) ##### Bug Fixes - allow async option to dictate type returned ([#3341](https://redirect.github.com/markedjs/marked/issues/3341)) ([b5a5004](https://redirect.github.com/markedjs/marked/commit/b5a50041ae0347a80d8d017b39b46a57f58354d0)) - Remove useNewRenderer ([#3342](https://redirect.github.com/markedjs/marked/issues/3342)) ([e64f226](https://redirect.github.com/markedjs/marked/commit/e64f226539baafee2935e173281157c70fb402db)) ##### BREAKING CHANGES - Remove old renderer - throw an error if `async: false` is set when an extension sets `async: true` ### [`v13.0.3`](https://redirect.github.com/markedjs/marked/releases/tag/v13.0.3) [Compare Source](https://redirect.github.com/markedjs/marked/compare/v13.0.2...v13.0.3) ##### Bug Fixes - fix recursion-like stack overflow error caused by the old render… ([#3380](https://redirect.github.com/markedjs/marked/issues/3380)) ([89af0b8](https://redirect.github.com/markedjs/marked/commit/89af0b85b1db67c86641144949d0a44461974442)) ### [`v13.0.2`](https://redirect.github.com/markedjs/marked/releases/tag/v13.0.2) [Compare Source](https://redirect.github.com/markedjs/marked/compare/v13.0.1...v13.0.2) ##### Bug Fixes - fix list item with blank first line ([#3351](https://redirect.github.com/markedjs/marked/issues/3351)) ([d28e4c6](https://redirect.github.com/markedjs/marked/commit/d28e4c65ea822a83049de5652cf3446a05d0c6b5)) ### [`v13.0.1`](https://redirect.github.com/markedjs/marked/releases/tag/v13.0.1) [Compare Source](https://redirect.github.com/markedjs/marked/compare/v13.0.0...v13.0.1) ##### Bug Fixes - fix this type in extension methods ([#3339](https://redirect.github.com/markedjs/marked/issues/3339)) ([520b9ad](https://redirect.github.com/markedjs/marked/commit/520b9ad355f2d098e251b5c89e973985922f5b76)) ### [`v13.0.0`](https://redirect.github.com/markedjs/marked/releases/tag/v13.0.0) [Compare Source](https://redirect.github.com/markedjs/marked/compare/v12.0.2...v13.0.0) ##### Bug Fixes - Fix blockquote code continuation ([#3264](https://redirect.github.com/markedjs/marked/issues/3264)) ([7ab8185](https://redirect.github.com/markedjs/marked/commit/7ab818502ed537ab8eed22dc9cf4f7602232aa53)) - Add parser as a property on the Renderer object ([#3291](https://redirect.github.com/markedjs/marked/issues/3291)) - Send block text tokens to the text renderer ([#3291](https://redirect.github.com/markedjs/marked/issues/3291)) ##### Features - Send token objects to renderers ([#3291](https://redirect.github.com/markedjs/marked/issues/3291)) ([1ce59ea](https://redirect.github.com/markedjs/marked/commit/1ce59ea827272b5d067f1e06d3ee4a1d52b1d9bb)) - Add space renderer that returns empty string by default ([#3291](https://redirect.github.com/markedjs/marked/issues/3291)) - Add header and align properties to TableCell token ([#3291](https://redirect.github.com/markedjs/marked/issues/3291)) - Add TableRow token ([#3291](https://redirect.github.com/markedjs/marked/issues/3291)) - Add Checkbox token ([#3291](https://redirect.github.com/markedjs/marked/issues/3291)) ##### BREAKING CHANGES - Add space token after blockquote and hr if there are multiple newlines - Send token objects to renderers and move logic to parse tokens from the parser to the renderers. - Most extensions that update marked renderers should still work with this version but will break in a future major version. - Extensions that change marked renderers will need to be updated and use new option `useNewRenderer` and accept a token object instead of multiple parameters. See updated [Renderer docs](https://marked.js.org/using_pro#renderer) ```js // v12 renderer extension const extension = { renderer: { heading(text, level) { // increase level by 1 return `${text}`; } } }; marked.use(extension); ``` ```js // v13 renderer extension const extension = { useNewRenderer: true, renderer: { heading(token) { // increase depth by 1 const text = this.parser.parseInline(token.tokens); const level = token.depth; return `${text}`; } } }; marked.use(extension); ``` --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/unraid/api). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Eli Bosley --- pnpm-lock.yaml | 16 +++++------ web/layouts/default.vue | 30 ++++++++++++++++---- web/package.json | 2 +- web/pages/changelog.vue | 50 ++++++++++++++++++++++++++++++++++ web/scripts/deploy-dev.sh | 3 ++ web/store/updateOsChangelog.ts | 16 ++++------- 6 files changed, 91 insertions(+), 26 deletions(-) create mode 100644 web/pages/changelog.vue diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cc63e2753..7c62afc86 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -742,11 +742,11 @@ importers: specifier: ^0.483.0 version: 0.483.0(vue@3.5.13(typescript@5.8.2)) marked: - specifier: ^12.0.2 - version: 12.0.2 + specifier: ^15.0.0 + version: 15.0.7 marked-base-url: specifier: ^1.1.6 - version: 1.1.6(marked@12.0.2) + version: 1.1.6(marked@15.0.7) pinia: specifier: ^3.0.1 version: 3.0.1(typescript@5.8.2)(vue@3.5.13(typescript@5.8.2)) @@ -8105,8 +8105,8 @@ packages: peerDependencies: marked: '>= 4 < 16' - marked@12.0.2: - resolution: {integrity: sha512-qXUm7e/YKFoqFPYPa3Ukg9xlI5cyAtGmyEIzMfW//m6kXwCy2Ps9DYf5ioijFKQ8qyuscrHoY04iJGctu2Kg0Q==} + marked@15.0.7: + resolution: {integrity: sha512-dgLIeKGLx5FwziAnsk4ONoGwHwGPJzselimvlVskE9XLN4Orv9u2VA3GWw/lYUqjfA0rUT/6fqKwfZJapP9BEg==} engines: {node: '>= 18'} hasBin: true @@ -20045,11 +20045,11 @@ snapshots: map-or-similar@1.5.0: {} - marked-base-url@1.1.6(marked@12.0.2): + marked-base-url@1.1.6(marked@15.0.7): dependencies: - marked: 12.0.2 + marked: 15.0.7 - marked@12.0.2: {} + marked@15.0.7: {} maska@2.1.11: {} diff --git a/web/layouts/default.vue b/web/layouts/default.vue index 066b6d8b0..c6aec88e1 100644 --- a/web/layouts/default.vue +++ b/web/layouts/default.vue @@ -1,13 +1,31 @@ - - Test Vue Components - - - Test Web Components - + + + {{ formatRouteName(route.name) }} + + + + diff --git a/web/package.json b/web/package.json index 9c52152f4..5608cc1df 100644 --- a/web/package.json +++ b/web/package.json @@ -100,7 +100,7 @@ "highlight.js": "^11.11.1", "isomorphic-dompurify": "^2.19.0", "lucide-vue-next": "^0.483.0", - "marked": "^12.0.2", + "marked": "^15.0.0", "marked-base-url": "^1.1.6", "pinia": "^3.0.1", "radix-vue": "^1.9.13", diff --git a/web/pages/changelog.vue b/web/pages/changelog.vue new file mode 100644 index 000000000..b615449c8 --- /dev/null +++ b/web/pages/changelog.vue @@ -0,0 +1,50 @@ + + + + + Changelog + + + + Test Changelog Modal + + + + + + + + diff --git a/web/scripts/deploy-dev.sh b/web/scripts/deploy-dev.sh index 4d7520faf..0c1fa7230 100755 --- a/web/scripts/deploy-dev.sh +++ b/web/scripts/deploy-dev.sh @@ -19,6 +19,9 @@ if [ ! -d "$source_directory" ]; then fi # Replace the value inside the rsync command with the user's input +# Delete existing web components in the target directory +ssh "root@${server_name}" "rm -rf /usr/local/emhttp/plugins/dynamix.my.servers/unraid-components/nuxt/*" + rsync_command="rsync -avz -e ssh $source_directory root@${server_name}:/usr/local/emhttp/plugins/dynamix.my.servers/unraid-components/nuxt" echo "Executing the following command:" diff --git a/web/store/updateOsChangelog.ts b/web/store/updateOsChangelog.ts index e864eaf21..23572b48b 100644 --- a/web/store/updateOsChangelog.ts +++ b/web/store/updateOsChangelog.ts @@ -82,17 +82,11 @@ export const useUpdateOsChangelogStore = defineStore('updateOsChangelog', () => // open links in new tab & replace .md from links const renderer = new marked.Renderer(); - const anchorRender = { - options: { - sanitize: true, - }, - render: marked.Renderer.prototype.link, - }; - renderer.link = function (href, title, text) { - const anchor = anchorRender.render(href, title, text); - return anchor - .replace(' { + const linkText = renderer.parser.parseInline(tokens); + const cleanHref = href.replace('.md', ''); // remove .md from href + return `${linkText}`; }; marked.setOptions({