From f407c8dde27616630caa51a147decdfd14015740 Mon Sep 17 00:00:00 2001 From: Florian Hammerschmidt Date: Fri, 8 Jul 2022 14:27:33 +0200 Subject: [PATCH 1/3] fix #5525 --- rescript | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/rescript b/rescript index d63cd56c64..6999b019ea 100755 --- a/rescript +++ b/rescript @@ -30,9 +30,13 @@ 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); + +if (fs.existsSync(bsConfigFile)) { + var genTypeConfig = require(bsConfigFile).gentypeconfig + if (genTypeConfig) { + var genTypeFileExtension = genTypeConfig.generatedFileExtension + } } // All clients of type MiniWebSocket From 8d89e18b08e1a96582807a1b4a139da784ce021a Mon Sep 17 00:00:00 2001 From: Florian Hammerschmidt Date: Fri, 8 Jul 2022 14:37:05 +0200 Subject: [PATCH 2/3] Handle genTypeFileExtension more explicitly --- rescript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rescript b/rescript index 6999b019ea..526742964e 100755 --- a/rescript +++ b/rescript @@ -31,6 +31,7 @@ process.env.BSB_PROJECT_ROOT = cwd; // If the project uses gentype and uses custom file extension // via generatedFileExtension, ignore them in watch mode var bsConfigFile = path.join(cwd, bsconfig); +var genTypeFileExtension = undefined; if (fs.existsSync(bsConfigFile)) { var genTypeConfig = require(bsConfigFile).gentypeconfig @@ -417,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") ); From 9ad8cc59a49cc03fa3b42492b1ff0bb035b6be21 Mon Sep 17 00:00:00 2001 From: Florian Hammerschmidt Date: Fri, 8 Jul 2022 14:40:01 +0200 Subject: [PATCH 3/3] Do not double declare genTypeFileExtension --- rescript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rescript b/rescript index 526742964e..2cb337441b 100755 --- a/rescript +++ b/rescript @@ -36,7 +36,7 @@ var genTypeFileExtension = undefined; if (fs.existsSync(bsConfigFile)) { var genTypeConfig = require(bsConfigFile).gentypeconfig if (genTypeConfig) { - var genTypeFileExtension = genTypeConfig.generatedFileExtension + genTypeFileExtension = genTypeConfig.generatedFileExtension } }