Modify regex

Author: evadecker

src/cli/lib/deployment.test.ts

@@ -56,20 +56,23 @@ test("git ignore changes", () => {
   expect(changesToGitIgnore(null)).toEqual(".env.local\n");
   expect(changesToGitIgnore("")).toEqual("\n.env.local\n");
   expect(changesToGitIgnore(".env")).toEqual(".env\n.env.local\n");
+  expect(changesToGitIgnore("# .env.local")).toEqual(
+    "# .env.local\n.env.local\n",
+  );
 
   // Handle existing
   expect(changesToGitIgnore(".env.local")).toEqual(null);
   expect(changesToGitIgnore(".env.*")).toEqual(null);
   expect(changesToGitIgnore(".env*")).toEqual(null);
-
-  // Handle inline comments
-  expect(changesToGitIgnore(".env.local # convex env")).toEqual(null);
+  expect(changesToGitIgnore(".env*.local")).toEqual(null);
+  expect(changesToGitIgnore("*.local")).toEqual(null);
+  expect(changesToGitIgnore("# convex env\n.env.local")).toEqual(null);
 
   // Handle Windows
   expect(changesToGitIgnore(".env.local\r")).toEqual(null);
 
   // Handle whitespace
-  expect(changesToGitIgnore(".env.local   ")).toEqual(null);
+  expect(changesToGitIgnore(" .env.local ")).toEqual(null);
 
   // Add .env.local (even if it's negated) to guide the user to solve the problem
   expect(changesToGitIgnore("!.env.local")).toEqual(

src/cli/lib/deployment.ts

@@ -147,18 +147,18 @@ export function changesToGitIgnore(existingFile: string | null): string | null {
   }
   const gitIgnoreLines = existingFile.split("\n");
   const envVarFileIgnored = gitIgnoreLines.some((line) => {
-    // Remove any inline comments
-    const trimmedLine = line.split("#")[0].trim();
+    // Remove extra whitespace
+    const trimmedLine = line.trim();
 
-    // Ignore negated patterns
-    if (trimmedLine.startsWith("!")) return false;
+    // Ignore negated patterns and comments
+    if (trimmedLine.startsWith("!") || trimmedLine.startsWith("#"))
+      return false;
 
     const envIgnorePatterns = [
-      /^\.env\.local$/,
-      /^\.env\.\*$/,
-      /^\.env\*$/,
-      /^.*\.local$/,
-      /^\.env\*\.local$/,
+      // .env.local, .env.*, .env*
+      /^\.env(\.local|\.\*|\*)$/,
+      // .env*.local, *.local
+      /^(\.env)?\*\.local$/,
     ];
 
     return envIgnorePatterns.some((pattern) => pattern.test(trimmedLine));