Skip to content

fix(ui~cli): file watcher ignore directory logic #1549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/mighty-buttons-poke.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"flowbite-react": patch
---

fix file watcher ignore directory logic leading to false positives
15 changes: 10 additions & 5 deletions packages/ui/src/cli/commands/dev.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
import fs from "fs/promises";
import { basename } from "path";
import chokidar from "chokidar";
import { isEqual } from "../../helpers/is-equal";
import { automaticClassGenerationMessage, classListFilePath, configFilePath, excludeDirs } from "../consts";
import {
allowedExtensions,
automaticClassGenerationMessage,
classListFilePath,
configFilePath,
excludeDirs,
} from "../consts";
import { buildClassList } from "../utils/build-class-list";
import { extractComponentImports } from "../utils/extract-component-imports";
import { getClassList } from "../utils/get-class-list";
Expand Down Expand Up @@ -50,12 +57,10 @@ export async function dev() {
const watcher = chokidar.watch(".", {
ignored: (path, stats) => {
if (stats?.isDirectory()) {
return excludeDirs.some((dir) => path.endsWith(dir));
return excludeDirs.includes(basename(path));
}
if (stats?.isFile()) {
return ![".astro", ".js", ".jsx", ".md", ".mdx", ".ts", ".tsx", configFilePath].some((type) =>
path.endsWith(type),
);
return !allowedExtensions.concat(configFilePath).some((ext) => path.endsWith(ext));
}
return false;
},
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/cli/commands/generate-class-list.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import fs from "fs/promises";
import { classListFilePath, excludeDirs } from "../consts";
import { allowedExtensions, classListFilePath, excludeDirs } from "../consts";
import { buildClassList } from "../utils/build-class-list";
import { extractComponentImports } from "../utils/extract-component-imports";
import { findFiles } from "../utils/find-files";
Expand All @@ -11,7 +11,7 @@ export async function generateClassList() {

if (!config.components.length) {
const files = await findFiles({
patterns: ["**/*.astro", "**/*.js", "**/*.jsx", "**/*.md", "**/*.mdx", "**/*.ts", "**/*.tsx"],
patterns: allowedExtensions.map((ext) => `**/*${ext}`),
excludeDirs,
});
const importedComponents = new Set<string>();
Expand Down
5 changes: 5 additions & 0 deletions packages/ui/src/cli/consts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@ export const classListFilePath = path.join(outputDir, classListFile);
export const configFilePath = path.join(outputDir, configFile);

export const excludeDirs = [
".astro",
".contentlayer",
".git",
".next",
".parcel-cache",
".turbo",
".vercel",
".vscode",
"build",
"coverage",
"dist",
Expand All @@ -26,4 +29,6 @@ export const excludeDirs = [
"storybook-static",
];

export const allowedExtensions = [".astro", ".js", ".jsx", ".md", ".mdx", ".ts", ".tsx"];

export const automaticClassGenerationMessage = `Components specified in ${configFilePath}. Automatic class generation is disabled.`;
2 changes: 1 addition & 1 deletion packages/ui/src/cli/utils/find-files.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export async function findFiles({
// Recursive search function
async function search(directory: string): Promise<void> {
// Skip excluded directories
if (excludeDirs.some((dir) => directory.endsWith(dir))) {
if (excludeDirs.includes(path.basename(directory))) {
return;
}

Expand Down
Loading