fix(tools-workspaces): exclude packages that don't have a manifest

.changeset/five-lizards-compete.md

@@ -0,0 +1,5 @@
+---
+"@rnx-kit/tools-workspaces": patch
+---
+
+Exclude packages that don't have a manifest

packages/tools-workspaces/src/common.ts

@@ -22,6 +22,10 @@ export const WORKSPACE_ROOT_SENTINELS = [
   PNPM_WORKSPACE_YAML,
 ];
 
+function dirnameAll(paths: string[]): string[] {
+  return paths.map((p) => path.dirname(p));
+}
+
 function makeFindSentinel<R>(finder: (name: string[]) => R) {
   let result: R | undefined;
   return () => {
@@ -34,25 +38,33 @@ function makeFindSentinel<R>(finder: (name: string[]) => R) {
 
 function makeFindPackages<R>(
   glob: (patterns: string[], options: Options) => R,
-  fallback: R
+  fallback: R,
+  postprocess: (result: R) => R
 ) {
   const ignore = ["**/Pods/**", "**/bower_components/**", "**/node_modules/**"];
   return (patterns: string[] | undefined, cwd: string): R => {
     if (!Array.isArray(patterns)) {
       return fallback;
     }
 
-    return glob(patterns, {
+    const pkgPatterns = patterns.map((p) => p + "/package.json");
+    const result = glob(pkgPatterns, {
       cwd,
       ignore,
       absolute: true,
-      onlyDirectories: true,
+      onlyFiles: true,
     });
+    return postprocess(result);
   };
 }
 
-export const findPackages = makeFindPackages(fg, Promise.resolve([]));
-export const findPackagesSync = makeFindPackages(fg.sync, []);
+export const findPackages = makeFindPackages(
+  fg,
+  Promise.resolve([]),
+  (result: Promise<string[]>) => result.then(dirnameAll)
+);
+
+export const findPackagesSync = makeFindPackages(fg.sync, [], dirnameAll);
 
 export const findSentinel = makeFindSentinel(findUp);
 export const findSentinelSync = makeFindSentinel(findUp.sync);

packages/tools-workspaces/test/__fixtures__/lerna-packages/packages/invalid-package/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

packages/tools-workspaces/test/__fixtures__/lerna-workspaces/packages/invalid-package/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

packages/tools-workspaces/test/__fixtures__/npm/packages/invalid-package/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

packages/tools-workspaces/test/__fixtures__/pnpm/packages/invalid-package/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

packages/tools-workspaces/test/__fixtures__/rush/packages/invalid-package/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

packages/tools-workspaces/test/__fixtures__/yarn/packages/invalid-package/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

packages/tools-workspaces/test/lerna.test.ts

@@ -49,22 +49,22 @@ describe("findWorkspacePackages", () => {
 
   test("returns packages for Lerna workspaces", async () => {
     setFixture("lerna-packages");
-    expect(await findWorkspacePackages()).toEqual(packagesPackages);
+    expect((await findWorkspacePackages()).sort()).toEqual(packagesPackages);
   });
 
   test("returns packages for Lerna workspaces (sync)", () => {
     setFixture("lerna-packages");
-    expect(findWorkspacePackagesSync()).toEqual(packagesPackages);
+    expect(findWorkspacePackagesSync().sort()).toEqual(packagesPackages);
   });
 
   test("returns packages for delegated workspaces", async () => {
     setFixture("lerna-workspaces");
-    expect(await findWorkspacePackages()).toEqual(workspacesPackages);
+    expect((await findWorkspacePackages()).sort()).toEqual(workspacesPackages);
   });
 
   test("returns packages for delegated workspaces (sync)", () => {
     setFixture("lerna-workspaces");
-    expect(findWorkspacePackagesSync()).toEqual(workspacesPackages);
+    expect(findWorkspacePackagesSync().sort()).toEqual(workspacesPackages);
   });
 });
 

packages/tools-workspaces/test/npm.test.ts

@@ -21,12 +21,12 @@ describe("findWorkspacePackages", () => {
 
   test("returns packages for npm workspaces", async () => {
     setFixture("npm");
-    expect(await findWorkspacePackages()).toEqual(packages);
+    expect((await findWorkspacePackages()).sort()).toEqual(packages);
   });
 
   test("returns packages for npm workspaces (sync)", () => {
     setFixture("npm");
-    expect(findWorkspacePackagesSync()).toEqual(packages);
+    expect(findWorkspacePackagesSync().sort()).toEqual(packages);
   });
 });
 

packages/tools-workspaces/test/pnpm.test.ts

@@ -21,12 +21,12 @@ describe("findWorkspacePackages", () => {
 
   test("returns packages for pnpm workspaces", async () => {
     setFixture("pnpm");
-    expect(await findWorkspacePackages()).toEqual(packages);
+    expect((await findWorkspacePackages()).sort()).toEqual(packages);
   });
 
   test("returns packages for pnpm workspaces (sync)", () => {
     setFixture("pnpm");
-    expect(findWorkspacePackagesSync()).toEqual(packages);
+    expect(findWorkspacePackagesSync().sort()).toEqual(packages);
   });
 });
 

packages/tools-workspaces/test/rush.test.ts

@@ -21,12 +21,12 @@ describe("findWorkspacePackages", () => {
 
   test("returns packages for Rush workspaces", async () => {
     setFixture("rush");
-    expect(await findWorkspacePackages()).toEqual(packages);
+    expect((await findWorkspacePackages()).sort()).toEqual(packages);
   });
 
   test("returns packages for Rush workspaces (sync)", () => {
     setFixture("rush");
-    expect(findWorkspacePackagesSync()).toEqual(packages);
+    expect(findWorkspacePackagesSync().sort()).toEqual(packages);
   });
 });
 

packages/tools-workspaces/test/yarn.test.ts

@@ -21,12 +21,12 @@ describe("findWorkspacePackages", () => {
 
   test("returns packages for Yarn workspaces", async () => {
     setFixture("yarn");
-    expect(await findWorkspacePackages()).toEqual(packages);
+    expect((await findWorkspacePackages()).sort()).toEqual(packages);
   });
 
   test("returns packages for Yarn workspaces (sync)", () => {
     setFixture("yarn");
-    expect(findWorkspacePackagesSync()).toEqual(packages);
+    expect(findWorkspacePackagesSync().sort()).toEqual(packages);
   });
 });