improve turbo settings and vite e2e test config (#8754)

* improve turbo settings and vite e2e test config

* skip the vite warnings playground when in build mode

* Run Wrangler test:e2e in non-interactive mode

* fixup! improve turbo settings and vite e2e test config

Author: petebacondarwin

packages/vite-plugin-cloudflare/e2e/vitest.config.ts

@@ -6,7 +6,7 @@ export default defineConfig({
 		cache: false,
 		root: __dirname,
 		testTimeout: 1000 * 60 * 10, // 10 min for lengthy installs
-		maxConcurrency: 3,
+		fileParallelism: false,
 		globalSetup: ["global-setup.ts"],
 	},
 });

packages/vite-plugin-cloudflare/playground/node-compat/__tests__/worker-warnings/warnings.spec.ts

@@ -1,15 +1,18 @@
 import dedent from "ts-dedent";
 import { expect, test, vi } from "vitest";
-import { serverLogs } from "../../../__test-utils__";
+import { isBuild, serverLogs } from "../../../__test-utils__";
 
-test("should display warnings if nodejs_compat is missing", async () => {
-	await vi.waitFor(async () => {
-		expect(serverLogs.warns.join("").replaceAll("\\", "/")).toContain(
-			dedent`
+test.skipIf(isBuild)(
+	"should display warnings if nodejs_compat is missing",
+	async () => {
+		await vi.waitFor(async () => {
+			expect(serverLogs.warns.join("").replaceAll("\\", "/")).toContain(
+				dedent`
 				Unexpected Node.js imports for environment "worker". Do you need to enable the "nodejs_compat" compatibility flag? Refer to https://developers.cloudflare.com/workers/runtime-apis/nodejs/ for more details.
 				 - "node:assert/strict" imported from "worker-warnings/index.ts"
 				 - "perf_hooks" imported from "worker-warnings/index.ts"
 				`
-		);
-	});
-});
+			);
+		});
+	}
+);

packages/wrangler/package.json

@@ -64,7 +64,7 @@
 		"test": "dotenv -- pnpm run assert-git-version && dotenv -- vitest",
 		"test:ci": "pnpm run test run",
 		"test:debug": "pnpm run test --silent=false --verbose=true",
-		"test:e2e": "dotenv -- vitest -c ./e2e/vitest.config.mts",
+		"test:e2e": "dotenv -- vitest run -c ./e2e/vitest.config.mts",
 		"test:watch": "pnpm run test --testTimeout=50000 --watch",
 		"type:tests": "tsc -p ./src/__tests__/tsconfig.json && tsc -p ./e2e/tsconfig.json"
 	},

packages/wrangler/turbo.json

@@ -21,55 +21,61 @@
 				"config-schema.json"
 			],
 			"env": [
-				"NODE_EXTRA_CA_CERTS",
-				"CLOUDFLARE_ACCOUNT_ID",
-				"SOURCEMAPS",
-				"NODE_ENV",
-				"SPARROW_SOURCE_KEY",
 				"ALGOLIA_APP_ID",
 				"ALGOLIA_PUBLIC_KEY",
-				"CLOUDFLARE_API_TOKEN",
-				"CLOUDFLARE_ACCOUNT_ID",
-				"WRANGLER_AUTH_DOMAIN",
-				"PATH",
-				"WRANGLER_LOG",
-				"EXPERIMENTAL_MIDDLEWARE",
-				"FORMAT_WRANGLER_ERRORS",
+				"NODE_ENV",
+				"SOURCEMAPS",
+				"SPARROW_SOURCE_KEY",
+				"SENTRY_DSN"
+			],
+			"passThroughEnv": [
+				"CF_PAGES_UPLOAD_JWT",
 				"CF_PAGES",
-				"WORKERS_CI",
 				"CI",
-				"CF_PAGES_UPLOAD_JWT",
+				"CLOUDFLARE_ACCOUNT_ID",
+				"CLOUDFLARE_API_TOKEN",
+				"CUSTOM_BUILD_VAR",
 				"EXPERIMENTAL_MIDDLEWARE",
+				"FORMAT_WRANGLER_ERRORS",
+				"http_proxy",
+				"HTTP_PROXY",
+				"https_proxy",
+				"HTTPS_PROXY",
+				"HYPERDRIVE_DATABASE_URL",
+				"LC_ALL",
 				"NO_D1_WARNING",
 				"NO_HYPERDRIVE_WARNING",
-				"WRANGLER",
-				"WRANGLER_IMPORT",
-				"CUSTOM_BUILD_VAR",
+				"PATH",
 				"PWD",
-				"LC_ALL",
-				"WRANGLER_SEND_METRICS",
-				"https_proxy",
-				"HTTPS_PROXY",
-				"http_proxy",
-				"HTTP_PROXY",
-				"CI_OS",
-				"SENTRY_DSN",
 				"SYSTEMROOT",
 				"TZ",
+				"WORKERS_CI",
+				"WRANGLER_API_ENVIRONMENT",
+				"WRANGLER_AUTH_DOMAIN",
 				"WRANGLER_DISABLE_EXPERIMENTAL_WARNING",
 				"WRANGLER_DISABLE_REQUEST_BODY_DRAINING",
-				"WRANGLER_WORKER_REGISTRY_PORT",
-				"WRANGLER_API_ENVIRONMENT",
-				"HYPERDRIVE_DATABASE_URL"
+				"WRANGLER_LOG",
+				"WRANGLER_SEND_METRICS",
+				"WRANGLER_WORKER_REGISTRY_PORT"
 			]
 		},
 		"test:ci": {
 			"inputs": ["!*/**/.wrangler/**", "**/__tests__/**"],
-			"dependsOn": ["build"]
+			"dependsOn": ["build"],
+			"env": ["VITEST", "NODE_DEBUG", "MINIFLARE_WORKERD_PATH"]
 		},
 		"test:e2e": {
 			"inputs": ["e2e/**"],
-			"dependsOn": ["build"]
+			"dependsOn": ["build"],
+			"env": [
+				"VITEST",
+				"NODE_DEBUG",
+				"MINIFLARE_WORKERD_PATH",
+				"WRANGLER",
+				"WRANGLER_IMPORT",
+				"CLOUDFLARE_ACCOUNT_ID",
+				"CLOUDFLARE_API_TOKEN"
+			]
 		}
 	}
 }

turbo.json

@@ -3,14 +3,8 @@
 	"remoteCache": {
 		"signature": true
 	},
-	"globalEnv": [
-		"CI_OS",
-		"NODE_VERSION",
-		"VITEST",
-		"NODE_DEBUG",
-		"NODE_EXTRA_CA_CERTS",
-		"MINIFLARE_WORKERD_PATH"
-	],
+	"globalEnv": ["CI_OS", "NODE_VERSION"],
+	"globalPassThroughEnv": ["NODE_EXTRA_CA_CERTS"],
 	"tasks": {
 		"dev": {
 			"persistent": true,
@@ -41,11 +35,9 @@
 		},
 		"test:ci": {
 			"dependsOn": ["build"],
-			"outputLogs": "new-only",
-			"env": ["MINIFLARE_WORKERD_PATH"]
+			"outputLogs": "new-only"
 		},
 		"test:e2e": {
-			"env": ["WRANGLER", "CLOUDFLARE_ACCOUNT_ID", "CLOUDFLARE_API_TOKEN"],
 			"dependsOn": ["build"],
 			"outputLogs": "new-only"
 		},