test: do not require remote bindings in basic vite e2e tests (#10759)

Author: petebacondarwin

.github/workflows/e2e.yml

@@ -109,7 +109,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout Repo
-        if: github.event.pull_request.head.repo.owner.login == 'cloudflare' || github.event_name == 'merge_group'
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
@@ -122,7 +121,7 @@ jobs:
               - '!**/*.md'
 
       - name: Install Dependencies
-        if: (github.event.pull_request.head.repo.owner.login == 'cloudflare' || github.event_name == 'merge_group') && steps.changes.outputs.everything_but_markdown == 'true'
+        if: steps.changes.outputs.everything_but_markdown == 'true'
         uses: ./.github/actions/install-dependencies
         with:
           node-version: ${{ matrix.node }}
@@ -132,18 +131,18 @@ jobs:
           turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
 
       - name: Bump package versions
-        if: (github.event.pull_request.head.repo.owner.login == 'cloudflare' || github.event_name == 'merge_group') && steps.changes.outputs.everything_but_markdown == 'true'
+        if: steps.changes.outputs.everything_but_markdown == 'true'
         run: node .github/changeset-version.js
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
       - name: Run Vite E2E tests
-        if: (github.event.pull_request.head.repo.owner.login == 'cloudflare' || github.event_name == 'merge_group') && steps.changes.outputs.everything_but_markdown == 'true'
+        if: steps.changes.outputs.everything_but_markdown == 'true'
         run: pnpm test:e2e -F @cloudflare/vite-plugin --log-order=stream
         timeout-minutes: 15
         env:
           NODE_DEBUG: "vite-plugin:test"
-          # The AI tests need to connect to Cloudflare
+          # The remote-binding tests need to connect to Cloudflare
           CLOUDFLARE_API_TOKEN: ${{ secrets.TEST_CLOUDFLARE_API_TOKEN }}
           CLOUDFLARE_ACCOUNT_ID: ${{ secrets.TEST_CLOUDFLARE_ACCOUNT_ID }}
           NODE_OPTIONS: "--max_old_space_size=8192"

packages/vite-plugin-cloudflare/e2e/basic.test.ts

@@ -170,24 +170,6 @@ describe("basic e2e tests", () => {
 					});
 				}
 			);
-
-			// This test checks that wrapped bindings which rely on additional workers with an authed connection to the CF API work
-			// They are skipped if you have not provided the necessary account id and api token.
-			describe.skipIf(
-				!process.env.CLOUDFLARE_ACCOUNT_ID || !process.env.CLOUDFLARE_API_TOKEN
-			)("Workers AI", () => {
-				test.skipIf(isBuildAndPreviewOnWindows(command))(
-					"can serve a Worker request",
-					async ({ expect }) => {
-						const proc = await runLongLived(pm, command, projectPath);
-						const url = await waitForReady(proc);
-
-						expect(await fetchJson(url + "/ai/")).toEqual({
-							response: expect.stringContaining("Workers AI"),
-						});
-					}
-				);
-			});
 		});
 	});
 });

packages/vite-plugin-cloudflare/e2e/fixtures/basic/api/index.ts

@@ -21,28 +21,6 @@ export default {
 			return Response.json(env);
 		}
 
-		if (url.pathname.startsWith("/ai/")) {
-			const messages = [
-				{
-					role: "user",
-					// This prompt generates the same output relatively reliably
-					content:
-						"Respond with the exact text 'This is a response from Workers AI.'. Do not include any other text",
-				},
-			];
-
-			const content = await env.AI.run("@hf/thebloke/zephyr-7b-beta-awq", {
-				messages,
-			});
-			if ("response" in content) {
-				return Response.json({
-					response: content.response,
-				});
-			} else {
-				return new Response("", { status: 500 });
-			}
-		}
-
 		return env.ASSETS.fetch(request);
 	},
 } satisfies ExportedHandler<Env>;

packages/vite-plugin-cloudflare/e2e/fixtures/basic/wrangler.jsonc

@@ -7,9 +7,6 @@
 		"binding": "ASSETS",
 	},
 	"main": "./api/index.ts",
-	"ai": {
-		"binding": "AI",
-	},
 	"vars": {
 		"VAR_1": "var-1",
 	},

packages/vite-plugin-cloudflare/e2e/fixtures/remote-bindings/entry-worker/src/index.ts

@@ -1,5 +1,28 @@
 export default {
 	async fetch(req, env) {
+		const url = new URL(req.url);
+		if (url.pathname.startsWith("/ai/")) {
+			const messages = [
+				{
+					role: "user",
+					// This prompt generates the same output relatively reliably
+					content:
+						"Respond with the exact text 'This is a response from Workers AI.'. Do not include any other text",
+				},
+			];
+
+			const content = await env.AI.run("@hf/thebloke/zephyr-7b-beta-awq", {
+				messages,
+			});
+			if ("response" in content) {
+				return Response.json({
+					response: content.response,
+				});
+			} else {
+				return new Response("", { status: 500 });
+			}
+		}
+
 		return Response.json({
 			localWorkerResponse: await (await env["LOCAL_WORKER"].fetch(req)).json(),
 			remoteWorkerResponse: await (

packages/vite-plugin-cloudflare/e2e/fixtures/remote-bindings/entry-worker/wrangler.jsonc

@@ -3,6 +3,9 @@
 	"main": "./src/index.ts",
 	"compatibility_date": "2024-12-30",
 	"compatibility_flags": ["nodejs_compat"],
+	"ai": {
+		"binding": "AI",
+	},
 	"services": [
 		{
 			"binding": "LOCAL_WORKER",

packages/vite-plugin-cloudflare/e2e/remote-bindings.test.ts

@@ -66,6 +66,19 @@ if (!process.env.CLOUDFLARE_ACCOUNT_ID || !process.env.CLOUDFLARE_API_TOKEN) {
 						});
 					}
 				);
+
+				// This test checks that wrapped bindings (e.g. AI) which rely on additional workers with an authed connection to the CF API work
+				test.skipIf(isBuildAndPreviewOnWindows(command))(
+					"Wrapped bindings (e.g. Workers AI) can serve a request",
+					async ({ expect }) => {
+						const proc = await runLongLived("pnpm", command, projectPath);
+						const url = await waitForReady(proc);
+
+						expect(await fetchJson(url + "/ai/")).toEqual({
+							response: expect.stringContaining("Workers AI"),
+						});
+					}
+				);
 			});
 
 			test("reflects changes applied during dev", async ({ expect }) => {