cleaning up

Author: josephjclark

.changeset/early-lions-create.md

@@ -0,0 +1,5 @@
+---
+'@openfn/cli': patch
+---
+
+jam

.github/workflows/changeset.yaml

@@ -12,16 +12,19 @@ jobs:
     name: Changeset present
     runs-on: ubuntu-latest
     steps:
-      # Full history so the merge-base with the target branch can be found
       - uses: actions/checkout@v6
         with:
+          # Full history so the merge-base with the target branch can be found
           fetch-depth: 0
       - uses: actions/setup-node@v6
         with:
           node-version: '24.14'
+      - uses: pnpm/action-setup@v4
+      # Install only the root package's dev-deps (which include @changesets/cli),
+      # not the whole workspace, so the script can run `changeset`
+      - run: pnpm install --filter @openfn/kit --frozen-lockfile --ignore-scripts
       # The condition sits on the step, not the job, so the check still reports
       # green when skipped - a required job skipped via `if` blocks the PR forever
-      # No install needed - the check only uses git and Node built-ins
       - name: Check for a changeset
         if: ${{ !contains(github.event.pull_request.labels.*.name, 'No changeset needed') }}
         run: node scripts/check-changesets.js "${{ github.event.pull_request.base.ref }}"

changeset.json

@@ -0,0 +1,44 @@
+{
+  "changesets": [
+    {
+      "releases": [
+        {
+          "name": "@openfn/cli",
+          "type": "patch"
+        }
+      ],
+      "summary": "jam",
+      "id": "early-lions-create"
+    },
+    {
+      "releases": [
+        {
+          "name": "@openfn/deploy",
+          "type": "minor"
+        }
+      ],
+      "summary": "jam",
+      "id": "sixty-canyons-occur"
+    }
+  ],
+  "releases": [
+    {
+      "name": "@openfn/cli",
+      "type": "patch",
+      "oldVersion": "1.38.4",
+      "changesets": [
+        "early-lions-create"
+      ],
+      "newVersion": "1.38.5"
+    },
+    {
+      "name": "@openfn/deploy",
+      "type": "minor",
+      "oldVersion": "0.13.1",
+      "changesets": [
+        "sixty-canyons-occur"
+      ],
+      "newVersion": "0.14.0"
+    }
+  ]
+}

scripts/check-changesets.js

@@ -5,7 +5,12 @@
  */
 
 const { execFileSync } = require('node:child_process');
-const { readFileSync, readdirSync, appendFileSync } = require('node:fs');
+const {
+  readFileSync,
+  existsSync,
+  unlinkSync,
+  appendFileSync,
+} = require('node:fs');
 const path = require('node:path');
 
 // Top-level dirs whose packages must carry a changeset when changed
@@ -83,18 +88,28 @@ for (const dir of changedDirs) {
   }
 }
 
-// Packages named across the frontmatter of every changeset file (the "covered"
-// set) - read straight from disk so pending and uncommitted changesets count
-const changesetDir = path.join(process.cwd(), '.changeset');
+// Ask changesets which packages are marked for release (the "covered" set).
+// Going through the CLI means we never parse the changeset file format ourselves
 const covered = new Set();
-for (const file of readdirSync(changesetDir)) {
-  if (!file.endsWith('.md') || file.toLowerCase() === 'readme.md') {
-    continue;
-  }
-  const contents = readFileSync(path.join(changesetDir, file), 'utf8');
-  for (const name of changesetPackages(contents)) {
-    covered.add(name);
+const planFile = path.join(process.cwd(), '.changeset-status.json');
+try {
+  execFileSync('pnpm', ['exec', 'changeset', 'status', '--output', planFile], {
+    stdio: ['ignore', 'pipe', 'pipe'],
+  });
+} catch {
+  // status exits non-zero and writes nothing when packages changed but no
+  // changesets exist yet - nothing is marked for release, covered stays empty
+}
+if (existsSync(planFile)) {
+  const plan = JSON.parse(readFileSync(planFile, 'utf8'));
+  // changesets[] = packages a changeset explicitly names. Not releases[], which
+  // also includes transitive dependency bumps we don't want to treat as covered
+  for (const changeset of plan.changesets) {
+    for (const release of changeset.releases) {
+      covered.add(release.name);
+    }
   }
+  unlinkSync(planFile);
 }
 
 // Any changed package that no changeset accounts for
@@ -140,22 +155,3 @@ if (process.env.GITHUB_STEP_SUMMARY) {
 }
 
 process.exit(1);
-
-// Package names listed in a changeset's frontmatter block
-function changesetPackages(contents) {
-  const frontmatter = contents.match(/^---\r?\n([\s\S]*?)\r?\n---/);
-  if (!frontmatter) {
-    return [];
-  }
-  const names = [];
-  for (const line of frontmatter[1].split('\n')) {
-    // e.g.  '@openfn/cli': minor   or   "@openfn/cli": patch
-    const entry = line.match(
-      /^\s*['"]?(@?[\w./-]+)['"]?\s*:\s*(patch|minor|major)\s*$/
-    );
-    if (entry) {
-      names.push(entry[1]);
-    }
-  }
-  return names;
-}