fix(pnpm): absolute cwd path matched workspace exclude rules (#121) (#…

…122)

* fix(pnpm): absolute path matched exclude rules

* chore(changeset): add changesets for fix

* chore: remove console.log

* Update .changeset/fair-days-rest.md

Co-authored-by: Mateusz Burzyński <[email protected]>

Co-authored-by: Mateusz Burzyński <[email protected]>

.changeset/fair-days-rest.md

@@ -0,0 +1,6 @@
+---
+"@manypkg/cli": patch
+"@manypkg/get-packages": patch
+---
+
+Fixed getting correct packages in pnpm workspaces with exclude rules.

__fixtures__/pnpm-exclude-workspace-case/package.json

@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "name": "pnpm-exclude-workspace-case",
+  "description": "pnpm exclude rule workspace work",
+  "version": "1.0.0"
+}

__fixtures__/pnpm-exclude-workspace-case/packages/pkg-a/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "pnpm-exclude-workspace-case-pkg-a",
+  "version": "1.0.0",
+  "dependencies": {
+    "pnpm-exclude-workspace-case-pkg-b": "1.0.0"
+  }
+}

__fixtures__/pnpm-exclude-workspace-case/packages/pkg-b/package.json

@@ -0,0 +1,5 @@
+
+{
+  "name": "pnpm-exclude-workspace-case-pkg-b",
+  "version": "1.0.0"
+}

__fixtures__/pnpm-exclude-workspace-case/packages/pnpm-exclude-workspace-case/package.json

@@ -0,0 +1,5 @@
+
+{
+  "name": "pnpm-exclude-workspace-case-excluded-pkg",
+  "version": "1.0.0"
+}

__fixtures__/pnpm-exclude-workspace-case/pnpm-workspace.yaml

@@ -0,0 +1,5 @@
+packages:
+  - 'packages/**'
+  # exclude packages that are inside myself name directories
+  - '!**/pnpm-exclude-workspace-case/**'
+

packages/get-packages/src/index.test.ts

@@ -69,6 +69,19 @@ let runTests = (getPackages: GetPackages) => {
     expect(allPackages.tool).toEqual("pnpm");
   });
 
+  it("should resolve workspace for pnpm with exclude rules", async () => {
+    const allPackages = await getPackages(f.copy("pnpm-exclude-workspace-case"));
+
+    expect(allPackages.packages[0].packageJson.name).toEqual(
+      "pnpm-exclude-workspace-case-pkg-a"
+    );
+    expect(allPackages.packages[1].packageJson.name).toEqual(
+      "pnpm-exclude-workspace-case-pkg-b"
+    );
+    expect(allPackages.packages.length).toEqual(2);
+    expect(allPackages.tool).toEqual("pnpm");
+  })
+
   it("should resolve workspaces for lerna", async () => {
     const allPackages = await getPackages(f.copy("lerna-workspace-base"));
 

packages/get-packages/src/index.ts

@@ -110,13 +110,13 @@ export async function getPackages(dir: string): Promise<Packages> {
     };
   }
 
-  const directories = await globby(tool.packageGlobs, {
+  const relativeDirectories = await globby(tool.packageGlobs, {
     cwd,
     onlyDirectories: true,
-    absolute: true,
     expandDirectories: false,
     ignore: ["**/node_modules"]
   });
+  const directories = relativeDirectories.map(p => path.resolve(cwd, p))
 
   let pkgJsonsMissingNameField: Array<string> = [];
 
@@ -234,13 +234,13 @@ export function getPackagesSync(dir: string): Packages {
       packages: [root]
     };
   }
-  const directories = globbySync(tool.packageGlobs, {
+  const relativeDirectories = globbySync(tool.packageGlobs, {
     cwd,
     onlyDirectories: true,
-    absolute: true,
     expandDirectories: false,
     ignore: ["**/node_modules"]
   });
+  const directories = relativeDirectories.map(p => path.resolve(cwd, p))
 
   let pkgJsonsMissingNameField: Array<string> = [];