Skip to content

Fix Cloudflare StaticSite file upload order #6290

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

Open
vimtor wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Fix Cloudflare StaticSite file upload order #6290

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
604a190
fix order for cloudflare static site
vimtor Dec 18, 2025
de28091
remove comment
vimtor Dec 18, 2025
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
83 changes: 46 additions & 37 deletions platform/src/components/cloudflare/providers/kv-data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,44 +50,53 @@ class Provider implements dynamic.ResourceProvider {
) {
const oldFilesMap = new Map(oldEntries.map((f) => [f.key, f]));

await Promise.all(
entries
.filter((entry) => {
const old = oldFilesMap.get(entry.key);
return (
old?.hash !== entry.hash ||
old?.contentType !== entry.contentType ||
old?.cacheControl !== entry.cacheControl
);
})
.map(async (entry) => {
const formData = new FormData();
formData.append(
"metadata",
JSON.stringify({
contentType: entry.contentType,
cacheControl: entry.cacheControl,
}),
);
//formData.append("value", fs.createReadStream(entry.source));
formData.append(
"value",
await fs.promises.readFile(entry.source, "base64"),
);
try {
await cfFetch(
`/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/values/${entry.key}`,
{
method: "PUT",
body: formData,
},
);
} catch (error: any) {
console.log(error);
throw error;
}
}),
const changedEntries = entries.filter((entry) => {
const old = oldFilesMap.get(entry.key);
return (
old?.hash !== entry.hash ||
old?.contentType !== entry.contentType ||
old?.cacheControl !== entry.cacheControl
);
});

// Split into HTML and non-HTML to upload non-HTML first.
// This avoids a race condition where the CDN serves new HTML
// referencing assets that haven't been uploaded yet.
const htmlEntries = changedEntries.filter((e) => e.key.endsWith(".html"));
const nonHtmlEntries = changedEntries.filter(
(e) => !e.key.endsWith(".html"),
);

const uploadEntry = async (entry: KvDataEntry) => {
const formData = new FormData();
formData.append(
"metadata",
JSON.stringify({
contentType: entry.contentType,
cacheControl: entry.cacheControl,
}),
);
//formData.append("value", fs.createReadStream(entry.source));
formData.append(
"value",
await fs.promises.readFile(entry.source, "base64"),
);
try {
await cfFetch(
`/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/values/${entry.key}`,
{
method: "PUT",
body: formData,
},
);
} catch (error: any) {
console.log(error);
throw error;
}
};

await Promise.all(nonHtmlEntries.map(uploadEntry));
await Promise.all(htmlEntries.map(uploadEntry));
}
}

Expand Down