fix(wb): getAllProjects()

WillBooster · Mar 24, 2024 · 18fd5e2 · 18fd5e2
1 parent 6466590
commit 18fd5e2
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 5 deletions.
diff --git a/packages/wb/src/project.ts b/packages/wb/src/project.ts
@@ -180,8 +180,16 @@ async function getAllProjects(argv: EnvReaderOptions, rootProject: Project, load
   const workspace = rootProject.packageJson.workspaces;
   if (!Array.isArray(workspace)) return allProjects;
 
-  const globPattern = workspace.map((ws: string) => path.join(rootProject.dirPath, ws));
-  const packageDirs = await globby(globPattern, { dot: true, onlyDirectories: true });
+  const globPattern: string[] = [];
+  const packageDirs: string[] = [];
+  for (const workspacePath of workspace.map((ws: string) => path.join(rootProject.dirPath, ws))) {
+    if (fs.existsSync(workspacePath)) {
+      packageDirs.push(workspacePath);
+    } else {
+      globPattern.push(workspacePath);
+    }
+  }
+  packageDirs.push(...(await globby(globPattern, { dot: true, onlyDirectories: true })));
   for (const subPackageDirPath of packageDirs) {
     if (!fs.existsSync(path.join(subPackageDirPath, 'package.json'))) continue;
 

diff --git a/packages/wb/test-fixtures/unusual-monorepo/dir/subdir/packages/sub1/package.json b/packages/wb/test-fixtures/unusual-monorepo/dir/subdir/packages/sub1/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@monorepo/sub1",
+  "name": "@unusual-monorepo/sub1",
   "devDependencies": {
     "typescript": "5.4.3"
   }

diff --git a/packages/wb/test-fixtures/unusual-monorepo/dir/subdir/packages/sub2/package.json b/packages/wb/test-fixtures/unusual-monorepo/dir/subdir/packages/sub2/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@monorepo/sub2",
+  "name": "@unusual-monorepo/sub2",
   "devDependencies": {
     "typescript": "5.4.3"
   }

diff --git a/packages/wb/test-fixtures/unusual-monorepo/dir/subdir/packages/sub3/README.md b/packages/wb/test-fixtures/unusual-monorepo/dir/subdir/packages/sub3/README.md
@@ -0,0 +1 @@
+# monorepo/sub2
diff --git a/packages/wb/test-fixtures/unusual-monorepo/dir/subdir/packages/sub3/package.json b/packages/wb/test-fixtures/unusual-monorepo/dir/subdir/packages/sub3/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "@unusual-monorepo/sub3",
+  "devDependencies": {
+    "typescript": "5.4.3"
+  }
+}
diff --git a/packages/wb/test-fixtures/unusual-monorepo/dir/subdir/packages/sub3/src/index.ts b/packages/wb/test-fixtures/unusual-monorepo/dir/subdir/packages/sub3/src/index.ts
@@ -0,0 +1 @@
+console.log('Hello');
diff --git a/packages/wb/test-fixtures/unusual-monorepo/dir/subdir/packages/sub3/tsconfig.json b/packages/wb/test-fixtures/unusual-monorepo/dir/subdir/packages/sub3/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "allowSyntheticDefaultImports": true,
+    "alwaysStrict": true,
+    "declaration": true,
+    "esModuleInterop": true,
+    "importHelpers": false,
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "outDir": "dist",
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "strict": true,
+    "target": "ESNext",
+    "typeRoots": ["../../node_modules/@types", "../../@types", "./@types"]
+  },
+  "include": ["scripts/**/*", "src/**/*", "tests/**/*"]
+}
diff --git a/packages/wb/test-fixtures/unusual-monorepo/package.json b/packages/wb/test-fixtures/unusual-monorepo/package.json
@@ -1,7 +1,8 @@
 {
   "name": "unusual-monorepo",
   "workspaces": [
-    "dir/subdir/packages/*"
+    "dir/subdir/packages/sub1",
+    "dir/subdir/*/sub2"
   ],
   "devDependencies": {
     "typescript": "5.4.3"