From aefe94a431401324f20127c60b590c977c6ea176 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Sat, 30 Dec 2023 04:14:57 -0500 Subject: [PATCH 1/5] chore: match .all-contributorsrc to template --- .all-contributorsrc | 6 +++--- src/steps/writing/creation/writeAllContributorsRC.ts | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 084b7eeb5..66f210c92 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1,6 +1,7 @@ { - "badgeTemplate": "\"All 🤝\" src=\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>_🤝-21bb42.svg\" />", + "badgeTemplate": "\t\"All 👪\" src=\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>_👪-21bb42.svg\" />", "commit": false, + "commitType": "docs", "commitConvention": "angular", "contributors": [ { @@ -381,6 +382,5 @@ "projectName": "create-typescript-app", "projectOwner": "JoshuaKGoldberg", "repoHost": "https://github.com", - "repoType": "github", - "commitType": "docs" + "repoType": "github" } diff --git a/src/steps/writing/creation/writeAllContributorsRC.ts b/src/steps/writing/creation/writeAllContributorsRC.ts index a44d5f4a7..f85f4864c 100644 --- a/src/steps/writing/creation/writeAllContributorsRC.ts +++ b/src/steps/writing/creation/writeAllContributorsRC.ts @@ -12,6 +12,7 @@ export async function writeAllContributorsRC(options: Options) { ' All Contributors: <%= contributors.length %> 👪', commit: false, commitConvention: "angular", + commitType: "docs", contributors: existing?.contributors ?? [], contributorsPerLine: 7, contributorsSortAlphabetically: true, From c20bd27a649f29ddfac7b48ffb22fb9bc42e2494 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Sat, 30 Dec 2023 04:31:08 -0500 Subject: [PATCH 2/5] Started updating snapshot... --- .all-contributorsrc | 2 +- script/__snapshots__/migrate-test-e2e.js.snap | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 66f210c92..388d70d53 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1,8 +1,8 @@ { "badgeTemplate": "\t\"All 👪\" src=\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>_👪-21bb42.svg\" />", "commit": false, - "commitType": "docs", "commitConvention": "angular", + "commitType": "docs", "contributors": [ { "avatar_url": "https://avatars.githubusercontent.com/u/3335181?v=4", diff --git a/script/__snapshots__/migrate-test-e2e.js.snap b/script/__snapshots__/migrate-test-e2e.js.snap index 48dda1835..973847e53 100644 --- a/script/__snapshots__/migrate-test-e2e.js.snap +++ b/script/__snapshots__/migrate-test-e2e.js.snap @@ -3,14 +3,17 @@ exports[`verify .all-contributorsrc 1`] = ` "--- a/.all-contributorsrc +++ b/.all-contributorsrc -@@ -1,5 +1,5 @@ +@@ -1,8 +1,8 @@ { -- "badgeTemplate": "\\"All 🤝\\" src=\\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>_🤝-21bb42.svg\\" />", -+ "badgeTemplate": "\\t\\"All 👪\\" src=\\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>_👪-21bb42.svg\\" />", + "badgeTemplate": "\\t\\"All 👪\\" src=\\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>_👪-21bb42.svg\\" />", "commit": false, +- "commitType": "docs", "commitConvention": "angular", ++ "commitType": "docs", "contributors": [ -@@ -24,363 +24,274 @@ + { + "avatar_url": "https://avatars.githubusercontent.com/u/3335181?v=4", +@@ -25,359 +25,271 @@ "name": "Jeff Wen", "avatar_url": "https://avatars.githubusercontent.com/u/3297859?v=4", "profile": "https://sinchang.me", @@ -408,12 +411,7 @@ exports[`verify .all-contributorsrc 1`] = ` + "files": ["README.md"], "imageSize": 100, "projectName": "create-typescript-app", - "projectOwner": "JoshuaKGoldberg", - "repoHost": "https://github.com", -- "repoType": "github", -- "commitType": "docs" -+ "repoType": "github" - }" + "projectOwner": "JoshuaKGoldberg"," `; exports[`verify .eslintignore 1`] = ` From ffcc3cdcaa4052d64c75380a02b1149192ff25a8 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Sat, 30 Dec 2023 04:32:15 -0500 Subject: [PATCH 3/5] Finally normalize snapshot --- script/__snapshots__/migrate-test-e2e.js.snap | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/script/__snapshots__/migrate-test-e2e.js.snap b/script/__snapshots__/migrate-test-e2e.js.snap index 973847e53..63c258e5c 100644 --- a/script/__snapshots__/migrate-test-e2e.js.snap +++ b/script/__snapshots__/migrate-test-e2e.js.snap @@ -3,16 +3,6 @@ exports[`verify .all-contributorsrc 1`] = ` "--- a/.all-contributorsrc +++ b/.all-contributorsrc -@@ -1,8 +1,8 @@ - { - "badgeTemplate": "\\t\\"All 👪\\" src=\\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>_👪-21bb42.svg\\" />", - "commit": false, -- "commitType": "docs", - "commitConvention": "angular", -+ "commitType": "docs", - "contributors": [ - { - "avatar_url": "https://avatars.githubusercontent.com/u/3335181?v=4", @@ -25,359 +25,271 @@ "name": "Jeff Wen", "avatar_url": "https://avatars.githubusercontent.com/u/3297859?v=4", From bf4af76b7731f98c54b918fcf42c3255a7f3b97a Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Sat, 30 Dec 2023 04:34:11 -0500 Subject: [PATCH 4/5] Align README.md too --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 38d676e66..2fe6c1539 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@

-All Contributors: 39 🤝 + All Contributors: 39 👪 Codecov Test Coverage From d35a12ce83f83187853821ffaccfbf48dc445ef2 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Sat, 30 Dec 2023 04:38:49 -0500 Subject: [PATCH 5/5] Align README snapshot --- script/__snapshots__/migrate-test-e2e.js.snap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/__snapshots__/migrate-test-e2e.js.snap b/script/__snapshots__/migrate-test-e2e.js.snap index 63c258e5c..ecc8b4e8b 100644 --- a/script/__snapshots__/migrate-test-e2e.js.snap +++ b/script/__snapshots__/migrate-test-e2e.js.snap @@ -637,7 +637,7 @@ exports[`verify README.md 1`] = `

--All Contributors: 39 🤝 +- All Contributors: 39 👪 + All Contributors: 39 👪 @@ -653,7 +653,7 @@ exports[`verify README.md 1`] = ` + Style: Prettier + TypeScript: Strict npm package version -+ All Contributors: 39 🤝 ++ All Contributors: 39 👪 + Sponsor: On GitHub 💸