Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"dependencies": {
"@npmcli/arborist": "^9.4.2",
"@npmcli/config": "^10.8.1",
"@pnpm/deps.path": "^1100.1.0",
"@pnpm/logger": "^1100.0.0",
"@pnpm/types": "^1001.3.0",
"consola": "^3.4.2",
Expand Down
13 changes: 8 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,10 @@ describe("generatePnpmLockfile integration", () => {
"my-config": { specifier: "1.0.0", version: "1.0.0" },
});
expect(rootImporter).not.toHaveProperty("packageManagerDependencies");
expect(documents[0]?.packages).toEqual({
"my-config@1.0.0": expect.any(Object),
});
expect(documents[0]?.snapshots).toEqual({});
});

/**
Expand Down
131 changes: 131 additions & 0 deletions src/lib/lockfile/helpers/generate-pnpm-lockfile.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,49 @@ describe("generatePnpmLockfile", () => {
snapshots: {},
} satisfies EnvLockfile;

const envLockfileWithConfigDependency = {
lockfileVersion: "9.0",
importers: {
".": {
configDependencies: {
"my-config": { specifier: "1.0.0", version: "1.0.0" },
},
packageManagerDependencies: {
pnpm: { specifier: "12.0.0", version: "12.0.0" },
},
},
},
packages: {
"my-config@1.0.0": { resolution: { integrity: "config" } },
"config-runtime@1.0.0": { resolution: { integrity: "runtime" } },
"patched-runtime@1.0.0(patch_hash=abc)": {
resolution: { integrity: "patched" },
},
"pnpm@12.0.0": { resolution: { integrity: "pnpm" } },
"@pnpm/exe.linux-x64@12.0.0": {
resolution: { integrity: "executable" },
},
"unrelated@1.0.0": { resolution: { integrity: "unrelated" } },
},
snapshots: {
"my-config@1.0.0": {
dependencies: {
"config-runtime": "1.0.0(peer@2.0.0)",
"patched-runtime": "1.0.0(patch_hash=abc)",
},
},
"config-runtime@1.0.0(peer@2.0.0)": {},
"patched-runtime@1.0.0(patch_hash=abc)": {},
"pnpm@12.0.0": {
optionalDependencies: {
"@pnpm/exe.linux-x64": "12.0.0",
},
},
"@pnpm/exe.linux-x64@12.0.0": {},
"unrelated@1.0.0": {},
},
} satisfies EnvLockfile;

beforeEach(() => {
const lockfile = createMockLockfile();
readWantedLockfile_v9.mockResolvedValue(lockfile as never);
Expand Down Expand Up @@ -668,6 +711,94 @@ describe("generatePnpmLockfile", () => {
expect(writeEnvLockfile_v9).not.toHaveBeenCalled();
});

it("should prune package manager packages when the output omits packageManager", async () => {
readEnvLockfile_v9.mockResolvedValue(envLockfileWithConfigDependency);

await generate({ name: "my-app", version: "1.0.0" });

expect(writeEnvLockfile_v9).toHaveBeenCalledWith(
"/workspace/apps/my-app/isolate",
{
lockfileVersion: "9.0",
importers: {
".": {
configDependencies: {
"my-config": { specifier: "1.0.0", version: "1.0.0" },
},
},
},
packages: {
"my-config@1.0.0": { resolution: { integrity: "config" } },
"config-runtime@1.0.0": {
resolution: { integrity: "runtime" },
},
"patched-runtime@1.0.0(patch_hash=abc)": {
resolution: { integrity: "patched" },
},
},
snapshots: {
"my-config@1.0.0": {
dependencies: {
"config-runtime": "1.0.0(peer@2.0.0)",
"patched-runtime": "1.0.0(patch_hash=abc)",
},
},
"config-runtime@1.0.0(peer@2.0.0)": {},
"patched-runtime@1.0.0(patch_hash=abc)": {},
},
},
);
});

it("should omit config dependencies that a generated Rush workspace does not declare", async () => {
isRushWorkspace.mockReturnValue(true);
readEnvLockfile_v9.mockResolvedValue(envLockfileWithConfigDependency);

await generate({
name: "my-app",
version: "1.0.0",
packageManager: "pnpm@12.0.0",
});

expect(writeEnvLockfile_v9).toHaveBeenCalledWith(
"/workspace/apps/my-app/isolate",
{
lockfileVersion: "9.0",
importers: {
".": {
configDependencies: {},
packageManagerDependencies: {
pnpm: { specifier: "12.0.0", version: "12.0.0" },
},
},
},
packages: {
"pnpm@12.0.0": { resolution: { integrity: "pnpm" } },
"@pnpm/exe.linux-x64@12.0.0": {
resolution: { integrity: "executable" },
},
},
snapshots: {
"pnpm@12.0.0": {
optionalDependencies: {
"@pnpm/exe.linux-x64": "12.0.0",
},
},
"@pnpm/exe.linux-x64@12.0.0": {},
},
},
);
});

it("should skip the env document for a Rush output without packageManager", async () => {
isRushWorkspace.mockReturnValue(true);
readEnvLockfile_v9.mockResolvedValue(envLockfileWithConfigDependency);

await generate({ name: "my-app", version: "1.0.0" });

expect(writeEnvLockfile_v9).not.toHaveBeenCalled();
});

it("should skip the env document when the workspace lockfile has none", async () => {
readEnvLockfile_v9.mockResolvedValue(null);

Expand Down
Loading
Loading