Skip to content

Commit 34bf393

Browse files
authored
Upload assets as JSON Lines (application/jsonl) rather than NDJSON (application/x-ndjson) (#6489)
1 parent dfe8c0d commit 34bf393

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

.changeset/pink-socks-tie.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"wrangler": patch
3+
---
4+
5+
fix: Upload assets as JSON Lines (application/jsonl) rather than NDJSON (application/x-ndjson)

packages/wrangler/src/__tests__/deploy.test.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4657,7 +4657,8 @@ addEventListener('fetch', event => {});`
46574657
["f05e28a3d0bdb90d3cf4bdafe592488f"],
46584658
["0de3dd5df907418e9730fd2bd747bd5e"],
46594659
];
4660-
const uploadHeaders: (string | null)[] = [];
4660+
const uploadAuthHeaders: (string | null)[] = [];
4661+
const uploadContentTypeHeaders: (string | null)[] = [];
46614662
msw.use(
46624663
http.post(
46634664
`*/accounts/some-account-id/workers/scripts/test-name/assets-upload-session`,
@@ -4679,11 +4680,12 @@ addEventListener('fetch', event => {});`
46794680
http.post(
46804681
"*/accounts/some-account-id/workers/assets/upload",
46814682
async ({ request }) => {
4683+
uploadContentTypeHeaders.push(request.headers.get("Content-Type"));
4684+
uploadAuthHeaders.push(request.headers.get("Authorization"));
46824685
const body = (await request.text())
46834686
.split("\n")
46844687
.map((x) => JSON.parse(x)) as UploadPayloadFile[];
46854688
bodies.push(body);
4686-
uploadHeaders.push(request.headers.get("Authorization"));
46874689
if (bodies.length === mockBuckets.length) {
46884690
return HttpResponse.json(
46894691
{
@@ -4714,12 +4716,18 @@ addEventListener('fetch', event => {});`
47144716
expectedType: "none",
47154717
});
47164718
await runWrangler("deploy");
4717-
expect(uploadHeaders).toStrictEqual([
4719+
expect(uploadAuthHeaders).toStrictEqual([
47184720
"Bearer <<aus-token>>",
47194721
"Bearer <<aus-token>>",
47204722
"Bearer <<aus-token>>",
47214723
"Bearer <<aus-token>>",
47224724
]);
4725+
expect(uploadContentTypeHeaders).toStrictEqual([
4726+
"application/jsonl",
4727+
"application/jsonl",
4728+
"application/jsonl",
4729+
"application/jsonl",
4730+
]);
47234731
expect(bodies.map((b) => b.length).sort()).toEqual([1, 1, 1, 2]);
47244732
expect(bodies.flatMap((b) => b)).toEqual(
47254733
expect.arrayContaining([

packages/wrangler/src/experimental-assets.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ export const syncExperimentalAssets = async (
137137
{
138138
method: "POST",
139139
headers: {
140-
"Content-Type": "application/x-ndjson",
140+
"Content-Type": "application/jsonl",
141141
Authorization: `Bearer ${initializeAssetsResponse.jwt}`,
142142
},
143143
body: payload.map((x) => JSON.stringify(x)).join("\n"),

0 commit comments

Comments
 (0)