Make .dev.vars and .env consistent and remove deprecated templates

Author: GregBrimble

.gitignore

@@ -108,13 +108,6 @@ web_modules/
 # Yarn Integrity file
 .yarn-integrity
 
-# dotenv environment variable files
-.env
-.env.development.local
-.env.test.local
-.env.production.local
-.env.local
-
 # parcel-bundler cache (https://parceljs.org/)
 .cache
 .parcel-cache
@@ -232,5 +225,8 @@ dist/**
 
 .e2e-test-report/
 
-.dev.vars
+.dev.vars*
+!.dev.vars.example
+.env*
+!.env.example
 .node-cache/

fixtures/container-app/.gitignore

@@ -92,14 +92,6 @@ web_modules/
 
 .yarn-integrity
 
-# dotenv environment variable files
-
-.env
-.env.development.local
-.env.test.local
-.env.production.local
-.env.local
-
 # parcel-bundler cache (https://parceljs.org/)
 
 .cache
@@ -168,6 +160,9 @@ dist
 
 # wrangler project
 
-.dev.vars
+.dev.vars*
+!.dev.vars.example
+.env*
+!.env.example
 .wrangler/
 worker-configuration.d.ts

packages/create-cloudflare/src/templates.ts

@@ -920,6 +920,13 @@ export const addWranglerToGitIgnore = (ctx: C3Context) => {
 	);
 	if (!hasDotDevDotVars) {
 		wranglerGitIgnoreFilesToAdd.push(".dev.vars*");
+		wranglerGitIgnoreFilesToAdd.push("!.dev.vars.example");
+	}
+
+	const hasDotEnv = existingGitIgnoreContent.match(/^\/?\.env(\.?\*)?(\s|$)/m);
+	if (!hasDotEnv) {
+		wranglerGitIgnoreFilesToAdd.push(".env*");
+		wranglerGitIgnoreFilesToAdd.push("!.env.example");
 	}
 
 	if (wranglerGitIgnoreFilesToAdd.length === 0) {

packages/create-cloudflare/templates/common/js/.gitignore

@@ -92,14 +92,6 @@ web_modules/
 
 .yarn-integrity
 
-# dotenv environment variable files
-
-.env
-.env.development.local
-.env.test.local
-.env.production.local
-.env.local
-
 # parcel-bundler cache (https://parceljs.org/)
 
 .cache
@@ -168,5 +160,8 @@ dist
 
 # wrangler project
 
-.dev.vars
+.dev.vars*
+!.dev.vars.example
+.env*
+!.env.example
 .wrangler/

packages/create-cloudflare/templates/common/ts/.gitignore

@@ -92,14 +92,6 @@ web_modules/
 
 .yarn-integrity
 
-# dotenv environment variable files
-
-.env
-.env.development.local
-.env.test.local
-.env.production.local
-.env.local
-
 # parcel-bundler cache (https://parceljs.org/)
 
 .cache

packages/create-cloudflare/templates/hello-world-durable-object-with-assets/js/.gitignore

@@ -92,14 +92,6 @@ web_modules/
 
 .yarn-integrity
 
-# dotenv environment variable files
-
-.env
-.env.development.local
-.env.test.local
-.env.production.local
-.env.local
-
 # parcel-bundler cache (https://parceljs.org/)
 
 .cache
@@ -168,5 +160,8 @@ dist
 
 # wrangler project
 
-.dev.vars
+.dev.vars*
+!.dev.vars.example
+.env*
+!.env.example
 .wrangler/

packages/create-cloudflare/templates/hello-world-durable-object-with-assets/py/.gitignore

@@ -48,14 +48,6 @@ jspm_packages/
 
 \*.tgz
 
-# dotenv environment variable files
-
-.env
-.env.development.local
-.env.test.local
-.env.production.local
-.env.local
-
 # public
 
 # Stores VSCode versions used for testing VSCode extensions
@@ -64,5 +56,8 @@ jspm_packages/
 
 # wrangler project
 
-.dev.vars
+.dev.vars*
+!.dev.vars.example
+.env*
+!.env.example
 .wrangler/

packages/create-cloudflare/templates/hello-world-durable-object-with-assets/ts/.gitignore

@@ -92,14 +92,6 @@ web_modules/
 
 .yarn-integrity
 
-# dotenv environment variable files
-
-.env
-.env.development.local
-.env.test.local
-.env.production.local
-.env.local
-
 # parcel-bundler cache (https://parceljs.org/)
 
 .cache
@@ -168,5 +160,8 @@ dist
 
 # wrangler project
 
-.dev.vars
+.dev.vars*
+!.dev.vars.example
+.env*
+!.env.example
 .wrangler/

packages/create-cloudflare/templates/hello-world-durable-object/js/.gitignore

@@ -92,14 +92,6 @@ web_modules/
 
 .yarn-integrity
 
-# dotenv environment variable files
-
-.env
-.env.development.local
-.env.test.local
-.env.production.local
-.env.local
-
 # parcel-bundler cache (https://parceljs.org/)
 
 .cache
@@ -168,5 +160,8 @@ dist
 
 # wrangler project
 
-.dev.vars
+.dev.vars*
+!.dev.vars.example
+.env*
+!.env.example
 .wrangler/

packages/create-cloudflare/templates/hello-world-durable-object/py/.gitignore

@@ -48,14 +48,6 @@ jspm_packages/
 
 \*.tgz
 
-# dotenv environment variable files
-
-.env
-.env.development.local
-.env.test.local
-.env.production.local
-.env.local
-
 # public
 
 # Stores VSCode versions used for testing VSCode extensions
@@ -64,5 +56,8 @@ jspm_packages/
 
 # wrangler project
 
-.dev.vars
+.dev.vars*
+!.dev.vars.example
+.env*
+!.env.example
 .wrangler/