knip 2.28.0 → 2.29.0

package/dist/ProjectPrincipal.js

@@ -6,7 +6,7 @@ import { getJSDocTags, isInModuleBlock } from './typescript/ast-helpers.js';
 import { createHosts } from './typescript/createHosts.js';
 import { getImportsAndExports } from './typescript/getImportsAndExports.js';
 import { SourceFileManager } from './typescript/SourceFileManager.js';
-import { isMaybePackageName } from './util/modules.js';
+import { isMaybePackageName, sanitizeSpecifier } from './util/modules.js';
 import { dirname, extname, isInNodeModules, join } from './util/path.js';
 import { timerify } from './util/Performance.js';
 const baseCompilerOptions = {
@@ -128,7 +128,7 @@ export class ProjectPrincipal {
                 }
             }
             else {
-                const sanitizedSpecifier = specifier.replace(/^([?!|-]+)?([^!?]+).*/, '$2');
+                const sanitizedSpecifier = sanitizeSpecifier(specifier);
                 if (isMaybePackageName(sanitizedSpecifier)) {
                     external.add(sanitizedSpecifier);
                 }

package/dist/plugins/next/index.js

@@ -9,7 +9,7 @@ const productionEntryFilePatternsWithoutSrc = [
     'app/**/{error,layout,loading,not-found,page,template}.{js,jsx,ts,tsx}',
     'instrumentation.{js,ts}',
     'app/{manifest,sitemap,robots}.{js,ts}',
-    'app/**/{icon,apple-icon}-image.{js,ts,tsx}',
+    'app/**/{icon,apple-icon}.{js,ts,tsx}',
     'app/**/{opengraph,twitter}-image.{js,ts,tsx}',
     'pages/**/*.{js,jsx,ts,tsx}',
 ];

package/dist/plugins/vitest/index.js

@@ -5,7 +5,7 @@ import { getEnvPackageName, getExternalReporters } from './helpers.js';
 export const NAME = 'Vitest';
 export const ENABLERS = ['vitest'];
 export const isEnabled = ({ dependencies }) => hasDependency(dependencies, ENABLERS);
-export const CONFIG_FILE_PATTERNS = ['vitest.config.ts'];
+export const CONFIG_FILE_PATTERNS = ['vitest.config.ts', 'vitest.{workspace,projects}.{ts,js,json}'];
 export const ENTRY_FILE_PATTERNS = [];
 export const findVitestDeps = (config) => {
     if (!config || !config.test)
@@ -18,8 +18,20 @@ export const findVitestDeps = (config) => {
     const globalSetup = cfg.globalSetup ? [cfg.globalSetup].flat() : [];
     return compact([...environments, ...reporters, ...coverage, ...setupFiles, ...globalSetup]);
 };
+const findVitestWorkspaceDeps = (config) => {
+    let deps = [];
+    for (const cfg of config) {
+        if (typeof cfg === 'string')
+            continue;
+        deps = [...deps, ...findVitestDeps(cfg)];
+    }
+    return compact(deps);
+};
 const findVitestDependencies = async (configFilePath) => {
     const config = await load(configFilePath);
+    if (Array.isArray(config)) {
+        return findVitestWorkspaceDeps(config);
+    }
     return findVitestDeps(config);
 };
 export const findDependencies = timerify(findVitestDependencies);

package/dist/plugins/vitest/types.d.ts

@@ -9,3 +9,4 @@ export interface VitestConfig {
         setupFiles?: string | string[];
     };
 }
+export type VitestWorkspaceConfig = (string | VitestConfig)[];

package/dist/typescript/getImportsAndExports.js

@@ -1,9 +1,7 @@
-import { existsSync } from 'node:fs';
 import { isBuiltin } from 'node:module';
-import { resolve, dirname } from 'node:path';
 import ts from 'typescript';
 import { getOrSet } from '../util/map.js';
-import { isMaybePackageName } from '../util/modules.js';
+import { isMaybePackageName, sanitizeSpecifier } from '../util/modules.js';
 import { isInNodeModules } from '../util/path.js';
 import { isDeclarationFileExtension, isAccessExpression, getAccessExpressionName, getJSDocTags, } from './ast-helpers.js';
 import getExportVisitors from './visitors/exports/index.js';
@@ -60,13 +58,14 @@ export const getImportsAndExports = (sourceFile, options) => {
                     if (!isInNodeModules(filePath)) {
                         addInternalImport({ identifier, specifier, symbol, filePath, isReExport });
                     }
-                    if (!isMaybePackageName(specifier))
+                    const sanitizedSpecifier = sanitizeSpecifier(specifier);
+                    if (!isMaybePackageName(sanitizedSpecifier))
                         return;
                     if (isDeclarationFileExtension(module.resolvedModule.extension)) {
-                        externalImports.add(specifier);
+                        externalImports.add(sanitizedSpecifier);
                     }
                     else {
-                        externalImports.add(module.resolvedModule.packageId?.name ?? specifier);
+                        externalImports.add(module.resolvedModule.packageId?.name ?? sanitizedSpecifier);
                     }
                 }
                 else {
@@ -75,13 +74,7 @@ export const getImportsAndExports = (sourceFile, options) => {
             }
         }
         else {
-            const filePath = resolve(dirname(sourceFile.fileName), specifier);
-            if (existsSync(filePath)) {
-                unresolvedImports.add(filePath);
-            }
-            else {
-                unresolvedImports.add(specifier);
-            }
+            unresolvedImports.add(specifier);
         }
     };
     const maybeAddNamespaceAccessAsImport = ({ namespace, member }) => {

package/dist/typescript/resolveModuleNames.js

@@ -1,11 +1,29 @@
+import { existsSync } from 'node:fs';
 import ts from 'typescript';
+import { sanitizeSpecifier } from '../util/modules.js';
+import { dirname, extname, isInternal, join } from '../util/path.js';
 import { ensureRealFilePath, isVirtualFilePath } from './utils.js';
 export function createCustomModuleResolver(customSys, compilerOptions, virtualFileExtensions) {
     function resolveModuleNames(moduleNames, containingFile) {
         return moduleNames.map(moduleName => resolveModuleName(moduleName, containingFile));
     }
     function resolveModuleName(name, containingFile) {
-        const tsResolvedModule = ts.resolveModuleName(name, containingFile, compilerOptions, ts.sys).resolvedModule;
+        const sanitizedSpecifier = sanitizeSpecifier(name);
+        const tsResolvedModule = ts.resolveModuleName(sanitizedSpecifier, containingFile, compilerOptions, ts.sys).resolvedModule;
+        if (!tsResolvedModule) {
+            const extension = extname(sanitizedSpecifier);
+            if (extension && isInternal(sanitizedSpecifier) && !virtualFileExtensions.includes(extension)) {
+                const resolvedFileName = join(dirname(containingFile), sanitizedSpecifier);
+                if (existsSync(resolvedFileName)) {
+                    return {
+                        resolvedFileName,
+                        extension,
+                        isExternalLibraryImport: false,
+                        resolvedUsingTsExtension: false,
+                    };
+                }
+            }
+        }
         if (virtualFileExtensions.length === 0)
             return tsResolvedModule;
         if (tsResolvedModule && !isVirtualFilePath(tsResolvedModule.resolvedFileName, virtualFileExtensions)) {

package/dist/util/modules.d.ts

@@ -6,3 +6,4 @@ export declare const isDefinitelyTyped: (packageName: string) => boolean;
 export declare const getDefinitelyTypedFor: (packageName: string) => string;
 export declare const getPackageFromDefinitelyTyped: (typedDependency: string) => string;
 export declare const getEntryPathFromManifest: (cwd: string, dir: string, manifest: PackageJson) => Promise<string[]>;
+export declare const sanitizeSpecifier: (specifier: string) => string;

package/dist/util/modules.js

@@ -50,3 +50,4 @@ export const getEntryPathFromManifest = (cwd, dir, manifest) => {
     }
     return _glob({ cwd, workingDir: dir, patterns: Array.from(entryPaths) });
 };
+export const sanitizeSpecifier = (specifier) => specifier.replace(/^([?!|-]+)?([^!?]+).*/, '$2');

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "2.28.0";
+export declare const version = "2.29.0";

package/dist/version.js

@@ -1 +1 @@
-export const version = '2.28.0';
+export const version = '2.29.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knip",
-  "version": "2.28.0",
+  "version": "2.29.0",
   "description": "Find unused files, dependencies and exports in your TypeScript and JavaScript projects",
   "homepage": "https://github.com/webpro/knip",
   "repository": "github:webpro/knip",