Skip to content
Open
Show file tree
Hide file tree
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
31 changes: 21 additions & 10 deletions src/presets/vercel/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { writeFile } from "../_utils/fs.ts";
import type { Nitro, NitroRouteRules, ProxyRuleOptions } from "nitro/types";
import { basename, dirname, relative, resolve } from "pathe";
import { Router } from "../../routing.ts";
import { escapeRegExp } from "../../utils/regex.ts";
import { joinURL, withLeadingSlash, withoutLeadingSlash } from "ufo";
import type {
PrerenderFunctionConfig,
Expand Down Expand Up @@ -223,6 +224,11 @@ function generateBuildConfig(nitro: Nitro, o11Routes?: ObservabilityRoute[]) {
.map(([path]) => path)
);

const publicAssetRouteSources = nitro.options.publicAssets
.filter((asset) => !asset.fallthrough)
.map((asset) => joinURL(nitro.options.baseURL, asset.baseURL || "/"))
.map((baseURL) => joinURL(escapeRegExp(baseURL), "(.*)"));

const config = defu(nitro.options.vercel?.config, {
version: 3,
framework: {
Expand Down Expand Up @@ -301,17 +307,22 @@ function generateBuildConfig(nitro: Nitro, o11Routes?: ObservabilityRoute[]) {
]
: []),
// Public asset rules
...nitro.options.publicAssets
.filter((asset) => !asset.fallthrough)
.map((asset) => joinURL(nitro.options.baseURL, asset.baseURL || "/"))
.map((baseURL) => ({
src: baseURL + "(.*)",
headers: {
"cache-control": "public,max-age=31536000,immutable",
},
continue: true,
})),
...publicAssetRouteSources.map((src) => ({
src,
headers: {
"cache-control": "public,max-age=31536000,immutable",
},
continue: true,
})),
{ handle: "filesystem" },
...publicAssetRouteSources.map((src) => ({
src,
status: 404,
headers: {
"cache-control": "no-store",
},
continue: false,
})),
],
} as VercelBuildConfigV3);

Expand Down
28 changes: 27 additions & 1 deletion test/presets/vercel.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,19 @@ describe("nitro:preset:vercel:web", async () => {
"headers": {
"cache-control": "public,max-age=31536000,immutable",
},
"src": "/build(.*)",
"src": "/build/(.*)",
},
{
"handle": "filesystem",
},
{
"continue": false,
"headers": {
"cache-control": "no-store",
},
"src": "/build/(.*)",
"status": 404,
},
{
"dest": "/rules/_/noncached/cached-isr?__isr_route=$__isr_route",
"src": "(?<__isr_route>/rules/_/noncached/cached)",
Expand Down Expand Up @@ -454,6 +462,24 @@ describe("nitro:preset:vercel:web", async () => {
`);
});

it("should not cache missing immutable public assets", async () => {
const config = await fsp
.readFile(resolve(ctx.outDir, "config.json"), "utf8")
.then((r) => JSON.parse(r));
const filesystemIndex = config.routes.findIndex(
(route: { handle?: string }) => route.handle === "filesystem"
);

expect(config.routes[filesystemIndex + 1]).toEqual({
src: "/build/(.*)",
status: 404,
headers: {
"cache-control": "no-store",
},
continue: false,
});
});

it("should generate prerender config", async () => {
const isrRouteConfig = await fsp.readFile(
resolve(ctx.outDir, "functions/rules/isr/[...]-isr.prerender-config.json"),
Expand Down