wrangler 2.6.2 → 2.7.0

package/src/__tests__/publish.test.ts

@@ -10,6 +10,7 @@ import {
 } from "../bundle-reporter";
 import { writeAuthConfigFile } from "../user";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
+import { mockAuthDomain } from "./helpers/mock-auth-domain";
 import {
 	createFetchResult,
 	setMockRawResponse,
@@ -47,6 +48,7 @@ describe("publish", () => {
 	const { setIsTTY } = useMockIsTTY();
 	const std = mockConsoleMethods();
 	const {
+		mockDomainUsesAccess,
 		mockOAuthServerCallback,
 		mockGrantAccessToken,
 		mockGrantAuthorization,
@@ -61,7 +63,7 @@ describe("publish", () => {
 		setMockResponse(
 			"/accounts/:accountId/workers/services/:scriptName",
 			() => ({
-				default_environment: { script: { last_deployed_from: "dash" } },
+				default_environment: { script: { last_deployed_from: "wrangler" } },
 			})
 		);
 		setMockResponse(
@@ -99,15 +101,20 @@ describe("publish", () => {
 
 			await runWrangler("publish ./index");
 
-			expect(std.out).toMatchInlineSnapshot(`
-			"Total Upload: xx KiB / gzip: xx KiB
+			expect(std).toMatchInlineSnapshot(`
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "out": "Total Upload: xx KiB / gzip: xx KiB
 			Worker ID:  abc12345
 			Worker ETag:  etag98765
 			Worker PipelineHash:  hash9999
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment ID: undefined"
+			Current Deployment ID: undefined",
+			  "warn": "",
+			}
 		`);
 		});
 	});
@@ -124,6 +131,7 @@ describe("publish", () => {
 		it("drops a user into the login flow if they're unauthenticated", async () => {
 			writeWranglerToml();
 			writeWorkerSource();
+			mockDomainUsesAccess({ usesAccess: false });
 			mockSubDomainRequest();
 			mockUploadWorkerRequest();
 			mockOAuthServerCallback();
@@ -150,6 +158,46 @@ describe("publish", () => {
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
+		describe("with an alternative auth domain", () => {
+			mockAuthDomain({ domain: "dash.staging.cloudflare.com" });
+
+			it("drops a user into the login flow if they're unauthenticated", async () => {
+				writeWranglerToml();
+				writeWorkerSource();
+				mockDomainUsesAccess({
+					usesAccess: false,
+					domain: "dash.staging.cloudflare.com",
+				});
+				mockSubDomainRequest();
+				mockUploadWorkerRequest();
+				mockOAuthServerCallback();
+				const accessTokenRequest = mockGrantAccessToken({
+					domain: "dash.staging.cloudflare.com",
+					respondWith: "ok",
+				});
+				mockGrantAuthorization({ respondWith: "success" });
+
+				await expect(runWrangler("publish index.js")).resolves.toBeUndefined();
+
+				expect(accessTokenRequest.actual.url).toEqual(
+					accessTokenRequest.expected.url
+				);
+
+				expect(std.out).toMatchInlineSnapshot(`
+			"Attempting to login via OAuth...
+			Opening a link in your default browser: https://dash.staging.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20d1%3Awrite%20pages%3Awrite%20zone%3Aread%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
+			Successfully logged in.
+			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: undefined"
+		`);
+				expect(std.warn).toMatchInlineSnapshot(`""`);
+				expect(std.err).toMatchInlineSnapshot(`""`);
+			});
+		});
+
 		it("warns a user when they're authenticated with an API token in wrangler config file", async () => {
 			writeWranglerToml();
 			writeWorkerSource();
@@ -257,12 +305,12 @@ describe("publish", () => {
 
 				await expect(runWrangler("publish index.js")).rejects
 					.toMatchInlineSnapshot(`
-						                [Error: More than one account available but unable to select one in non-interactive mode.
-						                Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
-						                Available accounts are ("<name>" - "<id>"):
-						                  "enterprise" - "1701")
-						                  "enterprise-nx" - "nx01")]
-					              `);
+			[Error: More than one account available but unable to select one in non-interactive mode.
+			Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
+			Available accounts are (\`<name>\`: \`<account_id>\`):
+			  \`enterprise\`: \`1701\`
+			  \`enterprise-nx\`: \`nx01\`]
+		`);
 			});
 
 			it("should throw error in non-TTY if 'CLOUDFLARE_API_TOKEN' is missing", async () => {
@@ -329,6 +377,7 @@ describe("publish", () => {
 				env: "some-env",
 				legacyEnv: true,
 			});
+
 			await runWrangler("publish index.js --env some-env");
 			expect(std.out).toMatchInlineSnapshot(`
 			"Total Upload: xx KiB / gzip: xx KiB
@@ -349,6 +398,7 @@ describe("publish", () => {
 				mockUploadWorkerRequest({
 					legacyEnv: true,
 				});
+
 				await runWrangler("publish index.js --legacy-env true");
 				expect(std.out).toMatchInlineSnapshot(`
 			"Total Upload: xx KiB / gzip: xx KiB
@@ -369,6 +419,7 @@ describe("publish", () => {
 					env: "some-env",
 					legacyEnv: true,
 				});
+
 				await runWrangler("publish index.js --env some-env --legacy-env true");
 				expect(std.out).toMatchInlineSnapshot(`
 			"Total Upload: xx KiB / gzip: xx KiB
@@ -389,6 +440,7 @@ describe("publish", () => {
 					env: "some-env",
 					legacyEnv: true,
 				});
+
 				await runWrangler("publish index.js --env some-env --legacy-env true");
 				expect(std.out).toMatchInlineSnapshot(`
 			"Total Upload: xx KiB / gzip: xx KiB
@@ -460,6 +512,7 @@ describe("publish", () => {
 				mockUploadWorkerRequest({
 					legacyEnv: false,
 				});
+
 				await runWrangler("publish index.js --legacy-env false");
 				expect(std.out).toMatchInlineSnapshot(`
 			"Total Upload: xx KiB / gzip: xx KiB
@@ -487,6 +540,7 @@ describe("publish", () => {
 					env: "some-env",
 					legacyEnv: false,
 				});
+
 				await runWrangler("publish index.js --env some-env --legacy-env false");
 				expect(std.out).toMatchInlineSnapshot(`
 			"Total Upload: xx KiB / gzip: xx KiB
@@ -770,22 +824,22 @@ describe("publish", () => {
 
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
-			        "▲ [WARNING] The current authentication token does not have 'All Zones' permissions.
+			"▲ [WARNING] The current authentication token does not have 'All Zones' permissions.
 
-			          Falling back to using the zone-based API endpoint to update each route individually.
-			          Note that there is no access to routes associated with zones that the API token does not have
-			          permission for.
-			          Existing routes for this Worker in such zones will not be deleted.
+			  Falling back to using the zone-based API endpoint to update each route individually.
+			  Note that there is no access to routes associated with zones that the API token does not have
+			  permission for.
+			  Existing routes for this Worker in such zones will not be deleted.
 
 
-			        ▲ [WARNING] Previously deployed routes:
+			▲ [WARNING] Previously deployed routes:
 
-			          The following routes were already associated with this worker, and have not been deleted:
-			           - \\"foo.example.com/other-route\\"
-			          If these routes are not wanted then you can remove them in the dashboard.
+			  The following routes were already associated with this worker, and have not been deleted:
+			   - \\"foo.example.com/other-route\\"
+			  If these routes are not wanted then you can remove them in the dashboard.
 
-			        "
-		      `);
+			"
+		`);
 			expect(std.out).toMatchInlineSnapshot(`
 			"Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (TIMINGS)
@@ -1150,17 +1204,17 @@ Update them to point to this script instead?`,
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
-			        "▲ [WARNING] Processing wrangler.toml configuration:
+			"▲ [WARNING] Processing wrangler.toml configuration:
 
-			            - Deprecation: \\"build.upload.main\\":
-			              Delete the \`build.upload.main\` and \`build.upload.dir\` fields.
-			              Then add the top level \`main\` field to your configuration file:
-			              \`\`\`
-			              main = \\"dist/index.js\\"
-			              \`\`\`
+			    - Deprecation: \\"build.upload.main\\":
+			      Delete the \`build.upload.main\` and \`build.upload.dir\` fields.
+			      Then add the top level \`main\` field to your configuration file:
+			      \`\`\`
+			      main = \\"dist/index.js\\"
+			      \`\`\`
 
-			        "
-		      `);
+			"
+		`);
 		});
 
 		it("should use `build.upload.main` relative to `build.upload.dir`", async () => {
@@ -1187,20 +1241,20 @@ Update them to point to this script instead?`,
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
-			        "▲ [WARNING] Processing ../wrangler.toml configuration:
+			"▲ [WARNING] Processing ../wrangler.toml configuration:
 
-			            - Deprecation: \\"build.upload.main\\":
-			              Delete the \`build.upload.main\` and \`build.upload.dir\` fields.
-			              Then add the top level \`main\` field to your configuration file:
-			              \`\`\`
-			              main = \\"foo/index.js\\"
-			              \`\`\`
-			            - Deprecation: \\"build.upload.dir\\":
-			              Use the top level \\"main\\" field or a command-line argument to specify the entry-point for the
-			          Worker.
+			    - Deprecation: \\"build.upload.main\\":
+			      Delete the \`build.upload.main\` and \`build.upload.dir\` fields.
+			      Then add the top level \`main\` field to your configuration file:
+			      \`\`\`
+			      main = \\"foo/index.js\\"
+			      \`\`\`
+			    - Deprecation: \\"build.upload.dir\\":
+			      Use the top level \\"main\\" field or a command-line argument to specify the entry-point for the
+			  Worker.
 
-			        "
-		      `);
+			"
+		`);
 		});
 
 		it("should error when both `main` and `build.upload.main` are used", async () => {
@@ -1539,17 +1593,17 @@ addEventListener('fetch', event => {});`
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(normalizeSlashes(std.warn)).toMatchInlineSnapshot(`
-			        "▲ [WARNING] Processing my-site/wrangler.toml configuration:
+			"▲ [WARNING] Processing my-site/wrangler.toml configuration:
 
-			            - Deprecation: \\"site.entry-point\\":
-			              Delete the \`site.entry-point\` field, then add the top level \`main\` field to your configuration
-			          file:
-			              \`\`\`
-			              main = \\"my-entry/index.js\\"
-			              \`\`\`
+			    - Deprecation: \\"site.entry-point\\":
+			      Delete the \`site.entry-point\` field, then add the top level \`main\` field to your configuration
+			  file:
+			      \`\`\`
+			      main = \\"my-entry/index.js\\"
+			      \`\`\`
 
-			        "
-		      `);
+			"
+		`);
 		});
 
 		it("should error if both main and site.entry-point are specified", async () => {
@@ -4015,24 +4069,24 @@ addEventListener('fetch', event => {});`
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
-			        "▲ [WARNING] Processing wrangler.toml configuration:
+			"▲ [WARNING] Processing wrangler.toml configuration:
 
-			            - In wrangler.toml, you have configured [durable_objects] exported by this Worker (SomeClass),
-			          but no [migrations] for them. This may not work as expected until you add a [migrations] section
-			          to your wrangler.toml. Add this configuration to your wrangler.toml:
+			    - In wrangler.toml, you have configured [durable_objects] exported by this Worker (SomeClass),
+			  but no [migrations] for them. This may not work as expected until you add a [migrations] section
+			  to your wrangler.toml. Add this configuration to your wrangler.toml:
 
-			                \`\`\`
-			                [[migrations]]
-			                tag = \\"v1\\" # Should be unique for each entry
-			                new_classes = [\\"SomeClass\\"]
-			                \`\`\`
+			        \`\`\`
+			        [[migrations]]
+			        tag = \\"v1\\" # Should be unique for each entry
+			        new_classes = [\\"SomeClass\\"]
+			        \`\`\`
 
-			              Refer to
-			          https://developers.cloudflare.com/workers/learning/using-durable-objects/#durable-object-migrations-in-wranglertoml
-			          for more details.
+			      Refer to
+			  https://developers.cloudflare.com/workers/learning/using-durable-objects/#durable-object-migrations-in-wranglertoml
+			  for more details.
 
-			        "
-		      `);
+			"
+		`);
 		});
 
 		it("does not warn if all the durable object bindings are to external classes", async () => {
@@ -4255,13 +4309,13 @@ addEventListener('fetch', event => {});`
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
-			          "▲ [WARNING] Processing wrangler.toml configuration:
+			"▲ [WARNING] Processing wrangler.toml configuration:
 
-			              - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in
-			            the future. DO NOT USE IN PRODUCTION.
+			    - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in
+			  the future. DO NOT USE IN PRODUCTION.
 
-			          "
-		        `);
+			"
+		`);
 			});
 
 			it("should publish all migrations on first publish (--env)", async () => {
@@ -4319,13 +4373,13 @@ addEventListener('fetch', event => {});`
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
-			          "▲ [WARNING] Processing wrangler.toml configuration:
+			"▲ [WARNING] Processing wrangler.toml configuration:
 
-			              - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in
-			            the future. DO NOT USE IN PRODUCTION.
+			    - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in
+			  the future. DO NOT USE IN PRODUCTION.
 
-			          "
-		        `);
+			"
+		`);
 			});
 
 			it("should use a script's current migration tag when publishing migrations", async () => {
@@ -4692,12 +4746,12 @@ addEventListener('fetch', event => {});`
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
-			        "▲ [WARNING] Processing wrangler.toml configuration:
+			"▲ [WARNING] Processing wrangler.toml configuration:
 
-			            - \\"unsafe\\" fields are experimental and may change or break at any time.
+			    - \\"unsafe\\" fields are experimental and may change or break at any time.
 
-			        "
-		      `);
+			"
+		`);
 		});
 
 		it("should error when bindings of different types have the same name", async () => {
@@ -5099,6 +5153,7 @@ addEventListener('fetch', event => {});`
 					],
 				});
 				mockSubDomainRequest();
+
 				await runWrangler("publish index.js");
 				expect(std.out).toMatchInlineSnapshot(`
 			"Total Upload: xx KiB / gzip: xx KiB
@@ -5791,12 +5846,12 @@ addEventListener('fetch', event => {});`
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
-			          "▲ [WARNING] Processing wrangler.toml configuration:
+			"▲ [WARNING] Processing wrangler.toml configuration:
 
-			              - \\"services\\" fields are experimental and may change or break at any time.
+			    - \\"services\\" fields are experimental and may change or break at any time.
 
-			          "
-		        `);
+			"
+		`);
 			});
 		});
 
@@ -5846,7 +5901,7 @@ addEventListener('fetch', event => {});`
 				mockUploadWorkerRequest({
 					expectedBindings: [
 						{
-							type: "namespace",
+							type: "dispatch_namespace",
 							name: "foo",
 							namespace: "Foo",
 						},
@@ -5864,13 +5919,7 @@ addEventListener('fetch', event => {});`
 			Current Deployment ID: undefined"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
-				expect(std.warn).toMatchInlineSnapshot(`
-			"▲ [WARNING] Processing wrangler.toml configuration:
-
-			    - \\"dispatch_namespaces\\" fields are experimental and may change or break at any time.
-
-			"
-		`);
+				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
 		});
 
@@ -5912,12 +5961,12 @@ addEventListener('fetch', event => {});`
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
-			          "▲ [WARNING] Processing wrangler.toml configuration:
+			"▲ [WARNING] Processing wrangler.toml configuration:
 
-			              - \\"unsafe\\" fields are experimental and may change or break at any time.
+			    - \\"unsafe\\" fields are experimental and may change or break at any time.
 
-			          "
-		        `);
+			"
+		`);
 			});
 			it("should warn if using unsafe bindings already handled by wrangler", async () => {
 				writeWranglerToml({
@@ -5956,17 +6005,17 @@ addEventListener('fetch', event => {});`
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
-			          "▲ [WARNING] Processing wrangler.toml configuration:
+			"▲ [WARNING] Processing wrangler.toml configuration:
 
-			              - \\"unsafe\\" fields are experimental and may change or break at any time.
-			              - \\"unsafe.bindings[0]\\": {\\"name\\":\\"my-binding\\",\\"type\\":\\"plain_text\\",\\"text\\":\\"text\\"}
-			                - The binding type \\"plain_text\\" is directly supported by wrangler.
-			                  Consider migrating this unsafe binding to a format for 'plain_text' bindings that is
-			            supported by wrangler for optimal support.
-			                  For more details, see https://developers.cloudflare.com/workers/cli-wrangler/configuration
+			    - \\"unsafe\\" fields are experimental and may change or break at any time.
+			    - \\"unsafe.bindings[0]\\": {\\"name\\":\\"my-binding\\",\\"type\\":\\"plain_text\\",\\"text\\":\\"text\\"}
+			      - The binding type \\"plain_text\\" is directly supported by wrangler.
+			        Consider migrating this unsafe binding to a format for 'plain_text' bindings that is
+			  supported by wrangler for optimal support.
+			        For more details, see https://developers.cloudflare.com/workers/cli-wrangler/configuration
 
-			          "
-		        `);
+			"
+		`);
 			});
 		});
 	});
@@ -6067,20 +6116,20 @@ addEventListener('fetch', event => {});`
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
-			        "▲ [WARNING] Processing wrangler.toml configuration:
+			"▲ [WARNING] Processing wrangler.toml configuration:
 
-			            - Deprecation: The \`build.upload.rules\` config field is no longer used, the rules should be
-			          specified via the \`rules\` config field. Delete the \`build.upload\` field from the configuration
-			          file, and add this:
-			              \`\`\`
-			              [[rules]]
-			              type = \\"Text\\"
-			              globs = [ \\"**/*.file\\" ]
-			              fallthrough = true
-			              \`\`\`
+			    - Deprecation: The \`build.upload.rules\` config field is no longer used, the rules should be
+			  specified via the \`rules\` config field. Delete the \`build.upload\` field from the configuration
+			  file, and add this:
+			      \`\`\`
+			      [[rules]]
+			      type = \\"Text\\"
+			      globs = [ \\"**/*.file\\" ]
+			      fallthrough = true
+			      \`\`\`
 
-			        "
-		      `);
+			"
+		`);
 		});
 
 		it("should be able to use fallthrough:true for multiple rules", async () => {
@@ -6246,10 +6295,10 @@ addEventListener('fetch', event => {});`
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
-			        "▲ [WARNING] Deprecation: detected a legacy module import in \\"./index.js\\". This will stop working in the future. Replace references to \\"text.file\\" with \\"./text.file\\";
+			"▲ [WARNING] Deprecation: detected a legacy module import in \\"./index.js\\". This will stop working in the future. Replace references to \\"text.file\\" with \\"./text.file\\";
 
-			        "
-		      `);
+			"
+		`);
 		});
 
 		it("should work with legacy module specifiers, with a deprecation warning (2)", async () => {
@@ -6276,10 +6325,10 @@ addEventListener('fetch', event => {});`
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
-			        "▲ [WARNING] Deprecation: detected a legacy module import in \\"./index.js\\". This will stop working in the future. Replace references to \\"index.wasm\\" with \\"./index.wasm\\";
+			"▲ [WARNING] Deprecation: detected a legacy module import in \\"./index.js\\". This will stop working in the future. Replace references to \\"index.wasm\\" with \\"./index.wasm\\";
 
-			        "
-		      `);
+			"
+		`);
 		});
 
 		it("should work with legacy module specifiers, with a deprecation warning (3)", async () => {
@@ -6308,10 +6357,10 @@ addEventListener('fetch', event => {});`
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
-			        "▲ [WARNING] Deprecation: detected a legacy module import in \\"./index.js\\". This will stop working in the future. Replace references to \\"text+name.file\\" with \\"./text+name.file\\";
+			"▲ [WARNING] Deprecation: detected a legacy module import in \\"./index.js\\". This will stop working in the future. Replace references to \\"text+name.file\\" with \\"./text+name.file\\";
 
-			        "
-		      `);
+			"
+		`);
 		});
 
 		it("should not match regular module specifiers when there aren't any possible legacy module matches", async () => {

package/src/__tests__/r2.test.ts

@@ -155,7 +155,7 @@ describe("r2", () => {
 							const { accountId } = request.params;
 							expect(accountId).toEqual("some-account-id");
 							expect(await request.json()).toEqual({ name: "testBucket" });
-							response.once(
+							return response.once(
 								context.status(200),
 								context.json({
 									success: true,
@@ -332,7 +332,7 @@ describe("r2", () => {
 					  "host": "api.cloudflare.com",
 					}
 				`);
-						response.once(
+						return response.once(
 							context.status(200),
 							context.json({
 								success: true,