@scaleway/changesets-renovate 2.2.2 → 2.2.3

package/dist/cli.js

@@ -0,0 +1,43 @@
+#!/usr/bin/env node
+import { env } from "node:process";
+import { simpleGit } from "simple-git";
+import { handleCatalogChanges } from "./handle-catalog.js";
+import { handlePackageChanges } from "./handle-packages.js";
+async function run() {
+  const branch = await simpleGit().branch();
+  const branchPrefix = env["BRANCH_PREFIX"] ?? "renovate/";
+  console.log("Detected branch:", branch);
+  if (!(branch.current.startsWith(branchPrefix) || env["SKIP_BRANCH_CHECK"])) {
+    console.log("Not a renovate branch, skipping");
+    return;
+  }
+  const diffOutput = await simpleGit().diffSummary(["--name-only", "HEAD~1"]);
+  const diffFiles = diffOutput.files.map((file) => file.file);
+  console.log("Found changed files:", diffFiles);
+  if (diffFiles.find((f) => f.startsWith(".changeset"))) {
+    console.log("Changeset already exists, skipping");
+    return;
+  }
+  const hasPackageChanges = diffFiles.some(
+    (file) => file.includes("package.json")
+  );
+  const hasWorkspaceChanges = diffFiles.some(
+    (file) => file.includes("pnpm-workspace.yaml")
+  );
+  if (!(hasPackageChanges || hasWorkspaceChanges)) {
+    console.log("No relevant changes detected, skipping");
+    return;
+  }
+  if (hasWorkspaceChanges) {
+    console.log("📚 Processing pnpm workspace catalog changes...");
+    await handleCatalogChanges(diffFiles);
+  }
+  if (hasPackageChanges) {
+    console.log("📦 Processing package.json changes...");
+    await handlePackageChanges(diffFiles);
+  }
+}
+run().catch(console.error);
+export {
+  run
+};

package/dist/createChangeset.d.ts

@@ -0,0 +1 @@
+export declare function createChangeset(fileName: string, packageBumps: Map<string, string>, packages: string[]): Promise<void>;

package/dist/createChangeset.js

@@ -0,0 +1,24 @@
+import { writeFile } from "node:fs/promises";
+import { env } from "node:process";
+async function createChangeset(fileName, packageBumps, packages) {
+  const messageLines = [];
+  for (const [pkg, bump] of packageBumps) {
+    messageLines.push(`Updated dependency \`${pkg}\` to \`${bump}\`.`);
+  }
+  if (env["SORT_CHANGESETS"]) {
+    packages.sort();
+    messageLines.sort();
+  }
+  const message = messageLines.join("\n");
+  const pkgs = packages.map((pkg) => `'${pkg}': patch`).join("\n");
+  const body = `---
+${pkgs}
+---
+
+${message.trim()}
+`;
+  await writeFile(fileName, body);
+}
+export {
+  createChangeset
+};

package/dist/git-utils.d.ts

@@ -0,0 +1,24 @@
+/**
+ * Load catalog from pnpm workspace file at specific git revision
+ * @param revision Git revision to load file from (default: HEAD)
+ * @param filePath Path to the pnpm workspace file (default: pnpm-workspace.yaml)
+ * @returns Catalog object or empty object if not found
+ */
+export declare function loadCatalogFromGit(revision?: string, filePath?: string): Promise<Record<string, string>>;
+/**
+ * Find changed dependencies between two git revisions of pnpm workspace
+ * @param oldRevision The previous git revision
+ * @param newRevision The current git revision (default: HEAD)
+ * @param filePath Path to the pnpm workspace file (default: pnpm-workspace.yaml)
+ * @returns Array of package names that have changed
+ */
+export declare function findChangedDependenciesFromGit(oldRevision: string, newRevision?: string, filePath?: string): Promise<Map<string, string>>;
+export declare function getBumpsFromGit(files: string[]): Promise<Map<string, string>>;
+/**
+ * Find packages affected by dependency changes
+ * @param changedDeps Array of changed dependency names
+ * @param packageJsonGlob Glob pattern to find package.json files
+ * @returns Set of package names that are affected by the changes
+ */
+export declare function findAffectedPackages(changedDeps: string[], packageJsonGlob?: string): Promise<Set<string>>;
+export declare function handleChangesetFile(fileName: string): Promise<void>;

package/dist/git-utils.js

@@ -0,0 +1,86 @@
+import { readFile } from "node:fs/promises";
+import { env } from "node:process";
+import fg from "fast-glob";
+import { load } from "js-yaml";
+import { simpleGit } from "simple-git";
+const { globSync } = fg;
+async function loadCatalogFromGit(revision = "HEAD", filePath = "pnpm-workspace.yaml") {
+  try {
+    if (!revision) {
+      return {};
+    }
+    const git = simpleGit();
+    const content = await git.show([`${revision}:${filePath}`]);
+    const parsed = load(content);
+    return parsed?.catalog ?? {};
+  } catch {
+    return {};
+  }
+}
+async function findChangedDependenciesFromGit(oldRevision, newRevision = "HEAD", filePath = "pnpm-workspace.yaml") {
+  const oldCatalog = await loadCatalogFromGit(oldRevision, filePath);
+  const newCatalog = await loadCatalogFromGit(newRevision, filePath);
+  const bumps = /* @__PURE__ */ new Map();
+  const filtedPackage = Object.entries(newCatalog).filter(
+    ([pkg, newVersion]) => oldCatalog[pkg] && oldCatalog[pkg] !== newVersion
+  );
+  for (const [pkg, newVersion] of filtedPackage) {
+    bumps.set(pkg, newVersion);
+  }
+  return bumps;
+}
+async function getBumpsFromGit(files) {
+  const bumps = /* @__PURE__ */ new Map();
+  const promises = files.map(async (file) => {
+    const changes = await simpleGit().show([file]);
+    for (const change of changes.split("\n")) {
+      if (change.startsWith("+ ")) {
+        const match = change.match(/"(.*?)"/g);
+        if (match?.[0] && match[1]) {
+          bumps.set(match[0].replace(/"/g, ""), match[1].replace(/"/g, ""));
+        }
+      }
+    }
+  });
+  await Promise.all(promises);
+  return bumps;
+}
+async function findAffectedPackages(changedDeps, packageJsonGlob = "packages/*/package.json") {
+  if (changedDeps.length === 0) {
+    return /* @__PURE__ */ new Set();
+  }
+  const packageJsonPaths = globSync(packageJsonGlob);
+  const affectedPackages = /* @__PURE__ */ new Set();
+  for (const pkgJsonPath of packageJsonPaths) {
+    try {
+      const json = JSON.parse(await readFile(pkgJsonPath, "utf8"));
+      const deps = {
+        ...json.dependencies,
+        ...json.devDependencies,
+        ...json.peerDependencies
+      };
+      for (const dep of changedDeps) {
+        if (deps[dep]) {
+          affectedPackages.add(json.name);
+          break;
+        }
+      }
+    } catch {
+    }
+  }
+  return affectedPackages;
+}
+async function handleChangesetFile(fileName) {
+  if (!env["SKIP_COMMIT"]) {
+    await simpleGit().add(fileName);
+    await simpleGit().commit(`chore: add ${fileName}`);
+    await simpleGit().push();
+  }
+}
+export {
+  findAffectedPackages,
+  findChangedDependenciesFromGit,
+  getBumpsFromGit,
+  handleChangesetFile,
+  loadCatalogFromGit
+};

package/dist/handle-catalog.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Handle pnpm workspace catalog changes
+ */
+export declare function handleCatalogChanges(diffFiles: string[]): Promise<void>;

package/dist/handle-catalog.js

@@ -0,0 +1,48 @@
+import { simpleGit } from "simple-git";
+import { createChangeset } from "./createChangeset.js";
+const {
+  findChangedDependenciesFromGit,
+  findAffectedPackages,
+  handleChangesetFile
+} = await import("./git-utils.js");
+async function handleCatalogChanges(diffFiles) {
+  const workspaceFiles = diffFiles.filter(
+    (file) => file.includes("pnpm-workspace.yaml")
+  );
+  if (workspaceFiles.length === 0) {
+    return;
+  }
+  console.log(
+    "🔍 Detected pnpm workspace changes, checking for catalog updates..."
+  );
+  console.log("🔍 Comparing catalogs: HEAD~1 -> HEAD");
+  const changedDeps = await findChangedDependenciesFromGit(
+    "HEAD~1",
+    "HEAD",
+    "pnpm-workspace.yaml"
+  );
+  if (changedDeps.size === 0) {
+    console.log("✅ No catalog dependency changes.", { changedDeps });
+    return;
+  }
+  console.log("📦 Changed dependencies:", changedDeps);
+  const affectedPackages = await findAffectedPackages([...changedDeps.keys()]);
+  if (affectedPackages.size === 0) {
+    console.log("📦 No packages affected by catalog changes.");
+    return;
+  }
+  console.log("\n📝 Affected packages:");
+  for (const pkg of affectedPackages) {
+    console.log(`  - ${pkg}`);
+  }
+  console.log("\n✏️  Creating changesets...");
+  const packageNames = [...affectedPackages.keys()];
+  const shortHash = (await simpleGit().revparse(["--short", "HEAD"])).trim();
+  const fileName = `.changeset/renovate-${shortHash}.md`;
+  await createChangeset(fileName, changedDeps, packageNames);
+  await handleChangesetFile(fileName);
+  console.log("\n✅ Done creating changesets.");
+}
+export {
+  handleCatalogChanges
+};

package/dist/handle-packages.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Handle package.json changes (original Renovate flow)
+ */
+export declare function handlePackageChanges(diffFiles: string[]): Promise<void>;

package/dist/handle-packages.js

@@ -0,0 +1,24 @@
+import { simpleGit } from "simple-git";
+import { createChangeset } from "./createChangeset.js";
+import { getBumpsFromGit, handleChangesetFile } from "./git-utils.js";
+import { getPackagesNames } from "./utils.js";
+async function handlePackageChanges(diffFiles) {
+  const files = diffFiles.filter((file) => file.includes("package.json"));
+  if (files.length === 0) {
+    console.log("No package.json changes to published packages, skipping");
+    return;
+  }
+  const packageNames = await getPackagesNames(files);
+  if (packageNames.length === 0) {
+    console.log("No packages modified, skipping");
+    return;
+  }
+  const shortHash = (await simpleGit().revparse(["--short", "HEAD"])).trim();
+  const fileName = `.changeset/renovate-${shortHash}.md`;
+  const packageBumps = await getBumpsFromGit(files);
+  await createChangeset(fileName, packageBumps, packageNames);
+  await handleChangesetFile(fileName);
+}
+export {
+  handlePackageChanges
+};

package/dist/utils.d.ts

@@ -0,0 +1,29 @@
+export declare function shouldIgnorePackage(packageName: string, ignoredPackages: string[]): boolean;
+export declare function getChangesetIgnoredPackages(): Promise<string[]>;
+export declare function getPackagesNames(files: string[]): Promise<string[]>;
+/**
+ * Load catalog from a YAML file
+ * @param filePath Path to the YAML file containing the catalog
+ * @returns Catalog object or empty object if not found
+ */
+export declare function loadCatalogFromFile(filePath: string): Promise<Record<string, string>>;
+/**
+ * Load catalog from pnpm workspace YAML content
+ * @param content Content of the pnpm-workspace.yaml file
+ * @returns Catalog object or empty object if not found
+ */
+export declare function loadCatalogFromWorkspaceContent(content: string): Record<string, string>;
+/**
+ * Find changed dependencies between two catalogs
+ * @param oldCatalog The previous catalog
+ * @param newCatalog The current catalog
+ * @returns Array of package names that have changed
+ */
+export declare function findChangedDependencies(oldCatalog: Record<string, string>, newCatalog: Record<string, string>): string[];
+/**
+ * Find packages affected by dependency changes
+ * @param changedDeps Array of changed dependency names
+ * @param packageJsonGlob Glob pattern to find package.json files
+ * @returns Set of package names that are affected by the changes
+ */
+export declare function findAffectedPackages(changedDeps: string[], packageJsonGlob?: string): Promise<Set<string>>;

package/dist/utils.js

@@ -0,0 +1,38 @@
+import { readFile } from "node:fs/promises";
+import fg from "fast-glob";
+import "js-yaml";
+const { globSync } = fg;
+function shouldIgnorePackage(packageName, ignoredPackages) {
+  return ignoredPackages.some((ignoredPackage) => {
+    if (ignoredPackage.endsWith("*")) {
+      return packageName.startsWith(ignoredPackage.slice(0, -1));
+    }
+    return packageName === ignoredPackage;
+  });
+}
+async function getChangesetIgnoredPackages() {
+  const changesetConfig = JSON.parse(
+    await readFile(".changeset/config.json", "utf8")
+  );
+  return changesetConfig.ignore ?? [];
+}
+async function getPackagesNames(files) {
+  const ignoredPackages = await getChangesetIgnoredPackages();
+  const packages = [];
+  const promises = files.map(async (file) => {
+    const data = JSON.parse(await readFile(file, "utf8"));
+    if (shouldIgnorePackage(data.name, ignoredPackages)) {
+      return;
+    }
+    if (!data.workspaces && data.version) {
+      packages.push(data.name);
+    }
+  });
+  await Promise.all(promises);
+  return packages;
+}
+export {
+  getChangesetIgnoredPackages,
+  getPackagesNames,
+  shouldIgnorePackage
+};

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@scaleway/changesets-renovate",
-  "version": "2.2.2",
-  "description": "Automatically create changesets for Renovate",
+  "version": "2.2.3",
+  "description": "Automatically create changesets for Renovate and pnpm catalogs",
   "type": "module",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "module": "./dist/cli.js",
+  "types": "./dist/cli.d.ts",
   "sideEffects": false,
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "default": "./dist/index.js"
+      "types": "./dist/cli.d.ts",
+      "default": "./dist/cli.js"
     }
   },
   "files": [
@@ -19,7 +19,7 @@
     "node": ">=20.x"
   },
   "bin": {
-    "changesets-renovate": "dist/index.js"
+    "changesets-renovate": "dist/cli.js"
   },
   "publishConfig": {
     "access": "public"
@@ -33,15 +33,22 @@
   "keywords": [
     "changesets",
     "renovate",
+    "pnpm",
+    "catalogs",
     "sync"
   ],
   "dependencies": {
+    "@types/js-yaml": "4.0.9",
+    "fast-glob": "3.3.3",
+    "js-yaml": "4.1.1",
     "simple-git": "3.30.0"
   },
   "scripts": {
     "prebuild": "shx rm -rf dist",
     "typecheck": "tsc --noEmit",
+    "typecheck:go": "tsgo --noEmit",
     "type:generate": "tsc --declaration -p tsconfig.build.json",
+    "type:generate:go": "tsgo --declaration -p tsconfig.build.json",
     "build": "vite build --config vite.config.ts && pnpm run type:generate",
     "build:profile": "npx vite-bundle-visualizer -c vite.config.ts",
     "lint": "eslint --report-unused-disable-directives --cache --cache-strategy content --ext ts,tsx .",

package/dist/index.js

@@ -1,107 +0,0 @@
-#!/usr/bin/env node
-import fs from "node:fs/promises";
-import { simpleGit } from "simple-git";
-console.debug("simpleGit", simpleGit);
-async function getChangesetIgnoredPackages() {
-  const changesetConfig = JSON.parse(
-    await fs.readFile(".changeset/config.json", "utf8")
-  );
-  return changesetConfig.ignore ?? [];
-}
-function shouldIgnorePackage(packageName, ignoredPackages) {
-  return ignoredPackages.some((ignoredPackage) => {
-    if (ignoredPackage.endsWith("*")) {
-      return packageName.startsWith(ignoredPackage.slice(0, -1));
-    }
-    return packageName === ignoredPackage;
-  });
-}
-async function getPackagesNames(files) {
-  const ignoredPackages = await getChangesetIgnoredPackages();
-  const packages = [];
-  const promises = files.map(async (file) => {
-    const data = JSON.parse(await fs.readFile(file, "utf8"));
-    if (shouldIgnorePackage(data.name, ignoredPackages)) {
-      return;
-    }
-    if (!data.workspaces && data.version) {
-      packages.push(data.name);
-    }
-  });
-  await Promise.all(promises);
-  return packages;
-}
-async function createChangeset(fileName, packageBumps, packages) {
-  const messageLines = [];
-  for (const [pkg, bump] of packageBumps) {
-    messageLines.push(`Updated dependency \`${pkg}\` to \`${bump}\`.`);
-  }
-  if (process.env["SORT_CHANGESETS"]) {
-    packages.sort();
-    messageLines.sort();
-  }
-  const message = messageLines.join("\n");
-  const pkgs = packages.map((pkg) => `'${pkg}': patch`).join("\n");
-  const body = `---
-${pkgs}
----
-
-${message.trim()}
-`;
-  await fs.writeFile(fileName, body);
-}
-async function getBumps(files) {
-  const bumps = /* @__PURE__ */ new Map();
-  const promises = files.map(async (file) => {
-    const changes = await simpleGit().show([file]);
-    for (const change of changes.split("\n")) {
-      if (change.startsWith("+ ")) {
-        const match = change.match(/"(.*?)"/g);
-        if (match?.[0] && match[1]) {
-          bumps.set(match[0].replace(/"/g, ""), match[1].replace(/"/g, ""));
-        }
-      }
-    }
-  });
-  await Promise.all(promises);
-  return bumps;
-}
-async function run() {
-  const branch = await simpleGit().branch();
-  const branchPrefix = process.env["BRANCH_PREFIX"] ?? "renovate/";
-  console.log("Detected branch:", branch);
-  if (!branch.current.startsWith(branchPrefix) && !process.env["SKIP_BRANCH_CHECK"]) {
-    console.log("Not a renovate branch, skipping");
-    return;
-  }
-  const diffOutput = await simpleGit().diffSummary(["--name-only", "HEAD~1"]);
-  const diffFiles = diffOutput.files.map((file) => file.file);
-  console.log("Found changed files:", diffFiles);
-  if (diffFiles.find((f) => f.startsWith(".changeset"))) {
-    console.log("Changeset already exists, skipping");
-    return;
-  }
-  const files = diffFiles.filter((file) => file.includes("package.json"));
-  if (!files.length) {
-    console.log("No package.json changes to published packages, skipping");
-    return;
-  }
-  const packageNames = await getPackagesNames(files);
-  if (packageNames.length === 0) {
-    console.log("No packages modified, skipping");
-    return;
-  }
-  const shortHash = (await simpleGit().revparse(["--short", "HEAD"])).trim();
-  const fileName = `.changeset/renovate-${shortHash}.md`;
-  const packageBumps = await getBumps(files);
-  await createChangeset(fileName, packageBumps, packageNames);
-  if (!process.env["SKIP_COMMIT"]) {
-    await simpleGit().add(fileName);
-    await simpleGit().commit(`chore: add changeset renovate-${shortHash}`);
-    await simpleGit().push();
-  }
-}
-run().catch(console.error);
-export {
-  run
-};