Skip to content

The open source AI video agent: turns any coding agent into a video agent, with an editor to change anything it makes.

Desktop installer: pin the app's own dependency by its exact version, which npm 10 takes (#276)

riverisbuildingea8cf6dcbb36
diff --git a/apps/desktop/scripts/locked-versions.mjs b/apps/desktop/scripts/locked-versions.mjs
index cd6e48a..ad63ee1 100644
--- a/apps/desktop/scripts/locked-versions.mjs
+++ b/apps/desktop/scripts/locked-versions.mjs
@@ -13,12 +13,13 @@ const SEMVER = /^\d+\.\d+\.\d+(?:-[\w.]+)?$/;
/**
* npm `overrides` from `pnpm list --prod --depth Infinity --json` of the package (its first entry). A package locked at
* one version is pinned to it; one locked at several is pinned under each package that depends on it. The package's
- * own dependencies are exact in its package.json already; one that another package depends on too is pinned to that
- * (`$name`, the only override npm takes for one), as pnpm's own overrides lift a version a dependency pins (undici,
- * pinned at 8.10.2 by pi-coding-agent).
- * @param {{ dependencies?: Record<string, any> }} tree
+ * own dependencies (`own`, its package.json's) are left to their specs; one exact there that another package depends on
+ * too is pinned to it, as pnpm's own overrides lift a version a dependency pins (undici, pinned at 8.10.2 by
+ * pi-coding-agent). npm takes an override of the package's own dependency only when it is that very spec (npm 10 does
+ * not resolve `$name`).
+ * @param {{ dependencies?: Record<string, any> }} tree @param {Record<string, string>} [own]
*/
-export function lockedOverrides(tree) {
+export function lockedOverrides(tree, own = {}) {
/** @type {Map<string, Set<string>>} */
const versions = new Map();
/** @type {Array<[string, string, string]>} parent, child, child's version */
@@ -43,7 +44,7 @@ export function lockedOverrides(tree) {
for (const [name, set] of versions) {
if (set.size !== 1) continue;
if (!direct.has(name)) overrides[name] = [...set][0];
- else if (nested.has(name)) overrides[name] = `$${name}`;
+ else if (nested.has(name) && own[name] === [...set][0]) overrides[name] = own[name];
}
for (const [parent, child, version] of edges) {
if (versions.get(child).size === 1) continue;
diff --git a/apps/desktop/scripts/locked-versions.test.mjs b/apps/desktop/scripts/locked-versions.test.mjs
index a7ba8e2..8b8faff 100644
--- a/apps/desktop/scripts/locked-versions.test.mjs
+++ b/apps/desktop/scripts/locked-versions.test.mjs
@@ -21,11 +21,11 @@ const tree = {
};
test("the installer's npm install is pinned to the lockfile's versions", () => {
- assert.deepEqual(lockedOverrides(tree), {
+ assert.deepEqual(lockedOverrides(tree, { undici: '8.12.2', diff: '9.0.0' }), {
'@earendil-works/pi-codemode': '1.1.0',
'playwright-core': '1.50.0',
/* the package's own, which another depends on too (pinned there at an older version): that one everywhere */
- undici: '$undici',
+ undici: '8.12.2',
/* two versions of diff: each under what depends on it; the package's own (exact) is not overridden */
'@earendil-works/pi-coding-agent': { diff: '8.0.4' },
'@agentclientprotocol/codex-acp': { diff: '9.0.0' },
diff --git a/apps/desktop/scripts/release.mjs b/apps/desktop/scripts/release.mjs
index bd3e9d7..7ad7f58 100644
--- a/apps/desktop/scripts/release.mjs
+++ b/apps/desktop/scripts/release.mjs
@@ -103,7 +103,7 @@ writeFileSync(join(stage, 'package.json'), `${JSON.stringify({
type: 'module',
main: 'src/main.mjs',
dependencies,
- overrides: lockedOverrides(lockedTree),
+ overrides: lockedOverrides(lockedTree, pkg.dependencies),
}, null, 2)}\n`);
run('npm', ['install', '--omit=dev', '--omit=optional', '--no-audit', '--no-fund', '--no-package-lock', '--loglevel=error'], { cwd: stage });
const offLock = versionsOffLock(lockedTree, join(stage, 'node_modules'));