The Open Framework for Building Agents
fix(eve): prefer the host root vercel.json services over the linked project root's (#2276)
Matt Lewis5e5d91bea764
diff --git a/.changeset/vercel-json-host-root.md b/.changeset/vercel-json-host-root.mdnew file mode 100644index 000000000..3010b42fa--- /dev/null+++ b/.changeset/vercel-json-host-root.md@@ -0,0 +1,5 @@+---+"eve": patch+---++Fix `vercel.json` services detection when a Vercel Root Directory is configured. The framework integrations now read `vercel.json` from the framework app root first, so a `services` declaration next to the app wins over the linked repository root's `vercel.json` — matching where Vercel itself reads the file from.diff --git a/packages/eve/src/shared/vercel-services.integration.test.ts b/packages/eve/src/shared/vercel-services.integration.test.tsindex 08d2e55fa..2d7e6c6f1 100644--- a/packages/eve/src/shared/vercel-services.integration.test.ts+++ b/packages/eve/src/shared/vercel-services.integration.test.ts@@ -137,6 +137,32 @@ describe("ensureEveVercelServicesConfig", () => {expect(result).toEqual({ mode: "root" });});+ it("prefers the host root vercel.json services over the linked project root's", async () => {+ const projectRoot = await createTempHostRoot();+ const hostRoot = join(projectRoot, "apps", "web");+ await mkdir(join(projectRoot, ".vercel"), { recursive: true });+ await writeFile(join(projectRoot, ".vercel", "project.json"), "{}\n");+ await mkdir(hostRoot, { recursive: true });+ await writeFile(join(projectRoot, "vercel.json"), `${JSON.stringify({})}\n`);+ await writeFile(+ join(hostRoot, "vercel.json"),+ `${JSON.stringify({+ services: {+ web: { root: ".", framework: "nuxtjs" },+ eve: { root: "agent", framework: "eve" },+ },+ })}\n`,+ );++ const result = await ensureEveVercelServicesConfig({+ appRoot: hostRoot,+ frameworkName: "Test",+ hostRoot: hostRoot,+ });++ expect(result).toEqual({ mode: "root" });+ });+it("generates nothing when vercel.json declares services including eve", async () => {const hostRoot = await createTempHostRoot();await writeFile(diff --git a/packages/eve/src/shared/vercel-services.ts b/packages/eve/src/shared/vercel-services.tsindex bf52a3d2d..b7cdfed6b 100644--- a/packages/eve/src/shared/vercel-services.ts+++ b/packages/eve/src/shared/vercel-services.ts@@ -325,7 +325,17 @@ export async function ensureEveVercelServicesConfig(input: {}): Promise<EnsureEveVercelServicesConfigResult> {const vercelDirectory = await findClosestLinkedVercelDirectory(input.hostRoot);const projectRoot = vercelDirectory === undefined ? input.hostRoot : dirname(vercelDirectory);- const rootVercelConfig = await readVercelJsonConfig(join(projectRoot, VERCEL_JSON_FILE_NAME));+ // With a Vercel Root Directory, vercel.json lives in the root directory+ // (the host root) while the .vercel link lives at the repository root, so+ // the host root declaration wins over the linked project root's.+ const hostRootVercelConfig = await readVercelJsonConfig(+ join(input.hostRoot, VERCEL_JSON_FILE_NAME),+ );+ const rootVercelConfig =+ projectRoot === input.hostRoot ||+ Object.keys(createServiceConfigRecord(hostRootVercelConfig.services)).length > 0+ ? hostRootVercelConfig+ : await readVercelJsonConfig(join(projectRoot, VERCEL_JSON_FILE_NAME));const rootServices = createServiceConfigRecord(rootVercelConfig.services);if (Object.keys(rootServices).length > 0) {