@codedrifters/configulator 0.0.129 → 0.0.130

package/lib/index.mjs

@@ -943,7 +943,6 @@ var PnpmWorkspace = class _PnpmWorkspace extends Component6 {
 // src/projects/monorepo-project.ts
 import {
   NodePackageManager as NodePackageManager2,
-  UpgradeDependencies,
   UpgradeDependenciesSchedule as UpgradeDependenciesSchedule2
 } from "projen/lib/javascript";
 import {
@@ -1435,6 +1434,18 @@ function addBuildCompleteJob(buildWorkflow) {
 }
 
 // src/projects/monorepo-project.ts
+var CONFIGULATOR_PACKAGE_NAME = "@codedrifters/configulator";
+function isConfigulatorRegistryConsumer(project) {
+  const dep = project.deps.all.find(
+    (d) => d.name === CONFIGULATOR_PACKAGE_NAME
+  );
+  if (!dep?.version) return false;
+  const v = dep.version;
+  if (v.startsWith("workspace:") || v.startsWith("file:") || v.startsWith("link:") || v.startsWith("catalog:")) {
+    return false;
+  }
+  return true;
+}
 var postInstallDependenciesMap = /* @__PURE__ */ new WeakMap();
 var MonorepoProject = class extends TypeScriptAppProject {
   constructor(userOptions) {
@@ -1520,9 +1531,12 @@ var MonorepoProject = class extends TypeScriptAppProject {
       release: false,
       /**
        * Uppgrade dependencies automatically unless otherwise instructed.
+       * Exclude @codedrifters/configulator so the default upgrade task does not
+       * upgrade it (version is often managed in-repo or via a separate sync step).
        */
       depsUpgrade: true,
       depsUpgradeOptions: {
+        exclude: ["@codedrifters/configulator"],
         workflowOptions: {
           schedule: UpgradeDependenciesSchedule2.DAILY
         },
@@ -1653,29 +1667,40 @@ var MonorepoProject = class extends TypeScriptAppProject {
     );
     this.gitignore?.addPatterns(".DS_Store", "test-reports");
     this.addDevDeps("constructs@catalog:");
-    if (options.upgradeConfigulatorTask === true) {
-      this.upgradeConfigulatorTask = new UpgradeDependencies(
-        this,
-        merge2(
-          {
-            include: ["@codedrifters/configulator"],
-            taskName: `upgrade-codedrifters-configulator`,
-            workflowOptions: {
-              schedule: UpgradeDependenciesSchedule2.DAILY
-            }
-          },
-          options.upgradeConfigulatorTaskOptions ?? {}
-        )
-      );
-    }
     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);
+    if (isConfigulatorRegistryConsumer(this)) {
+      this.tasks.tryFind("post-upgrade")?.exec(`pnpm update -r ${CONFIGULATOR_PACKAGE_NAME}`);
+      this.tasks.tryFind("post-upgrade")?.spawn(this.defaultTask);
+    }
+    const upgradeWorkflow = this.github?.tryFindWorkflow("upgrade");
+    const upgradeJob = upgradeWorkflow?.getJob("upgrade");
+    const jobWithSteps = upgradeJob && "steps" in upgradeJob ? upgradeJob : void 0;
+    if (jobWithSteps?.steps && Array.isArray(jobWithSteps.steps)) {
+      const insertIndex = 4;
+      if (isConfigulatorRegistryConsumer(this)) {
+        jobWithSteps.steps.splice(insertIndex, 0, {
+          name: `Sync ${CONFIGULATOR_PACKAGE_NAME} in workspace`,
+          run: `pnpm update -r ${CONFIGULATOR_PACKAGE_NAME}`
+        });
+        jobWithSteps.steps.splice(insertIndex + 1, 0, {
+          name: "Synthesize",
+          run: this.runTaskCommand(this.defaultTask)
+        });
+      }
+      jobWithSteps.steps.splice(
+        insertIndex + (isConfigulatorRegistryConsumer(this) ? 2 : 0),
+        0,
+        {
+          name: "Run subproject upgrades",
+          run: "pnpm -r run upgrade"
+        }
+      );
+    }
   }
   /**
    * Allows a sub project to request installation of dependency at the Monorepo root