Removed "rescript legacy" subcommand in favor of separate "rescript-legacy" binary (#7928)

* Removed "rescript legacy" subcommand in favor of separate "rescript-legacy" binary

* CHANGELOG

* Cleanup

* Update yarn.lock

Author: cknitt

.github/workflows/ci.yml

@@ -579,7 +579,7 @@ jobs:
         working-directory: ${{ steps.tmp-dir.outputs.path }}
 
       - name: Test installation
-        run: npx rescript -h && npx rescript legacy build && cat src/Test.res.js
+        run: npx rescript -h && npx rescript-legacy build && cat src/Test.res.js
         shell: bash
         working-directory: ${{ steps.tmp-dir.outputs.path }}
 
@@ -634,7 +634,7 @@ jobs:
         working-directory: ${{ steps.tmp-dir.outputs.path }}
 
       - name: Test installation
-        run: pnpm rescript -h && pnpm rescript legacy build && cat src/Test.res.js
+        run: pnpm rescript -h && pnpm rescript-legacy build && cat src/Test.res.js
         shell: bash
         working-directory: ${{ steps.tmp-dir.outputs.path }}
 

CHANGELOG.md

@@ -14,6 +14,8 @@
 
 #### :boom: Breaking Change
 
+- Removed "rescript legacy" subcommand in favor of separate "rescript-legacy" binary. https://github.com/rescript-lang/rescript/pull/7928
+
 #### :eyeglasses: Spec Compliance
 
 #### :rocket: New Feature

packages/playground/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "clean": "rescript clean",
     "test": "node ./playground_test.cjs",
-    "build": "rescript clean && rescript legacy build && node scripts/generate_cmijs.mjs && rollup -c",
+    "build": "rescript clean && rescript-legacy build && node scripts/generate_cmijs.mjs && rollup -c",
     "upload-bundle": "node scripts/upload_bundle.mjs",
     "serve-bundle": "node serve-bundle.mjs"
   },

packages/playground/scripts/generate_cmijs.mjs

@@ -24,7 +24,7 @@ import {
 } from "./common.mjs";
 
 exec("yarn rescript clean");
-exec("yarn rescript legacy");
+exec("yarn rescript-legacy build");
 
 // We need to build the compiler's builtin modules as a separate cmij.
 // Otherwise we can't use them for compilation within the playground.

rewatch/src/build.rs

@@ -22,12 +22,10 @@ use console::style;
 use indicatif::{ProgressBar, ProgressStyle};
 use log::log_enabled;
 use serde::Serialize;
-use std::ffi::OsString;
 use std::fmt;
 use std::fs::File;
 use std::io::{Write, stdout};
 use std::path::{Path, PathBuf};
-use std::process::Stdio;
 use std::time::{Duration, Instant};
 
 fn is_dirty(module: &Module) -> bool {
@@ -593,24 +591,3 @@ pub fn build(
         }
     }
 }
-
-pub fn pass_through_legacy(mut args: Vec<OsString>) -> i32 {
-    let project_root = helpers::get_abs_path(Path::new("."));
-    let project_context = ProjectContext::new(&project_root).unwrap();
-    let rescript_legacy_path = helpers::get_rescript_legacy(&project_context);
-
-    args.insert(0, rescript_legacy_path.into());
-    let status = std::process::Command::new("node")
-        .args(args)
-        .stdout(Stdio::inherit())
-        .stderr(Stdio::inherit())
-        .status();
-
-    match status {
-        Ok(s) => s.code().unwrap_or(0),
-        Err(err) => {
-            eprintln!("Error running the legacy build system: {err}");
-            1
-        }
-    }
-}

rewatch/src/cli.rs

@@ -38,9 +38,9 @@ pub enum FileExtension {
 // which leaks the packaging detail into the CLI UX.
 #[command(name = "rescript", bin_name = "rescript")]
 #[command(version)]
-#[command(
-    after_help = "[1m[1m[4mNote:[0m If no command is provided, the [1mbuild[0m command is run by default. See `rescript help build` for more information."
-)]
+#[command(after_help = "[1m[1m[4mNotes:[0m
+  - If no command is provided, the [1mbuild[0m command is run by default. See `rescript help build` for more information.
+  - For the legacy (pre-v12) build system, run `rescript-legacy` instead.")]
 pub struct Cli {
     /// Verbosity:
     /// -v -> Debug
@@ -493,14 +493,6 @@ pub enum Command {
         #[command()]
         path: String,
     },
-    /// Use the legacy build system.
-    ///
-    /// After this command is encountered, the rest of the arguments are passed to the legacy build system.
-    #[command(disable_help_flag = true, external_subcommand = true)]
-    Legacy {
-        #[arg(allow_hyphen_values = true, num_args = 0..)]
-        legacy_args: Vec<OsString>,
-    },
 }
 
 impl Deref for FolderArg {

rewatch/src/helpers.rs

@@ -377,28 +377,6 @@ pub fn get_bsc() -> PathBuf {
         .to_stripped_verbatim_path()
 }
 
-pub fn get_rescript_legacy(project_context: &ProjectContext) -> PathBuf {
-    let root_path = project_context.get_root_path();
-    let node_modules_rescript = root_path.join("node_modules").join("rescript");
-    let rescript_legacy_path = if node_modules_rescript.exists() {
-        node_modules_rescript
-            .join("cli")
-            .join("rescript-legacy.js")
-            .canonicalize()
-            .map(StrippedVerbatimPath::to_stripped_verbatim_path)
-    } else {
-        // If the root folder / node_modules doesn't exist, something is wrong.
-        // The only way this can happen is if we are inside the rescript repository.
-        root_path
-            .join("cli")
-            .join("rescript-legacy.js")
-            .canonicalize()
-            .map(StrippedVerbatimPath::to_stripped_verbatim_path)
-    };
-
-    rescript_legacy_path.unwrap_or_else(|_| panic!("Could not find rescript-legacy.exe"))
-}
-
 pub fn string_ends_with_any(s: &Path, suffixes: &[&str]) -> bool {
     suffixes
         .iter()

rewatch/src/main.rs

@@ -88,10 +88,6 @@ fn main() -> Result<()> {
                 dev.dev,
             )
         }
-        cli::Command::Legacy { legacy_args } => {
-            let code = build::pass_through_legacy(legacy_args);
-            std::process::exit(code);
-        }
         cli::Command::Format {
             stdin,
             check,

rewatch/testrepo/package.json

@@ -9,7 +9,6 @@
       "packages/new-namespace",
       "packages/namespace-casing",
       "packages/with-dev-deps",
-      "packages/compiled-by-legacy",
       "packages/nonexisting-dev-files",
       "packages/deprecated-config",
       "packages/file-casing",
@@ -28,10 +27,7 @@
   },
   "scripts": {
     "build": "../target/release/rescript build .",
-    "build:rescript": "rescript legacy build",
     "watch": "../target/release/rescript watch .",
-    "watch:rescript": "rescript legacy watch",
-    "clean": "../target/release/rescript clean .",
-    "clean:rescript": "rescript clean"
+    "clean": "../target/release/rescript clean ."
   }
 }