fix(scripts): point the fixture's pnpm state at the fixture root (00-01)
A copied state file still named the repository as the validated project, so pnpm inside a fixture re-verified and started an install through the linked package directories. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
840de45ee7
commit
926f448fce
@@ -1,4 +1,4 @@
|
|||||||
import { copyFile, mkdir, readdir, stat, symlink } from "node:fs/promises";
|
import { copyFile, mkdir, readdir, readFile, stat, symlink, writeFile } from "node:fs/promises";
|
||||||
import path from "node:path";
|
import path from "node:path";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -21,6 +21,11 @@ import path from "node:path";
|
|||||||
* runs inside the fixture, so they are copied: a link would carry the fixture's
|
* runs inside the fixture, so they are copied: a link would carry the fixture's
|
||||||
* path into the repository's own state and make its next pnpm command
|
* path into the repository's own state and make its next pnpm command
|
||||||
* re-verify the install.
|
* re-verify the install.
|
||||||
|
*
|
||||||
|
* The copied workspace state still names the repository as its validated
|
||||||
|
* project, so pnpm in the fixture would re-verify and start an install through
|
||||||
|
* the linked directories. It is rewritten to name the fixture root instead:
|
||||||
|
* the packages are the repository's own, already validated.
|
||||||
*/
|
*/
|
||||||
export async function linkFixtureNodeModules(
|
export async function linkFixtureNodeModules(
|
||||||
fixtureRoot: string,
|
fixtureRoot: string,
|
||||||
@@ -35,4 +40,25 @@ export async function linkFixtureNodeModules(
|
|||||||
if ((await stat(from)).isDirectory()) await symlink(from, to, "dir");
|
if ((await stat(from)).isDirectory()) await symlink(from, to, "dir");
|
||||||
else await copyFile(from, to);
|
else await copyFile(from, to);
|
||||||
}
|
}
|
||||||
|
await retargetWorkspaceState(
|
||||||
|
path.join(target, ".pnpm-workspace-state-v1.json"),
|
||||||
|
fixtureRoot,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function retargetWorkspaceState(
|
||||||
|
statePath: string,
|
||||||
|
fixtureRoot: string,
|
||||||
|
): Promise<void> {
|
||||||
|
let state: { projects?: Record<string, unknown>; lastValidatedTimestamp?: number };
|
||||||
|
try {
|
||||||
|
state = JSON.parse(await readFile(statePath, "utf8"));
|
||||||
|
} catch {
|
||||||
|
return; // no state file, or not pnpm's JSON: nothing to retarget
|
||||||
|
}
|
||||||
|
const [project] = Object.values(state.projects ?? {});
|
||||||
|
if (project === undefined) return;
|
||||||
|
state.projects = { [fixtureRoot]: project };
|
||||||
|
state.lastValidatedTimestamp = Date.now();
|
||||||
|
await writeFile(statePath, `${JSON.stringify(state, null, 2)}\n`);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -95,6 +95,40 @@ describe("fixture node_modules linking", () => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// A copied state file still names the repository as the validated project,
|
||||||
|
// so pnpm inside the fixture re-verified the install and started one through
|
||||||
|
// the linked directories. Pointing it at the fixture keeps pnpm from
|
||||||
|
// installing into a tree whose packages are shared with the repository.
|
||||||
|
it("points the copied workspace state at the fixture root", async () => {
|
||||||
|
const source = await sourceTree();
|
||||||
|
const fixture = await mkdtemp(path.join(tmpdir(), "fixture-root-"));
|
||||||
|
const statePath = ".pnpm-workspace-state-v1.json";
|
||||||
|
try {
|
||||||
|
await writeFile(
|
||||||
|
path.join(source, "node_modules", statePath),
|
||||||
|
JSON.stringify({
|
||||||
|
lastValidatedTimestamp: 1,
|
||||||
|
projects: { [source]: { name: "template", version: "0.1.0" } },
|
||||||
|
settings: { dev: true },
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
const before = Date.now();
|
||||||
|
await linkFixtureNodeModules(fixture, source);
|
||||||
|
|
||||||
|
const state = JSON.parse(
|
||||||
|
await readFile(path.join(fixture, "node_modules", statePath), "utf8"),
|
||||||
|
);
|
||||||
|
expect(state.projects).toEqual({
|
||||||
|
[fixture]: { name: "template", version: "0.1.0" },
|
||||||
|
});
|
||||||
|
expect(state.lastValidatedTimestamp).toBeGreaterThanOrEqual(before);
|
||||||
|
expect(state.settings).toEqual({ dev: true });
|
||||||
|
} finally {
|
||||||
|
await rm(source, { recursive: true, force: true });
|
||||||
|
await rm(fixture, { recursive: true, force: true });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
it("creates node_modules as a real directory, never a symlink", async () => {
|
it("creates node_modules as a real directory, never a symlink", async () => {
|
||||||
const source = await sourceTree();
|
const source = await sourceTree();
|
||||||
const fixture = await mkdtemp(path.join(tmpdir(), "fixture-root-"));
|
const fixture = await mkdtemp(path.join(tmpdir(), "fixture-root-"));
|
||||||
|
|||||||
Reference in New Issue
Block a user