From c70bdb0fb4fe4ea133348d680867e333ace7dd13 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Mon, 25 Nov 2024 02:40:53 -0500 Subject: [PATCH 1/2] fix: use root-level slashes in .gitignore and .prettierignore --- .gitignore | 6 +++--- .prettierignore | 10 +++++----- script/__snapshots__/migrate-test-e2e.ts.snap | 20 +++++++++---------- .../creation/createDotGitignore.test.ts | 10 +++++----- .../writing/creation/createDotGitignore.ts | 6 +++--- src/steps/writing/creation/rootFiles.ts | 10 +++++----- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 32ffbca94..67a4fbfa1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -coverage*/ -lib/ -node_modules/ +/coverage +/lib +/node_modules diff --git a/.prettierignore b/.prettierignore index 608dd8d91..40d32561f 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,5 +1,5 @@ -.all-contributorsrc -.husky/ -coverage*/ -lib/ -pnpm-lock.yaml +/.all-contributorsrc +/.husky +/coverage* +/lib +/pnpm-lock.yaml diff --git a/script/__snapshots__/migrate-test-e2e.ts.snap b/script/__snapshots__/migrate-test-e2e.ts.snap index c633fd135..226a55f57 100644 --- a/script/__snapshots__/migrate-test-e2e.ts.snap +++ b/script/__snapshots__/migrate-test-e2e.ts.snap @@ -31,22 +31,22 @@ exports[`expected file changes > .gitignore 1`] = ` "--- a/.gitignore +++ b/.gitignore @@ ... @@ --coverage*/ -+coverage/ - lib/ - node_modules/" +-/coverage* ++/coverage + /lib + /node_modules" `; exports[`expected file changes > .prettierignore 1`] = ` "--- a/.prettierignore +++ b/.prettierignore @@ ... @@ - .all-contributorsrc - .husky/ --coverage*/ -+coverage/ - lib/ - pnpm-lock.yaml" + /.all-contributorsrc + /.husky +-/coverage* ++/coverage + /lib + /pnpm-lock.yaml" `; exports[`expected file changes > README.md 1`] = ` diff --git a/src/steps/writing/creation/createDotGitignore.test.ts b/src/steps/writing/creation/createDotGitignore.test.ts index c887e4b66..1ce565fe1 100644 --- a/src/steps/writing/creation/createDotGitignore.test.ts +++ b/src/steps/writing/creation/createDotGitignore.test.ts @@ -7,9 +7,9 @@ describe("createDotGitignore", () => { const actual = createDotGitignore({ excludeTests: false }); expect(actual).toMatchInlineSnapshot(` - "coverage/ - lib/ - node_modules/ + "/coverage + /lib + /node_modules " `); }); @@ -18,8 +18,8 @@ describe("createDotGitignore", () => { const actual = createDotGitignore({ excludeTests: true }); expect(actual).toMatchInlineSnapshot(` - "lib/ - node_modules/ + "/lib + /node_modules " `); }); diff --git a/src/steps/writing/creation/createDotGitignore.ts b/src/steps/writing/creation/createDotGitignore.ts index 3321ba826..e0cd5ed67 100644 --- a/src/steps/writing/creation/createDotGitignore.ts +++ b/src/steps/writing/creation/createDotGitignore.ts @@ -3,8 +3,8 @@ import { formatIgnoreFile } from "./formatters/formatIgnoreFile.js"; export function createDotGitignore(options: Pick) { return formatIgnoreFile([ - ...(options.excludeTests ? [] : ["coverage/"]), - "lib/", - "node_modules/", + ...(options.excludeTests ? [] : ["/coverage"]), + "/lib", + "/node_modules", ]); } diff --git a/src/steps/writing/creation/rootFiles.ts b/src/steps/writing/creation/rootFiles.ts index c5ea67ed4..2083af94d 100644 --- a/src/steps/writing/creation/rootFiles.ts +++ b/src/steps/writing/creation/rootFiles.ts @@ -27,11 +27,11 @@ export async function createRootFiles(options: Options) { }), ".nvmrc": `20.12.2\n`, ".prettierignore": formatIgnoreFile([ - ...(options.excludeAllContributors ? [] : [".all-contributorsrc"]), - ".husky/", - ...(options.excludeTests ? [] : ["coverage/"]), - "lib/", - "pnpm-lock.yaml", + ...(options.excludeAllContributors ? [] : ["/.all-contributorsrc"]), + "/.husky", + ...(options.excludeTests ? [] : ["/coverage"]), + "/lib", + "/pnpm-lock.yaml", ]), ".prettierrc.json": await formatJson({ $schema: "http://json.schemastore.org/prettierrc", From fc21d27ad08ad6dfc7a5f796049f1a9e6d4451f3 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Tue, 26 Nov 2024 15:00:45 -0500 Subject: [PATCH 2/2] fix: .gitignore should have asterisk for coverage --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 67a4fbfa1..cd60c28d4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/coverage +/coverage* /lib /node_modules