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.

Sign up for GitHub

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

Jump to bottom

fix: setting the right tag values for fetch cache #304

Merged
merged 3 commits into from
Nov 27, 2023
Merged

fix: setting the right tag values for fetch cache #304

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bdb7e98
fix: get tag values for fetch cache
mathisobadia Nov 3, 2023
bb09162
Merge branch 'sst:main' into main
mathisobadia Nov 27, 2023
4974457
make fetch tag backward compatible
mathisobadia Nov 27, 2023
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
16 changes: 14 additions & 2 deletions packages/open-next/src/adapters/cache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@
| CachedFetchValue
| CachedRouteValue;

type IncrementalCacheContext = {
revalidate?: number | false | undefined;
fetchCache?: boolean | undefined;
fetchUrl?: string | undefined;
fetchIdx?: number | undefined;
tags?: string[] | undefined;
};

interface CacheHandlerContext {
fs?: never;
dev?: boolean;
Expand Down Expand Up @@ -243,7 +251,11 @@
}
}

async set(key: string, data?: IncrementalCacheValue): Promise<void> {
async set(
key: string,
data?: IncrementalCacheValue,
ctx?: IncrementalCacheContext,
): Promise<void> {
if (globalThis.disableIncrementalCache) {
return;
}
Expand Down Expand Up @@ -287,14 +299,14 @@
props: data.props,
} as S3CachedFile),
);
} else if (data === null || data === undefined) {

Check warning on line 302 in packages/open-next/src/adapters/cache.ts

View workflow job for this annotation

GitHub Actions / validate 

Add the missing "else" clause
await this.deleteS3Objects(key);
}
// Write derivedTags to dynamodb
// If we use an in house version of getDerivedTags in build we should use it here instead of next's one
const derivedTags: string[] =
data?.kind === "FETCH"
? data.data.tags ?? []
? ctx?.tags ?? data?.data?.tags ?? [] // before version 14 next.js used data?.data?.tags so we keep it for backward compatibility
: data?.kind === "PAGE"
? data.headers?.["x-next-cache-tags"]?.split(",") ?? []
: [];
Expand Down
Loading