vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-07-14 10:46:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(release): manage tracked private shrinkwraps

Browse Source
This commit is contained in:
Vincent Koc
2026-07-10 16:53:38 -07:00
committed by Vincent Koc
parent 968c9549b4
commit eefd6248f4
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/vault/npm-shrinkwrap.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@openclaw/vault",
"version": "2026.6.2",
"version": "2026.6.11",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@openclaw/vault",
"version": "2026.6.2"
"version": "2026.6.11"
}
}
}

21
scripts/generate-npm-shrinkwrap.mjs
View File

@@ -1080,9 +1080,11 @@ function shrinkwrapPathForPackage(packageDir) {
return path.join(packageDir, "npm-shrinkwrap.json");
}
function listPublishablePluginPackageDirs() {
function listManagedShrinkwrapPackageDirs() {
// Published workspace packages (packages/*) ship npm-shrinkwrap.json just
// like publishable plugins so their transitive dependency tree stays pinned.
// Keep any already-tracked shrinkwrap managed too, including private packages,
// or version alignment can leave that release metadata silently stale.
return ["extensions", "packages"]
.flatMap((parentDir) =>
readdirSync(path.join(ROOT_DIR, parentDir), { withFileTypes: true })
@@ -1095,14 +1097,17 @@ function listPublishablePluginPackageDirs() {
return false;
}
const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf8"));
return packageJson.openclaw?.release?.publishToNpm === true;
return (
packageJson.openclaw?.release?.publishToNpm === true ||
existsSync(shrinkwrapPathForPackage(path.join(ROOT_DIR, packageDir)))
);
})
.toSorted((left, right) => left.localeCompare(right));
}
function shrinkwrapPackageDirsForChangedPaths(changedPaths) {
const packageDirs = new Set();
const publishablePluginPackageDirs = new Set(listPublishablePluginPackageDirs());
const managedShrinkwrapPackageDirs = new Set(listManagedShrinkwrapPackageDirs());
let hasAmbiguousDependencyPolicyChange = false;
let hasLockfileChange = false;
@@ -1121,7 +1126,7 @@ function shrinkwrapPackageDirsForChangedPaths(changedPaths) {
const workspacePackageMatch = changedPath.match(
/^((?:extensions|packages)\/[^/]+)\/(?:package\.json|npm-shrinkwrap\.json)$/u,
);
if (workspacePackageMatch && publishablePluginPackageDirs.has(workspacePackageMatch[1])) {
if (workspacePackageMatch && managedShrinkwrapPackageDirs.has(workspacePackageMatch[1])) {
packageDirs.add(path.resolve(ROOT_DIR, workspacePackageMatch[1]));
continue;
}
@@ -1140,14 +1145,14 @@ function shrinkwrapPackageDirsForChangedPaths(changedPaths) {
if (hasAmbiguousDependencyPolicyChange) {
return [
ROOT_DIR,
...listPublishablePluginPackageDirs().map((dir) => path.resolve(ROOT_DIR, dir)),
...listManagedShrinkwrapPackageDirs().map((dir) => path.resolve(ROOT_DIR, dir)),
];
}
if (hasLockfileChange) {
return [
ROOT_DIR,
...listPublishablePluginPackageDirs().map((dir) => path.resolve(ROOT_DIR, dir)),
...listManagedShrinkwrapPackageDirs().map((dir) => path.resolve(ROOT_DIR, dir)),
];
}
return [...packageDirs].toSorted((left, right) =>
@@ -1258,7 +1263,7 @@ export function resolvePackageDirs(args) {
jobs,
packageDirs: [
ROOT_DIR,
...listPublishablePluginPackageDirs().map((dir) => path.resolve(ROOT_DIR, dir)),
...listManagedShrinkwrapPackageDirs().map((dir) => path.resolve(ROOT_DIR, dir)),
],
};
}
@@ -1267,7 +1272,7 @@ export function resolvePackageDirs(args) {
check,
changedPaths: check ? listCheckChangedPaths() : [],
jobs,
packageDirs: listPublishablePluginPackageDirs().map((dir) => path.resolve(ROOT_DIR, dir)),
packageDirs: listManagedShrinkwrapPackageDirs().map((dir) => path.resolve(ROOT_DIR, dir)),
};
}
if (changed) {

7
test/scripts/generate-npm-shrinkwrap.test.ts
View File

@@ -491,6 +491,12 @@ describe("generate-npm-shrinkwrap", () => {
).toEqual(["extensions/acpx"]);
});
it("targets changed tracked shrinkwraps for private packages", () => {
expect(
shrinkwrapPackageDirsForChangedPaths(["extensions/vault/package.json"]).map(repoRelativePath),
).toEqual(["extensions/vault"]);
});
it("falls back to every shrinkwrap when lockfile ownership is ambiguous", () => {
const packageDirs = shrinkwrapPackageDirsForChangedPaths(["pnpm-lock.yaml"]).map(
repoRelativePath,
@@ -498,6 +504,7 @@ describe("generate-npm-shrinkwrap", () => {
expect(packageDirs).toContain("");
expect(packageDirs).toContain("extensions/acpx");
expect(packageDirs).toContain("extensions/vault");
});
it("falls back to every shrinkwrap when mixed lockfile changes do not map to packages", () => {