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 @@ + + 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 @@ + + + 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({