diff --git a/config/registry.json b/config/registry.json
index cf6c9ae..b465bee 100644
--- a/config/registry.json
+++ b/config/registry.json
@@ -195,7 +195,7 @@
           "format": "biome format --write ."
         },
         "devDependencies": {
-          "@biomejs/biome": "2.4.15"
+          "@biomejs/biome": "2.5.0"
         }
       }
     },
@@ -236,7 +236,7 @@
           "lint": "biome lint ."
         },
         "devDependencies": {
-          "@biomejs/biome": "2.4.15"
+          "@biomejs/biome": "2.5.0"
         }
       }
     },
diff --git a/config/templates/base/astro/.gitignore b/config/templates/base/astro/.gitignore.tmpl
similarity index 64%
rename from config/templates/base/astro/.gitignore
rename to config/templates/base/astro/.gitignore.tmpl
index 16d54bb..b86c1a0 100644
--- a/config/templates/base/astro/.gitignore
+++ b/config/templates/base/astro/.gitignore.tmpl
@@ -19,6 +19,19 @@ pnpm-debug.log*
 
 # macOS-specific files
 .DS_Store
+._*
 
 # jetbrains setting folder
 .idea/
+
+# cloudflare / wrangler
+.wrangler/
+.dev.vars
+
+# playwright
+test-results/
+playwright-report/
+.playwright-mcp/
+
+# lighthouse ci
+.lighthouseci/
diff --git a/config/templates/base/astro/astro.config.mjs.tmpl b/config/templates/base/astro/astro.config.mjs.tmpl
index ddb0345..877449f 100644
--- a/config/templates/base/astro/astro.config.mjs.tmpl
+++ b/config/templates/base/astro/astro.config.mjs.tmpl
@@ -9,6 +9,9 @@ import react from '@astrojs/react';
 {{- if eq .CSS "tailwindcss"}}
 import tailwindcss from "@tailwindcss/vite";
 {{- end}}
+{{- if or (eq .Deployment "cloudflare-pages") (eq .Deployment "cloudflare-workers")}}
+import cloudflare from '@astrojs/cloudflare';
+{{- end}}
 
 // https://astro.build/config
 export default defineConfig({
@@ -19,13 +22,16 @@ export default defineConfig({
       MICROCMS_SERVICE_DOMAIN: envField.string({ context: 'server', access: 'secret'}),
       {{- end}}
     }
-  }
-{{- if or (eq .Base "astro-vue") (eq .Base "astro-react")}}
+  },
+  {{- if or (eq .Deployment "cloudflare-pages") (eq .Deployment "cloudflare-workers")}}
+  adapter: cloudflare(),
+  {{- end}}
+  {{- if or (eq .Base "astro-vue") (eq .Base "astro-react")}}
   integrations: [{{if eq .Base "astro-vue"}}vue(){{end}}{{if eq .Base "astro-react"}}react(){{end}}],
-{{- end}}
-{{- if eq .CSS "tailwindcss"}},
+  {{- end}}
+  {{- if eq .CSS "tailwindcss"}}
   vite: {
     plugins: [tailwindcss()],
   },
-{{- end}}
+  {{- end}}
 });
diff --git a/config/templates/base/nuxt/.gitignore b/config/templates/base/nuxt/.gitignore.tmpl
similarity index 57%
rename from config/templates/base/nuxt/.gitignore
rename to config/templates/base/nuxt/.gitignore.tmpl
index 9cdea45..ca12357 100644
--- a/config/templates/base/nuxt/.gitignore
+++ b/config/templates/base/nuxt/.gitignore.tmpl
@@ -15,11 +15,21 @@ logs
 
 # Misc
 .DS_Store
+._*
 .fleet
 .idea
 
-# Wrangler
-.wrangler
+# cloudflare / wrangler
+.wrangler/
+.dev.vars
+
+# playwright
+test-results/
+playwright-report/
+.playwright-mcp/
+
+# lighthouse ci
+.lighthouseci/
 
 # Local env files
 .env
diff --git a/config/templates/base/vite/.gitignore b/config/templates/base/vite/.gitignore.tmpl
similarity index 63%
rename from config/templates/base/vite/.gitignore
rename to config/templates/base/vite/.gitignore.tmpl
index a547bf3..285aea6 100644
--- a/config/templates/base/vite/.gitignore
+++ b/config/templates/base/vite/.gitignore.tmpl
@@ -17,8 +17,21 @@ dist-ssr
 !.vscode/extensions.json
 .idea
 .DS_Store
+._*
 *.suo
 *.ntvs*
 *.njsproj
 *.sln
 *.sw?
+
+# cloudflare / wrangler
+.wrangler/
+.dev.vars
+
+# playwright
+test-results/
+playwright-report/
+.playwright-mcp/
+
+# lighthouse ci
+.lighthouseci/
diff --git a/config/templates/deploy/cloudflare-workers/wrangler.jsonc.tmpl b/config/templates/deploy/cloudflare-workers/wrangler.jsonc.tmpl
index 400b4f3..077b79c 100644
--- a/config/templates/deploy/cloudflare-workers/wrangler.jsonc.tmpl
+++ b/config/templates/deploy/cloudflare-workers/wrangler.jsonc.tmpl
@@ -12,6 +12,21 @@
     "enabled": true
   }
 }
+{{- else if .Base.IsAstro}}
+{
+  "$schema": "./node_modules/wrangler/config-schema.json",
+  "name": "{{.ProjectName}}",
+  "main": "@astrojs/cloudflare/entrypoints/server",
+  "compatibility_date": "{{.Date}}",
+  "compatibility_flags": ["nodejs_compat"],
+  "assets": {
+    "directory": "./dist",
+    "binding": "ASSETS"
+  },
+  "observability": {
+    "enabled": true
+  }
+}
 {{- else}}
 {
   "$schema": "./node_modules/wrangler/config-schema.json",
diff --git a/config/templates/fmt/biome/biome.json.tmpl b/config/templates/fmt/biome/biome.json.tmpl
index da871c3..0d3b9d0 100644
--- a/config/templates/fmt/biome/biome.json.tmpl
+++ b/config/templates/fmt/biome/biome.json.tmpl
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.4.15/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.5.0/schema.json",
   "files": {
     "includes": [
       "**",
diff --git a/config/templates/integration/astro/react/src/components/react/button.tsx b/config/templates/integration/astro/react/src/components/react/button.tsx
index 88e30e9..ae13799 100644
--- a/config/templates/integration/astro/react/src/components/react/button.tsx
+++ b/config/templates/integration/astro/react/src/components/react/button.tsx
@@ -10,7 +10,7 @@ const Button = () => {
     <span>
       Count: {count}
     </span>
-    <button onClick={handleClick}>
+    <button type="button" onClick={handleClick}>
       Click me
     </button>
   </>
diff --git a/config/templates/integration/vite/react/src/app.tsx.tmpl b/config/templates/integration/vite/react/src/app.tsx.tmpl
index 04efc31..9fd2e6a 100644
--- a/config/templates/integration/vite/react/src/app.tsx.tmpl
+++ b/config/templates/integration/vite/react/src/app.tsx.tmpl
@@ -16,7 +16,7 @@ const App = () => {
         <span>
           Count: {{ "{ count }" }}
         </span>
-        <button onClick={handleClick}>Click me</button>
+        <button type="button" onClick={handleClick}>Click me</button>
       </div>
     </main>
   );
diff --git a/config/templates/linter/eslint/eslint.config.mjs.tmpl b/config/templates/linter/eslint/eslint.config.mjs.tmpl
index 86fe819..ff5fc0c 100644
--- a/config/templates/linter/eslint/eslint.config.mjs.tmpl
+++ b/config/templates/linter/eslint/eslint.config.mjs.tmpl
@@ -1,7 +1,9 @@
 import js from '@eslint/js'
 import globals from 'globals'
+{{- if .Base.IsReactInt}}
 import reactHooks from 'eslint-plugin-react-hooks'
 import reactRefresh from 'eslint-plugin-react-refresh'
+{{- end}}
 import tseslint from 'typescript-eslint'
 import { defineConfig, globalIgnores } from 'eslint/config'
 
diff --git a/pkg/config.go b/pkg/config.go
index b0a34bd..39ae432 100644
--- a/pkg/config.go
+++ b/pkg/config.go
@@ -87,11 +87,14 @@ func (b BaseFramework) IsVite() bool {
 }
 
 func (b BaseFramework) GetIntegration() (BaseIntegration, error) {
-	if globalRegistry != nil {
+	if globalRegistry == nil {
 		return BaseIntegration(""), errors.New("unable to read registry")
 	}
 
 	entry := globalRegistry.GetBase(string(b))
+	if entry == nil {
+		return BaseIntegration(""), errors.New("unknown base framework")
+	}
 	return BaseIntegration(entry.Integration), nil
 }
 
diff --git a/pkg/packagejson.go b/pkg/packagejson.go
index a9f2503..3f87731 100644
--- a/pkg/packagejson.go
+++ b/pkg/packagejson.go
@@ -175,12 +175,16 @@ func applyCrossCuttingRules(pkg *packageJSON, cfg ProjectConfig) {
 		pkg.DevDependencies["prettier-plugin-astro"] = "0.14.1"
 	}
 
-	// eslint + vite-react → extra React eslint plugins
-	if cfg.Linter == "eslint" && cfg.Base == "vite-react" {
+	// eslint → globals and typescript-eslint always required by eslint.config.mjs
+	if cfg.Linter == "eslint" {
 		pkg.DevDependencies["globals"] = "^17.4.0"
+		pkg.DevDependencies["typescript-eslint"] = "^8.58.0"
+	}
+
+	// eslint + react integration → React eslint plugins
+	if cfg.Linter == "eslint" && cfg.Base.IsReactInt() {
 		pkg.DevDependencies["eslint-plugin-react-hooks"] = "^7.0.1"
 		pkg.DevDependencies["eslint-plugin-react-refresh"] = "^0.5.2"
-		pkg.DevDependencies["typescript-eslint"] = "^8.58.0"
 	}
 
 	// veevalidate + zod → @vee-validate/zod adapter
@@ -198,4 +202,9 @@ func applyCrossCuttingRules(pkg *packageJSON, cfg ProjectConfig) {
 		pkg.DevDependencies["vite"] = "^6.3.5"
 	}
 
+	// astro + cloudflare -> @astrojs/cloudflare adapter
+	if cfg.Base.IsAstro() && (cfg.Deployment == "cloudflare-pages" || cfg.Deployment == "cloudflare-workers") {
+		pkg.DevDependencies["@astrojs/cloudflare"] = "^13.0.0"
+	}
+
 }