mirror of
https://github.com/unraid/api.git
synced 2025-12-31 13:39:52 -06:00
fix(deps): update dependency marked to v15 (#1249)
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 <details> <summary>markedjs/marked (marked)</summary> ### [`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](9ae87de7cb)) ### [`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](7712a5324f)) ### [`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](8a01658cac)) ### [`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](e4198ed70d)) ### [`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](9b988c47bd)) ### [`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](fd015f147d)) ### [`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](1f579f7628)) ### [`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](58d66e59d1)) - Move all regexps to rules ([#​3519](https://redirect.github.com/markedjs/marked/issues/3519)) ([1f88deb](1f88deb58a)) ##### 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](0afe87d7fb)) - fix html comment after list ([#​3518](https://redirect.github.com/markedjs/marked/issues/3518)) ([a612576](a612576ff6)) ### [`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](2b7efa8dda)) - kill SIGINT signal at man for marked --help ([#​3483](https://redirect.github.com/markedjs/marked/issues/3483)) ([b1fd3ea](b1fd3eafd8)) ### [`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](9d7b728749)) ### [`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](9ed6456a37)) ### [`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](3f0430a45e)) ##### Features - add provideLexer and provideParser hooks ([#​3424](https://redirect.github.com/markedjs/marked/issues/3424)) ([447f5af](447f5af7e4)) ### [`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](b5a50041ae)) - Remove useNewRenderer ([#​3342](https://redirect.github.com/markedjs/marked/issues/3342)) ([e64f226](e64f226539)) ##### 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](89af0b85b1)) ### [`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](d28e4c65ea)) ### [`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](520b9ad355)) ### [`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](7ab818502e)) - 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](1ce59ea827)) - 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 `<h${level + 1}>${text}</h${level + 1}>`; } } }; 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 `<h${level + 1}>${text}</h${level + 1}>`; } } }; marked.use(extension); ``` </details> --- ### 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. --- - [ ] <!-- rebase-check -->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). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4yMDcuMSIsInVwZGF0ZWRJblZlciI6IjM5LjIwNy4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Eli Bosley <ekbosley@gmail.com>
This commit is contained in:
16
pnpm-lock.yaml
generated
16
pnpm-lock.yaml
generated
@@ -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: {}
|
||||
|
||||
|
||||
@@ -1,13 +1,31 @@
|
||||
<template>
|
||||
<client-only>
|
||||
<div class="flex flex-row items-center justify-center gap-6 p-6 text-gray-200 bg-zinc-800">
|
||||
<NuxtLink to="/" class="underline hover:no-underline focus:no-underline" active-class="text-orange">
|
||||
Test Vue Components
|
||||
</NuxtLink>
|
||||
<NuxtLink to="/webComponents" class="underline hover:no-underline focus:no-underline" active-class="text-orange">
|
||||
Test Web Components
|
||||
</NuxtLink>
|
||||
<template v-for="route in routes" :key="route.path">
|
||||
<NuxtLink :to="route.path" class="underline hover:no-underline focus:no-underline" active-class="text-orange">
|
||||
{{ formatRouteName(route.name) }}
|
||||
</NuxtLink>
|
||||
</template>
|
||||
</div>
|
||||
<slot />
|
||||
</client-only>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
const router = useRouter();
|
||||
const routes = computed(() => {
|
||||
return router.getRoutes()
|
||||
.filter(route => !route.path.includes(':') && route.path !== '/404' && route.name)
|
||||
.sort((a, b) => a.path.localeCompare(b.path));
|
||||
});
|
||||
|
||||
function formatRouteName(name) {
|
||||
if (!name) return 'Home';
|
||||
// Convert route names like "web-components" to "Web Components"
|
||||
return name
|
||||
.replace(/-/g, ' ')
|
||||
.split(' ')
|
||||
.map(word => word.charAt(0).toUpperCase() + word.slice(1))
|
||||
.join(' ');
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -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",
|
||||
|
||||
50
web/pages/changelog.vue
Normal file
50
web/pages/changelog.vue
Normal file
@@ -0,0 +1,50 @@
|
||||
<script setup lang="ts">
|
||||
import { ref } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useUpdateOsChangelogStore } from '~/store/updateOsChangelog';
|
||||
|
||||
const changelog = ref('');
|
||||
const updateOsChangelogStore = useUpdateOsChangelogStore();
|
||||
const { releaseForUpdate: updateOsChangelogModalVisible } = storeToRefs(updateOsChangelogStore);
|
||||
onMounted(async () => {
|
||||
const response = await fetch('https://releases.unraid.net/json');
|
||||
const data = await response.json();
|
||||
if (data.length > 0) {
|
||||
changelog.value = data[0].changelog;
|
||||
}
|
||||
});
|
||||
|
||||
function showChangelogModal() {
|
||||
// Simulate receiving a release for update
|
||||
updateOsChangelogStore.setReleaseForUpdate({
|
||||
version: '6.12.3',
|
||||
date: '2023-07-15',
|
||||
changelog: changelog.value,
|
||||
name: '6.12.3',
|
||||
isEligible: true,
|
||||
isNewer: true,
|
||||
sha256: '1234567890'
|
||||
});
|
||||
}
|
||||
const { t } = useI18n();
|
||||
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="container mx-auto p-6">
|
||||
<h1 class="text-2xl font-bold mb-6">Changelog</h1>
|
||||
<UpdateOsChangelogModal :t="t" :open="!!updateOsChangelogModalVisible" />
|
||||
<div class="mb-6">
|
||||
<button
|
||||
class="px-4 py-2 bg-blue-500 text-white rounded hover:bg-blue-600"
|
||||
@click="showChangelogModal"
|
||||
>
|
||||
Test Changelog Modal
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="prose max-w-none">
|
||||
<div v-html="changelog"></div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -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:"
|
||||
|
||||
@@ -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('<a', "<a target='_blank' ") // open links in new tab
|
||||
.replace('.md', ''); // remove .md from links
|
||||
|
||||
renderer.link = ({ href, title, tokens }) => {
|
||||
const linkText = renderer.parser.parseInline(tokens);
|
||||
const cleanHref = href.replace('.md', ''); // remove .md from href
|
||||
return `<a href="${cleanHref}" ${title ? `title="${title}"` : ''} target="_blank">${linkText}</a>`;
|
||||
};
|
||||
|
||||
marked.setOptions({
|
||||
|
||||
Reference in New Issue
Block a user