From 701d41ee8b79f67df9dd896806e32d6e37fd2db4 Mon Sep 17 00:00:00 2001
From: Andy Jessop <andrewdjessop@gmail.com>
Date: Fri, 4 Oct 2024 12:14:34 +0200
Subject: [PATCH] chore: use wrangler.js as entrypoint (#6891)

* chore: use wrangler.js as entrypoint

* chore: fix test

* chore: one more test fix

* fix

---------

Co-authored-by: Rahul Sethi <5822355+RamIdeas@users.noreply.github.com>
---
 .github/workflows/e2e.yml         | 11 ++---------
 packages/wrangler/e2e/dev.test.ts |  4 ++--
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 43ba5b1a4ed2..4272060251ba 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -43,20 +43,13 @@ jobs:
           NODE_ENV: "production"
           CI_OS: ${{ runner.os }}
 
-      - name: Deploy a local version of Wrangler
-        run: |
-          pnpm --filter wrangler deploy ${{ github.workspace}}/temp/wrangler
-          rm ${{ github.workspace}}/temp/wrangler/templates/tsconfig.json
-        env:
-          NODE_ENV: "production"
-
       - name: Run tests
         run: pnpm run test:e2e:wrangler
         env:
           CLOUDFLARE_API_TOKEN: ${{ secrets.TEST_CLOUDFLARE_API_TOKEN }}
           CLOUDFLARE_ACCOUNT_ID: ${{ secrets.TEST_CLOUDFLARE_ACCOUNT_ID }}
-          WRANGLER: node --no-warnings ${{ github.workspace}}/temp/wrangler/bin/wrangler.js
-          WRANGLER_IMPORT: ${{ github.workspace}}/temp/wrangler/wrangler-dist/cli.js
+          WRANGLER: node --no-warnings ${{ github.workspace}}/packages/wrangler/bin/wrangler.js
+          WRANGLER_IMPORT: ${{ github.workspace}}/packages/wrangler/wrangler-dist/cli.js
           NODE_OPTIONS: "--max_old_space_size=8192"
           WRANGLER_LOG_PATH: ${{ runner.temp }}/wrangler-debug-logs/
           TEST_REPORT_PATH: ${{ runner.temp }}/test-report/index.html
diff --git a/packages/wrangler/e2e/dev.test.ts b/packages/wrangler/e2e/dev.test.ts
index 1a58ec632fd0..7ec1dc18ed57 100644
--- a/packages/wrangler/e2e/dev.test.ts
+++ b/packages/wrangler/e2e/dev.test.ts
@@ -922,14 +922,14 @@ describe("custom builds", () => {
 		// now check assets are still fetchable, even after updates
 
 		const res = await fetch(url);
-		await expect(res.text()).resolves.toBe("hello\n");
+		await expect(res.text()).resolves.toContain("hello");
 
 		await helper.seed({
 			"public/index.html": "world",
 		});
 
 		const resText = await retry(
-			(text) => text === "hello\n",
+			(text) => text.includes("hello"),
 			async () => {
 				const res2 = await fetch(url);
 				return res2.text();