Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(public-assets): do not shadow paths that share prefix #2516

Merged
merged 1 commit into from
Jun 12, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/rollup/plugins/public-assets.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { promises as fsp } from "node:fs";
import { relative, resolve } from "pathe";
import { withTrailingSlash } from "ufo";
import createEtag from "etag";
import mime from "mime";
import { globby } from "globby";
Expand Down Expand Up @@ -112,7 +113,10 @@ export function readAsset (id) {
const publicAssetBases = Object.fromEntries(
nitro.options.publicAssets
.filter((dir) => !dir.fallthrough && dir.baseURL !== "/")
.map((dir) => [dir.baseURL, { maxAge: dir.maxAge }])
.map((dir) => [
withTrailingSlash(dir.baseURL),
{ maxAge: dir.maxAge },
pi0 marked this conversation as resolved.
Show resolved Hide resolved
])
);

// prettier-ignore
Expand Down