Skip to content

fix #5525 #5526

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.

Sign up for GitHub

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 3 commits into from
Jul 9, 2022
Merged

fix #5525 #5526

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f407c8d
fix #5525
fhammerschmidt Jul 8, 2022
8d89e18
Handle genTypeFileExtension more explicitly
fhammerschmidt Jul 8, 2022
9ad8cc5
Do not double declare genTypeFileExtension
fhammerschmidt Jul 8, 2022
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
13 changes: 9 additions & 4 deletions rescript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,14 @@ process.env.BSB_PROJECT_ROOT = cwd;

// If the project uses gentype and uses custom file extension
// via generatedFileExtension, ignore them in watch mode
var genTypeConfig = require(path.join(cwd, bsconfig)).gentypeconfig
if (genTypeConfig) {
var genTypeFileExtension = genTypeConfig.generatedFileExtension
var bsConfigFile = path.join(cwd, bsconfig);
var genTypeFileExtension = undefined;

if (fs.existsSync(bsConfigFile)) {
var genTypeConfig = require(bsConfigFile).gentypeconfig
if (genTypeConfig) {
genTypeFileExtension = genTypeConfig.generatedFileExtension
}
}

// All clients of type MiniWebSocket
Expand Down Expand Up @@ -413,7 +418,7 @@ if (
fileName.endsWith(".mjs") ||
fileName.endsWith(".cjs") ||
fileName.endsWith(".gen.tsx") ||
fileName.endsWith(genTypeFileExtension) ||
(genTypeFileExtension && fileName.endsWith(genTypeFileExtension)) ||
watch_generated.indexOf(fileName) >= 0 ||
fileName.endsWith(".swp")
);
Expand Down