isolate-package 1.33.0-0 → 1.33.0

package/src/lib/patches/copy-patches.test.ts

@@ -15,17 +15,9 @@ vi.mock("fs-extra", () => ({
 vi.mock("~/lib/utils", () => ({
   filterPatchedDependencies: vi.fn(),
   getIsolateRelativeLogPath: vi.fn((p: string) => p),
-  getPackageName: vi.fn((spec: string) => {
-    if (spec.startsWith("@")) {
-      const parts = spec.split("@");
-      return `@${parts[1] ?? ""}`;
-    }
-    return spec.split("@")[0] ?? "";
-  }),
   getRootRelativeLogPath: vi.fn((p: string) => p),
   isRushWorkspace: vi.fn(() => false),
   readTypedJson: vi.fn(),
-  readTypedJsonSync: vi.fn(),
   readTypedYamlSync: vi.fn(),
 }));
 
@@ -37,25 +29,16 @@ vi.mock("~/lib/package-manager", () => ({
 /** Mock the pnpm lockfile readers */
 vi.mock("pnpm_lockfile_file_v8", () => ({
   readWantedLockfile: vi.fn(() => Promise.resolve(null)),
-  getLockfileImporterId: vi.fn(
-    (root: string, dir: string) => dir.replace(`${root}/`, "") || ".",
-  ),
 }));
 
 vi.mock("pnpm_lockfile_file_v9", () => ({
   readWantedLockfile: vi.fn(() => Promise.resolve(null)),
-  getLockfileImporterId: vi.fn(
-    (root: string, dir: string) => dir.replace(`${root}/`, "") || ".",
-  ),
 }));
 
 const fs = vi.mocked((await import("fs-extra")).default);
 const { filterPatchedDependencies, readTypedJson, readTypedYamlSync } =
   vi.mocked(await import("~/lib/utils"));
 const { usePackageManager } = vi.mocked(await import("~/lib/package-manager"));
-const { readWantedLockfile: readWantedLockfile_v9 } = vi.mocked(
-  await import("pnpm_lockfile_file_v9"),
-);
 
 describe("copyPatches", () => {
   beforeEach(() => {
@@ -82,8 +65,6 @@ describe("copyPatches", () => {
 
     const result = await copyPatches({
       workspaceRootDir: "/workspace",
-      targetPackageDir: "/workspace/packages/test",
-      internalDepPackageNames: [],
       targetPackageManifest: { name: "test", version: "1.0.0" },
       isolateDir: "/workspace/isolate",
       packagesRegistry: {},
@@ -145,8 +126,6 @@ describe("copyPatches", () => {
 
       const result = await copyPatches({
         workspaceRootDir: "/workspace",
-        targetPackageDir: "/workspace/packages/test",
-        internalDepPackageNames: [],
         targetPackageManifest: { name: "test", version: "1.0.0" },
         isolateDir: "/workspace/isolate",
         packagesRegistry: {},
@@ -167,8 +146,6 @@ describe("copyPatches", () => {
 
       const result = await copyPatches({
         workspaceRootDir: "/workspace",
-        targetPackageDir: "/workspace/packages/test",
-        internalDepPackageNames: [],
         targetPackageManifest: { name: "test", version: "1.0.0" },
         isolateDir: "/workspace/isolate",
         packagesRegistry: {},
@@ -199,8 +176,6 @@ describe("copyPatches", () => {
 
       const result = await copyPatches({
         workspaceRootDir: "/workspace",
-        targetPackageDir: "/workspace/packages/test",
-        internalDepPackageNames: [],
         targetPackageManifest: targetManifest,
         isolateDir: "/workspace/isolate",
         packagesRegistry: {},
@@ -239,8 +214,6 @@ describe("copyPatches", () => {
 
       const result = await copyPatches({
         workspaceRootDir: "/workspace",
-        targetPackageDir: "/workspace/packages/test",
-        internalDepPackageNames: [],
         targetPackageManifest: targetManifest,
         isolateDir: "/workspace/isolate",
         packagesRegistry: {},
@@ -283,8 +256,6 @@ describe("copyPatches", () => {
 
       const result = await copyPatches({
         workspaceRootDir: "/workspace",
-        targetPackageDir: "/workspace/packages/test",
-        internalDepPackageNames: [],
         targetPackageManifest: targetManifest,
         isolateDir: "/workspace/isolate",
         packagesRegistry: {},
@@ -316,8 +287,6 @@ describe("copyPatches", () => {
 
       const result = await copyPatches({
         workspaceRootDir: "/workspace",
-        targetPackageDir: "/workspace/packages/test",
-        internalDepPackageNames: [],
         targetPackageManifest: targetManifest,
         isolateDir: "/workspace/isolate",
         packagesRegistry: {},
@@ -352,8 +321,6 @@ describe("copyPatches", () => {
 
       const result = await copyPatches({
         workspaceRootDir: "/workspace",
-        targetPackageDir: "/workspace/packages/test",
-        internalDepPackageNames: [],
         targetPackageManifest: targetManifest,
         isolateDir: "/workspace/isolate",
         packagesRegistry: {},
@@ -397,8 +364,6 @@ describe("copyPatches", () => {
 
       const result = await copyPatches({
         workspaceRootDir: "/workspace",
-        targetPackageDir: "/workspace/packages/test",
-        internalDepPackageNames: [],
         targetPackageManifest: targetManifest,
         isolateDir: "/workspace/isolate",
         packagesRegistry: {},
@@ -444,8 +409,6 @@ describe("copyPatches", () => {
 
       const result = await copyPatches({
         workspaceRootDir: "/workspace",
-        targetPackageDir: "/workspace/packages/test",
-        internalDepPackageNames: [],
         targetPackageManifest: targetManifest,
         isolateDir: "/workspace/isolate",
         packagesRegistry: {},
@@ -493,8 +456,6 @@ describe("copyPatches", () => {
 
     const result = await copyPatches({
       workspaceRootDir: "/workspace",
-      targetPackageDir: "/workspace/packages/test",
-      internalDepPackageNames: [],
       targetPackageManifest: targetManifest,
       isolateDir: "/workspace/isolate",
       packagesRegistry: {},
@@ -548,8 +509,6 @@ describe("copyPatches", () => {
 
     const result = await copyPatches({
       workspaceRootDir: "/workspace",
-      targetPackageDir: "/workspace/packages/test",
-      internalDepPackageNames: [],
       targetPackageManifest: consumerManifest,
       isolateDir: "/workspace/isolate",
       packagesRegistry: {
@@ -577,88 +536,4 @@ describe("copyPatches", () => {
     expect(reachable!.has("firebase-package")).toBe(true);
     expect(reachable!.has("tslib")).toBe(true);
   });
-
-  it("should pick up deep external-to-external transitives from the pnpm lockfile (regression: issue #167 follow-up)", async () => {
-    /**
-     * Target depends on `@react-pdf/renderer` (external). The patched
-     * `@react-pdf/render` is only a transitive of `@react-pdf/renderer`. The
-     * manifest walker can't see it because it can't open external manifests,
-     * so the lockfile walker has to surface it.
-     */
-    const targetManifest: PackageManifest = {
-      name: "consumer",
-      version: "1.0.0",
-      dependencies: { "@react-pdf/renderer": "^4.0.0" },
-    };
-
-    readTypedYamlSync.mockReturnValue({
-      patchedDependencies: {
-        "@react-pdf/render@4.3.0": "patches/@react-pdf__render@4.3.0.patch",
-      },
-    });
-    readTypedJson.mockResolvedValue({
-      name: "root",
-      version: "1.0.0",
-    } as PackageManifest);
-
-    filterPatchedDependencies.mockReturnValue({
-      "@react-pdf/render@4.3.0": "patches/@react-pdf__render@4.3.0.patch",
-    });
-
-    fs.existsSync.mockReturnValue(true);
-
-    usePackageManager.mockReturnValue({
-      name: "pnpm",
-      majorVersion: 9,
-      version: "9.0.0",
-      packageManagerString: "pnpm@9.0.0",
-    });
-
-    /**
-     * Fake v9 lockfile: target importer depends on @react-pdf/renderer, which
-     * has @react-pdf/render as its only resolved dep.
-     */
-    readWantedLockfile_v9.mockResolvedValue({
-      lockfileVersion: "9.0",
-      importers: {
-        "packages/consumer": {
-          specifiers: { "@react-pdf/renderer": "^4.0.0" },
-          dependencies: { "@react-pdf/renderer": "4.0.0" },
-        },
-      },
-      packages: {
-        "@react-pdf/renderer@4.0.0": {
-          resolution: { integrity: "sha512-x" },
-          dependencies: { "@react-pdf/render": "4.3.0" },
-        },
-        "@react-pdf/render@4.3.0": {
-          resolution: { integrity: "sha512-y" },
-        },
-      },
-    } as unknown as Awaited<ReturnType<typeof readWantedLockfile_v9>>);
-
-    const result = await copyPatches({
-      workspaceRootDir: "/workspace",
-      targetPackageDir: "/workspace/packages/consumer",
-      internalDepPackageNames: [],
-      targetPackageManifest: targetManifest,
-      isolateDir: "/workspace/isolate",
-      packagesRegistry: {},
-      includeDevDependencies: false,
-    });
-
-    expect(result).toEqual({
-      "@react-pdf/render@4.3.0": {
-        path: "patches/@react-pdf__render@4.3.0.patch",
-        hash: "",
-      },
-    });
-
-    const filterCall = filterPatchedDependencies.mock.calls[0]?.[0];
-    expect(filterCall).toBeDefined();
-    const reachable = filterCall!.reachableDependencyNames;
-    expect(reachable).toBeInstanceOf(Set);
-    expect(reachable!.has("@react-pdf/renderer")).toBe(true);
-    expect(reachable!.has("@react-pdf/render")).toBe(true);
-  });
 });

package/src/lib/patches/copy-patches.ts

@@ -18,29 +18,23 @@ import {
   readTypedJson,
   readTypedYamlSync,
 } from "~/lib/utils";
-import { collectInstalledNamesFromBunLockfile } from "./collect-installed-names-bun";
-import { collectInstalledNamesFromPnpmLockfile } from "./collect-installed-names-pnpm";
 
 export async function copyPatches({
   workspaceRootDir,
-  targetPackageDir,
   targetPackageManifest,
   packagesRegistry,
-  internalDepPackageNames,
   isolateDir,
   includeDevDependencies,
 }: {
   workspaceRootDir: string;
-  targetPackageDir: string;
   targetPackageManifest: PackageManifest;
   packagesRegistry: PackagesRegistry;
-  internalDepPackageNames: string[];
   isolateDir: string;
   includeDevDependencies: boolean;
 }): Promise<Record<string, PatchFile>> {
   const log = useLogger();
 
-  const { name: packageManagerName, majorVersion } = usePackageManager();
+  const { name: packageManagerName } = usePackageManager();
 
   let patchedDependencies: Record<string, string> | undefined;
 
@@ -108,37 +102,6 @@ export async function copyPatches({
     includeDevDependencies,
   });
 
-  /**
-   * Manifest-based reachability misses external→external transitives because
-   * external manifests aren't loaded here. Walk the package-manager's
-   * lockfile to also pick up those names, so a patch for a deeply-nested
-   * external dep (e.g. `@react-pdf/render` reached via `@react-pdf/renderer`)
-   * survives isolation.
-   */
-  const lockfileInstalledNames =
-    packageManagerName === "pnpm"
-      ? await collectInstalledNamesFromPnpmLockfile({
-          workspaceRootDir,
-          targetPackageDir,
-          internalDepPackageNames,
-          packagesRegistry,
-          majorVersion,
-          includeDevDependencies,
-        })
-      : packageManagerName === "bun"
-        ? collectInstalledNamesFromBunLockfile({
-            workspaceRootDir,
-            targetPackageDir,
-            internalDepPackageNames,
-            packagesRegistry,
-            includeDevDependencies,
-          })
-        : new Set<string>();
-
-  for (const name of lockfileInstalledNames) {
-    reachableDependencyNames.add(name);
-  }
-
   const filteredPatches = filterPatchedDependencies({
     patchedDependencies,
     targetPackageManifest,