fix: full paths in gitignore, and ignore .yarn for lint

Author: djMax

eslint.config.mts

@@ -12,6 +12,6 @@ export default defineConfig([
   },
   tseslint.configs.recommended,
   {
-    ignores: ["./build/**", "node_modules/**"],
+    ignores: ["./build/**", "node_modules/**", ".yarn/**"],
   },
 ]);

src/cli.spec.ts

@@ -47,8 +47,8 @@ describe('cli', () => {
       );
 
       const gitignore = await readFile(path.join(cwd, '.gitignore'), 'utf8');
-      expect(gitignore).toContain('secrets/.env');
-      expect(gitignore).toContain('config/app.json');
+      expect(gitignore).toContain('/secrets/.env');
+      expect(gitignore).toContain('/config/app.json');
 
       expect(stdout.toString()).toMatch(/cpconfig apply/);
     });
@@ -89,7 +89,7 @@ describe('cli', () => {
         'from module',
       );
       const gitignore = await readFile(path.join(cwd, '.gitignore'), 'utf8');
-      expect(gitignore).toContain('module-output.txt');
+      expect(gitignore).toContain('/module-output.txt');
       expect(stdout.toString()).toContain('cpconfig apply');
       expect(stdout.toString()).toContain('cpconfig.config.mjs');
     });
@@ -133,7 +133,7 @@ describe('cli', () => {
       );
 
       const gitignore = await readFile(path.join(cwd, '.gitignore'), 'utf8');
-      expect(gitignore).toContain('ts-output.txt');
+      expect(gitignore).toContain('/ts-output.txt');
     });
   });
 
@@ -184,7 +184,7 @@ describe('cli', () => {
       expect(deserialised.cliArgs).toEqual(['--json']);
 
       const gitignore = await readFile(path.join(cwd, 'generated.ignore'), 'utf8');
-      expect(gitignore).toContain('factory.txt');
+      expect(gitignore).toContain('/factory.txt');
       const stdoutJson = JSON.parse(stdout.toString()) as {
         gitignore: { path: string };
       };

src/index.spec.ts

@@ -21,7 +21,7 @@ describe('syncConfigs', () => {
 
       expect(result.files.map(({ action }) => action)).toEqual(['created', 'created']);
       expect(result.gitignore.updated).toBe(true);
-      expect(result.gitignore.added).toEqual(['env/.env.local', '.secrets.yml']);
+      expect(result.gitignore.added).toEqual(['/env/.env.local', '/.secrets.yml']);
 
       await expect(readFile(path.join(rootDir, 'env/.env.local'), 'utf8')).resolves.toBe(
         'TOKEN=secret',
@@ -32,8 +32,8 @@ describe('syncConfigs', () => {
 
       const gitignore = await readFile(path.join(rootDir, '.gitignore'), 'utf8');
       expect(gitignore).toContain('# Managed by cpconfig');
-      expect(gitignore).toContain('env/.env.local');
-      expect(gitignore).toContain('.secrets.yml');
+      expect(gitignore).toContain('/env/.env.local');
+      expect(gitignore).toContain('/.secrets.yml');
     });
   });
 
@@ -74,11 +74,11 @@ describe('syncConfigs', () => {
       ]);
       expect(result.gitignore.updated).toBe(true);
       expect(result.gitignore.added).toEqual([]);
-      expect(result.gitignore.removed).toEqual(['config/b.json']);
+      expect(result.gitignore.removed).toEqual(['/config/b.json']);
 
       const gitignore = await readFile(path.join(rootDir, '.gitignore'), 'utf8');
-      expect(gitignore).toContain('config/a.json');
-      expect(gitignore).not.toContain('config/b.json');
+      expect(gitignore).toContain('/config/a.json');
+      expect(gitignore).not.toContain('/config/b.json');
     });
   });
 
@@ -116,8 +116,8 @@ describe('syncConfigs', () => {
       );
 
       const gitignore = await readFile(path.join(rootDir, '.gitignore'), 'utf8');
-      expect(gitignore).toContain('secret.log');
-      expect(gitignore).not.toContain('visible.log');
+      expect(gitignore).toContain('/secret.log');
+      expect(gitignore).not.toContain('/visible.log');
     });
   });
 

src/index.ts

@@ -242,11 +242,14 @@ function normalizeFiles(files: ConfigMap, rootDir: string): NormalizedConfigFile
       }
     }
 
+    const gitignoreEntry =
+      entry.gitignore === false ? null : formatGitignoreEntry(normalizedRelative);
+
     return {
       absolutePath,
       relativePath: normalizedRelative,
       contents,
-      gitignoreEntry: entry.gitignore === false ? null : normalizedRelative,
+      gitignoreEntry,
       mode: entry.mode,
       sentinel,
     } satisfies NormalizedConfigFile;
@@ -284,6 +287,14 @@ function normalizeRelativePath(relativePath: string): string {
   return posix.replace(/^\.\/(.*)/, '$1');
 }
 
+function formatGitignoreEntry(relativePath: string): string {
+  if (relativePath.startsWith('/')) {
+    return relativePath;
+  }
+
+  return `/${relativePath}`;
+}
+
 async function syncFile(
   file: NormalizedConfigFile,
   options: { dryRun: boolean; encoding: BufferEncoding },