wrangler 2.12.0 → 2.12.2

package/src/__tests__/pages/publish.test.ts

@@ -69,7 +69,7 @@ describe("deployment create", () => {
 		          --commit-message  The commit message to attach to this deployment  [string]
 		          --commit-dirty    Whether or not the workspace should be considered dirty for this deployment  [boolean]
 		          --skip-caching    Skip asset caching which speeds up builds  [boolean]
-		          --no-bundle       Whether to run bundling on \`_worker.js\` before deploying  [boolean] [default: true]
+		          --no-bundle       Whether to run bundling on \`_worker.js\` before deploying  [boolean] [default: false]
 
 		    🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose"
 	  `);
@@ -1116,10 +1116,10 @@ describe("deployment create", () => {
 					const body = await (req as RestRequestWithFormData).formData();
 					const manifest = JSON.parse(body.get("manifest") as string);
 
-					// for Functions projects, we auto-generate a `_worker.js`,
+					// for Functions projects, we auto-generate a `_worker.bundle`,
 					// `functions-filepath-routing-config.json`, and `_routes.json`
 					// file, based on the contents of `/functions`
-					const generatedWorkerJS = body.get("_worker.js") as string;
+					const generatedWorkerBundle = body.get("_worker.bundle") as string;
 					const generatedRoutesJSON = body.get("_routes.json") as string;
 					const generatedFilepathRoutingConfig = body.get(
 						"functions-filepath-routing-config.json"
@@ -1129,7 +1129,7 @@ describe("deployment create", () => {
 					expect([...body.keys()]).toEqual([
 						"manifest",
 						"functions-filepath-routing-config.json",
-						"_worker.js",
+						"_worker.bundle",
 						"_routes.json",
 					]);
 
@@ -1139,14 +1139,14 @@ describe("deployment create", () => {
 				                                  }
 			                            `);
 
-					// the contents of the generated `_worker.js` file is pretty massive, so I don't
+					// the contents of the generated `_worker.bundle` file is pretty massive, so I don't
 					// think snapshot testing makes much sense here. Plus, calling
 					// `.toMatchInlineSnapshot()` without any arguments, in order to generate that
 					// snapshot value, doesn't generate anything in this case (probably because the
-					// file contents is too big). So for now, let's test that _worker.js was indeed
+					// file contents is too big). So for now, let's test that _worker.bundle was indeed
 					// generated and that the file size is greater than zero
-					expect(generatedWorkerJS).not.toBeNull();
-					expect(generatedWorkerJS.length).toBeGreaterThan(0);
+					expect(generatedWorkerBundle).not.toBeNull();
+					expect(generatedWorkerBundle.length).toBeGreaterThan(0);
 
 					const maybeRoutesJSONSpec = JSON.parse(generatedRoutesJSON);
 					expect(isRoutesJSONSpec(maybeRoutesJSONSpec)).toBe(true);
@@ -1215,7 +1215,7 @@ describe("deployment create", () => {
 		    "✨ Compiled Worker successfully
 		    ✨ Success! Uploaded 1 files (TIMINGS)
 
-		    ✨ Uploading Functions
+		    ✨ Uploading Functions bundle
 		    ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
 	    `);
 
@@ -1301,11 +1301,11 @@ describe("deployment create", () => {
 					expect(req.params.accountId).toEqual("some-account-id");
 					const body = await (req as RestRequestWithFormData).formData();
 					const manifest = JSON.parse(body.get("manifest") as string);
-					const customWorkerJS = body.get("_worker.js");
+					const workerBundle = body.get("_worker.bundle");
 
 					// make sure this is all we uploaded
 					expect([...body.keys()].sort()).toEqual(
-						["manifest", "_worker.js"].sort()
+						["manifest", "_worker.bundle"].sort()
 					);
 
 					expect(manifest).toMatchInlineSnapshot(`
@@ -1314,8 +1314,8 @@ describe("deployment create", () => {
 				                                      }
 			                                `);
 
-					expect(workerHasD1Shim(customWorkerJS as string)).toBeTruthy();
-					expect(customWorkerJS).toContain(
+					expect(workerHasD1Shim(workerBundle as string)).toBeTruthy();
+					expect(workerBundle).toContain(
 						`console.log("SOMETHING FROM WITHIN THE WORKER");`
 					);
 
@@ -1359,13 +1359,13 @@ describe("deployment create", () => {
 			)
 		);
 
-		await runWrangler("pages publish public --project-name=foo --bundle");
+		await runWrangler("pages publish public --project-name=foo");
 
 		expect(std.out).toMatchInlineSnapshot(`
 		    "✨ Success! Uploaded 1 files (TIMINGS)
 
 		    ✨ Compiled Worker successfully
-		    ✨ Uploading _worker.js
+		    ✨ Uploading Worker bundle
 		    ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
 	  `);
 
@@ -1489,7 +1489,7 @@ describe("deployment create", () => {
 					expect(req.params.accountId).toEqual("some-account-id");
 					const body = await (req as RestRequestWithFormData).formData();
 					const manifest = JSON.parse(body.get("manifest") as string);
-					const generatedWorkerJS = body.get("_worker.js") as string;
+					const generatedWorkerBundle = body.get("_worker.bundle") as string;
 					const customRoutesJSON = body.get("_routes.json") as string;
 					const generatedFilepathRoutingConfig = body.get(
 						"functions-filepath-routing-config.json"
@@ -1500,7 +1500,7 @@ describe("deployment create", () => {
 						[
 							"manifest",
 							"functions-filepath-routing-config.json",
-							"_worker.js",
+							"_worker.bundle",
 							"_routes.json",
 						].sort()
 					);
@@ -1511,9 +1511,9 @@ describe("deployment create", () => {
 				                                }
 			                          `);
 
-					// file content of generated `_worker.js` is too massive to snapshot test
-					expect(generatedWorkerJS).not.toBeNull();
-					expect(generatedWorkerJS.length).toBeGreaterThan(0);
+					// file content of generated `_worker.bundle` is too massive to snapshot test
+					expect(generatedWorkerBundle).not.toBeNull();
+					expect(generatedWorkerBundle.length).toBeGreaterThan(0);
 
 					const customRoutes = JSON.parse(customRoutesJSON);
 					expect(customRoutes).toMatchObject({
@@ -1587,7 +1587,7 @@ describe("deployment create", () => {
 		    "✨ Compiled Worker successfully
 		    ✨ Success! Uploaded 1 files (TIMINGS)
 
-		    ✨ Uploading Functions
+		    ✨ Uploading Functions bundle
 		    ✨ Uploading _routes.json
 		    ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
 	    `);
@@ -1821,13 +1821,13 @@ and that at least one include rule is provided.
 					const body = await (req as RestRequestWithFormData).formData();
 
 					const manifest = JSON.parse(body.get("manifest") as string);
-					const customWorkerJS = body.get("_worker.js") as string;
+					const workerBundle = body.get("_worker.bundle") as string;
 					const customRoutesJSON = body.get("_routes.json") as string;
 
 					// make sure this is all we uploaded
 					expect([...body.keys()]).toEqual([
 						"manifest",
-						"_worker.js",
+						"_worker.bundle",
 						"_routes.json",
 					]);
 					expect(req.params.accountId).toEqual("some-account-id");
@@ -1837,15 +1837,45 @@ and that at least one include rule is provided.
 				            }
 			          `);
 
-					expect(customWorkerJS).toMatchInlineSnapshot(`
-				"
-				      export default {
-				        async fetch(request, env) {
-				          const url = new URL(request.url);
-				          return url.pathname.startsWith('/api/') ? new Response('Ok') : env.ASSETS.fetch(request);
-				        }
-				      };
-				    "
+					// some fields in workerBundle, such as the undici form boundary
+					// or the file hashes, are randomly generated. Let's replace these
+					// dynamic values with static ones so we can properly test the
+					// contents of `workerBundle`
+					// see https://jestjs.io/docs/snapshot-testing#property-matchers
+					let workerBundleWithConstantData = workerBundle.replace(
+						/------formdata-undici-0.[0-9]*/g,
+						"------formdata-undici-0.test"
+					);
+					workerBundleWithConstantData = workerBundleWithConstantData.replace(
+						/bundledWorker-0.[0-9]*.mjs/g,
+						"bundledWorker-0.test.mjs"
+					);
+
+					// we care about a couple of things here, like the presence of `metadata`,
+					// `bundledWorker`, the wasm import, etc., and since `workerBundle` is
+					// small enough, let's go ahead and snapshot test the whole thing
+					expect(workerBundleWithConstantData).toMatchInlineSnapshot(`
+				"------formdata-undici-0.test
+				Content-Disposition: form-data; name=\\"metadata\\"
+
+				{\\"main_module\\":\\"bundledWorker-0.test.mjs\\"}
+				------formdata-undici-0.test
+				Content-Disposition: form-data; name=\\"bundledWorker-0.test.mjs\\"; filename=\\"bundledWorker-0.test.mjs\\"
+				Content-Type: application/javascript+module
+
+				// _worker.js
+				var worker_default = {
+				  async fetch(request, env) {
+				    const url = new URL(request.url);
+				    return url.pathname.startsWith(\\"/api/\\") ? new Response(\\"Ok\\") : env.ASSETS.fetch(request);
+				  }
+				};
+				export {
+				  worker_default as default
+				};
+				//# sourceMappingURL=bundledWorker-0.test.mjs.map
+
+				------formdata-undici-0.test--"
 			`);
 
 					expect(JSON.parse(customRoutesJSON)).toMatchObject({
@@ -1894,7 +1924,7 @@ and that at least one include rule is provided.
 		    "✨ Success! Uploaded 1 files (TIMINGS)
 
 		    ✨ Compiled Worker successfully
-		    ✨ Uploading _worker.js
+		    ✨ Uploading Worker bundle
 		    ✨ Uploading _routes.json
 		    ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
 	  `);
@@ -2110,27 +2140,58 @@ and that at least one include rule is provided.
 				async (req, res, ctx) => {
 					const body = await (req as RestRequestWithFormData).formData();
 					const manifest = JSON.parse(body.get("manifest") as string);
-					const customWorkerJS = body.get("_worker.js");
+					const customWorkerBundle = body.get("_worker.bundle") as string;
 
 					expect(req.params.accountId).toEqual("some-account-id");
 					// make sure this is all we uploaded
 					expect([...body.keys()].sort()).toEqual(
-						["manifest", "_worker.js"].sort()
+						["manifest", "_worker.bundle"].sort()
 					);
 					expect(manifest).toMatchInlineSnapshot(`
 				Object {
 				  "/README.md": "13a03eaf24ae98378acd36ea00f77f2f",
 				}
 			`);
-					expect(customWorkerJS).toMatchInlineSnapshot(`
-				"
-				      export default {
-				        async fetch(request, env) {
-				          const url = new URL(request.url);
-				          return url.pathname.startsWith('/api/') ? new Response('Ok') : env.ASSETS.fetch(request);
-				        }
-				      };
-				    "
+
+					// some fields in workerBundle, such as the undici form boundary
+					// or the file hashes, are randomly generated. Let's replace these
+					// dynamic values with static ones so we can properly test the
+					// contents of `workerBundle`
+					// see https://jestjs.io/docs/snapshot-testing#property-matchers
+					let workerBundleWithConstantData = customWorkerBundle.replace(
+						/------formdata-undici-0.[0-9]*/g,
+						"------formdata-undici-0.test"
+					);
+					workerBundleWithConstantData = workerBundleWithConstantData.replace(
+						/bundledWorker-0.[0-9]*.mjs/g,
+						"bundledWorker-0.test.mjs"
+					);
+
+					// we care about a couple of things here, like the presence of `metadata`,
+					// `bundledWorker`, the wasm import, etc., and since `workerBundle` is
+					// small enough, let's go ahead and snapshot test the whole thing
+					expect(workerBundleWithConstantData).toMatchInlineSnapshot(`
+				"------formdata-undici-0.test
+				Content-Disposition: form-data; name=\\"metadata\\"
+
+				{\\"main_module\\":\\"bundledWorker-0.test.mjs\\"}
+				------formdata-undici-0.test
+				Content-Disposition: form-data; name=\\"bundledWorker-0.test.mjs\\"; filename=\\"bundledWorker-0.test.mjs\\"
+				Content-Type: application/javascript+module
+
+				// _worker.js
+				var worker_default = {
+				  async fetch(request, env) {
+				    const url = new URL(request.url);
+				    return url.pathname.startsWith(\\"/api/\\") ? new Response(\\"Ok\\") : env.ASSETS.fetch(request);
+				  }
+				};
+				export {
+				  worker_default as default
+				};
+				//# sourceMappingURL=bundledWorker-0.test.mjs.map
+
+				------formdata-undici-0.test--"
 			`);
 
 					return res.once(
@@ -2172,14 +2233,14 @@ and that at least one include rule is provided.
 		    "✨ Success! Uploaded 1 files (TIMINGS)
 
 		    ✨ Compiled Worker successfully
-		    ✨ Uploading _worker.js
+		    ✨ Uploading Worker bundle
 		    ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
 	  `);
 
 		expect(std.err).toMatchInlineSnapshot('""');
 	});
 
-	it("should bundle Functions and resolve its external module imports if the `--experimental-worker-bundle` flag is set", async () => {
+	it("should bundle Functions and resolve its external module imports", async () => {
 		// set up the directory of static files to upload.
 		mkdirSync("public");
 		writeFileSync("public/README.md", "This is a readme");
@@ -2364,9 +2425,7 @@ async function onRequest() {
 			)
 		);
 
-		await runWrangler(
-			"pages publish public --project-name=foo --experimental-worker-bundle=true"
-		);
+		await runWrangler("pages publish public --project-name=foo");
 
 		expect(std.out).toMatchInlineSnapshot(`
 		"✨ Compiled Worker successfully
@@ -2380,7 +2439,7 @@ async function onRequest() {
 		expect(std.err).toMatchInlineSnapshot('""');
 	});
 
-	it("should bundle _worker.js and resolve its external module imports if the `--experimental-worker-bundle` flag is set", async () => {
+	it("should bundle _worker.js and resolve its external module imports", async () => {
 		// set up the directory of static files to upload
 		mkdirSync("public");
 		writeFileSync("public/README.md", "This is a readme");
@@ -2570,9 +2629,7 @@ async function onRequest() {
 			)
 		);
 
-		await runWrangler(
-			"pages publish public --project-name=foo --experimental-worker-bundle=true"
-		);
+		await runWrangler("pages publish public --project-name=foo");
 
 		expect(std.out).toMatchInlineSnapshot(`
 		"✨ Success! Uploaded 1 files (TIMINGS)
@@ -2605,7 +2662,7 @@ async function onRequest() {
 			contents.includes("worker_default as default");
 
 		const simulateServer = (
-			generatedWorkerJsCheck: (workerJsContent: string) => void
+			generatedWorkerBundleCheck: (workerJsContent: string) => void
 		) => {
 			mockGetUploadTokenRequest(
 				"<<funfetti-auth-jwt>>",
@@ -2639,9 +2696,9 @@ async function onRequest() {
 					"*/accounts/:accountId/pages/projects/foo/deployments",
 					async (req, res, ctx) => {
 						const body = await (req as RestRequestWithFormData).formData();
-						const generatedWorkerJS = body.get("_worker.js") as string;
+						const generatedWorkerBundle = body.get("_worker.bundle") as string;
 
-						generatedWorkerJsCheck(generatedWorkerJS);
+						generatedWorkerBundleCheck(generatedWorkerBundle);
 
 						return res.once(
 							ctx.status(200),
@@ -2674,12 +2731,30 @@ async function onRequest() {
 			);
 		};
 
-		it("should not bundle the _worker.js when both `--bundle` and `--no-bundle` are omitted", async () => {
+		it("should bundle the _worker.js when both `--bundle` and `--no-bundle` are omitted", async () => {
 			simulateServer((generatedWorkerJS) =>
-				expect(workerIsBundled(generatedWorkerJS)).toBeFalsy()
+				expect(workerIsBundled(generatedWorkerJS)).toBeTruthy()
 			);
 			await runWrangler("pages publish public --project-name=foo");
-			expect(std.out).toContain("✨ Uploading _worker.js");
+			expect(std.out).toContain("✨ Uploading Worker bundle");
+		});
+
+		it("should not bundle the _worker.js when `--no-bundle` is set", async () => {
+			simulateServer((generatedWorkerJS) =>
+				expect(workerIsBundled(generatedWorkerJS)).toBeFalsy()
+			);
+			await runWrangler("pages publish public --project-name=foo --no-bundle");
+			expect(std.out).toContain("✨ Uploading Worker bundle");
+		});
+
+		it("should not bundle the _worker.js when `--bundle` is set to false", async () => {
+			simulateServer((generatedWorkerJS) =>
+				expect(workerIsBundled(generatedWorkerJS)).toBeFalsy()
+			);
+			await runWrangler(
+				"pages publish public --project-name=foo --bundle=false"
+			);
+			expect(std.out).toContain("✨ Uploading Worker bundle");
 		});
 
 		it("should bundle the _worker.js when the `--no-bundle` is set to false", async () => {
@@ -2689,7 +2764,7 @@ async function onRequest() {
 			await runWrangler(
 				"pages publish public --no-bundle=false --project-name=foo"
 			);
-			expect(std.out).toContain("✨ Uploading _worker.js");
+			expect(std.out).toContain("✨ Uploading Worker bundle");
 		});
 
 		it("should bundle the _worker.js when the `--bundle` is set to true", async () => {
@@ -2699,7 +2774,7 @@ async function onRequest() {
 			await runWrangler(
 				"pages publish public --bundle=true --project-name=foo"
 			);
-			expect(std.out).toContain("✨ Uploading _worker.js");
+			expect(std.out).toContain("✨ Uploading Worker bundle");
 		});
 	});
 });

package/src/__tests__/publish.test.ts

@@ -326,7 +326,7 @@ describe("publish", () => {
 				await expect(runWrangler("publish index.js")).rejects.toThrowError();
 
 				expect(std.err).toMatchInlineSnapshot(`
-			          "X [ERROR] In a non-interactive environment, it's necessary to set a CLOUDFLARE_API_TOKEN environment variable for wrangler to work. Please go to https://developers.cloudflare.com/api/tokens/create/ for instructions on how to create an api token, and assign its value to CLOUDFLARE_API_TOKEN.
+			          "X [ERROR] In a non-interactive environment, it's necessary to set a CLOUDFLARE_API_TOKEN environment variable for wrangler to work. Please go to https://developers.cloudflare.com/fundamentals/api/get-started/create-token/ for instructions on how to create an api token, and assign its value to CLOUDFLARE_API_TOKEN.
 
 			          "
 		        `);
@@ -1649,7 +1649,7 @@ addEventListener('fetch', event => {});`
 			};
 			writeAssets(assets);
 			mockUploadWorkerRequest({
-				expectedMainModule: "serve-static-assets.entry.js",
+				expectedMainModule: "no-op-worker.js",
 			});
 			mockSubDomainRequest();
 			mockListKVNamespacesRequest(kvNamespace);
@@ -1740,7 +1740,7 @@ addEventListener('fetch', event => {});`
 			writeWorkerSource();
 			writeAssets(assets);
 			mockUploadWorkerRequest({
-				expectedMainModule: "serve-static-assets.entry.js",
+				expectedMainModule: "index.js",
 			});
 			mockSubDomainRequest();
 			mockListKVNamespacesRequest(kvNamespace);
@@ -1925,7 +1925,7 @@ addEventListener('fetch', event => {});`
 			writeWorkerSource();
 			writeAssets(assets);
 			mockUploadWorkerRequest({
-				expectedMainModule: "serve-static-assets.entry.js",
+				expectedMainModule: "index.js",
 			});
 			mockSubDomainRequest();
 			mockListKVNamespacesRequest(kvNamespace);
@@ -1972,7 +1972,7 @@ addEventListener('fetch', event => {});`
 			writeWorkerSource();
 			writeAssets(assets);
 			mockUploadWorkerRequest({
-				expectedMainModule: "serve-static-assets.entry.js",
+				expectedMainModule: "index.js",
 			});
 			mockSubDomainRequest();
 			mockListKVNamespacesRequest(kvNamespace);
@@ -3015,7 +3015,7 @@ addEventListener('fetch', event => {});`
 			writeWorkerSource();
 			writeAssets(assets, "my-assets");
 			mockUploadWorkerRequest({
-				expectedMainModule: "serve-static-assets.entry.js",
+				expectedMainModule: "index.js",
 			});
 			mockSubDomainRequest();
 			mockListKVNamespacesRequest(kvNamespace);
@@ -5846,7 +5846,7 @@ addEventListener('fetch', event => {});`
 
 			"
 		`);
-				const output = fs.readFileSync("tmp/d1-beta-facade.entry.js", "utf-8");
+				const output = fs.readFileSync("tmp/index.js", "utf-8");
 				expect(output).toContain(
 					`var ExampleDurableObject2 = maskDurableObjectDefinition(ExampleDurableObject);`
 				);
@@ -6579,6 +6579,47 @@ addEventListener('fetch', event => {});`
 		`);
 		});
 
+		it("should preserve the entry point file name, even when using a facade", async () => {
+			writeWranglerToml();
+			writeWorkerSource();
+			mockSubDomainRequest();
+			mockUploadWorkerRequest();
+			const assets = [
+				{ filePath: "file-1.txt", content: "Content of file-1" },
+				{ filePath: "file-2.txt", content: "Content of file-2" },
+			];
+			const kvNamespace = {
+				title: "__test-name-workers_sites_assets",
+				id: "__test-name-workers_sites_assets-id",
+			};
+			writeAssets(assets);
+			mockListKVNamespacesRequest(kvNamespace);
+			mockKeyListRequest(kvNamespace.id, []);
+			mockUploadAssetsToKVRequest(kvNamespace.id, assets);
+			await runWrangler("publish index.js --outdir some-dir --assets assets");
+			expect(fs.existsSync("some-dir/index.js")).toBe(true);
+			expect(fs.existsSync("some-dir/index.js.map")).toBe(true);
+			expect(std).toMatchInlineSnapshot(`
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "out": "Reading file-1.txt...
+			Uploading as file-1.2ca234f380.txt...
+			Reading file-2.txt...
+			Uploading as file-2.5938485188.txt...
+			↗️  Done syncing assets
+			Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: Galaxy-Class",
+			  "warn": "▲ [WARNING] The --assets argument is experimental and may change or break at any time
+
+			",
+			}
+		`);
+		});
+
 		it("should copy any module imports related assets to --outdir if specified", async () => {
 			writeWranglerToml();
 			fs.writeFileSync(