tailwind-lint 0.11.2 → 0.12.0

package/dist/cli.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_linter = require("./linter-B9R7nuem.cjs");
+const require_linter = require("./linter-DQMo7IYe.cjs");
 let node_path = require("node:path");
 node_path = require_linter.__toESM(node_path, 1);
 let ansis = require("ansis");
@@ -110,7 +110,8 @@ function resolveOptions(files, options) {
 	let autoDiscover = hasAutoFlag;
 	if (hasConfigFlag && options.config) configPath = node_path.isAbsolute(options.config) ? options.config : node_path.resolve(process.cwd(), options.config);
 	if (hasConfigFlag && options.config && !hasFiles) {
-		cwd = node_path.dirname(configPath);
+		const configDir = node_path.dirname(configPath);
+		cwd = require_linter.isCssConfigFile(configPath) ? require_linter.findProjectRoot(configDir) : configDir;
 		patterns = [];
 		autoDiscover = true;
 	}

package/dist/{linter-B9R7nuem.cjs → linter-DQMo7IYe.cjs}

@@ -628,7 +628,17 @@ async function loadV4DesignSystem(state, cwd, configPath, verbose = false) {
 //#region src/utils/config.ts
 const require$2 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href || __filename);
 const CONFIG_DISCOVERY_MAX_DEPTH = 8;
+const PROJECT_ROOT_MARKERS = ["package.json", ".git"];
 const isCssConfigFile = (filePath) => filePath.endsWith(".css");
+function findProjectRoot(startDir) {
+	let current = node_path.resolve(startDir);
+	while (true) {
+		if (PROJECT_ROOT_MARKERS.some((marker) => fileExists(node_path.join(current, marker)))) return current;
+		const parent = node_path.dirname(current);
+		if (parent === current) return node_path.resolve(startDir);
+		current = parent;
+	}
+}
 function syntheticViteCssConfigPath(viteConfigPath) {
 	return node_path.join(node_path.dirname(viteConfigPath), SYNTHETIC_VITE_CSS_CONFIG_NAME);
 }
@@ -653,17 +663,6 @@ async function findTailwindConfigPath(cwd, configPath) {
 		const resolved = node_path.isAbsolute(configPath) ? configPath : node_path.resolve(cwd, configPath);
 		return fileExists(resolved) ? resolved : null;
 	}
-	for (const p of V3_CONFIG_PATHS) {
-		const fullPath = node_path.join(cwd, p);
-		if (fileExists(fullPath)) return fullPath;
-	}
-	const v3Recursive = await (0, tinyglobby.glob)(V3_CONFIG_PATHS.map((p) => `**/${p}`), {
-		cwd,
-		absolute: true,
-		ignore: DEFAULT_IGNORE_PATTERNS,
-		deep: CONFIG_DISCOVERY_MAX_DEPTH
-	});
-	if (v3Recursive.length > 0) return sortByPathDepth(v3Recursive)[0];
 	const v4Paths = V4_CSS_FOLDERS.flatMap((folder) => V4_CSS_NAMES.map((name) => node_path.join(folder, name)));
 	for (const p of v4Paths) {
 		const fullPath = node_path.join(cwd, p);
@@ -672,6 +671,10 @@ async function findTailwindConfigPath(cwd, configPath) {
 			if (TAILWIND_V4_IMPORT_REGEX.test(content)) return fullPath;
 		} catch {}
 	}
+	for (const p of V3_CONFIG_PATHS) {
+		const fullPath = node_path.join(cwd, p);
+		if (fileExists(fullPath)) return fullPath;
+	}
 	const cssCandidates = await (0, tinyglobby.glob)("**/*.css", {
 		cwd,
 		absolute: true,
@@ -684,6 +687,13 @@ async function findTailwindConfigPath(cwd, configPath) {
 		if (TAILWIND_V4_IMPORT_REGEX.test(content)) v4Matches.push(candidate);
 	} catch {}
 	if (v4Matches.length > 0) return sortCssCandidates(cwd, v4Matches)[0];
+	const v3Recursive = await (0, tinyglobby.glob)(V3_CONFIG_PATHS.map((p) => `**/${p}`), {
+		cwd,
+		absolute: true,
+		ignore: DEFAULT_IGNORE_PATTERNS,
+		deep: CONFIG_DISCOVERY_MAX_DEPTH
+	});
+	if (v3Recursive.length > 0) return sortByPathDepth(v3Recursive)[0];
 	const viteConfigPath = await findTailwindViteConfigPath(cwd);
 	if (viteConfigPath) return syntheticViteCssConfigPath(viteConfigPath);
 	return null;
@@ -810,6 +820,8 @@ async function createState(cwd, configPath, verbose = false) {
 }
 //#endregion
 //#region src/linter.ts
+const SOURCE_FILE_PATTERN = "**/*.{js,jsx,ts,tsx,html,vue,svelte,astro,mdx}";
+const GLOB_PATTERN_REGEX = /[*?[\]{}]/;
 async function validateDocument(state, filePath, content) {
 	try {
 		if (!state) throw new Error("State is not initialized");
@@ -843,33 +855,41 @@ async function expandPatterns(cwd, patterns, extraIgnore = []) {
 async function discoverFilesFromConfig(cwd, configPath) {
 	const configFilePath = await findTailwindConfigPath(cwd, configPath);
 	if (!configFilePath) throw new Error("Could not find Tailwind config for auto-discovery.\nUse --config to specify the path, or provide file patterns directly.");
+	const discoveryCwd = isCssConfigFile(configFilePath) ? findProjectRoot(node_path.dirname(configFilePath)) : cwd;
 	if (!isCssConfigFile(configFilePath)) {
 		const config = await loadTailwindConfig(configFilePath);
 		if (!config || !config.content) throw new Error("Tailwind config is missing the 'content' property.\nAdd a content array to specify which files to scan:\n  content: ['./src/**/*.{js,jsx,ts,tsx}']");
 		const patterns = extractContentPatterns(config);
 		if (patterns.length === 0) throw new Error("No content patterns found in Tailwind config.\nEnsure your config has a content array with file patterns.");
-		return expandPatterns(cwd, patterns);
+		return expandPatterns(discoveryCwd, patterns);
 	}
 	const configDir = node_path.dirname(configFilePath);
 	const cssContent = fileExists(configFilePath) ? readFileSync(configFilePath) : SYNTHETIC_VITE_CSS_CONFIG_CONTENT;
 	const includeConfigFile = (files) => {
 		if (!fileExists(configFilePath)) return files;
-		const relativeConfigPath = node_path.relative(cwd, configFilePath);
+		const relativeConfigPath = node_path.relative(discoveryCwd, configFilePath);
 		return [...new Set([relativeConfigPath, ...files])].sort((a, b) => a.localeCompare(b));
 	};
+	const resolveDiscoveredFiles = (files) => discoveryCwd === cwd ? files : files.map((file) => node_path.resolve(discoveryCwd, file)).sort((a, b) => a.localeCompare(b));
 	const { include, exclude } = extractSourcePatterns(cssContent);
 	const importSource = extractImportSourceDirectives(cssContent);
 	const resolveFromConfig = (pattern) => {
 		const absolutePattern = node_path.resolve(configDir, pattern);
-		return node_path.relative(cwd, absolutePattern);
+		return node_path.relative(discoveryCwd, absolutePattern);
 	};
 	const resolvedExclude = exclude.map(resolveFromConfig);
-	const gitignorePatterns = readGitignorePatterns(cwd);
+	const gitignorePatterns = readGitignorePatterns(discoveryCwd);
 	const extraIgnore = [...resolvedExclude, ...gitignorePatterns];
-	if (include.length > 0) return includeConfigFile(await expandPatterns(cwd, include.map(resolveFromConfig), extraIgnore));
-	if (importSource.roots.length > 0) return includeConfigFile(await expandPatterns(cwd, importSource.roots.map((root) => resolveFromConfig(node_path.join(root, "**/*.{js,jsx,ts,tsx,html,vue,svelte,astro,mdx}"))), extraIgnore));
-	if (importSource.disableAutoSource) return includeConfigFile([]);
-	return includeConfigFile(await expandPatterns(cwd, [DEFAULT_FILE_PATTERN], extraIgnore));
+	const explicitSourcePatterns = include.map((source) => resolveFromConfig(normalizeSourcePattern(source)));
+	let autoPatterns = [];
+	if (!importSource.disableAutoSource) autoPatterns = importSource.roots.length > 0 ? importSource.roots.map((root) => resolveFromConfig(normalizeSourcePattern(root))) : [DEFAULT_FILE_PATTERN];
+	const autoFiles = autoPatterns.length > 0 ? await expandPatterns(discoveryCwd, autoPatterns, extraIgnore) : [];
+	const explicitFiles = explicitSourcePatterns.length > 0 ? await expandPatterns(discoveryCwd, explicitSourcePatterns, resolvedExclude) : [];
+	return resolveDiscoveredFiles(includeConfigFile([...new Set([...autoFiles, ...explicitFiles])].sort((a, b) => a.localeCompare(b))));
+}
+function normalizeSourcePattern(pattern) {
+	if (GLOB_PATTERN_REGEX.test(pattern) || node_path.extname(pattern)) return pattern;
+	return node_path.join(pattern, SOURCE_FILE_PATTERN);
 }
 function extractContentPatterns(config) {
 	if (!config.content) return [];
@@ -954,7 +974,7 @@ async function initializeState(cwd, configPath, verbose = false) {
 async function lint({ cwd, patterns, configPath, autoDiscover, fix = false, verbose = false, onProgress }) {
 	const state = await initializeState(cwd, configPath, verbose);
 	const discoveredFiles = await discoverFiles(cwd, patterns, configPath, autoDiscover);
-	const files = state.configPath && isCssConfigFile(state.configPath) && fileExists(state.configPath) ? [...new Set([node_path.relative(cwd, state.configPath), ...discoveredFiles])].sort((a, b) => a.localeCompare(b)) : discoveredFiles;
+	const files = uniqueFilesByResolvedPath(cwd, state.configPath && isCssConfigFile(state.configPath) && fileExists(state.configPath) ? [node_path.relative(cwd, state.configPath), ...discoveredFiles] : discoveredFiles);
 	const skippedFiles = [];
 	const lintableFiles = files.filter((file) => {
 		if (getFileSize(node_path.isAbsolute(file) ? file : node_path.resolve(cwd, file)) > 524288) {
@@ -978,6 +998,17 @@ async function lint({ cwd, patterns, configPath, autoDiscover, fix = false, verb
 		skippedFiles
 	};
 }
+function uniqueFilesByResolvedPath(cwd, files) {
+	const seen = /* @__PURE__ */ new Set();
+	const unique = [];
+	for (const file of files) {
+		const absolutePath = node_path.isAbsolute(file) ? file : node_path.resolve(cwd, file);
+		if (seen.has(absolutePath)) continue;
+		seen.add(absolutePath);
+		unique.push(file);
+	}
+	return unique.sort((a, b) => a.localeCompare(b));
+}
 //#endregion
 Object.defineProperty(exports, "DEFAULT_FILE_PATTERN", {
 	enumerable: true,
@@ -1015,6 +1046,18 @@ Object.defineProperty(exports, "extractSourcePatterns", {
 		return extractSourcePatterns;
 	}
 });
+Object.defineProperty(exports, "findProjectRoot", {
+	enumerable: true,
+	get: function() {
+		return findProjectRoot;
+	}
+});
+Object.defineProperty(exports, "isCssConfigFile", {
+	enumerable: true,
+	get: function() {
+		return isCssConfigFile;
+	}
+});
 Object.defineProperty(exports, "lint", {
 	enumerable: true,
 	get: function() {

package/dist/linter.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_linter = require("./linter-B9R7nuem.cjs");
+const require_linter = require("./linter-DQMo7IYe.cjs");
 exports.extractImportSourceDirectives = require_linter.extractImportSourceDirectives;
 exports.extractSourcePatterns = require_linter.extractSourcePatterns;
 exports.lint = require_linter.lint;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "tailwind-lint",
-	"version": "0.11.2",
+	"version": "0.12.0",
 	"description": "A command-line tool that uses the Tailwind CSS IntelliSense plugin to show linting suggestions for your Tailwind CSS classes",
 	"keywords": [
 		"cli",
@@ -66,9 +66,9 @@
 		"vscode-languageserver-textdocument": "^1.0.12"
 	},
 	"devDependencies": {
-		"@types/node": "^25.9.1",
-		"oxfmt": "^0.53.0",
-		"oxlint": "^1.68.0",
+		"@types/node": "^25.9.3",
+		"oxfmt": "^0.54.0",
+		"oxlint": "^1.69.0",
 		"tsdown": "^0.22.2",
 		"typescript": "^6.0.3",
 		"vitest": "^4.1.8"
@@ -77,5 +77,5 @@
 		"node": ">=22.0.0",
 		"pnpm": ">=10.0.0"
 	},
-	"packageManager": "pnpm@11.5.1"
+	"packageManager": "pnpm@11.5.3"
 }