create-typescript-app 2.4.0 → 2.4.2

package/lib/blocks/blockRepositoryBranchRuleset.js

@@ -8,22 +8,45 @@ const blockRepositoryBranchRuleset = base.createBlock({
     requiredStatusChecks: z.array(z.string()).default([])
   },
   setup({ addons, options }) {
-    return createRequestSend(
-      addons.requiredStatusChecks,
-      "POST /repos/{owner}/{repo}/rulesets",
-      options,
-      "branch-ruleset-create",
-      void 0
-    );
+    return {
+      requests: [
+        {
+          id: "branch-ruleset-create",
+          async send({ octokit }) {
+            await octokit.request(
+              "POST /repos/{owner}/{repo}/rulesets",
+              createInnerSend(addons.requiredStatusChecks, options)
+            );
+          }
+        }
+      ]
+    };
   },
   transition({ addons, options }) {
-    return createRequestSend(
-      addons.requiredStatusChecks,
-      `PUT /repos/{owner}/{repo}/rulesets/{ruleset_id}`,
-      options,
-      "branch-ruleset-update",
-      options.rulesetId
-    );
+    return {
+      requests: [
+        {
+          id: "branch-ruleset-update",
+          async send({ octokit }) {
+            if (options.rulesetId) {
+              await octokit.request(
+                `PUT /repos/{owner}/{repo}/rulesets/{ruleset_id}`,
+                createInnerSend(
+                  addons.requiredStatusChecks,
+                  options,
+                  options.rulesetId
+                )
+              );
+            } else {
+              await octokit.request(
+                `POST /repos/{owner}/{repo}/rulesets/{ruleset_id}`,
+                createInnerSend(addons.requiredStatusChecks, options)
+              );
+            }
+          }
+        }
+      ]
+    };
   },
   // TODO: Make produce() optional
   // This needs createBlock to be generic to know if block.produce({}) is ok
@@ -31,61 +54,54 @@ const blockRepositoryBranchRuleset = base.createBlock({
     return {};
   }
 });
-function createRequestSend(contexts, endpoint, options, requestId, rulesetId) {
+function createInnerSend(contexts, options, rulesetId) {
   return {
-    requests: [
+    bypass_actors: [
       {
-        id: requestId,
-        async send({ octokit }) {
-          await octokit.request(endpoint, {
-            bypass_actors: [
-              {
-                // This *seems* to be the Repository Admin role always?
-                // https://github.com/github/rest-api-description/issues/4406
-                actor_id: 5,
-                actor_type: "RepositoryRole",
-                bypass_mode: "always"
-              }
-            ],
-            conditions: {
-              ref_name: {
-                exclude: [],
-                include: ["refs/heads/main"]
-              }
-            },
-            enforcement: "active",
-            name: "Branch protection for main",
-            owner: options.owner,
-            repo: options.repository,
-            rules: [
-              { type: "deletion" },
-              {
-                parameters: {
-                  allowed_merge_methods: ["squash"],
-                  dismiss_stale_reviews_on_push: false,
-                  require_code_owner_review: false,
-                  require_last_push_approval: false,
-                  required_approving_review_count: 0,
-                  required_review_thread_resolution: false
-                },
-                type: "pull_request"
-              },
-              {
-                parameters: {
-                  required_status_checks: contexts.map((context) => ({
-                    context
-                  })),
-                  strict_required_status_checks_policy: false
-                },
-                type: "required_status_checks"
-              }
-            ],
-            ruleset_id: rulesetId,
-            target: "branch"
-          });
-        }
+        // This *seems* to be the Repository Admin role always?
+        // https://github.com/github/rest-api-description/issues/4406
+        actor_id: 5,
+        actor_type: "RepositoryRole",
+        bypass_mode: "always"
+      }
+    ],
+    conditions: {
+      ref_name: {
+        exclude: [],
+        include: ["refs/heads/main"]
+      }
+    },
+    enforcement: "active",
+    name: "Branch protection for main",
+    owner: options.owner,
+    repo: options.repository,
+    rules: [
+      { type: "deletion" },
+      {
+        parameters: {
+          allowed_merge_methods: ["squash"],
+          dismiss_stale_reviews_on_push: false,
+          require_code_owner_review: false,
+          require_last_push_approval: false,
+          required_approving_review_count: 0,
+          required_review_thread_resolution: false
+        },
+        type: "pull_request"
+      },
+      {
+        parameters: {
+          required_status_checks: contexts.map((context) => ({
+            context
+          })),
+          strict_required_status_checks_policy: false
+        },
+        type: "required_status_checks"
       }
-    ]
+    ],
+    // Type fun because the GitHub Octokit APIs don't provide named types...
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    ruleset_id: rulesetId === void 0 ? rulesetId : Number(rulesetId),
+    target: "branch"
   };
 }
 export {

package/lib/data/packageData.d.ts

@@ -1,5 +1,5 @@
 var name = "create-typescript-app";
-var version = "2.3.0";
+var version = "2.4.1";
 var description = "Quickstart-friendly TypeScript template with comprehensive, configurable, opinionated tooling. 🎁";
 var repository = {
 	type: "git",

package/lib/options/readAllContributors.d.ts

@@ -1,6 +1,6 @@
 import { AllContributorContributor } from '../types.js';
 import { TakeInput } from 'bingo';
 
-declare function readAllContributors(take: TakeInput): Promise<AllContributorContributor[]>;
+declare function readAllContributors(take: TakeInput): Promise<AllContributorContributor[] | undefined>;
 
 export { readAllContributors };

package/lib/options/readAllContributors.js

@@ -11,7 +11,7 @@ async function readAllContributors(take) {
   const user = await take(inputFromOctokit, {
     endpoint: "GET /user"
   });
-  return [
+  return user && [
     {
       avatar_url: user.avatar_url,
       contributions: ownerContributions,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-typescript-app",
-	"version": "2.4.0",
+	"version": "2.4.2",
 	"description": "Quickstart-friendly TypeScript template with comprehensive, configurable, opinionated tooling. 🎁",
 	"repository": {
 		"type": "git",