Miscellaneous improvements and refactorings (#11414)

* pin the Typescript version

* add error message info to debug where we are getting the api token from

* allow C3 to import from workers-utils

* clean up vitest config

* Add PWD to turbo's global pass-through env

* post review fixups

* add changeset

Author: petebacondarwin

.changeset/ready-humans-thank.md

@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+add extra logging to user log-in flow for diagnosing failed login requests

packages/create-cloudflare/tsconfig.json

@@ -14,7 +14,7 @@
 	"compilerOptions": {
 		"target": "ESNext",
 		"module": "preserve",
-		"moduleResolution": "node",
+		"moduleResolution": "bundler",
 		"allowJs": true,
 		"strict": true,
 		"esModuleInterop": true,

packages/workers-utils/tests/vitest.setup.ts

@@ -5,16 +5,14 @@ export default defineConfig({
 	test: {
 		testTimeout: 15_000,
 		pool: "forks",
-		retry: 0,
 		include: ["**/tests/**/*.test.ts"],
-		setupFiles: path.resolve(__dirname, "tests/vitest.setup.ts"),
 		globalSetup: path.resolve(__dirname, "tests/vitest.global.ts"),
 		reporters: ["default"],
-		globals: true,
 		snapshotFormat: {
 			escapeString: true,
 			printBasicPrototype: true,
 		},
 		unstubEnvs: true,
+		mockReset: true,
 	},
 });

packages/workers-utils/vitest.config.mts

@@ -733,15 +733,21 @@ describe("deploy", () => {
 				  https://test-name.test-sub-domain.workers.dev
 				Current Version ID: Galaxy-Class"
 			`);
-			expect(std.warn).toMatchInlineSnapshot(`
-			"▲ [WARNING] It looks like you have used Wrangler v1's \`config\` command to login with an API token.
 
-			  This is no longer supported in the current version of Wrangler.
-			  If you wish to authenticate via an API token then please set the \`CLOUDFLARE_API_TOKEN\`
-			  environment variable.
+			// The current working directory is replaced with `<cwd>` to make the snapshot consistent across environments
+			// But since the actual working directory could be a long string on some operating systems it is possible that the string gets wrapped to a new line.
+			// To avoid failures across different environments, we remove any newline before `<cwd>` in the snapshot.
+			expect(std.warn.replaceAll(/from[ \r\n]+<cwd>/g, "from <cwd>"))
+				.toMatchInlineSnapshot(`
+					"▲ [WARNING] It looks like you have used Wrangler v1's \`config\` command to login with an API token
 
-			"
-		`);
+					  from <cwd>/home/.config/.wrangler/config/default.toml.
+					  This is no longer supported in the current version of Wrangler.
+					  If you wish to authenticate via an API token then please set the \`CLOUDFLARE_API_TOKEN\`
+					  environment variable.
+
+					"
+				`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 

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

@@ -198,9 +198,14 @@ describe("getUserInfo(COMPLIANCE_REGION_CONFIG_UNKNOWN)", () => {
 		writeAuthConfigFile({ api_token: "API_TOKEN" });
 		await getUserInfo(COMPLIANCE_REGION_CONFIG_UNKNOWN);
 
-		expect(std.warn).toMatchInlineSnapshot(`
-			"▲ [WARNING] It looks like you have used Wrangler v1's \`config\` command to login with an API token.
-
+		// The current working directory is replaced with `<cwd>` to make the snapshot consistent across environments
+		// But since the actual working directory could be a long string on some operating systems it is possible that the string gets wrapped to a new line.
+		// To avoid failures across different environments, we remove any newline before `<cwd>` in the snapshot.
+		expect(std.warn.replaceAll(/from[ \r\n]+<cwd>/g, "from <cwd>"))
+			.toMatchInlineSnapshot(`
+			"▲ [WARNING] It looks like you have used Wrangler v1's \`config\` command to login with an API token
+
+			  from <cwd>/home/.config/.wrangler/config/default.toml.
 			  This is no longer supported in the current version of Wrangler.
 			  If you wish to authenticate via an API token then please set the \`CLOUDFLARE_API_TOKEN\`
 			  environment variable.

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

@@ -422,7 +422,8 @@ function getAuthTokens(config?: UserAuthConfig): AuthTokens | undefined {
 			};
 		} else if (api_token) {
 			logger.warn(
-				"It looks like you have used Wrangler v1's `config` command to login with an API token.\n" +
+				"It looks like you have used Wrangler v1's `config` command to login with an API token\n" +
+					`from ${config === undefined ? getAuthConfigFilePath() : "in-memory config"}.\n` +
 					"This is no longer supported in the current version of Wrangler.\n" +
 					"If you wish to authenticate via an API token then please set the `CLOUDFLARE_API_TOKEN` environment variable."
 			);

packages/wrangler/src/user/user.ts

@@ -24,7 +24,7 @@ catalog:
   "@vitest/ui": ~3.2.0
   # rimraf@6 requires node 20 or >=22
   rimraf: "^6.0.1"
-  typescript: "^5.8.3"
+  typescript: "~5.8.3"
   undici: "7.14.0"
   # Override undici-types from @types/node so that the Cloudflare SDK typings match our installed
   # version of Undici

pnpm-lock.yaml

@@ -5,17 +5,18 @@
 	},
 	"globalEnv": ["CI_OS", "NODE_VERSION"],
 	"globalPassThroughEnv": [
-		"NODE_EXTRA_CA_CERTS",
 		"CI",
-		"VSCODE_INSPECTOR_OPTIONS",
-		"WRANGLER_LOG_PATH",
-		"TEST_REPORT_PATH",
 		"CLOUDFLARE_CONTAINER_REGISTRY",
 		"DOCKER_HOST",
-		"WRANGLER_DOCKER_HOST",
-		"WRANGLER_LOG",
+		"LOCAL_TESTS_WITHOUT_DOCKER",
+		"NODE_EXTRA_CA_CERTS",
+		"PWD",
+		"TEST_REPORT_PATH",
+		"VSCODE_INSPECTOR_OPTIONS",
 		"WRANGLER_API_ENVIRONMENT",
-		"LOCAL_TESTS_WITHOUT_DOCKER"
+		"WRANGLER_DOCKER_HOST",
+		"WRANGLER_LOG_PATH",
+		"WRANGLER_LOG"
 	],
 	"tasks": {
 		"dev": {