Allow workspace patterns to be relative (fixes #617)

webpro-nl · May 3, 2024 · 6c71399 · 6c71399
1 parent 386e395
commit 6c71399
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/packages/knip/fixtures/workspaces-tooling/package.json b/packages/knip/fixtures/workspaces-tooling/package.json
@@ -1,6 +1,4 @@
 {
   "name": "@workspaces-tooling/root",
-  "workspaces": [
-    "packages/*"
-  ]
+  "workspaces": ["./packages/*"]
 }
diff --git a/packages/knip/src/ConfigurationChief.ts b/packages/knip/src/ConfigurationChief.ts
@@ -267,11 +267,12 @@ export class ConfigurationChief {
   }
 
   private getListedWorkspaces() {
-    return this.manifest?.workspaces
+    const workspaces = this.manifest?.workspaces
       ? Array.isArray(this.manifest.workspaces)
         ? this.manifest.workspaces
         : this.manifest.workspaces.packages ?? []
       : [];
+    return workspaces.map(pattern => pattern.replace(/(?<=!?)\.\//, ''));
   }
 
   private getIgnoredWorkspacePatterns() {

diff --git a/packages/knip/src/util/map-workspaces.ts b/packages/knip/src/util/map-workspaces.ts
@@ -9,7 +9,7 @@ import { join } from './path.js';
 import { _require } from './require.js';
 
 export default async function mapWorkspaces(cwd: string, workspaces: string[]) {
-  const [negatedPatterns, patterns] = partition(workspaces, p => p.match(/^!+/));
+  const [negatedPatterns, patterns] = partition(workspaces, p => p.match(/^!/));
   const byPkgDir = new Map<string, Package>();
   const byPkgName = new Map<string, Package>();