Skip to content

armgit / eve

Public Imported from GitHub
0

The Open Framework for Building Agents

fix(eve): preserve canary package metadata (#2001)

OwenKephartd755a4e69eeb
diff --git a/apps/package-artifacts/lib/pack.mjs b/apps/package-artifacts/lib/pack.mjs
new file mode 100644
index 000000000..b1705646f
--- /dev/null
+++ b/apps/package-artifacts/lib/pack.mjs
@@ -0,0 +1,47 @@
+import { execFile as execFileCallback } from "node:child_process";
+import { mkdtemp, mkdir, readFile, rm, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+import { promisify } from "node:util";
+
+const execFile = promisify(execFileCallback);
+
+export async function packPackage(packageRoot, version, env = process.env) {
+ const workDirectory = await mkdtemp(join(tmpdir(), "eve-package-artifacts-"));
+ const pnpmTarballPath = join(workDirectory, "pnpm.tgz");
+ const extractedDirectory = join(workDirectory, "extracted");
+ const finalDirectory = join(workDirectory, "final");
+
+ try {
+ // Let pnpm resolve workspace and catalog specifiers in the published manifest.
+ await execFile("pnpm", ["--dir", packageRoot, "pack", "--out", pnpmTarballPath], { env });
+ await mkdir(extractedDirectory);
+ await execFile("tar", ["-xzf", pnpmTarballPath, "-C", extractedDirectory]);
+
+ const packedPackageRoot = join(extractedDirectory, "package");
+ const packedPackageJsonPath = join(packedPackageRoot, "package.json");
+ const packedPackageJson = JSON.parse(await readFile(packedPackageJsonPath, "utf8"));
+ packedPackageJson.version = version;
+ await writeFile(packedPackageJsonPath, `${JSON.stringify(packedPackageJson, null, 2)}\n`);
+
+ // Repack outside the workspace so pnpm's cached stable version cannot replace the canary version.
+ await mkdir(finalDirectory);
+ const { stdout } = await execFile(
+ "npm",
+ ["pack", "--ignore-scripts", "--json", "--pack-destination", finalDirectory],
+ { cwd: packedPackageRoot, env },
+ );
+ const [packResult] = JSON.parse(stdout);
+ if (typeof packResult?.filename !== "string") {
+ throw new Error("npm pack did not report a tarball filename.");
+ }
+ if (packResult.version !== version) {
+ throw new Error(
+ `Expected packed version ${version}, received ${String(packResult.version)}.`,
+ );
+ }
+ return readFile(join(finalDirectory, packResult.filename));
+ } finally {
+ await rm(workDirectory, { force: true, recursive: true });
+ }
+}
diff --git a/apps/package-artifacts/lib/pack.test.mjs b/apps/package-artifacts/lib/pack.test.mjs
new file mode 100644
index 000000000..0fd68f40b
--- /dev/null
+++ b/apps/package-artifacts/lib/pack.test.mjs
@@ -0,0 +1,46 @@
+import { execFile as execFileCallback } from "node:child_process";
+import { mkdtemp, mkdir, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { promisify } from "node:util";
+
+import { afterEach, describe, expect, test } from "vitest";
+
+import { packPackage } from "./pack.mjs";
+
+const execFile = promisify(execFileCallback);
+let testRoot;
+
+afterEach(async () => {
+ if (testRoot !== undefined) await rm(testRoot, { force: true, recursive: true });
+});
+
+describe("packPackage", () => {
+ test("preserves pnpm manifest transformations and stamps build metadata", async () => {
+ testRoot = await mkdtemp(join(tmpdir(), "eve-package-artifacts-test-"));
+ const packageRoot = join(testRoot, "packages", "test-package");
+ await mkdir(packageRoot, { recursive: true });
+ await writeFile(
+ join(testRoot, "pnpm-workspace.yaml"),
+ 'packages:\n - "packages/*"\ncatalog:\n example: "1.2.3"\n',
+ );
+ await writeFile(
+ join(packageRoot, "package.json"),
+ JSON.stringify({
+ name: "eve-pack-test",
+ version: "0.33.3",
+ peerDependencies: { example: "catalog:" },
+ }),
+ );
+
+ const version = "0.33.3+main.abc";
+ const tarball = await packPackage(packageRoot, version);
+ const tarballPath = join(testRoot, "package.tgz");
+ await writeFile(tarballPath, tarball);
+
+ const { stdout } = await execFile("tar", ["-xOf", tarballPath, "package/package.json"]);
+ const packageJson = JSON.parse(stdout);
+ expect(packageJson.version).toBe(version);
+ expect(packageJson.peerDependencies.example).toBe("1.2.3");
+ });
+});
diff --git a/apps/package-artifacts/scripts/build.mjs b/apps/package-artifacts/scripts/build.mjs
index 13bfd38e3..29f5d18e1 100644
--- a/apps/package-artifacts/scripts/build.mjs
+++ b/apps/package-artifacts/scripts/build.mjs
@@ -1,9 +1,7 @@
-import { execFile as execFileCallback } from "node:child_process";
import { createHash } from "node:crypto";
import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
import { dirname, join, resolve } from "node:path";
import { fileURLToPath } from "node:url";
-import { promisify } from "node:util";
import { get, head, put } from "@vercel/blob";
@@ -14,8 +12,7 @@ import {
packageManifestPath,
preparePackageJson,
} from "../lib/package.mjs";
-
-const execFile = promisify(execFileCallback);
+import { packPackage } from "../lib/pack.mjs";
const appRoot = resolve(dirname(fileURLToPath(import.meta.url)), "..");
const repoRoot = resolve(appRoot, "../..");
const packageRoot = join(repoRoot, "packages/eve");
@@ -51,12 +48,10 @@ const artifactPath = packageArtifactPath(sourceSha);
try {
await rm(artifactDirectory, { force: true, recursive: true });
await writeFile(packageJsonPath, `${JSON.stringify(preparedPackageJson, null, 2)}\n`);
- await execFile("pnpm", ["--dir", packageRoot, "pack", "--pack-destination", artifactDirectory], {
- cwd: repoRoot,
- env: { ...process.env, EVE_MAIN_DEPENDENCY_URL: dependencyUrl },
+ const tarball = await packPackage(packageRoot, version, {
+ ...process.env,
+ EVE_MAIN_DEPENDENCY_URL: dependencyUrl,
});
-
- const tarball = await readFile(join(artifactDirectory, `eve-${version}.tgz`));
const sha256 = createHash("sha256").update(tarball).digest("hex");
let artifact;
try {