From 00fc7e0a4edaa75ba90b9289ab64b3540b4427f0 Mon Sep 17 00:00:00 2001 From: nojaf Date: Mon, 21 Jul 2025 09:24:25 +0200 Subject: [PATCH 1/5] Rename rewatch to rescript --- rewatch/Cargo.lock | 2 +- rewatch/Cargo.toml | 2 +- rewatch/src/main.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rewatch/Cargo.lock b/rewatch/Cargo.lock index aadce2cbb4..dc1a869918 100644 --- a/rewatch/Cargo.lock +++ b/rewatch/Cargo.lock @@ -777,7 +777,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] -name = "rewatch" +name = "rescript" version = "12.0.0-beta.3" dependencies = [ "ahash", diff --git a/rewatch/Cargo.toml b/rewatch/Cargo.toml index 31993f6756..35c8e216c8 100644 --- a/rewatch/Cargo.toml +++ b/rewatch/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "rewatch" +name = "rescript" version = "12.0.0-beta.3" edition = "2024" diff --git a/rewatch/src/main.rs b/rewatch/src/main.rs index a5d3d31d96..76f33b4ab8 100644 --- a/rewatch/src/main.rs +++ b/rewatch/src/main.rs @@ -3,7 +3,7 @@ use clap::Parser; use log::LevelFilter; use std::{io::Write, path::Path}; -use rewatch::{build, cli, cmd, format, lock, watcher}; +use rescript::{build, cli, cmd, format, lock, watcher}; fn main() -> Result<()> { let args = cli::Cli::parse(); From 14e738a4a37912d88090c87f5430fc8b46525c90 Mon Sep 17 00:00:00 2001 From: nojaf Date: Mon, 21 Jul 2025 09:25:05 +0200 Subject: [PATCH 2/5] Remove unused crates --- rewatch/Cargo.lock | 12 ------------ rewatch/Cargo.toml | 2 -- 2 files changed, 14 deletions(-) diff --git a/rewatch/Cargo.lock b/rewatch/Cargo.lock index dc1a869918..8a5c5df501 100644 --- a/rewatch/Cargo.lock +++ b/rewatch/Cargo.lock @@ -629,16 +629,6 @@ dependencies = [ "windows-sys 0.45.0", ] -[[package]] -name = "notify-debouncer-mini" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e23e9fa24f094b143c1eb61f90ac6457de87be6987bc70746e0179f7dbc9007b" -dependencies = [ - "crossbeam-channel", - "notify", -] - [[package]] name = "ntapi" version = "0.4.1" @@ -794,12 +784,10 @@ dependencies = [ "indicatif", "log", "notify", - "notify-debouncer-mini", "num_cpus", "rayon", "regex", "serde", - "serde_derive", "serde_json", "sysinfo", "tempfile", diff --git a/rewatch/Cargo.toml b/rewatch/Cargo.toml index 35c8e216c8..a4274c3197 100644 --- a/rewatch/Cargo.toml +++ b/rewatch/Cargo.toml @@ -18,12 +18,10 @@ futures-timer = "3.0.2" indicatif = "0.17.3" log = { version = "0.4.17" } notify = { version = "5.1.0", features = ["serde"] } -notify-debouncer-mini = { version = "0.2.0" } rayon = "1.6.1" num_cpus = "1.17.0" regex = "1.7.1" serde = { version = "1.0.152", features = ["derive"] } -serde_derive = "1.0.152" serde_json = { version = "1.0.93" } sysinfo = "0.29.10" tempfile = "3.10.1" From 79ff4d13e4bbbc630e3770738c19d458f689b736 Mon Sep 17 00:00:00 2001 From: nojaf Date: Mon, 21 Jul 2025 09:39:56 +0200 Subject: [PATCH 3/5] Rename in CI --- .github/workflows/ci.yml | 4 ++-- scripts/copyExes.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 34047e52ae..ec1ad4cafc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -144,9 +144,9 @@ jobs: - name: Copy rewatch binary run: | - cp rewatch/target/${{ matrix.rust-target }}/release/rewatch${{ runner.os == 'Windows' && '.exe' || '' }} rewatch + cp rewatch/target/${{ matrix.rust-target }}/release/rescript{{ runner.os == 'Windows' && '.exe' || '' }} rescript mkdir -p rewatch/target/release - cp rewatch/target/${{ matrix.rust-target }}/release/rewatch${{ runner.os == 'Windows' && '.exe' || '' }} rewatch/target/release + cp rewatch/target/${{ matrix.rust-target }}/release/rescript{{ runner.os == 'Windows' && '.exe' || '' }} rewatch/target/release ./scripts/copyExes.js --rewatch shell: bash diff --git a/scripts/copyExes.js b/scripts/copyExes.js index 9020a3d5ab..7e5ea182a2 100755 --- a/scripts/copyExes.js +++ b/scripts/copyExes.js @@ -46,7 +46,7 @@ if (shouldCopyNinja) { } if (shouldCopyRewatch) { - copyExe(path.join(rewatchDir, "target", "release"), "rewatch", "rescript"); + copyExe(path.join(rewatchDir, "target", "release"), "rescript"); } /** From ebb7261bcb3c8f701849be9a3e79ef4a36beb15a Mon Sep 17 00:00:00 2001 From: nojaf Date: Mon, 21 Jul 2025 09:58:22 +0200 Subject: [PATCH 4/5] $ --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec1ad4cafc..75ab39a455 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -144,9 +144,9 @@ jobs: - name: Copy rewatch binary run: | - cp rewatch/target/${{ matrix.rust-target }}/release/rescript{{ runner.os == 'Windows' && '.exe' || '' }} rescript + cp rewatch/target/${{ matrix.rust-target }}/release/rescript${{ runner.os == 'Windows' && '.exe' || '' }} rescript mkdir -p rewatch/target/release - cp rewatch/target/${{ matrix.rust-target }}/release/rescript{{ runner.os == 'Windows' && '.exe' || '' }} rewatch/target/release + cp rewatch/target/${{ matrix.rust-target }}/release/rescript${{ runner.os == 'Windows' && '.exe' || '' }} rewatch/target/release ./scripts/copyExes.js --rewatch shell: bash From 5d1d4afd7e43527ec98af2c66b87dd69e3ef40ba Mon Sep 17 00:00:00 2001 From: nojaf Date: Mon, 21 Jul 2025 10:07:43 +0200 Subject: [PATCH 5/5] Rename in suite-ci.sh --- rewatch/tests/suite-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rewatch/tests/suite-ci.sh b/rewatch/tests/suite-ci.sh index 692000357e..76cc50b21c 100755 --- a/rewatch/tests/suite-ci.sh +++ b/rewatch/tests/suite-ci.sh @@ -9,7 +9,7 @@ cd $(dirname $0) if [ -n "$1" ]; then REWATCH_EXECUTABLE="$1" else - REWATCH_EXECUTABLE="../target/release/rewatch" + REWATCH_EXECUTABLE="../target/release/rescript" eval $(node ./get_bin_paths.js) fi