Skip to content

Commit 1bba8a1

Browse files
committed
Update based on PR feedback
1 parent c2ce101 commit 1bba8a1

File tree

3 files changed

+5
-46
lines changed

3 files changed

+5
-46
lines changed

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

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4481,48 +4481,7 @@ addEventListener('fetch', event => {});`
44814481
await runWrangler("deploy");
44824482

44834483
expect(std.warn).toMatchInlineSnapshot(`
4484-
"▲ [WARNING] Using assets with smart placement turned on may result in poor performance.
4485-
4486-
"
4487-
`);
4488-
});
4489-
4490-
it("should warn when using smart placement with assets-first", async () => {
4491-
const assets = [
4492-
{ filePath: ".assetsignore", content: "*.bak\nsub-dir" },
4493-
{ filePath: "file-1.txt", content: "Content of file-1" },
4494-
{ filePath: "file-2.bak", content: "Content of file-2" },
4495-
{ filePath: "file-3.txt", content: "Content of file-3" },
4496-
{ filePath: "sub-dir/file-4.bak", content: "Content of file-4" },
4497-
{ filePath: "sub-dir/file-5.txt", content: "Content of file-5" },
4498-
];
4499-
writeAssets(assets, "assets");
4500-
writeWranglerConfig({
4501-
assets: {
4502-
directory: "assets",
4503-
experimental_serve_directly: true,
4504-
},
4505-
placement: {
4506-
mode: "smart",
4507-
},
4508-
});
4509-
const bodies: AssetManifest[] = [];
4510-
await mockAUSRequest(bodies);
4511-
mockSubDomainRequest();
4512-
mockUploadWorkerRequest({
4513-
expectedAssets: {
4514-
jwt: "<<aus-completion-token>>",
4515-
config: {
4516-
serve_directly: true,
4517-
},
4518-
},
4519-
expectedType: "none",
4520-
});
4521-
4522-
await runWrangler("deploy");
4523-
4524-
expect(std.warn).toMatchInlineSnapshot(`
4525-
"▲ [WARNING] Using assets with smart placement turned on may result in poor performance.
4484+
"▲ [WARNING] Using assets with smart placement enabled may result in poor performance.
45264485
45274486
"
45284487
`);
@@ -4568,7 +4527,7 @@ addEventListener('fetch', event => {});`
45684527
`);
45694528
});
45704529

4571-
it("should error if an experimental_serve_directly is false without providing a user Worker", async () => {
4530+
it("should error if experimental_serve_directly is false and no user Worker is provided", async () => {
45724531
writeWranglerConfig({
45734532
assets: {
45744533
directory: "xyz",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1726,7 +1726,7 @@ describe.sequential("wrangler dev", () => {
17261726
`);
17271727
});
17281728

1729-
it("should error if an experimental_serve_directly is false without providing a user Worker", async () => {
1729+
it("should error if experimental_serve_directly is false and no user Worker is provided", async () => {
17301730
writeWranglerConfig({
17311731
assets: { directory: "assets", experimental_serve_directly: false },
17321732
});

packages/wrangler/src/assets.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,11 +450,11 @@ export function validateAssetsArgsAndConfig(
450450
config?.assets?.experimental_serve_directly
451451
) {
452452
logger.warn(
453-
"Using assets with smart placement turned on may result in poor performance."
453+
"Using assets with smart placement enabled may result in poor performance."
454454
);
455455
}
456456

457-
// User worker ahead of assets, but no assets binding provided
457+
// User Worker ahead of assets, but no assets binding provided
458458
if (
459459
"legacy" in args
460460
? args.assets?.assetConfig?.serve_directly === false &&

0 commit comments

Comments
 (0)