From b1395a74b7f719a2637531fc2f96fa0f45b66a62 Mon Sep 17 00:00:00 2001
From: emily-shen <69125074+emily-shen@users.noreply.github.com>
Date: Thu, 3 Apr 2025 11:34:58 +0100
Subject: [PATCH 1/4] remove unnecessary bits for spa mode
---
.../create-cloudflare/templates/react/workers/js/src/App.jsx | 2 +-
.../templates/react/workers/js/{api => worker}/index.js | 1 -
.../templates/react/workers/js/wrangler.jsonc | 4 ++--
.../create-cloudflare/templates/react/workers/ts/src/App.tsx | 2 +-
.../templates/react/workers/ts/{api => worker}/index.ts | 2 --
.../templates/react/workers/ts/wrangler.jsonc | 4 ++--
.../templates/vue/workers/js/server/index.js | 1 -
.../create-cloudflare/templates/vue/workers/js/wrangler.jsonc | 1 -
.../templates/vue/workers/ts/server/index.ts | 2 --
.../create-cloudflare/templates/vue/workers/ts/wrangler.jsonc | 1 -
10 files changed, 6 insertions(+), 14 deletions(-)
rename packages/create-cloudflare/templates/react/workers/js/{api => worker}/index.js (84%)
rename packages/create-cloudflare/templates/react/workers/ts/{api => worker}/index.ts (85%)
diff --git a/packages/create-cloudflare/templates/react/workers/js/src/App.jsx b/packages/create-cloudflare/templates/react/workers/js/src/App.jsx
index f9baf810c6..a1569eb959 100644
--- a/packages/create-cloudflare/templates/react/workers/js/src/App.jsx
+++ b/packages/create-cloudflare/templates/react/workers/js/src/App.jsx
@@ -45,7 +45,7 @@ function App() {
Name from API is: {name}
- Edit api/index.js to change the name
+ Edit worker/index.js to change the name
diff --git a/packages/create-cloudflare/templates/react/workers/js/api/index.js b/packages/create-cloudflare/templates/react/workers/js/worker/index.js
similarity index 84%
rename from packages/create-cloudflare/templates/react/workers/js/api/index.js
rename to packages/create-cloudflare/templates/react/workers/js/worker/index.js
index 5f8fd38675..280c6cdfe9 100644
--- a/packages/create-cloudflare/templates/react/workers/js/api/index.js
+++ b/packages/create-cloudflare/templates/react/workers/js/worker/index.js
@@ -8,6 +8,5 @@ export default {
});
}
- return env.ASSETS.fetch(request);
},
}
diff --git a/packages/create-cloudflare/templates/react/workers/js/wrangler.jsonc b/packages/create-cloudflare/templates/react/workers/js/wrangler.jsonc
index 3730936520..fca2a5d866 100644
--- a/packages/create-cloudflare/templates/react/workers/js/wrangler.jsonc
+++ b/packages/create-cloudflare/templates/react/workers/js/wrangler.jsonc
@@ -1,8 +1,8 @@
{
"name": "",
- "main": "api/index.js",
+ "main": "worker/index.js",
"compatibility_date": "",
- "assets": { "not_found_handling": "single-page-application", "binding": "ASSETS" },
+ "assets": { "not_found_handling": "single-page-application" },
"observability": {
"enabled": true
}
diff --git a/packages/create-cloudflare/templates/react/workers/ts/src/App.tsx b/packages/create-cloudflare/templates/react/workers/ts/src/App.tsx
index c7c944013d..37918862e2 100644
--- a/packages/create-cloudflare/templates/react/workers/ts/src/App.tsx
+++ b/packages/create-cloudflare/templates/react/workers/ts/src/App.tsx
@@ -45,7 +45,7 @@ function App() {
Name from API is: {name}
- Edit api/index.ts to change the name
+ Edit worker/index.ts to change the name
diff --git a/packages/create-cloudflare/templates/react/workers/ts/api/index.ts b/packages/create-cloudflare/templates/react/workers/ts/worker/index.ts
similarity index 85%
rename from packages/create-cloudflare/templates/react/workers/ts/api/index.ts
rename to packages/create-cloudflare/templates/react/workers/ts/worker/index.ts
index 3bef2c8d19..e94e9bf082 100644
--- a/packages/create-cloudflare/templates/react/workers/ts/api/index.ts
+++ b/packages/create-cloudflare/templates/react/workers/ts/worker/index.ts
@@ -7,7 +7,5 @@ export default {
name: "Cloudflare",
});
}
-
- return env.ASSETS.fetch(request);
},
} satisfies ExportedHandler;
diff --git a/packages/create-cloudflare/templates/react/workers/ts/wrangler.jsonc b/packages/create-cloudflare/templates/react/workers/ts/wrangler.jsonc
index b44e4723b2..f3758be559 100644
--- a/packages/create-cloudflare/templates/react/workers/ts/wrangler.jsonc
+++ b/packages/create-cloudflare/templates/react/workers/ts/wrangler.jsonc
@@ -1,8 +1,8 @@
{
"name": "",
- "main": "api/index.ts",
+ "main": "worker/index.ts",
"compatibility_date": "",
- "assets": { "not_found_handling": "single-page-application", "binding": "ASSETS" },
+ "assets": { "not_found_handling": "single-page-application" },
"observability": {
"enabled": true
}
diff --git a/packages/create-cloudflare/templates/vue/workers/js/server/index.js b/packages/create-cloudflare/templates/vue/workers/js/server/index.js
index 9c4d2a6c6b..6d4b5e95bc 100644
--- a/packages/create-cloudflare/templates/vue/workers/js/server/index.js
+++ b/packages/create-cloudflare/templates/vue/workers/js/server/index.js
@@ -8,6 +8,5 @@ export default {
});
}
- return env.ASSETS.fetch(request);
},
};
diff --git a/packages/create-cloudflare/templates/vue/workers/js/wrangler.jsonc b/packages/create-cloudflare/templates/vue/workers/js/wrangler.jsonc
index dfdd9a5743..2d6f58e498 100644
--- a/packages/create-cloudflare/templates/vue/workers/js/wrangler.jsonc
+++ b/packages/create-cloudflare/templates/vue/workers/js/wrangler.jsonc
@@ -4,7 +4,6 @@
"main": "server/index.ts",
"assets": {
"not_found_handling": "single-page-application",
- "binding": "ASSETS"
},
"observability": {
"enabled": true
diff --git a/packages/create-cloudflare/templates/vue/workers/ts/server/index.ts b/packages/create-cloudflare/templates/vue/workers/ts/server/index.ts
index 7b99daf8e4..fefb11b5d7 100644
--- a/packages/create-cloudflare/templates/vue/workers/ts/server/index.ts
+++ b/packages/create-cloudflare/templates/vue/workers/ts/server/index.ts
@@ -7,7 +7,5 @@ export default {
name: "Cloudflare",
});
}
-
- return env.ASSETS.fetch(request);
},
} satisfies ExportedHandler;
diff --git a/packages/create-cloudflare/templates/vue/workers/ts/wrangler.jsonc b/packages/create-cloudflare/templates/vue/workers/ts/wrangler.jsonc
index dfdd9a5743..2d6f58e498 100644
--- a/packages/create-cloudflare/templates/vue/workers/ts/wrangler.jsonc
+++ b/packages/create-cloudflare/templates/vue/workers/ts/wrangler.jsonc
@@ -4,7 +4,6 @@
"main": "server/index.ts",
"assets": {
"not_found_handling": "single-page-application",
- "binding": "ASSETS"
},
"observability": {
"enabled": true
From 7f30df3ca0721a76dce8fde032e30e6cbf7779f8 Mon Sep 17 00:00:00 2001
From: emily-shen <69125074+emily-shen@users.noreply.github.com>
Date: Thu, 3 Apr 2025 11:38:34 +0100
Subject: [PATCH 2/4] changeset
---
.changeset/shiny-facts-cross.md | 7 +++++++
1 file changed, 7 insertions(+)
create mode 100644 .changeset/shiny-facts-cross.md
diff --git a/.changeset/shiny-facts-cross.md b/.changeset/shiny-facts-cross.md
new file mode 100644
index 0000000000..0f52d8470a
--- /dev/null
+++ b/.changeset/shiny-facts-cross.md
@@ -0,0 +1,7 @@
+---
+"create-cloudflare": patch
+---
+
+remove unnecessary ASSETS binding call in SPA templates
+
+With SPA mode now enabled by default for compat dates since 2025-04-01, the Workers in the React and Vue templates no longer need this fallback ASSETS binding.
From 81f889e8e9ec6e339d9413c8ebe12f1b51fcc7af Mon Sep 17 00:00:00 2001
From: emily-shen <69125074+emily-shen@users.noreply.github.com>
Date: Thu, 3 Apr 2025 11:54:52 +0100
Subject: [PATCH 3/4] pr feedback
---
.../templates/react/workers/js/worker/index.js | 1 +
.../templates/react/workers/ts/tsconfig.worker.json | 2 +-
.../templates/react/workers/ts/worker/index.ts | 1 +
.../create-cloudflare/templates/vue/workers/js/server/index.js | 1 +
.../create-cloudflare/templates/vue/workers/ts/server/index.ts | 1 +
5 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/packages/create-cloudflare/templates/react/workers/js/worker/index.js b/packages/create-cloudflare/templates/react/workers/js/worker/index.js
index 280c6cdfe9..b86210eefe 100644
--- a/packages/create-cloudflare/templates/react/workers/js/worker/index.js
+++ b/packages/create-cloudflare/templates/react/workers/js/worker/index.js
@@ -8,5 +8,6 @@ export default {
});
}
+ return new Response(null, { status: 404 });
},
}
diff --git a/packages/create-cloudflare/templates/react/workers/ts/tsconfig.worker.json b/packages/create-cloudflare/templates/react/workers/ts/tsconfig.worker.json
index 3ab2efbb2f..2d4ea95b43 100644
--- a/packages/create-cloudflare/templates/react/workers/ts/tsconfig.worker.json
+++ b/packages/create-cloudflare/templates/react/workers/ts/tsconfig.worker.json
@@ -4,5 +4,5 @@
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.worker.tsbuildinfo",
"types": ["@cloudflare/workers-types/2023-07-01", "./worker-configuration.d.ts", "vite/client"],
},
- "include": ["api"],
+ "include": ["worker"],
}
diff --git a/packages/create-cloudflare/templates/react/workers/ts/worker/index.ts b/packages/create-cloudflare/templates/react/workers/ts/worker/index.ts
index e94e9bf082..f080bf1738 100644
--- a/packages/create-cloudflare/templates/react/workers/ts/worker/index.ts
+++ b/packages/create-cloudflare/templates/react/workers/ts/worker/index.ts
@@ -7,5 +7,6 @@ export default {
name: "Cloudflare",
});
}
+ return new Response(null, { status: 404 });
},
} satisfies ExportedHandler;
diff --git a/packages/create-cloudflare/templates/vue/workers/js/server/index.js b/packages/create-cloudflare/templates/vue/workers/js/server/index.js
index 6d4b5e95bc..a14cce09d8 100644
--- a/packages/create-cloudflare/templates/vue/workers/js/server/index.js
+++ b/packages/create-cloudflare/templates/vue/workers/js/server/index.js
@@ -8,5 +8,6 @@ export default {
});
}
+ return new Response(null, { status: 404 });
},
};
diff --git a/packages/create-cloudflare/templates/vue/workers/ts/server/index.ts b/packages/create-cloudflare/templates/vue/workers/ts/server/index.ts
index fefb11b5d7..7e6512cf2d 100644
--- a/packages/create-cloudflare/templates/vue/workers/ts/server/index.ts
+++ b/packages/create-cloudflare/templates/vue/workers/ts/server/index.ts
@@ -7,5 +7,6 @@ export default {
name: "Cloudflare",
});
}
+ return new Response(null, { status: 404 });
},
} satisfies ExportedHandler;
From 58335c5b8834894d1d4d9f9402284af3e5af89fb Mon Sep 17 00:00:00 2001
From: emily-shen <69125074+emily-shen@users.noreply.github.com>
Date: Thu, 3 Apr 2025 13:16:32 +0100
Subject: [PATCH 4/4] remove unnecessary env
---
.../templates/react/workers/ts/worker/index.ts | 2 +-
.../create-cloudflare/templates/vue/workers/js/server/index.js | 2 +-
.../create-cloudflare/templates/vue/workers/ts/server/index.ts | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/packages/create-cloudflare/templates/react/workers/ts/worker/index.ts b/packages/create-cloudflare/templates/react/workers/ts/worker/index.ts
index f080bf1738..67cc72243d 100644
--- a/packages/create-cloudflare/templates/react/workers/ts/worker/index.ts
+++ b/packages/create-cloudflare/templates/react/workers/ts/worker/index.ts
@@ -1,5 +1,5 @@
export default {
- fetch(request, env) {
+ fetch(request) {
const url = new URL(request.url);
if (url.pathname.startsWith("/api/")) {
diff --git a/packages/create-cloudflare/templates/vue/workers/js/server/index.js b/packages/create-cloudflare/templates/vue/workers/js/server/index.js
index a14cce09d8..0d41342125 100644
--- a/packages/create-cloudflare/templates/vue/workers/js/server/index.js
+++ b/packages/create-cloudflare/templates/vue/workers/js/server/index.js
@@ -1,5 +1,5 @@
export default {
- fetch(request, env) {
+ fetch(request) {
const url = new URL(request.url);
if (url.pathname.startsWith("/api/")) {
diff --git a/packages/create-cloudflare/templates/vue/workers/ts/server/index.ts b/packages/create-cloudflare/templates/vue/workers/ts/server/index.ts
index 7e6512cf2d..18b51f64b3 100644
--- a/packages/create-cloudflare/templates/vue/workers/ts/server/index.ts
+++ b/packages/create-cloudflare/templates/vue/workers/ts/server/index.ts
@@ -1,5 +1,5 @@
export default {
- fetch(request, env) {
+ fetch(request) {
const url = new URL(request.url);
if (url.pathname.startsWith("/api/")) {