Don't complain about ignoredWorkspaces without a package.json

webpro-nl · Nov 30, 2023 · 42dbfce · 42dbfce
1 parent ecee44b
commit 42dbfce
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/packages/knip/fixtures/workspaces-ignored/package.json b/packages/knip/fixtures/workspaces-ignored/package.json
@@ -4,7 +4,8 @@
     "ignoreWorkspaces": [
       "packages/c",
       "packages/d*",
-      "packages/f"
+      "packages/f",
+      "packages/g"
     ]
   }
 }
diff --git a/packages/knip/fixtures/workspaces-ignored/packages/g/main.c b/packages/knip/fixtures/workspaces-ignored/packages/g/main.c
diff --git a/packages/knip/src/ConfigurationChief.ts b/packages/knip/src/ConfigurationChief.ts
@@ -10,7 +10,7 @@ import { arrayify } from './util/array.js';
 import parsedArgValues from './util/cli-arguments.js';
 import { partitionCompilers } from './util/compilers.js';
 import { ConfigurationError, LoaderError } from './util/errors.js';
-import { findFile, loadJSON } from './util/fs.js';
+import { findFile, isDirectory, isFile, loadJSON } from './util/fs.js';
 import { getIncludedIssueTypes } from './util/get-included-issue-types.js';
 import { _dirGlob } from './util/glob.js';
 import { _load } from './util/loader.js';
@@ -468,8 +468,11 @@ export class ConfigurationChief {
   public getUnusedIgnoredWorkspaces() {
     const ignoredWorkspaceNames = this.config.ignoreWorkspaces;
     const workspaceNames = [...this.manifestWorkspaces.keys(), ...this.additionalWorkspaceNames];
-    return ignoredWorkspaceNames.filter(
-      ignoredWorkspaceName => !workspaceNames.some(name => micromatch.isMatch(name, ignoredWorkspaceName))
-    );
+    return ignoredWorkspaceNames
+      .filter(ignoredWorkspaceName => !workspaceNames.some(name => micromatch.isMatch(name, ignoredWorkspaceName)))
+      .filter(ignoredWorkspaceName => {
+        const dir = join(this.cwd, ignoredWorkspaceName);
+        return !isDirectory(dir) || isFile(join(dir, 'package.json'));
+      });
   }
 }
diff --git a/packages/knip/src/util/fs.ts b/packages/knip/src/util/fs.ts
@@ -5,6 +5,11 @@ import stripJsonComments from 'strip-json-comments';
 import { LoaderError } from './errors.js';
 import { dirname, join } from './path.js';
 
+export const isDirectory = (filePath: string) => {
+  const stat = statSync(filePath, { throwIfNoEntry: false });
+  return stat !== undefined && stat.isDirectory();
+};
+
 export const isFile = (filePath: string) => {
   const stat = statSync(filePath, { throwIfNoEntry: false });
   return stat !== undefined && stat.isFile();