From f852637b6250c9580cec1392e9c55f90ced59978 Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Mon, 21 Jul 2025 17:11:41 +0200 Subject: [PATCH 1/2] Rename all remaining bsconfig.json to rescript.json --- .../example-project/{bsconfig.json => rescript.json} | 0 .../larger-project/{bsconfig.json => rescript.json} | 0 .../workspace-project/app/{bsconfig.json => rescript.json} | 0 .../common/{bsconfig.json => rescript.json} | 0 .../myplugin/{bsconfig.json => rescript.json} | 0 .../workspace-project/{bsconfig.json => rescript.json} | 0 rewatch/src/config.rs | 6 +++--- .../packages/dep01/{bsconfig.json => rescript.json} | 0 .../packages/dep02/{bsconfig.json => rescript.json} | 0 .../testrepo/packages/main/{bsconfig.json => rescript.json} | 0 .../namespace-casing/{bsconfig.json => rescript.json} | 0 .../packages/new-namespace/{bsconfig.json => rescript.json} | 0 rewatch/testrepo/{bsconfig.json => rescript.json} | 0 rewatch/tests/suffix.sh | 4 ++-- 14 files changed, 5 insertions(+), 5 deletions(-) rename analysis/examples/example-project/{bsconfig.json => rescript.json} (100%) rename analysis/examples/larger-project/{bsconfig.json => rescript.json} (100%) rename analysis/examples/workspace-project/app/{bsconfig.json => rescript.json} (100%) rename analysis/examples/workspace-project/common/{bsconfig.json => rescript.json} (100%) rename analysis/examples/workspace-project/myplugin/{bsconfig.json => rescript.json} (100%) rename analysis/examples/workspace-project/{bsconfig.json => rescript.json} (100%) rename rewatch/testrepo/packages/dep01/{bsconfig.json => rescript.json} (100%) rename rewatch/testrepo/packages/dep02/{bsconfig.json => rescript.json} (100%) rename rewatch/testrepo/packages/main/{bsconfig.json => rescript.json} (100%) rename rewatch/testrepo/packages/namespace-casing/{bsconfig.json => rescript.json} (100%) rename rewatch/testrepo/packages/new-namespace/{bsconfig.json => rescript.json} (100%) rename rewatch/testrepo/{bsconfig.json => rescript.json} (100%) diff --git a/analysis/examples/example-project/bsconfig.json b/analysis/examples/example-project/rescript.json similarity index 100% rename from analysis/examples/example-project/bsconfig.json rename to analysis/examples/example-project/rescript.json diff --git a/analysis/examples/larger-project/bsconfig.json b/analysis/examples/larger-project/rescript.json similarity index 100% rename from analysis/examples/larger-project/bsconfig.json rename to analysis/examples/larger-project/rescript.json diff --git a/analysis/examples/workspace-project/app/bsconfig.json b/analysis/examples/workspace-project/app/rescript.json similarity index 100% rename from analysis/examples/workspace-project/app/bsconfig.json rename to analysis/examples/workspace-project/app/rescript.json diff --git a/analysis/examples/workspace-project/common/bsconfig.json b/analysis/examples/workspace-project/common/rescript.json similarity index 100% rename from analysis/examples/workspace-project/common/bsconfig.json rename to analysis/examples/workspace-project/common/rescript.json diff --git a/analysis/examples/workspace-project/myplugin/bsconfig.json b/analysis/examples/workspace-project/myplugin/rescript.json similarity index 100% rename from analysis/examples/workspace-project/myplugin/bsconfig.json rename to analysis/examples/workspace-project/myplugin/rescript.json diff --git a/analysis/examples/workspace-project/bsconfig.json b/analysis/examples/workspace-project/rescript.json similarity index 100% rename from analysis/examples/workspace-project/bsconfig.json rename to analysis/examples/workspace-project/rescript.json diff --git a/rewatch/src/config.rs b/rewatch/src/config.rs index 6707dc881b..744ddd7985 100644 --- a/rewatch/src/config.rs +++ b/rewatch/src/config.rs @@ -222,7 +222,7 @@ pub enum DeprecationWarning { BscFlags, } -/// # bsconfig.json representation +/// # rescript.json representation /// This is tricky, there is a lot of ambiguity. This is probably incomplete. #[derive(Deserialize, Debug, Clone, Default)] pub struct Config { @@ -256,10 +256,10 @@ pub struct Config { pub jsx: Option, #[serde(rename = "gentypeconfig")] pub gentype_config: Option, - // this is a new feature of rewatch, and it's not part of the bsconfig.json spec + // this is a new feature of rewatch, and it's not part of the rescript.json spec #[serde(rename = "namespace-entry")] pub namespace_entry: Option, - // this is a new feature of rewatch, and it's not part of the bsconfig.json spec + // this is a new feature of rewatch, and it's not part of the rescript.json spec #[serde(rename = "allowed-dependents")] pub allowed_dependents: Option>, diff --git a/rewatch/testrepo/packages/dep01/bsconfig.json b/rewatch/testrepo/packages/dep01/rescript.json similarity index 100% rename from rewatch/testrepo/packages/dep01/bsconfig.json rename to rewatch/testrepo/packages/dep01/rescript.json diff --git a/rewatch/testrepo/packages/dep02/bsconfig.json b/rewatch/testrepo/packages/dep02/rescript.json similarity index 100% rename from rewatch/testrepo/packages/dep02/bsconfig.json rename to rewatch/testrepo/packages/dep02/rescript.json diff --git a/rewatch/testrepo/packages/main/bsconfig.json b/rewatch/testrepo/packages/main/rescript.json similarity index 100% rename from rewatch/testrepo/packages/main/bsconfig.json rename to rewatch/testrepo/packages/main/rescript.json diff --git a/rewatch/testrepo/packages/namespace-casing/bsconfig.json b/rewatch/testrepo/packages/namespace-casing/rescript.json similarity index 100% rename from rewatch/testrepo/packages/namespace-casing/bsconfig.json rename to rewatch/testrepo/packages/namespace-casing/rescript.json diff --git a/rewatch/testrepo/packages/new-namespace/bsconfig.json b/rewatch/testrepo/packages/new-namespace/rescript.json similarity index 100% rename from rewatch/testrepo/packages/new-namespace/bsconfig.json rename to rewatch/testrepo/packages/new-namespace/rescript.json diff --git a/rewatch/testrepo/bsconfig.json b/rewatch/testrepo/rescript.json similarity index 100% rename from rewatch/testrepo/bsconfig.json rename to rewatch/testrepo/rescript.json diff --git a/rewatch/tests/suffix.sh b/rewatch/tests/suffix.sh index 51d8c9e816..4586fcb05a 100755 --- a/rewatch/tests/suffix.sh +++ b/rewatch/tests/suffix.sh @@ -16,7 +16,7 @@ else fi # Replace suffix -replace "s/.mjs/.res.js/g" bsconfig.json +replace "s/.mjs/.res.js/g" rescript.json error_output=$(rewatch build 2>&1) if [ $? -eq 0 ]; @@ -50,7 +50,7 @@ else fi # Restore Suffix -replace "s/.res.js/.mjs/g" bsconfig.json +replace "s/.res.js/.mjs/g" rescript.json # Restore original build error_output=$(rewatch build 2>&1) From 7bcddd794b0ef5052f274938ae35d3767e3fcb98 Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Tue, 22 Jul 2025 17:00:26 +0200 Subject: [PATCH 2/2] Also those under node_modules ... --- .../node_modules/b/{bsconfig.json => rescript.json} | 0 .../node_modules/c/{bsconfig.json => rescript.json} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename tests/build_tests/transitive_dependency/node_modules/b/{bsconfig.json => rescript.json} (100%) rename tests/build_tests/transitive_dependency/node_modules/c/{bsconfig.json => rescript.json} (100%) diff --git a/tests/build_tests/transitive_dependency/node_modules/b/bsconfig.json b/tests/build_tests/transitive_dependency/node_modules/b/rescript.json similarity index 100% rename from tests/build_tests/transitive_dependency/node_modules/b/bsconfig.json rename to tests/build_tests/transitive_dependency/node_modules/b/rescript.json diff --git a/tests/build_tests/transitive_dependency/node_modules/c/bsconfig.json b/tests/build_tests/transitive_dependency/node_modules/c/rescript.json similarity index 100% rename from tests/build_tests/transitive_dependency/node_modules/c/bsconfig.json rename to tests/build_tests/transitive_dependency/node_modules/c/rescript.json