@scaleway/changesets-renovate 2.2.6 → 2.4.0

package/dist/cli.js

@@ -7,7 +7,7 @@ import { simpleGit } from "simple-git";
 async function run() {
 	const branch = await simpleGit().branch();
 	const branchPrefix = env["BRANCH_PREFIX"] ?? "renovate/";
-	console.log("Detected branch:", branch);
+	console.log("Detected branch:", branch.current);
 	if (!(branch.current.startsWith(branchPrefix) || env["SKIP_BRANCH_CHECK"])) {
 		console.log("Not a renovate branch, skipping");
 		return;

package/dist/git-utils.d.ts

@@ -14,11 +14,4 @@ export declare function loadCatalogFromGit(revision?: string, filePath?: string)
  */
 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

@@ -1,10 +1,7 @@
 import { env } from "node:process";
 import { simpleGit } from "simple-git";
-import { readFile } from "node:fs/promises";
-import fg from "fast-glob";
-import { load } from "js-yaml";
+import { parse } from "yaml";
 //#region src/git-utils.ts
-var { globSync } = fg;
 /**
 * Load catalog from pnpm workspace file at specific git revision
 * @param revision Git revision to load file from (default: HEAD)
@@ -14,7 +11,7 @@ var { globSync } = fg;
 async function loadCatalogFromGit(revision = "HEAD", filePath = "pnpm-workspace.yaml") {
 	try {
 		if (!revision) return {};
-		return load(await simpleGit().show([`${revision}:${filePath}`]))?.catalog ?? {};
+		return parse(await simpleGit().show([`${revision}:${filePath}`]))?.catalog ?? {};
 	} catch {
 		return {};
 	}
@@ -46,30 +43,6 @@ async function getBumpsFromGit(files) {
 	await Promise.all(promises);
 	return bumps;
 }
-/**
-* 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
-*/
-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);
@@ -78,4 +51,4 @@ async function handleChangesetFile(fileName) {
 	}
 }
 //#endregion
-export { findAffectedPackages, findChangedDependenciesFromGit, getBumpsFromGit, handleChangesetFile };
+export { findChangedDependenciesFromGit, getBumpsFromGit, handleChangesetFile };

package/dist/handle-catalog.js

@@ -1,7 +1,8 @@
 import { createChangeset } from "./createChangeset.js";
+import { findChangedDependenciesFromGit, handleChangesetFile } from "./git-utils.js";
+import { findAffectedPackages } from "./utils.js";
 import { simpleGit } from "simple-git";
 //#region src/handle-catalog.ts
-var { findChangedDependenciesFromGit, findAffectedPackages, handleChangesetFile } = await import("./git-utils.js");
 /**
 * Handle pnpm workspace catalog changes
 */

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
-export declare function shouldIgnorePackage(packageName: string, ignoredPackages: string[]): boolean;
-export declare function getChangesetIgnoredPackages(): Promise<string[]>;
+import { read } from '@changesets/config';
+export declare function getChangesetConfig(): ReturnType<typeof read>;
 export declare function getPackagesNames(files: string[]): Promise<string[]>;
 /**
  * Load catalog from a YAML file

package/dist/utils.js

@@ -1,27 +1,60 @@
 import { readFile } from "node:fs/promises";
-import fg from "fast-glob";
-import "js-yaml";
+import "yaml";
+import path from "node:path";
+import { read } from "@changesets/config";
+import { glob } from "tinyglobby";
 //#region src/utils.ts
-var { globSync } = fg;
-function shouldIgnorePackage(packageName, ignoredPackages) {
-	return ignoredPackages.some((ignoredPackage) => {
-		if (ignoredPackage.endsWith("*")) return packageName.startsWith(ignoredPackage.slice(0, -1));
-		return packageName === ignoredPackage;
-	});
+function shouldSkipPackage(packageJson, { ignore, allowPrivatePackages }) {
+	if (ignore?.includes(packageJson.name)) return true;
+	if (packageJson.private && !allowPrivatePackages) return true;
+	return !packageJson.version;
 }
-async function getChangesetIgnoredPackages() {
-	return JSON.parse(await readFile(".changeset/config.json", "utf8")).ignore ?? [];
+async function getChangesetConfig() {
+	return read(process.cwd());
 }
 async function getPackagesNames(files) {
-	const ignoredPackages = await getChangesetIgnoredPackages();
+	const config = await getChangesetConfig();
 	const packages = [];
 	const promises = files.map(async (file) => {
 		const data = JSON.parse(await readFile(file, "utf8"));
-		if (shouldIgnorePackage(data.name, ignoredPackages)) return;
+		if (shouldSkipPackage(data, {
+			ignore: config.ignore,
+			allowPrivatePackages: config.privatePackages.version
+		})) return;
 		if (!data.workspaces && data.version) packages.push(data.name);
 	});
 	await Promise.all(promises);
 	return packages;
 }
+/**
+* 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
+*/
+async function findAffectedPackages(changedDeps, packageJsonGlob = "packages/*/package.json") {
+	if (changedDeps.length === 0) return /* @__PURE__ */ new Set();
+	const config = await getChangesetConfig();
+	const packageJsonPaths = await glob(packageJsonGlob, { expandDirectories: false });
+	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
+		};
+		if (shouldSkipPackage(json, {
+			ignore: config.ignore,
+			allowPrivatePackages: config.privatePackages.version
+		})) break;
+		for (const dep of changedDeps) if (deps[dep]) {
+			const dirName = path.basename(path.dirname(pkgJsonPath));
+			affectedPackages.add(dirName);
+			break;
+		}
+	} catch {}
+	return affectedPackages;
+}
 //#endregion
-export { getPackagesNames };
+export { findAffectedPackages, getPackagesNames };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scaleway/changesets-renovate",
-  "version": "2.2.6",
+  "version": "2.4.0",
   "description": "Automatically create changesets for Renovate and pnpm catalogs",
   "keywords": [
     "catalogs",
@@ -35,10 +35,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@types/js-yaml": "4.0.9",
-    "fast-glob": "3.3.3",
-    "js-yaml": "4.1.1",
-    "simple-git": "3.36.0"
+    "@changesets/config": "3.1.4",
+    "simple-git": "3.36.0",
+    "tinyglobby": "0.2.16",
+    "yaml": "2.8.4"
   },
   "engines": {
     "node": ">=20.x"