diff --git a/packages/js/package.json b/packages/js/package.json
index 45a6aa315..82f10300a 100644
--- a/packages/js/package.json
+++ b/packages/js/package.json
@@ -40,8 +40,12 @@
     "typecheck": "tsc --noEmit",
     "clean": "rimraf dist && rimraf node_modules",
     "lint": "eslint --ext .tsx,.ts .",
-    "build": "rimraf dist && tsdown",
-    "dev": "tsdown --watch"
+    "codegen": "pnpm run env",
+    "codegen:watch": "concurrently -n \"env\" -k \"pnpm run env:watch\"",
+    "build": "rimraf dist && pnpm run codegen && tsdown",
+    "dev": "concurrently -n \"build,codegen\" -k \"tsdown --watch\" \"pnpm run codegen:watch\"",
+    "env": "tsx ./scripts/generate-env.ts",
+    "env:watch": "chokidar --silent './scripts/generate-env.ts' -c 'pnpm run env' --throttle 2000"
   },
   "files": [
     "README.md",
diff --git a/packages/next/package.json b/packages/next/package.json
index 5fe9ef11f..49ab26c0e 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -40,10 +40,10 @@
     "typecheck": "tsc --noEmit",
     "clean": "rimraf dist && rimraf node_modules",
     "lint": "eslint --ext .tsx,.ts .",
-    "build": "rimraf dist && pnpm run codegen && tsdown",
-    "dev": "concurrently -n \"build,codegen\" -k \"tsdown --watch\" \"pnpm run codegen:watch\"",
     "codegen": "pnpm run env && pnpm run css",
     "codegen:watch": "concurrently -n \"env,css\" -k \"pnpm run env:watch\" \"pnpm run css:watch\"",
+    "build": "rimraf dist && pnpm run codegen && tsdown",
+    "dev": "concurrently -n \"build,codegen\" -k \"tsdown --watch\" \"pnpm run codegen:watch\"",
     "env": "tsx ./scripts/generate-env.ts",
     "env:watch": "chokidar --silent './scripts/generate-env.ts' -c 'pnpm run env' --throttle 2000",
     "css": "pnpm run css-tw && pnpm run css-sc",
diff --git a/packages/react/package.json b/packages/react/package.json
index 69548d765..51bb66a6b 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -40,10 +40,10 @@
     "typecheck": "tsc --noEmit",
     "clean": "rimraf dist && rimraf node_modules",
     "lint": "eslint --ext .tsx,.ts .",
-    "build": "rimraf dist && pnpm run codegen && tsdown",
-    "dev": "concurrently -n \"build,codegen\" -k \"tsdown --watch\" \"pnpm run codegen:watch\"",
     "codegen": "pnpm run env && pnpm run css",
     "codegen:watch": "concurrently -n \"env,css\" -k \"pnpm run env:watch\" \"pnpm run css:watch\"",
+    "build": "rimraf dist && pnpm run codegen && tsdown",
+    "dev": "concurrently -n \"build,codegen\" -k \"tsdown --watch\" \"pnpm run codegen:watch\"",
     "env": "tsx ./scripts/generate-env.ts",
     "env:watch": "chokidar --silent './scripts/generate-env.ts' -c 'pnpm run env' --throttle 2000",
     "css": "pnpm run css-tw && pnpm run css-sc",
diff --git a/packages/tanstack-start/package.json b/packages/tanstack-start/package.json
index e2ecca4cc..053f152c0 100644
--- a/packages/tanstack-start/package.json
+++ b/packages/tanstack-start/package.json
@@ -51,10 +51,10 @@
     "typecheck": "tsc --noEmit",
     "clean": "rimraf dist && rimraf node_modules",
     "lint": "eslint --ext .tsx,.ts .",
-    "build": "rimraf dist && pnpm run codegen && tsdown",
-    "dev": "concurrently -n \"build,codegen\" -k \"tsdown --watch\" \"pnpm run codegen:watch\"",
     "codegen": "pnpm run env && pnpm run css",
     "codegen:watch": "concurrently -n \"env,css\" -k \"pnpm run env:watch\" \"pnpm run css:watch\"",
+    "build": "rimraf dist && pnpm run codegen && tsdown",
+    "dev": "concurrently -n \"build,codegen\" -k \"tsdown --watch\" \"pnpm run codegen:watch\"",
     "env": "tsx ./scripts/generate-env.ts",
     "env:watch": "chokidar --silent './scripts/generate-env.ts' -c 'pnpm run env' --throttle 2000",
     "css": "pnpm run css-tw && pnpm run css-sc",
diff --git a/packages/template/package-template.json b/packages/template/package-template.json
index 85100abf7..ed4ebec0b 100644
--- a/packages/template/package-template.json
+++ b/packages/template/package-template.json
@@ -67,18 +67,19 @@
     "lint": "eslint --ext .tsx,.ts .",
 
     "//": "IF_PLATFORM template react-like",
-    "build": "rimraf dist && pnpm run codegen && tsdown",
-    "dev": "concurrently -n \"build,codegen\" -k \"tsdown --watch\" \"pnpm run codegen:watch\"",
     "codegen": "pnpm run env && pnpm run css",
     "codegen:watch": "concurrently -n \"env,css\" -k \"pnpm run env:watch\" \"pnpm run css:watch\"",
+    "//": "ELSE_PLATFORM",
+    "codegen": "pnpm run env",
+    "codegen:watch": "concurrently -n \"env\" -k \"pnpm run env:watch\"",
+    "//": "END_PLATFORM",
+
+    "build": "rimraf dist && pnpm run codegen && tsdown",
+    "dev": "concurrently -n \"build,codegen\" -k \"tsdown --watch\" \"pnpm run codegen:watch\"",
     "env": "tsx ./scripts/generate-env.ts",
     "env:watch": "chokidar --silent './scripts/generate-env.ts' -c 'pnpm run env' --throttle 2000"
-    ,"//": "ELSE_PLATFORM",
-    "build": "rimraf dist && tsdown",
-    "dev": "tsdown --watch"
-    ,"//": "END_PLATFORM",
 
-    "//": "IF_PLATFORM template react-like"
+    ,"//": "IF_PLATFORM template react-like"
     ,"css": "pnpm run css-tw && pnpm run css-sc",
     "css:watch": "concurrently -n \"tw,sc\" -k \"pnpm run css-tw:watch\" \"pnpm run css-sc:watch\"",
     "css-tw:watch": "tailwindcss -i ./src/global.css -o ./src/generated/tailwind.css --watch",
@@ -88,11 +89,7 @@
     ,"//": "END_PLATFORM",
 
     "//": "IF_PLATFORM template"
-    ,"codegen": "pnpm run env && pnpm run css",
-    "codegen:watch": "concurrently -n \"env,css\" -k \"pnpm run env:watch\" \"pnpm run css:watch\"",
-    "env": "tsx ./scripts/generate-env.ts",
-    "env:watch": "chokidar --silent './scripts/generate-env.ts' -c 'pnpm run env' --throttle 2000",
-    "override-env-local-for-quetzal": "echo \"\\n$STACK_ENV_LOCAL_PACKAGE_BUILD_OVERRIDE_FOR_QUETZAL\\n\" >> .env.local",
+    ,"override-env-local-for-quetzal": "echo \"\\n$STACK_ENV_LOCAL_PACKAGE_BUILD_OVERRIDE_FOR_QUETZAL\\n\" >> .env.local",
     "quetzal": "rimraf quetzal-translations && pnpm run override-env-local-for-quetzal && quetzal-process-translations && tsx ./scripts/merge-quetzal-translations.ts",
     "quetzal:ignore-errors": "pnpm run quetzal || echo Quetzal failed, probably because the API key is missing. We will just ignore it",
     "quetzal:watch": "chokidar --silent \"src/**/*\" -i \"src/generated/quetzal-translations.ts\" -c 'pnpm run quetzal:ignore-errors' --throttle 2000"
diff --git a/packages/template/package.json b/packages/template/package.json
index fffab828b..d4fe1bc4c 100644
--- a/packages/template/package.json
+++ b/packages/template/package.json
@@ -52,10 +52,10 @@
     "typecheck": "tsc --noEmit",
     "clean": "rimraf dist && rimraf node_modules",
     "lint": "eslint --ext .tsx,.ts .",
-    "build": "rimraf dist && pnpm run codegen && tsdown",
-    "dev": "concurrently -n \"build,codegen\" -k \"tsdown --watch\" \"pnpm run codegen:watch\"",
     "codegen": "pnpm run env && pnpm run css",
     "codegen:watch": "concurrently -n \"env,css\" -k \"pnpm run env:watch\" \"pnpm run css:watch\"",
+    "build": "rimraf dist && pnpm run codegen && tsdown",
+    "dev": "concurrently -n \"build,codegen\" -k \"tsdown --watch\" \"pnpm run codegen:watch\"",
     "env": "tsx ./scripts/generate-env.ts",
     "env:watch": "chokidar --silent './scripts/generate-env.ts' -c 'pnpm run env' --throttle 2000",
     "css": "pnpm run css-tw && pnpm run css-sc",
diff --git a/scripts/generate-sdks.ts b/scripts/generate-sdks.ts
index b0b353b04..20409f785 100644
--- a/scripts/generate-sdks.ts
+++ b/scripts/generate-sdks.ts
@@ -159,6 +159,15 @@ withGeneratorLock(async () => {
       return baseEditFn({ relativePath, content, platforms: PLATFORMS["js"] });
     },
     filterFn: (relativePath) => {
+      const jsGeneratedFiles = new Set([
+        "scripts/generate-env.ts",
+        "src/generated/.gitignore",
+        "src/generated/env.ts",
+      ]);
+      if (jsGeneratedFiles.has(relativePath)) {
+        return true;
+      }
+
       const ignores = [
         "postcss.config.js",
         "tailwind.config.js",
@@ -172,8 +181,6 @@ withGeneratorLock(async () => {
         "src/components-page/",
         "src/generated/",
         "src/providers/",
-        "src/global.css",
-        "src/global.d.ts",
       ];
 
       if (tanstackStartOnlyTemplateFiles.has(relativePath) || templateOnlyFiles.has(relativePath)) {