@codedrifters/configulator 0.0.125 → 0.0.127

package/lib/index.mjs

@@ -751,7 +751,12 @@ var VERSION_NPM_PACKAGES = [
   { key: "TURBO_VERSION", npmPackage: "turbo" },
   { key: "VITEST_VERSION", npmPackage: "vitest" }
 ];
-var VERSION_KEYS_SKIP = ["NODE_WORKFLOWS"];
+var VERSION_KEYS_SKIP = [
+  "NODE_WORKFLOWS",
+  "VITE_VERSION",
+  "VITEST_VERSION"
+  // Pinned to 3.x for Vite 5 compatibility; skip until ESM-only (issue #142)
+];
 
 // src/versions.ts
 var VERSION = {
@@ -787,10 +792,17 @@ var VERSION = {
    * What version of the turborepo library should we use?
    */
   TURBO_VERSION: "2.8.14",
+  /**
+   * What version of Vite to use (pnpm override). Pinned to 5.x so Vitest 4.x
+   * can load config (Vite 6+/7+ are ESM-only; see issue #142). Remove override
+   * when moving to ESM-only test setup.
+   */
+  VITE_VERSION: "5.4.11",
   /**
    * What version of Vitest to use when testRunner is 'vitest'.
+   * Pinned to 3.x so it works with Vite 5 (Vitest 4 requires Vite 6). See issue #142.
    */
-  VITEST_VERSION: "4.0.18"
+  VITEST_VERSION: "3.2.4"
 };
 
 // src/jsii/jsii-faker.ts
@@ -1295,6 +1307,133 @@ var VSCodeConfig = class extends Component9 {
   }
 };
 
+// src/workflows/approve-merge-upgrade.ts
+import { JobPermission as JobPermission2 } from "projen/lib/github/workflows-model";
+var MERGE_METHODS = {
+  SQUASH: "squash",
+  MERGE: "merge",
+  REBASE: "rebase"
+};
+var DEFAULT_WORKFLOW_NAME = "approve-and-merge-upgrade";
+var DEFAULT_AUTO_APPROVE_LABEL = "auto-approve";
+var DEFAULT_HEAD_BRANCH = "github-actions/upgrade";
+var DEFAULT_APPROVAL_APP_ID_SECRET = "APPROVAL_APP_ID";
+var DEFAULT_APPROVAL_APP_PRIVATE_KEY_SECRET = "APPROVAL_APP_PRIVATE_KEY";
+var DEFAULT_MERGE_METHOD = MERGE_METHODS.SQUASH;
+var PULL_REQUEST_TARGET_TYPES = [
+  "labeled",
+  "synchronize",
+  "reopened",
+  "ready_for_review"
+];
+function addApproveMergeUpgradeWorkflow(project, options) {
+  const workflowName = options.workflowName ?? DEFAULT_WORKFLOW_NAME;
+  const autoApproveLabel = options.autoApproveLabel ?? DEFAULT_AUTO_APPROVE_LABEL;
+  const headBranch = options.headBranch ?? DEFAULT_HEAD_BRANCH;
+  const allowedUsernames = options.allowedUsernames;
+  const appIdSecret = options.approvalAppIdSecret ?? DEFAULT_APPROVAL_APP_ID_SECRET;
+  const privateKeySecret = options.approvalAppPrivateKeySecret ?? DEFAULT_APPROVAL_APP_PRIVATE_KEY_SECRET;
+  const mergeMethod = options.mergeMethod ?? DEFAULT_MERGE_METHOD;
+  const workflow = project.github?.addWorkflow(workflowName);
+  if (!workflow) return;
+  workflow.on({
+    pullRequestTarget: {
+      types: [...PULL_REQUEST_TARGET_TYPES],
+      ...options.branches && options.branches.length > 0 ? { branches: options.branches } : {}
+    }
+  });
+  const jobCondition = [
+    `contains(github.event.pull_request.labels.*.name, '${autoApproveLabel}')`,
+    `github.event.pull_request.head.ref == '${headBranch}'`,
+    `(${allowedUsernames.map((u) => `github.event.pull_request.user.login == '${u}'`).join(" || ")})`
+  ].join(" && ");
+  workflow.addJobs({
+    "approve-and-merge": {
+      name: "Approve and merge upgrade PR",
+      runsOn: ["ubuntu-latest"],
+      permissions: {
+        pullRequests: JobPermission2.WRITE,
+        contents: JobPermission2.WRITE
+      },
+      if: jobCondition,
+      steps: [
+        {
+          name: "Generate token",
+          id: "generate_token",
+          uses: "actions/create-github-app-token@v2",
+          with: {
+            "app-id": `\${{ secrets.${appIdSecret} }}`,
+            "private-key": `\${{ secrets.${privateKeySecret} }}`
+          }
+        },
+        {
+          name: "Auto-approve",
+          uses: "hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363",
+          with: {
+            "github-token": "${{ steps.generate_token.outputs.token }}"
+          }
+        },
+        {
+          name: "Enable auto-merge (squash)",
+          uses: "peter-evans/enable-pull-request-automerge@v3",
+          with: {
+            token: "${{ steps.generate_token.outputs.token }}",
+            "pull-request-number": "${{ github.event.pull_request.number }}",
+            "merge-method": mergeMethod
+          }
+        }
+      ]
+    }
+  });
+}
+
+// src/workflows/build-complete-job.ts
+import { JobPermission as JobPermission3 } from "projen/lib/github/workflows-model";
+var BUILD_JOB_ID = "build";
+var COMPLETE_JOB_ID = "complete";
+function buildCompleteJobRunScript(jobIds) {
+  const lines = [];
+  for (const id of jobIds) {
+    const expr = "${{ needs." + id + ".result }}";
+    if (id === BUILD_JOB_ID) {
+      lines.push(
+        `if [ "${expr}" != "success" ]; then echo "Job ${id} must succeed"; exit 1; fi`
+      );
+    } else {
+      lines.push(
+        `if [ "${expr}" != "success" ] && [ "${expr}" != "skipped" ]; then echo "Job ${id} must succeed or be skipped"; exit 1; fi`
+      );
+    }
+  }
+  return lines.join("\n");
+}
+function addBuildCompleteJob(buildWorkflow) {
+  const w = buildWorkflow.workflow;
+  if (!w?.jobs || typeof w.addJob !== "function") {
+    return;
+  }
+  const jobIds = Object.keys(w.jobs).filter((id) => id !== COMPLETE_JOB_ID);
+  if (jobIds.length === 0) {
+    return;
+  }
+  const runScript = buildCompleteJobRunScript(jobIds);
+  w.addJob(COMPLETE_JOB_ID, {
+    name: "Complete",
+    needs: jobIds,
+    if: "always()",
+    runsOn: ["ubuntu-latest"],
+    permissions: {
+      contents: JobPermission3.NONE
+    },
+    steps: [
+      {
+        name: "Verify all jobs succeeded or were skipped",
+        run: runScript
+      }
+    ]
+  });
+}
+
 // src/projects/monorepo-project.ts
 var postInstallDependenciesMap = /* @__PURE__ */ new WeakMap();
 var MonorepoProject = class extends TypeScriptAppProject {
@@ -1529,6 +1668,12 @@ var MonorepoProject = class extends TypeScriptAppProject {
         )
       );
     }
+    if (options.approveMergeUpgradeOptions) {
+      addApproveMergeUpgradeWorkflow(this, options.approveMergeUpgradeOptions);
+    }
+    if (this.buildWorkflow) {
+      addBuildCompleteJob(this.buildWorkflow);
+    }
     this.tasks.tryFind("post-upgrade")?.exec("pnpm upgrade -r");
     this.tasks.tryFind("post-upgrade")?.spawn(this.defaultTask);
   }
@@ -1595,7 +1740,7 @@ var import_utils3 = __toESM(require_lib());
 import { Component as Component11 } from "projen";
 import { BuildWorkflow } from "projen/lib/build";
 import { GitHub } from "projen/lib/github";
-import { JobPermission as JobPermission2 } from "projen/lib/github/workflows-model";
+import { JobPermission as JobPermission4 } from "projen/lib/github/workflows-model";
 var PROD_DEPLOY_NAME = "prod-deploy";
 var AwsDeployWorkflow = class _AwsDeployWorkflow extends Component11 {
   constructor(project, options = {}) {
@@ -1824,14 +1969,15 @@ var AwsDeployWorkflow = class _AwsDeployWorkflow extends Component11 {
         ],
         runsOn: ["ubuntu-latest"],
         permissions: {
-          contents: JobPermission2.READ,
-          idToken: JobPermission2.WRITE
+          contents: JobPermission4.READ,
+          idToken: JobPermission4.WRITE
         },
         concurrency: deployJobName,
         if: jobCondition,
         steps: [...this.deploySteps(target)]
       });
     });
+    addBuildCompleteJob(this.buildWorkflow);
   }
   static of(project, buildWorkflow) {
     const isDefined = (c) => c instanceof _AwsDeployWorkflow && c.buildWorkflow === buildWorkflow;
@@ -1863,7 +2009,9 @@ export {
   AwsDeployWorkflow,
   AwsDeploymentConfig,
   AwsDeploymentTarget,
+  COMPLETE_JOB_ID,
   JsiiFaker,
+  MERGE_METHODS,
   MIMIMUM_RELEASE_AGE,
   MonorepoProject,
   PROD_DEPLOY_NAME,
@@ -1881,6 +2029,8 @@ export {
   VERSION_NPM_PACKAGES,
   VSCodeConfig,
   Vitest,
+  addApproveMergeUpgradeWorkflow,
+  addBuildCompleteJob,
   getLatestEligibleVersion
 };
 //# sourceMappingURL=index.mjs.map