PR review

webpro-nl · Mar 14, 2024 · 213aa6e · 213aa6e
1 parent a1e6d50
commit 213aa6e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/packages/docs/scripts/generate-plugin-docs.ts b/packages/docs/scripts/generate-plugin-docs.ts
@@ -10,7 +10,7 @@ import remarkStringify from 'remark-stringify';
 import { unified } from 'unified';
 import { u } from 'unist-builder';
 import { base } from '../config.js';
-import type { Plugin } from '../../knip/src/types/plugins.js';
+import type { Plugin } from 'knip/dist/types/plugins.ts';
 import type { Root } from 'mdast';
 import type { Node } from 'unist';
 

diff --git a/packages/knip/src/plugins/msw/index.ts b/packages/knip/src/plugins/msw/index.ts
@@ -1,3 +1,5 @@
+// eslint-disable-next-line n/no-restricted-import
+import path from 'node:path';
 import { basename } from '../../util/path.js';
 import { hasDependency } from '../../util/plugin.js';
 import { toEntryPattern } from '../../util/protocols.js';
@@ -14,15 +16,7 @@ const isEnabled: IsPluginEnabledCallback = ({ dependencies }) => hasDependency(d
 const CONFIG_FILE_PATTERNS = ['package.json'];
 
 const ENTRY_FILE_PATTERNS = [
-  '**/mockServiceWorker.{js,ts}',
-  'mocks/browser.{js,ts}',
-  'mocks/handlers.{js,ts}"',
-  'mocks/index.{js,ts}"',
-  'mocks/server.{js,ts}"',
-  'src/mocks/browser.{js,ts}',
-  'src/mocks/handlers.{js,ts}"',
-  'src/mocks/index.{js,ts}"',
-  'src/mocks/server.{js,ts}"',
+  'mockServiceWorker.js',
 ];
 
 const findDependencies: GenericPluginCallback = async (configFilePath, options) => {
@@ -34,7 +28,7 @@ const findDependencies: GenericPluginCallback = async (configFilePath, options)
   const workerDirectory = localConfig?.workerDirectory;
 
   if (workerDirectory) {
-    ENTRY_FILE_PATTERNS.push(`${workerDirectory}/mockServiceWorker.{js,ts}`)
+    return [toEntryPattern(path.join(workerDirectory, '/mockServiceWorker.js'))];
   }
 
   const entryPatterns =  ENTRY_FILE_PATTERNS.map(toEntryPattern);

diff --git a/packages/knip/test/plugins/msw.test.ts b/packages/knip/test/plugins/msw.test.ts
@@ -14,15 +14,15 @@ test('Should not see the msw files in issues', async () => {
     isStrict: true,
   });
 
-  assert.equal(issues.files.size, 3);
+  assert.equal(issues.files.size, 13);
   assert(issues.files.has(join(cwd, 'junk.js')));
   assert(issues.files.has(join(cwd, 'mocks/junk.js')));
   assert(issues.files.has(join(cwd, 'src/mocks/junk.js')));
 
   assert.deepEqual(counters, {
     ...baseCounters,
     devDependencies: 1,
-    files: 3,
+    files: 13,
     total: 14,
     processed: 14,
   });