create-typescript-app 2.0.0-beta.17 → 2.0.0-beta.19

package/lib/blocks/blockNvmrc.d.ts

@@ -1,17 +1,18 @@
 import * as bingo_stratum from 'bingo-stratum';
 
 declare const blockNvmrc: bingo_stratum.BlockWithoutAddons<{
+    owner: string;
+    repository: string;
     description: string;
-    access: "public" | "restricted";
-    directory: string;
     email: {
         github: string;
         npm: string;
     };
     title: string;
-    owner: string;
-    repository: string;
+    access: "public" | "restricted";
+    directory: string;
     author?: string | undefined;
+    version?: string | undefined;
     bin?: string | undefined;
     contributors?: {
         name: string;
@@ -24,8 +25,8 @@ declare const blockNvmrc: bingo_stratum.BlockWithoutAddons<{
     explainer?: string[] | undefined;
     funding?: string | undefined;
     guide?: {
-        href: string;
         title: string;
+        href: string;
     } | undefined;
     keywords?: string[] | undefined;
     logo?: {
@@ -43,8 +44,8 @@ declare const blockNvmrc: bingo_stratum.BlockWithoutAddons<{
         devDependencies?: Record<string, string> | undefined;
         scripts?: Record<string, string> | undefined;
     } | undefined;
+    rulesetId?: string | undefined;
     usage?: string | undefined;
-    version?: string | undefined;
 }>;
 
 export { blockNvmrc };

package/lib/blocks/blockPRCompliance.d.ts

@@ -1,17 +1,18 @@
 import * as bingo_stratum from 'bingo-stratum';
 
 declare const blockPRCompliance: bingo_stratum.BlockWithoutAddons<{
+    owner: string;
+    repository: string;
     description: string;
-    access: "public" | "restricted";
-    directory: string;
     email: {
         github: string;
         npm: string;
     };
     title: string;
-    owner: string;
-    repository: string;
+    access: "public" | "restricted";
+    directory: string;
     author?: string | undefined;
+    version?: string | undefined;
     bin?: string | undefined;
     contributors?: {
         name: string;
@@ -24,8 +25,8 @@ declare const blockPRCompliance: bingo_stratum.BlockWithoutAddons<{
     explainer?: string[] | undefined;
     funding?: string | undefined;
     guide?: {
-        href: string;
         title: string;
+        href: string;
     } | undefined;
     keywords?: string[] | undefined;
     logo?: {
@@ -43,8 +44,8 @@ declare const blockPRCompliance: bingo_stratum.BlockWithoutAddons<{
         devDependencies?: Record<string, string> | undefined;
         scripts?: Record<string, string> | undefined;
     } | undefined;
+    rulesetId?: string | undefined;
     usage?: string | undefined;
-    version?: string | undefined;
 }>;
 
 export { blockPRCompliance };

package/lib/blocks/blockPackageJson.d.ts

@@ -2,25 +2,26 @@ import * as bingo_stratum from 'bingo-stratum';
 
 declare const blockPackageJson: bingo_stratum.BlockWithAddons<{
     properties: {
+        files?: string[] | undefined;
         dependencies?: Record<string, string> | undefined;
         devDependencies?: Record<string, string> | undefined;
         scripts?: Record<string, string> | undefined;
-        files?: string[] | undefined;
         peerDependencies?: Record<string, string> | undefined;
     } & Record<string, unknown>;
     cleanupCommands: string[];
 }, {
+    owner: string;
+    repository: string;
     description: string;
-    access: "public" | "restricted";
-    directory: string;
     email: {
         github: string;
         npm: string;
     };
     title: string;
-    owner: string;
-    repository: string;
+    access: "public" | "restricted";
+    directory: string;
     author?: string | undefined;
+    version?: string | undefined;
     bin?: string | undefined;
     contributors?: {
         name: string;
@@ -33,8 +34,8 @@ declare const blockPackageJson: bingo_stratum.BlockWithAddons<{
     explainer?: string[] | undefined;
     funding?: string | undefined;
     guide?: {
-        href: string;
         title: string;
+        href: string;
     } | undefined;
     keywords?: string[] | undefined;
     logo?: {
@@ -52,8 +53,8 @@ declare const blockPackageJson: bingo_stratum.BlockWithAddons<{
         devDependencies?: Record<string, string> | undefined;
         scripts?: Record<string, string> | undefined;
     } | undefined;
+    rulesetId?: string | undefined;
     usage?: string | undefined;
-    version?: string | undefined;
 }>;
 
 export { blockPackageJson };

package/lib/blocks/blockPnpmDedupe.d.ts

@@ -1,17 +1,18 @@
 import * as bingo_stratum from 'bingo-stratum';
 
 declare const blockPnpmDedupe: bingo_stratum.BlockWithoutAddons<{
+    owner: string;
+    repository: string;
     description: string;
-    access: "public" | "restricted";
-    directory: string;
     email: {
         github: string;
         npm: string;
     };
     title: string;
-    owner: string;
-    repository: string;
+    access: "public" | "restricted";
+    directory: string;
     author?: string | undefined;
+    version?: string | undefined;
     bin?: string | undefined;
     contributors?: {
         name: string;
@@ -24,8 +25,8 @@ declare const blockPnpmDedupe: bingo_stratum.BlockWithoutAddons<{
     explainer?: string[] | undefined;
     funding?: string | undefined;
     guide?: {
-        href: string;
         title: string;
+        href: string;
     } | undefined;
     keywords?: string[] | undefined;
     logo?: {
@@ -43,8 +44,8 @@ declare const blockPnpmDedupe: bingo_stratum.BlockWithoutAddons<{
         devDependencies?: Record<string, string> | undefined;
         scripts?: Record<string, string> | undefined;
     } | undefined;
+    rulesetId?: string | undefined;
     usage?: string | undefined;
-    version?: string | undefined;
 }>;
 
 export { blockPnpmDedupe };

package/lib/blocks/blockPrettier.d.ts

@@ -10,17 +10,18 @@ declare const blockPrettier: bingo_stratum.BlockWithAddons<{
         files: string;
     }[];
 }, {
+    owner: string;
+    repository: string;
     description: string;
-    access: "public" | "restricted";
-    directory: string;
     email: {
         github: string;
         npm: string;
     };
     title: string;
-    owner: string;
-    repository: string;
+    access: "public" | "restricted";
+    directory: string;
     author?: string | undefined;
+    version?: string | undefined;
     bin?: string | undefined;
     contributors?: {
         name: string;
@@ -33,8 +34,8 @@ declare const blockPrettier: bingo_stratum.BlockWithAddons<{
     explainer?: string[] | undefined;
     funding?: string | undefined;
     guide?: {
-        href: string;
         title: string;
+        href: string;
     } | undefined;
     keywords?: string[] | undefined;
     logo?: {
@@ -52,8 +53,8 @@ declare const blockPrettier: bingo_stratum.BlockWithAddons<{
         devDependencies?: Record<string, string> | undefined;
         scripts?: Record<string, string> | undefined;
     } | undefined;
+    rulesetId?: string | undefined;
     usage?: string | undefined;
-    version?: string | undefined;
 }>;
 
 export { blockPrettier };

package/lib/blocks/blockPrettierPluginCurly.d.ts

@@ -1,17 +1,18 @@
 import * as bingo_stratum from 'bingo-stratum';
 
 declare const blockPrettierPluginCurly: bingo_stratum.BlockWithoutAddons<{
+    owner: string;
+    repository: string;
     description: string;
-    access: "public" | "restricted";
-    directory: string;
     email: {
         github: string;
         npm: string;
     };
     title: string;
-    owner: string;
-    repository: string;
+    access: "public" | "restricted";
+    directory: string;
     author?: string | undefined;
+    version?: string | undefined;
     bin?: string | undefined;
     contributors?: {
         name: string;
@@ -24,8 +25,8 @@ declare const blockPrettierPluginCurly: bingo_stratum.BlockWithoutAddons<{
     explainer?: string[] | undefined;
     funding?: string | undefined;
     guide?: {
-        href: string;
         title: string;
+        href: string;
     } | undefined;
     keywords?: string[] | undefined;
     logo?: {
@@ -43,8 +44,8 @@ declare const blockPrettierPluginCurly: bingo_stratum.BlockWithoutAddons<{
         devDependencies?: Record<string, string> | undefined;
         scripts?: Record<string, string> | undefined;
     } | undefined;
+    rulesetId?: string | undefined;
     usage?: string | undefined;
-    version?: string | undefined;
 }>;
 
 export { blockPrettierPluginCurly };

package/lib/blocks/blockPrettierPluginPackageJson.d.ts

@@ -1,17 +1,18 @@
 import * as bingo_stratum from 'bingo-stratum';
 
 declare const blockPrettierPluginPackageJson: bingo_stratum.BlockWithoutAddons<{
+    owner: string;
+    repository: string;
     description: string;
-    access: "public" | "restricted";
-    directory: string;
     email: {
         github: string;
         npm: string;
     };
     title: string;
-    owner: string;
-    repository: string;
+    access: "public" | "restricted";
+    directory: string;
     author?: string | undefined;
+    version?: string | undefined;
     bin?: string | undefined;
     contributors?: {
         name: string;
@@ -24,8 +25,8 @@ declare const blockPrettierPluginPackageJson: bingo_stratum.BlockWithoutAddons<{
     explainer?: string[] | undefined;
     funding?: string | undefined;
     guide?: {
-        href: string;
         title: string;
+        href: string;
     } | undefined;
     keywords?: string[] | undefined;
     logo?: {
@@ -43,8 +44,8 @@ declare const blockPrettierPluginPackageJson: bingo_stratum.BlockWithoutAddons<{
         devDependencies?: Record<string, string> | undefined;
         scripts?: Record<string, string> | undefined;
     } | undefined;
+    rulesetId?: string | undefined;
     usage?: string | undefined;
-    version?: string | undefined;
 }>;
 
 export { blockPrettierPluginPackageJson };

package/lib/blocks/blockPrettierPluginSh.d.ts

@@ -1,17 +1,18 @@
 import * as bingo_stratum from 'bingo-stratum';
 
 declare const blockPrettierPluginSh: bingo_stratum.BlockWithoutAddons<{
+    owner: string;
+    repository: string;
     description: string;
-    access: "public" | "restricted";
-    directory: string;
     email: {
         github: string;
         npm: string;
     };
     title: string;
-    owner: string;
-    repository: string;
+    access: "public" | "restricted";
+    directory: string;
     author?: string | undefined;
+    version?: string | undefined;
     bin?: string | undefined;
     contributors?: {
         name: string;
@@ -24,8 +25,8 @@ declare const blockPrettierPluginSh: bingo_stratum.BlockWithoutAddons<{
     explainer?: string[] | undefined;
     funding?: string | undefined;
     guide?: {
-        href: string;
         title: string;
+        href: string;
     } | undefined;
     keywords?: string[] | undefined;
     logo?: {
@@ -43,8 +44,8 @@ declare const blockPrettierPluginSh: bingo_stratum.BlockWithoutAddons<{
         devDependencies?: Record<string, string> | undefined;
         scripts?: Record<string, string> | undefined;
     } | undefined;
+    rulesetId?: string | undefined;
     usage?: string | undefined;
-    version?: string | undefined;
 }>;
 
 export { blockPrettierPluginSh };

package/lib/blocks/blockREADME.d.ts

@@ -5,17 +5,18 @@ declare const blockREADME: bingo_stratum.BlockWithAddons<{
     notices: string[];
     sections: string[];
 }, {
+    owner: string;
+    repository: string;
     description: string;
-    access: "public" | "restricted";
-    directory: string;
     email: {
         github: string;
         npm: string;
     };
     title: string;
-    owner: string;
-    repository: string;
+    access: "public" | "restricted";
+    directory: string;
     author?: string | undefined;
+    version?: string | undefined;
     bin?: string | undefined;
     contributors?: {
         name: string;
@@ -28,8 +29,8 @@ declare const blockREADME: bingo_stratum.BlockWithAddons<{
     explainer?: string[] | undefined;
     funding?: string | undefined;
     guide?: {
-        href: string;
         title: string;
+        href: string;
     } | undefined;
     keywords?: string[] | undefined;
     logo?: {
@@ -47,8 +48,8 @@ declare const blockREADME: bingo_stratum.BlockWithAddons<{
         devDependencies?: Record<string, string> | undefined;
         scripts?: Record<string, string> | undefined;
     } | undefined;
+    rulesetId?: string | undefined;
     usage?: string | undefined;
-    version?: string | undefined;
 }>;
 
 export { blockREADME };

package/lib/blocks/blockReleaseIt.d.ts

@@ -1,17 +1,18 @@
 import * as bingo_stratum from 'bingo-stratum';
 
 declare const blockReleaseIt: bingo_stratum.BlockWithoutAddons<{
+    owner: string;
+    repository: string;
     description: string;
-    access: "public" | "restricted";
-    directory: string;
     email: {
         github: string;
         npm: string;
     };
     title: string;
-    owner: string;
-    repository: string;
+    access: "public" | "restricted";
+    directory: string;
     author?: string | undefined;
+    version?: string | undefined;
     bin?: string | undefined;
     contributors?: {
         name: string;
@@ -24,8 +25,8 @@ declare const blockReleaseIt: bingo_stratum.BlockWithoutAddons<{
     explainer?: string[] | undefined;
     funding?: string | undefined;
     guide?: {
-        href: string;
         title: string;
+        href: string;
     } | undefined;
     keywords?: string[] | undefined;
     logo?: {
@@ -43,8 +44,8 @@ declare const blockReleaseIt: bingo_stratum.BlockWithoutAddons<{
         devDependencies?: Record<string, string> | undefined;
         scripts?: Record<string, string> | undefined;
     } | undefined;
+    rulesetId?: string | undefined;
     usage?: string | undefined;
-    version?: string | undefined;
 }>;
 
 export { blockReleaseIt };

package/lib/blocks/blockRenovate.d.ts

@@ -1,17 +1,18 @@
 import * as bingo_stratum from 'bingo-stratum';
 
 declare const blockRenovate: bingo_stratum.BlockWithoutAddons<{
+    owner: string;
+    repository: string;
     description: string;
-    access: "public" | "restricted";
-    directory: string;
     email: {
         github: string;
         npm: string;
     };
     title: string;
-    owner: string;
-    repository: string;
+    access: "public" | "restricted";
+    directory: string;
     author?: string | undefined;
+    version?: string | undefined;
     bin?: string | undefined;
     contributors?: {
         name: string;
@@ -24,8 +25,8 @@ declare const blockRenovate: bingo_stratum.BlockWithoutAddons<{
     explainer?: string[] | undefined;
     funding?: string | undefined;
     guide?: {
-        href: string;
         title: string;
+        href: string;
     } | undefined;
     keywords?: string[] | undefined;
     logo?: {
@@ -43,8 +44,8 @@ declare const blockRenovate: bingo_stratum.BlockWithoutAddons<{
         devDependencies?: Record<string, string> | undefined;
         scripts?: Record<string, string> | undefined;
     } | undefined;
+    rulesetId?: string | undefined;
     usage?: string | undefined;
-    version?: string | undefined;
 }>;
 
 export { blockRenovate };

package/lib/blocks/blockRepositoryBranchRuleset.d.ts

@@ -3,17 +3,18 @@ import * as bingo_stratum from 'bingo-stratum';
 declare const blockRepositoryBranchRuleset: bingo_stratum.BlockWithAddons<{
     requiredStatusChecks: string[];
 }, {
+    owner: string;
+    repository: string;
     description: string;
-    access: "public" | "restricted";
-    directory: string;
     email: {
         github: string;
         npm: string;
     };
     title: string;
-    owner: string;
-    repository: string;
+    access: "public" | "restricted";
+    directory: string;
     author?: string | undefined;
+    version?: string | undefined;
     bin?: string | undefined;
     contributors?: {
         name: string;
@@ -26,8 +27,8 @@ declare const blockRepositoryBranchRuleset: bingo_stratum.BlockWithAddons<{
     explainer?: string[] | undefined;
     funding?: string | undefined;
     guide?: {
-        href: string;
         title: string;
+        href: string;
     } | undefined;
     keywords?: string[] | undefined;
     logo?: {
@@ -45,8 +46,8 @@ declare const blockRepositoryBranchRuleset: bingo_stratum.BlockWithAddons<{
         devDependencies?: Record<string, string> | undefined;
         scripts?: Record<string, string> | undefined;
     } | undefined;
+    rulesetId?: string | undefined;
     usage?: string | undefined;
-    version?: string | undefined;
 }>;
 
 export { blockRepositoryBranchRuleset };

package/lib/blocks/blockRepositoryBranchRuleset.js

@@ -7,63 +7,87 @@ const blockRepositoryBranchRuleset = base.createBlock({
   addons: {
     requiredStatusChecks: z.array(z.string()).default([])
   },
-  produce({ addons, options }) {
-    return {
-      requests: [
-        {
-          id: "branch-ruleset",
-          async send({ octokit }) {
-            await octokit.request("POST /repos/{owner}/{repo}/rulesets", {
-              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"]
-                }
+  setup({ addons, options }) {
+    return createRequestSend(
+      addons.requiredStatusChecks,
+      "POST /repos/{owner}/{repo}/rulesets",
+      options,
+      "branch-ruleset-create",
+      void 0
+    );
+  },
+  transition({ addons, options }) {
+    return createRequestSend(
+      addons.requiredStatusChecks,
+      `PUT /repos/{owner}/{repo}/rulesets/{ruleset_id}`,
+      options,
+      "branch-ruleset-update",
+      options.rulesetId
+    );
+  },
+  // TODO: Make produce() optional
+  // This needs createBlock to be generic to know if block.produce({}) is ok
+  produce() {
+    return {};
+  }
+});
+function createRequestSend(contexts, endpoint, options, requestId, rulesetId) {
+  return {
+    requests: [
+      {
+        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"
               },
-              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
                 },
-                {
-                  parameters: {
-                    required_status_checks: addons.requiredStatusChecks.map(
-                      (context) => ({ context })
-                    ),
-                    strict_required_status_checks_policy: false
-                  },
-                  type: "required_status_checks"
-                }
-              ],
-              target: "branch"
-            });
-          }
+                type: "required_status_checks"
+              }
+            ],
+            ruleset_id: rulesetId,
+            target: "branch"
+          });
         }
-      ]
-    };
-  }
-});
+      }
+    ]
+  };
+}
 export {
   blockRepositoryBranchRuleset
 };