chore(deps): November 21 updates, Prettier Svelte 4.2 formatting, no more deepmerge ignore (#134)

- npm update --save --before=2026-11-18 (keeps the 3-day cooldown): astro 7.4.12,
  @astrojs/cloudflare 14.4.8, @astrojs/mdx 8.1.6, @astrojs/sitemap 3.7.5,
  @astrojs/svelte 9.1.6, jose 6.2.17, marked 18.2.1, eslint 10.15.0,
  eslint-plugin-svelte 3.24.1, knip 6.45.1, playwright 1.65.1, prettier 3.10.1,
  prettier-plugin-svelte 4.2.0, typescript-eslint 8.72.2, wrangler 4.164.0.
  Supersedes Dependabot #129-#133.
- prettier-plugin-svelte 4.2.0 breaks long tags at their edges instead of hugging the
  text, so 14 Svelte files are reformatted. Svelte 5 drops whitespace at the start and
  end of a tag, so the rendered markup is unchanged (compiled before/after samples
  produce identical output).
- osv-scanner.toml: deepmerge GHSA-gcqx-w48m-w2h4 (alias CVE-2026-93753) was withdrawn
  on 2026-11-16 and OSV no longer reports deepmerge 4.3.1, so both ignores go.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
poli0981andClaude Opus 5.5 authored and GitHub committed 2026-11-21 07:26:03 +07:00
1 parent 76869fabec
commit f384bc6e16
17 files changed
+1035 -1079

No files matched your search

+10 -17
View File
@@ -2,20 +2,13 @@
# (.github/workflows/osv-scanner.yml scans package-lock.json at the repo root).
#
# Every entry needs a reason and an ignoreUntil date, so an ignore expires on
# its own and the weekly scan turns red again for another look.
# deepmerge <= 4.3.1: mergeObject() can return objects with a poisoned prototype.
# No patched release exists (4.3.1 is the latest, from 2023). The only path to it
# is @astrojs/svelte → @sveltejs/vite-plugin-svelte, which merges this repo's own
# Svelte/Vite config at build time. Nothing from a visitor or the network reaches
# it, and it is not part of the Worker bundle. Recheck when vite-plugin-svelte
# drops deepmerge or a fixed version ships.
[[IgnoredVulns]]
id = "GHSA-gcqx-w48m-w2h4"
ignoreUntil = 2027-02-09
reason = "Build-time only (vite-plugin-svelte merges our own config); no patched deepmerge release exists."
[[IgnoredVulns]]
id = "CVE-2026-93753"
ignoreUntil = 2027-02-09
reason = "Alias of GHSA-gcqx-w48m-w2h4 (deepmerge); same reasoning."
# its own and the weekly scan turns red again for another look:
#
# [[IgnoredVulns]]
# id = "GHSA-xxxx-xxxx-xxxx"
# ignoreUntil = 2027-01-31
# reason = "Why it cannot reach a visitor, and what would make it go away."
#
# No entries today. The last one, deepmerge GHSA-gcqx-w48m-w2h4 (alias
# CVE-2026-93753), was removed on 2026-11-21: the advisory was withdrawn on
# 2026-11-16 and OSV no longer reports deepmerge 4.3.1.
+865 -940
View File
File diff suppressed because it is too large. Load diff
+15 -15
View File
@@ -50,15 +50,15 @@
}
},
"dependencies": {
"@astrojs/cloudflare": "^14.4.6",
"@astrojs/mdx": "^8.1.3",
"@astrojs/cloudflare": "^14.4.8",
"@astrojs/mdx": "^8.1.6",
"@astrojs/rss": "^4.0.19",
"@astrojs/sitemap": "^3.7.4",
"@astrojs/svelte": "^9.1.2",
"@astrojs/sitemap": "^3.7.5",
"@astrojs/svelte": "^9.1.6",
"@tailwindcss/vite": "^4.3.5",
"astro": "^7.4.7",
"jose": "^6.2.15",
"marked": "^18.1.3",
"astro": "^7.4.12",
"jose": "^6.2.17",
"marked": "^18.2.1",
"sharp": "^0.35.5",
"svelte": "^5.57.3",
"tailwindcss": "^4.3.5",
@@ -71,22 +71,22 @@
"@resvg/resvg-js": "^2.6.2",
"@types/node": "^26.6.6",
"@typescript/native": "npm:typescript@^7.0.2",
"eslint": "^10.14.0",
"eslint": "^10.15.0",
"eslint-plugin-astro": "^3.2.1",
"eslint-plugin-svelte": "^3.24.0",
"eslint-plugin-svelte": "^3.24.1",
"exifr": "^7.1.3",
"knip": "^6.44.1",
"knip": "^6.45.1",
"lefthook": "^2.2.2",
"pagefind": "^1.6.0",
"playwright": "^1.65.0",
"prettier": "^3.9.10",
"playwright": "^1.65.1",
"prettier": "^3.10.1",
"prettier-plugin-astro": "^0.14.1",
"prettier-plugin-svelte": "^4.1.1",
"prettier-plugin-svelte": "^4.2.0",
"prettier-plugin-tailwindcss": "^0.8.1",
"satori": "^0.63.2",
"satori-html": "^0.3.2",
"typescript": "~6.0.3",
"typescript-eslint": "~8.72.1",
"wrangler": "^4.158.0"
"typescript-eslint": "~8.72.2",
"wrangler": "^4.164.0"
}
}
+9 -5
View File
@@ -151,9 +151,9 @@
<div class="bar">
<!-- Arrowing to another photo announces its position and its caption: focus stays on
the button, so nothing else would say which photo is now showing. -->
<span class="count" aria-live="polite"
>{counter}<span class="sr-only"> — {current.alt}</span></span
>
<span class="count" aria-live="polite">
{counter}<span class="sr-only"> — {current.alt}</span>
</span>
<button type="button" class="close" onclick={close} aria-label={labels.close}>✕</button>
</div>
@@ -162,8 +162,10 @@
class="nav prev"
onclick={prev}
disabled={index === 0}
aria-label={labels.prev}>‹</button
aria-label={labels.prev}
>
‹
</button>
<div
class="track"
@@ -189,8 +191,10 @@
class="nav next"
onclick={next}
disabled={index === slides.length - 1}
aria-label={labels.next}>›</button
aria-label={labels.next}
>
›
</button>
<!-- The same words are the image's alt and the dialog's description (aria-describedby
still resolves a hidden node), so the visible copy is hidden from the reading order
+6 -2
View File
@@ -122,8 +122,10 @@
type="button"
class:active={size === key}
aria-pressed={size === key}
onclick={() => setSize(key)}>{text}</button
onclick={() => setSize(key)}
>
{text}
</button>
{/each}
</div>
</div>
@@ -135,8 +137,10 @@
type="button"
class:active={theme === key}
aria-pressed={theme === key}
onclick={() => setTheme(key)}>{text}</button
onclick={() => setTheme(key)}
>
{text}
</button>
{/each}
</div>
</div>
+3 -3
View File
@@ -249,9 +249,9 @@
spellcheck="false"
/>
<!-- The name starts with the visible "Esc" so voice control can target it (WCAG 2.5.3). -->
<button type="button" class="close" onclick={close} aria-label={`Esc — ${labels.close}`}
>Esc</button
>
<button type="button" class="close" onclick={close} aria-label={`Esc — ${labels.close}`}>
Esc
</button>
</div>
<div class="results">
+3 -1
View File
@@ -56,8 +56,10 @@
class="gh-repo"
href={`https://github.com/${item.repo}`}
target="_blank"
rel="noopener noreferrer">{item.repo}</a
rel="noopener noreferrer"
>
{item.repo}
</a>
{#if item.detail}
<span class="gh-detail">· {item.detail}</span>
{/if}
+5 -5
View File
@@ -58,8 +58,8 @@
<section class="card">
<div class="section-head">
<h2>Nhật ký admin</h2>
<label class="muted small"
>Lọc
<label class="muted small">
Lọc
<select bind:value={filter}>
<option value="">Tất cả</option>
<option value="content">Nội dung</option>
@@ -96,9 +96,9 @@
<ol class="log">
{#each data.commits as commit (commit.sha)}
<li>
<a href={commit.url} target="_blank" rel="noopener noreferrer"
><code>{shortSha(commit.sha)}</code></a
>
<a href={commit.url} target="_blank" rel="noopener noreferrer">
<code>{shortSha(commit.sha)}</code>
</a>
<span class="what">{commit.message}</span>
<span class="muted small when" title={dateTime(commit.date)}>
{ago(commit.date)} · {commit.author}
+6 -4
View File
@@ -59,9 +59,9 @@
{#if sessionLost}
<div class="session" role="alert">
<span
>Phiên đăng nhập Cloudflare Access đã hết hạn. Bản nháp đang viết vẫn được giữ trên máy.</span
>
<span>
Phiên đăng nhập Cloudflare Access đã hết hạn. Bản nháp đang viết vẫn được giữ trên máy.
</span>
<button type="button" onclick={() => location.reload()}>Đăng nhập lại</button>
</div>
{/if}
@@ -99,8 +99,10 @@
<button
type="button"
class={pending.danger ? "danger" : "primary"}
onclick={() => answer(true)}>{pending.confirmLabel}</button
onclick={() => answer(true)}
>
{pending.confirmLabel}
</button>
</div>
{/if}
</dialog>
+12 -12
View File
@@ -99,8 +99,8 @@
create();
}}
>
<label
>Loại
<label>
Loại
<select bind:value={collection}>
{#each Object.values(COLLECTIONS).filter((spec) => spec.creatable) as spec (spec.id)}
<option value={spec.id}>{spec.label}</option>
@@ -110,8 +110,8 @@
{#if collection === "stories"}
<label>Bộ truyện (slug) <input bind:value={series} placeholder="dem-khong-tieng" /></label>
{/if}
<label
>Slug
<label>
Slug
<input
bind:value={slug}
placeholder="ten-bai-viet"
@@ -121,11 +121,11 @@
spellcheck="false"
/>
</label>
<label
>Ngôn ngữ
<select bind:value={newLang}
><option value="vi">vi</option><option value="en">en</option></select
>
<label>
Ngôn ngữ
<select bind:value={newLang}>
<option value="vi">vi</option><option value="en">en</option>
</select>
</label>
<button type="submit" class="primary" disabled={!newPath || taken}>Tạo</button>
</form>
@@ -179,9 +179,9 @@
{:else if groups.length === 0}
<p class="muted">
{#if filtered}
Không có mục nào khớp bộ lọc. <button type="button" class="ghost" onclick={clearFilters}
>Xoá bộ lọc</button
>
Không có mục nào khớp bộ lọc. <button type="button" class="ghost" onclick={clearFilters}>
Xoá bộ lọc
</button>
{:else}
Repo nội dung chưa có bài nào.
{/if}
+22 -19
View File
@@ -60,8 +60,10 @@
<a
href={`https://github.com/poli0981/poli0981-dev/commit/${overview.config.version.commit}`}
target="_blank"
rel="noopener noreferrer"><code>{shortSha(overview.config.version.commit)}</code></a
rel="noopener noreferrer"
>
<code>{shortSha(overview.config.version.commit)}</code>
</a>
{/if}
· triển khai {ago(overview.config.version.timestamp)}
</p>
@@ -89,11 +91,13 @@
{#if overview.content}
<table>
<thead>
<tr
><th scope="col">Loại</th><th scope="col">Tổng</th><th scope="col">vi</th><th
scope="col">en</th
><th scope="col">Nháp</th></tr
>
<tr>
<th scope="col">Loại</th><th scope="col">Tổng</th><th scope="col">vi</th><th
scope="col"
>
en
</th><th scope="col">Nháp</th>
</tr>
</thead>
<tbody>
{#each overview.content.collections as c (c.id)}
@@ -102,10 +106,9 @@
<td>{c.total}</td>
<td>{c.vi}</td>
<td>{c.en}</td>
<td
>{#if c.drafts}<span class="pill" data-tone="warn">{c.drafts}</span
>{:else}0{/if}</td
>
<td>
{#if c.drafts}<span class="pill" data-tone="warn">{c.drafts}</span>{:else}0{/if}
</td>
</tr>
{/each}
</tbody>
@@ -150,15 +153,15 @@
<p><a href="/admin/media/">{overview.media.count} ảnh</a> trong thư viện R2.</p>
{#if overview.widgets}
<p class="pills">
<span class="pill" data-tone={tone(overview.widgets.yt)}
>YouTube {overview.widgets.yt}</span
>
<span class="pill" data-tone={tone(overview.widgets.steam)}
>Steam {overview.widgets.steam}</span
>
<span class="pill" data-tone={tone(overview.widgets.gh)}
>GitHub {overview.widgets.gh}</span
>
<span class="pill" data-tone={tone(overview.widgets.yt)}>
YouTube {overview.widgets.yt}
</span>
<span class="pill" data-tone={tone(overview.widgets.steam)}>
Steam {overview.widgets.steam}
</span>
<span class="pill" data-tone={tone(overview.widgets.gh)}>
GitHub {overview.widgets.gh}
</span>
</p>
<p class="muted small" title={dateTime(overview.widgets.lastRun)}>
Cron widgets chạy {ago(overview.widgets.lastRun)}
+22 -14
View File
@@ -291,8 +291,10 @@
onclick={save}
disabled={saving || loading || Boolean(loadError)}
aria-keyshortcuts="Control+S Meta+S"
title="Lưu (Ctrl/⌘+S)">Lưu</button
title="Lưu (Ctrl/⌘+S)"
>
Lưu
</button>
</div>
</div>
@@ -321,18 +323,19 @@
{@const errorId = `err-${field.key}`}
<div class="field">
{#if field.type === "checkbox"}
<label class="check"
><input type="checkbox" bind:checked={data[field.key]} /> {field.label}</label
>
<label class="check">
<input type="checkbox" bind:checked={data[field.key]} />
{field.label}
</label>
{:else if field.type === "media"}
<span class="label">{field.label}</span>
{#if data[field.key]?.id}
<img class="cover" src={mediaFallbackSrc(data[field.key])} alt="" />
<div class="row">
<button type="button" onclick={() => (picking = "cover")}>Đổi ảnh</button>
<button type="button" onclick={() => ((data[field.key] = undefined), touch())}
>Bỏ</button
>
<button type="button" onclick={() => ((data[field.key] = undefined), touch())}>
Bỏ
</button>
</div>
{:else}
<button type="button" onclick={() => (picking = "cover")}>Chọn ảnh bìa</button>
@@ -354,9 +357,9 @@
aria-describedby={invalid(field.key) ? errorId : undefined}
>
<option value={undefined}>—</option>
{#each field.options ?? [] as option (option)}<option value={option}
>{option}</option
>{/each}
{#each field.options ?? [] as option (option)}<option value={option}>
{option}
</option>{/each}
</select>
{:else if field.type === "tags"}
<input
@@ -412,8 +415,10 @@
aria-controls="panel-edit"
aria-selected={tab === "edit"}
tabindex={tab === "edit" ? 0 : -1}
onclick={() => (tab = "edit")}>Soạn</button
onclick={() => (tab = "edit")}
>
Soạn
</button>
<button
type="button"
role="tab"
@@ -421,11 +426,14 @@
aria-controls="panel-preview"
aria-selected={tab === "preview"}
tabindex={tab === "preview" ? 0 : -1}
onclick={() => (tab = "preview")}>Xem trước</button
onclick={() => (tab = "preview")}
>
Xem trước
</button>
</div>
<button type="button" class="insert" onclick={() => (picking = "insert")}>Chèn ảnh</button
>
<button type="button" class="insert" onclick={() => (picking = "insert")}>
Chèn ảnh
</button>
</div>
{#if tab === "edit"}
<div role="tabpanel" id="panel-edit" aria-labelledby="tab-edit">
+26 -18
View File
@@ -216,9 +216,9 @@
onclick={() => open(album)}
>
<span>{album.titles.vi ?? album.album}</span>
<span class="meta"
>{album.photos.length} ảnh R2{album.local ? ` · ${album.local} ảnh repo` : ""}</span
>
<span class="meta">
{album.photos.length} ảnh R2{album.local ? ` · ${album.local} ảnh repo` : ""}
</span>
</button>
</li>
{/each}
@@ -274,14 +274,14 @@
>
<img src={mediaFallbackSrc(photo)} alt="" />
<div class="captions">
<label
><span class="sr-only">Chú thích tiếng Việt, ảnh {index + 1}</span>
<input bind:value={photo.caption.vi} placeholder="Chú thích (vi)" /></label
>
<label
><span class="sr-only">English caption, photo {index + 1}</span>
<input bind:value={photo.caption.en} placeholder="Caption (en)" /></label
>
<label>
<span class="sr-only">Chú thích tiếng Việt, ảnh {index + 1}</span>
<input bind:value={photo.caption.vi} placeholder="Chú thích (vi)" />
</label>
<label>
<span class="sr-only">English caption, photo {index + 1}</span>
<input bind:value={photo.caption.en} placeholder="Caption (en)" />
</label>
</div>
<div class="order">
<button
@@ -289,25 +289,33 @@
class="cover-pick"
aria-pressed={current.coverId === photo.id}
aria-label={`Đặt ảnh ${index + 1} làm ảnh bìa`}
onclick={() => current && (current.coverId = photo.id)}>★</button
onclick={() => current && (current.coverId = photo.id)}
>
★
</button>
<button
type="button"
aria-label={`Đưa ảnh ${index + 1} lên`}
disabled={index === 0}
onclick={() => move(index, index - 1)}>↑</button
onclick={() => move(index, index - 1)}
>
↑
</button>
<button
type="button"
aria-label={`Đưa ảnh ${index + 1} xuống`}
disabled={index === current.photos.length - 1}
onclick={() => move(index, index + 1)}>↓</button
onclick={() => move(index, index + 1)}
>
↓
</button>
<button
type="button"
aria-label={`Bỏ ảnh ${index + 1} khỏi album`}
onclick={() => removePhoto(photo)}>✕</button
onclick={() => removePhoto(photo)}
>
✕
</button>
</div>
</li>
{/each}
@@ -321,9 +329,9 @@
{#if !creating}
<button type="button" class="danger" onclick={removeAlbum}>Xoá album</button>
{/if}
<button type="button" class="primary push" onclick={save} disabled={saving || !dirty}
>{saving ? "Đang lưu…" : "Lưu album"}</button
>
<button type="button" class="primary push" onclick={save} disabled={saving || !dirty}>
{saving ? "Đang lưu…" : "Lưu album"}
</button>
</div>
</section>
{/if}
+10 -7
View File
@@ -159,8 +159,8 @@
}}
>
<p>Kéo thả ảnh vào đây, hoặc</p>
<label class="button pick"
>Chọn tệp
<label class="button pick">
Chọn tệp
<input
type="file"
accept="image/*"
@@ -254,21 +254,24 @@
{/if}
</p>
<div class="row">
<button type="button" onclick={() => copy(mediaPictureHtml(item, item.alt), "HTML")}
>Copy HTML</button
>
<button type="button" onclick={() => copy(mediaPictureHtml(item, item.alt), "HTML")}>
Copy HTML
</button>
<button
type="button"
onclick={() => copy(`{ id: "${item.id}", w: ${item.w}, h: ${item.h} }`, "ID")}
>Copy ID</button
>
Copy ID
</button>
<button
type="button"
class="danger"
onclick={() => remove(item)}
disabled={used.length > 0}
title={used.length ? "Gỡ ảnh khỏi các bài trước khi xoá" : undefined}>Xoá</button
title={used.length ? "Gỡ ảnh khỏi các bài trước khi xoá" : undefined}
>
Xoá
</button>
</div>
</div>
</li>
+3 -3
View File
@@ -98,9 +98,9 @@
<div class="top">
<strong id="picker-title">{multiple ? "Chọn ảnh (nhiều)" : "Chọn ảnh"}</strong>
<input type="search" bind:value={query} placeholder="Tìm ảnh" aria-label="Tìm ảnh" />
<label class="button upload"
>Tải ảnh lên <input type="file" accept="image/*" multiple onchange={upload} /></label
>
<label class="button upload">
Tải ảnh lên <input type="file" accept="image/*" multiple onchange={upload} />
</label>
<button type="button" onclick={() => load(true)} title="Tải lại danh sách">↻</button>
<button type="button" onclick={onclose}>Đóng</button>
</div>
+8 -3
View File
@@ -91,8 +91,10 @@
data-state="failure"
href={status.run.url}
target="_blank"
rel="noopener noreferrer">lần xuất bản trước lỗi ↗</a
rel="noopener noreferrer"
>
lần xuất bản trước lỗi ↗
</a>
{:else if pending}
<span class="state" data-state="pending">có thay đổi chưa xuất bản</span>
{:else}
@@ -103,15 +105,18 @@
class="warn"
href="/admin/security/"
title="Xuất bản đang dùng chung token nội dung — xem trang Bảo mật"
>⚠<span class="sr-only">Xuất bản đang dùng chung token nội dung</span></a
>
⚠<span class="sr-only">Xuất bản đang dùng chung token nội dung</span>
</a>
{/if}
<button
type="button"
class="primary"
onclick={publish}
disabled={busy || !pending || running || checking}>Xuất bản</button
disabled={busy || !pending || running || checking}
>
Xuất bản
</button>
{:else if failedToLoad}
<span class="state" data-state="failure">không đọc được trạng thái xuất bản</span>
{/if}
+10 -11
View File
@@ -100,8 +100,8 @@
void add();
}}
>
<label
>Địa chỉ hoặc dải CIDR
<label>
Địa chỉ hoặc dải CIDR
<input
bind:value={cidr}
required
@@ -110,11 +110,11 @@
spellcheck="false"
/>
</label>
<label
>Lý do <input bind:value={reason} maxlength="200" placeholder="vd. cào dữ liệu" /></label
>
<label
>Thời hạn
<label>
Lý do <input bind:value={reason} maxlength="200" placeholder="vd. cào dữ liệu" />
</label>
<label>
Thời hạn
<select bind:value={duration}>
<option value="1">1 giờ</option>
<option value="24">1 ngày</option>
@@ -146,10 +146,9 @@
<td title={dateTime(entry.until)}>
{entry.until ? (expired(entry) ? "đã hết hạn" : ago(entry.until)) : "không"}
</td>
<td
><button type="button" class="danger" onclick={() => remove(entry)}>Gỡ</button
></td
>
<td>
<button type="button" class="danger" onclick={() => remove(entry)}>Gỡ</button>
</td>
</tr>
{/each}
</tbody>