From ada9416443e53e8e1ebfce821e3e757bd436b3bb Mon Sep 17 00:00:00 2001 From: emily-shen <69125074+emily-shen@users.noreply.github.com> Date: Fri, 14 Mar 2025 13:10:02 +0000 Subject: [PATCH 1/4] add tab to types line --- packages/create-cloudflare/e2e-tests/frameworks.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-cloudflare/e2e-tests/frameworks.test.ts b/packages/create-cloudflare/e2e-tests/frameworks.test.ts index a016b525b469..7084504434d1 100644 --- a/packages/create-cloudflare/e2e-tests/frameworks.test.ts +++ b/packages/create-cloudflare/e2e-tests/frameworks.test.ts @@ -390,7 +390,7 @@ const verifyBuildCfTypesScript = async ( // the file still contains the env interface expect(outputFileContentPostLines).toContain( - `interface ${envInterfaceName} {`, + `\tinterface ${envInterfaceName} {`, ); }; From 93f30584c9a6b5a46fa12371c1ee60dfee35d772 Mon Sep 17 00:00:00 2001 From: emily-shen <69125074+emily-shen@users.noreply.github.com> Date: Fri, 14 Mar 2025 13:34:13 +0000 Subject: [PATCH 2/4] change line check --- packages/create-cloudflare/e2e-tests/frameworks.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-cloudflare/e2e-tests/frameworks.test.ts b/packages/create-cloudflare/e2e-tests/frameworks.test.ts index 7084504434d1..1365b6577516 100644 --- a/packages/create-cloudflare/e2e-tests/frameworks.test.ts +++ b/packages/create-cloudflare/e2e-tests/frameworks.test.ts @@ -390,7 +390,7 @@ const verifyBuildCfTypesScript = async ( // the file still contains the env interface expect(outputFileContentPostLines).toContain( - `\tinterface ${envInterfaceName} {`, + `interface ${envInterfaceName} extends Cloudflare.Env {}`, ); }; From 4168041166e2fc77784e22824e40aeac3edd1e96 Mon Sep 17 00:00:00 2001 From: emily-shen <69125074+emily-shen@users.noreply.github.com> Date: Fri, 14 Mar 2025 14:14:48 +0000 Subject: [PATCH 3/4] allow both old and new type format --- packages/create-cloudflare/e2e-tests/frameworks.test.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/create-cloudflare/e2e-tests/frameworks.test.ts b/packages/create-cloudflare/e2e-tests/frameworks.test.ts index 1365b6577516..c52995e1f6e5 100644 --- a/packages/create-cloudflare/e2e-tests/frameworks.test.ts +++ b/packages/create-cloudflare/e2e-tests/frameworks.test.ts @@ -389,9 +389,14 @@ const verifyBuildCfTypesScript = async ( expect(outputFileContentPostLines).not.toContain("// Generated by Wrangler"); // the file still contains the env interface - expect(outputFileContentPostLines).toContain( - `interface ${envInterfaceName} extends Cloudflare.Env {}`, + const hasEnvInterface = outputFileContentPostLines.some( + (line) => + // old type gen - some frameworkte templates pin older versions of wrangler + line === `interface ${envInterfaceName} {` || + // new after importable env change + line === `interface ${envInterfaceName} extends Cloudflare.Env {`, ); + expect(hasEnvInterface).toBe(true); }; const verifyBuildScript = async ( From 46197bc667d76c462cbc168b8cee0467b261dabd Mon Sep 17 00:00:00 2001 From: Samuel Macleod Date: Fri, 14 Mar 2025 15:55:03 +0000 Subject: [PATCH 4/4] Fix new types snapshot --- packages/create-cloudflare/e2e-tests/frameworks.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-cloudflare/e2e-tests/frameworks.test.ts b/packages/create-cloudflare/e2e-tests/frameworks.test.ts index c52995e1f6e5..562281e2aeba 100644 --- a/packages/create-cloudflare/e2e-tests/frameworks.test.ts +++ b/packages/create-cloudflare/e2e-tests/frameworks.test.ts @@ -394,7 +394,7 @@ const verifyBuildCfTypesScript = async ( // old type gen - some frameworkte templates pin older versions of wrangler line === `interface ${envInterfaceName} {` || // new after importable env change - line === `interface ${envInterfaceName} extends Cloudflare.Env {`, + line === `interface ${envInterfaceName} extends Cloudflare.Env {}`, ); expect(hasEnvInterface).toBe(true); };