Skip to content

fix(eve): install just-bash in scenario apps #3639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ctgowrie wants to merge 1 commit into from
Closed

fix(eve): install just-bash in scenario apps #3639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/eve/src/internal/testing/scenario-app.scenario.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ describe("materializeScenarioApp", () => {
expect(manifest.name).toBe("manifest-only-app");
expect(manifest.type).toBe("module");
expect(manifest.dependencies["eve"]).toMatch(/^file:\.\/eve-.*\.tgz$/);
expect(manifest.dependencies["just-bash"]).toMatch(/^\d+\.\d+\.\d+/);
});

it("creates declared empty directories", async () => {
Expand Down Expand Up @@ -71,12 +72,15 @@ describe("materializeScenarioApp", () => {
});

const eveManifestPath = join(app.appRoot, "node_modules", "eve", "package.json");
const justBashManifestPath = join(app.appRoot, "node_modules", "just-bash", "package.json");
const zodManifestPath = join(app.appRoot, "node_modules", "zod", "package.json");

const eveManifestStat = await stat(eveManifestPath);
const justBashManifestStat = await stat(justBashManifestPath);
const zodManifestStat = await stat(zodManifestPath);

expect(eveManifestStat.isFile()).toBe(true);
expect(justBashManifestStat.isFile()).toBe(true);
expect(zodManifestStat.isFile()).toBe(true);
}, 60_000);
});
19 changes: 13 additions & 6 deletions packages/eve/src/internal/testing/scenario-app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import {
writeFile,
} from "node:fs/promises";
import { execFile } from "node:child_process";
import { createRequire } from "node:module";
import { readFileSync } from "node:fs";
import { findPackageJSON } from "node:module";
import { tmpdir } from "node:os";
import { basename, dirname, join } from "node:path";
import { promisify } from "node:util";
Expand All @@ -21,8 +22,8 @@ import { resolvePackageRoot } from "#internal/application/package.js";
import { runPnpmCommand } from "#internal/testing/run-pnpm-command.js";

const SCENARIO_APP_CLEANUP_TIMEOUT_MS = 60_000;
const require = createRequire(import.meta.url);
const SCENARIO_AI_PACKAGE_VERSION = resolvePackageVersion("ai");
const SCENARIO_JUST_BASH_PACKAGE_VERSION = resolvePackageVersion("just-bash");

/**
* Declarative description of a scenario-tier application.
Expand Down Expand Up @@ -58,8 +59,9 @@ export interface ScenarioAppDescriptor {
* package names, values are npm version specifiers or `file:` specifiers.
*
* `eve` is always wired via the test tarball and must not be
* listed here. The AI SDK peer dependency is wired from the workspace's
* installed version by default unless a descriptor overrides `ai`.
* listed here. The AI SDK and just-bash peer dependencies are wired from
* the workspace's installed versions by default unless a descriptor
* overrides them.
*/
readonly dependencies?: Readonly<Record<string, string>>;
/**
Expand Down Expand Up @@ -195,6 +197,7 @@ async function writePackageManifest(input: {
dependencies: {
ai: SCENARIO_AI_PACKAGE_VERSION,
[EVE_PACKAGE_NAME]: `file:./${tarballFileName}`,
"just-bash": SCENARIO_JUST_BASH_PACKAGE_VERSION,
...input.descriptor.dependencies,
},
name: input.descriptor.name,
Expand All @@ -212,10 +215,14 @@ async function writePackageManifest(input: {
}

function resolvePackageVersion(packageName: string): string {
const manifest = require(`${packageName}/package.json`) as { version?: unknown };
const manifestPath = findPackageJSON(packageName, import.meta.url);
if (manifestPath === undefined) {
throw new Error(`Could not resolve the installed ${packageName} package manifest.`);
}

const manifest = JSON.parse(readFileSync(manifestPath, "utf8")) as { version?: unknown };
if (typeof manifest.version !== "string") {
throw new Error(`Expected ${packageName}/package.json to contain a string version.`);
throw new Error(`Expected ${manifestPath} to contain a string version.`);
}

return manifest.version;
Expand Down
Loading