Skip to content

refactor: account for empty tag list in tag cache #918

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

Merged
merged 1 commit into from
Oct 1, 2025
+18 −6
Merged

refactor: account for empty tag list in tag cache #918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .changeset/great-eyes-tan.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@opennextjs/cloudflare": patch
---

refactor: account for empty tag list in tag cache
8 changes: 6 additions & 2 deletions packages/cloudflare/src/api/overrides/tag-cache/d1-next-tag-cache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ export class D1NextModeTagCache implements NextModeTagCache {

async getLastRevalidated(tags: string[]): Promise<number> {
const { isDisabled, db } = this.getConfig();
if (isDisabled) return 0;
if (isDisabled || tags.length === 0) {
return 0;
}
try {
const result = await db
.prepare(
Expand All @@ -36,7 +38,9 @@ export class D1NextModeTagCache implements NextModeTagCache {

async hasBeenRevalidated(tags: string[], lastModified?: number): Promise<boolean> {
const { isDisabled, db } = this.getConfig();
if (isDisabled) return false;
if (isDisabled || tags.length === 0) {
return false;
}
try {
const result = await db
.prepare(
Expand Down
9 changes: 6 additions & 3 deletions packages/cloudflare/src/api/overrides/tag-cache/do-sharded-tag-cache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,9 @@ class ShardedDOTagCache implements NextModeTagCache {

public async getLastRevalidated(tags: string[]): Promise<number> {
const { isDisabled } = this.getConfig();
if (isDisabled) return 0;
if (tags.length === 0) return 0; // No tags to check
if (isDisabled || tags.length === 0) {
return 0;
}
const deduplicatedTags = Array.from(new Set(tags)); // We deduplicate the tags to avoid unnecessary requests
try {
const shardedTagGroups = this.groupTagsByDO({ tags: deduplicatedTags });
Expand Down Expand Up @@ -177,7 +178,9 @@ class ShardedDOTagCache implements NextModeTagCache {
*/
public async hasBeenRevalidated(tags: string[], lastModified?: number): Promise<boolean> {
const { isDisabled } = this.getConfig();
if (isDisabled) return false;
if (isDisabled || tags.length === 0) {
return false;
}
try {
const shardedTagGroups = this.groupTagsByDO({ tags });
const shardedTagRevalidationOutcomes = await Promise.all(
Expand Down
2 changes: 1 addition & 1 deletion packages/cloudflare/src/api/overrides/tag-cache/kv-next-tag-cache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export class KVNextModeTagCache implements NextModeTagCache {

async getLastRevalidated(tags: string[]): Promise<number> {
const kv = this.getKv();
if (!kv) {
if (!kv || tags.length === 0) {
return 0;
}

Expand Down