refactor: split dir for CLI and dev scripts (#6782)

cometkim · web-flow · commit fcdf7a954474 · 2024-06-20T19:04:21.000+02:00
* refactor: split dir for CLI and dev scripts

* make it official entrypoint that can be referenced by outside

* update artifact list

* can it be referenced from actions script too?

* fix format

* fix postinstall script

but do we really need to keep this? The `postinstall` hooks is avoided
by default in other PMs

* artifacts

* switch back bin_path resolution to use imports

* remove unnecessary npmignore
diff --git a/.github/workflows/get_artifact_dir_name.js b/.github/workflows/get_artifact_dir_name.js
@@ -1,7 +1,7 @@
 const fs = require("fs");
 const os = require("os");
 
-const artifactDirName = require("../../scripts/bin_path").dirName;
+const { dirName: artifactDirName } = require("../../cli/bin_path.js");
 
 // Pass artifactDirName to subsequent GitHub actions
 fs.appendFileSync(
diff --git a/.github/workflows/prepare_package_upload.js b/.github/workflows/prepare_package_upload.js
@@ -1,7 +1,7 @@
 const fs = require("fs");
 const os = require("os");
 
-const packageSpec = JSON.parse(fs.readFileSync("./package.json", "utf8"));
+const packageSpec = require("rescript/package.json");
 const { version } = packageSpec;
 
 const commitHash = process.argv[2] || process.env.GITHUB_SHA;
diff --git a/bsc b/bsc
@@ -2,7 +2,7 @@
 "use strict";
 
 var child_process = require("child_process");
-var bsc_exe = require("./scripts/bin_path").bsc_exe;
+var { bsc_exe } = require("./cli/bin_path");
 
 var delegate_args = process.argv.slice(2);
 
diff --git a/cli/bin_path.js b/cli/bin_path.js
diff --git a/cli/rescript_arg.js b/cli/rescript_arg.js
diff --git a/cli/rescript_bsb.js b/cli/rescript_bsb.js
@@ -4,7 +4,7 @@ const fs = require("fs");
 const path = require("path");
 var os = require("os");
 const child_process = require("child_process");
-const rescript_exe = require("./bin_path").rescript_exe;
+const { rescript_exe } = require("./bin_path");
 
 const cwd = process.cwd();
 const lockFileName = path.join(cwd, ".bsb.lock");
diff --git a/cli/rescript_convert.js b/cli/rescript_convert.js
diff --git a/cli/rescript_dump.js b/cli/rescript_dump.js
diff --git a/cli/rescript_format.js b/cli/rescript_format.js
diff --git a/cli/rescript_postinstall.js b/cli/rescript_postinstall.js
@@ -2,8 +2,7 @@
 const child_process = require("child_process");
 const fs = require("fs");
 
-const bsc_exe = require("./bin_path").bsc_exe;
-const ninja_exe = require("./bin_path").ninja_exe;
+const { bsc_exe, ninja_exe } = require("./bin_path");
 
 function checkNinja() {
   if (!fs.existsSync(ninja_exe)) {
diff --git a/cli/rewatch b/cli/rewatch
@@ -5,7 +5,7 @@
 const path = require("path");
 const child_process = require("child_process");
 
-const binAbsolutePath = require("./bin_path").absolutePath;
+const { absolutePath: binAbsolutePath } = require("./bin_path");
 const rewatchExe = path.join(binAbsolutePath, "rewatch.exe");
 
 const args = process.argv.slice(2);
diff --git a/jscomp/build_tests/build_warn_as_error/input.js b/jscomp/build_tests/build_warn_as_error/input.js
@@ -1,6 +1,6 @@
 var p = require("child_process");
 var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 
 var o = p.spawnSync(rescript_exe, ["build", "-warn-error", "+110"], {
   encoding: "utf8",
diff --git a/jscomp/build_tests/case/input.js b/jscomp/build_tests/case/input.js
@@ -1,6 +1,6 @@
 var p = require("child_process");
 var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 var o = p.spawnSync(rescript_exe, { encoding: "utf8", cwd: __dirname });
 
 if (
diff --git a/jscomp/build_tests/case2/input.js b/jscomp/build_tests/case2/input.js
@@ -1,6 +1,6 @@
 var p = require("child_process");
 var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 var o = p.spawnSync(rescript_exe, { encoding: "utf8", cwd: __dirname });
 
 if (
diff --git a/jscomp/build_tests/case3/input.js b/jscomp/build_tests/case3/input.js
@@ -4,7 +4,7 @@ var p = require("child_process");
 var fs = require("fs");
 var path = require("path");
 var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 p.spawnSync(`${rescript_exe} clean && ${rescript_exe} build`, {
   encoding: "utf8",
   cwd: __dirname,
diff --git a/jscomp/build_tests/cmd/input.js b/jscomp/build_tests/cmd/input.js
@@ -2,10 +2,10 @@ var p = require("child_process");
 
 var assert = require("assert");
 
-var bsc_exe_path = require("../../../scripts/bin_path").bsc_exe;
+var { bsc_exe: bsc_exe_path } = require("#cli/bin_path");
 
 var react = `
-type u 
+type u
 
 external a : u = "react" [@@module]
 
@@ -23,7 +23,7 @@ external foo : bla = "foo.react" [@@module]
 
 external bar : unit -> bla  = "bar" [@@val] [@@module "foo.react"]
 
-let c = foo 
+let c = foo
 
 let d = bar ()
 `;
diff --git a/jscomp/build_tests/custom_namespace/input.js b/jscomp/build_tests/custom_namespace/input.js
@@ -1,6 +1,6 @@
 var child_process = require("child_process");
 var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 
 child_process.execSync(`${rescript_exe} clean && ${rescript_exe} build`, {
   cwd: __dirname,
diff --git a/jscomp/build_tests/cycle/input.js b/jscomp/build_tests/cycle/input.js
@@ -3,7 +3,7 @@ const cp = require("child_process");
 const assert = require("assert");
 const fs = require("fs");
 const path = require("path");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 
 var output = cp.spawnSync(rescript_exe, { encoding: "utf8", shell: true });
 
diff --git a/jscomp/build_tests/cycle1/input.js b/jscomp/build_tests/cycle1/input.js
@@ -3,7 +3,7 @@ const cp = require("child_process");
 const assert = require("assert");
 const fs = require("fs");
 const path = require("path");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+const { rescript_exe } = require("#cli/bin_path");
 
 cp.execSync(`${rescript_exe} clean`, { cwd: __dirname });
 
diff --git a/jscomp/build_tests/deprecated-package-specs/input.js b/jscomp/build_tests/deprecated-package-specs/input.js
@@ -1,6 +1,6 @@
 const child_process = require("child_process");
 const assert = require("assert");
-const rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+const { rescript_exe } = require("#cli/bin_path");
 
 const out = child_process.spawnSync(rescript_exe, { encoding: "utf8" });
 assert.match(
diff --git a/jscomp/build_tests/devonly/input.js b/jscomp/build_tests/devonly/input.js
@@ -1,5 +1,5 @@
 //@ts-check
 var cp = require("child_process");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 
 cp.execSync(rescript_exe, { cwd: __dirname, encoding: "utf8" });
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/input.js b/jscomp/build_tests/duplicated_symlinked_packages/input.js
@@ -1,7 +1,7 @@
 const fs = require("fs");
 const path = require("path");
 const child_process = require("child_process");
-const rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+const { rescript_exe } = require("#cli/bin_path");
 
 const expectedFilePath = path.join(__dirname, "out.expected");
 
diff --git a/jscomp/build_tests/exports/input.js b/jscomp/build_tests/exports/input.js
@@ -1,5 +1,5 @@
 var child_process = require("child_process");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 
 child_process.execSync(rescript_exe, {
   cwd: __dirname,
diff --git a/jscomp/build_tests/hyphen2/input.js b/jscomp/build_tests/hyphen2/input.js
@@ -1,4 +1,4 @@
 var p = require("child_process");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 
 p.execSync(rescript_exe, { cwd: __dirname });
diff --git a/jscomp/build_tests/in_source/input.js b/jscomp/build_tests/in_source/input.js
@@ -2,7 +2,7 @@ var child_process = require("child_process");
 
 var assert = require("assert");
 
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 
 assert.throws(
   () => {
diff --git a/jscomp/build_tests/install/input.js b/jscomp/build_tests/install/input.js
@@ -2,7 +2,7 @@ var p = require("child_process");
 var fs = require("fs");
 var path = require("path");
 var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 
 p.spawnSync(rescript_exe, [`clean`], {
   encoding: "utf8",
diff --git a/jscomp/build_tests/nested/input.js b/jscomp/build_tests/nested/input.js
@@ -2,7 +2,7 @@ var p = require("child_process");
 var assert = require("assert");
 var fs = require("fs");
 var path = require("path");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 p.execSync(rescript_exe, { cwd: __dirname });
 
 var content = fs.readFileSync(path.join(__dirname, "src", "demo.js"), "utf8");
diff --git a/jscomp/build_tests/nnest/input.js b/jscomp/build_tests/nnest/input.js
@@ -4,7 +4,7 @@ var p = require("child_process");
 var assert = require("assert");
 var fs = require("fs");
 var path = require("path");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 p.execSync(rescript_exe, { cwd: __dirname });
 
 var content = fs.readFileSync(path.join(__dirname, "src", "demo.js"), "utf8");
diff --git a/jscomp/build_tests/ns/input.js b/jscomp/build_tests/ns/input.js
@@ -1,4 +1,4 @@
 var child_process = require("child_process");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 
 child_process.execSync(rescript_exe, { cwd: __dirname });
diff --git a/jscomp/build_tests/post-build/input.js b/jscomp/build_tests/post-build/input.js
@@ -1,6 +1,6 @@
 var child_process = require("child_process");
 var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 
 var out = child_process.spawnSync(rescript_exe, { encoding: "utf8" });
 
diff --git a/jscomp/build_tests/react_ppx/input.js b/jscomp/build_tests/react_ppx/input.js
@@ -1,5 +1,5 @@
 //@ts-check
 var cp = require("child_process");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 
 cp.execSync(rescript_exe, { cwd: __dirname });
diff --git a/jscomp/build_tests/rerror/input.js b/jscomp/build_tests/rerror/input.js
@@ -1,6 +1,6 @@
 var child_process = require("child_process");
 var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 child_process.spawnSync(`${rescript_exe} clean`, {
   cwd: __dirname,
   encoding: "utf8",
diff --git a/jscomp/build_tests/scoped_ppx/input.js b/jscomp/build_tests/scoped_ppx/input.js
@@ -1,6 +1,6 @@
 var cp = require("child_process");
 var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 cp.execSync(rescript_exe, { cwd: __dirname, encoding: "utf8" });
 
 var output = cp.execSync(`${rescript_exe} build -- -t commands src/hello.ast`, {
diff --git a/jscomp/build_tests/super_errors/input.js b/jscomp/build_tests/super_errors/input.js
@@ -2,7 +2,7 @@ const fs = require("fs");
 const path = require("path");
 const child_process = require("child_process");
 
-var bsc = require("../../../scripts/bin_path").bsc_exe;
+const { bsc_exe: bsc } = require("#cli/bin_path");
 
 const expectedDir = path.join(__dirname, "expected");
 
diff --git a/jscomp/build_tests/transitive_pinned_dependency1/input.js b/jscomp/build_tests/transitive_pinned_dependency1/input.js
@@ -2,7 +2,7 @@
 var child_process = require("child_process");
 var assert = require("assert");
 var fs = require("fs");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 
 console.log(
   child_process.execSync(rescript_exe, { encoding: "utf8", cwd: "./a" })
diff --git a/jscomp/build_tests/transitive_pinned_dependency1/package.json b/jscomp/build_tests/transitive_pinned_dependency1/package.json
diff --git a/jscomp/build_tests/transitive_pinned_dependency2/input.js b/jscomp/build_tests/transitive_pinned_dependency2/input.js
@@ -2,7 +2,7 @@
 var child_process = require("child_process");
 var assert = require("assert");
 var fs = require("fs");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 
 console.log(
   child_process.execSync(rescript_exe, { encoding: "utf8", cwd: "./a" })
diff --git a/jscomp/build_tests/transitive_pinned_dependency2/package.json b/jscomp/build_tests/transitive_pinned_dependency2/package.json
diff --git a/jscomp/build_tests/unboxed_bool_with_const/input.js b/jscomp/build_tests/unboxed_bool_with_const/input.js
@@ -2,7 +2,7 @@
 
 var cp = require("child_process");
 var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 
 var out = cp.spawnSync(rescript_exe, {
   cwd: __dirname,
diff --git a/jscomp/build_tests/uncurried-always/input.js b/jscomp/build_tests/uncurried-always/input.js
@@ -1,6 +1,6 @@
 //@ts-check
 const cp = require("child_process");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 
 cp.execSync(`${rescript_exe} clean`, { cwd: __dirname });
 cp.execSync(`${rescript_exe}`, { cwd: __dirname });
diff --git a/jscomp/build_tests/unicode/input.js b/jscomp/build_tests/unicode/input.js
@@ -1,6 +1,6 @@
 //@ts-check
 var child_process = require("child_process");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 
 console.log(child_process.execSync(rescript_exe, { encoding: "utf8" }));
 
diff --git a/jscomp/build_tests/warn_legacy_config/input.js b/jscomp/build_tests/warn_legacy_config/input.js
@@ -1,6 +1,6 @@
 const { spawnSync } = require("child_process");
 const assert = require("assert");
-const rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+const { rescript_exe } = require("#cli/bin_path");
 
 const output = spawnSync(rescript_exe, { encoding: "utf8" });
 assert(
diff --git a/jscomp/build_tests/weird_deps/input.js b/jscomp/build_tests/weird_deps/input.js
@@ -2,7 +2,7 @@
 
 var cp = require("child_process");
 var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 
 var out = cp.spawnSync(rescript_exe, {
   cwd: __dirname,
diff --git a/jscomp/build_tests/weird_devdeps/input.js b/jscomp/build_tests/weird_devdeps/input.js
@@ -2,7 +2,7 @@
 
 var cp = require("child_process");
 var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var rescript_exe = require("#cli/bin_path").rescript_exe;
 
 var out = cp.spawnSync(rescript_exe, {
   cwd: __dirname,
diff --git a/jscomp/build_tests/weird_names/input.js b/jscomp/build_tests/weird_names/input.js
@@ -1,7 +1,7 @@
 var cp = require("child_process");
 var assert = require("assert");
 var path = require("path");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 
 var out = cp.spawnSync(rescript_exe, { encoding: "utf8" });
 
diff --git a/jscomp/build_tests/weird_names_not_found_bug/input.js b/jscomp/build_tests/weird_names_not_found_bug/input.js
@@ -1,6 +1,6 @@
 var cp = require("child_process");
 var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 
 var out = cp.spawnSync(rescript_exe, { encoding: "utf8" });
 if (out.stderr !== "") {
diff --git a/jscomp/build_tests/x-y/input.js b/jscomp/build_tests/x-y/input.js
@@ -1,4 +1,4 @@
 var p = require("child_process");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 
 p.execSync(rescript_exe);
diff --git a/jscomp/build_tests/xpkg/input.js b/jscomp/build_tests/xpkg/input.js
@@ -1,6 +1,6 @@
 var p = require("child_process");
 var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 try {
   var output = p.spawnSync(`${rescript_exe} build -regen`, {
     shell: true,
diff --git a/jscomp/build_tests/zerocycle/input.js b/jscomp/build_tests/zerocycle/input.js
@@ -1,5 +1,5 @@
 var p = require("child_process");
 var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var { rescript_exe } = require("#cli/bin_path");
 var out = p.spawnSync(rescript_exe, { encoding: "utf8", cwd: __dirname });
 assert(out.status == 0);
diff --git a/jscomp/others/release.ninja b/jscomp/others/release.ninja
@@ -7,7 +7,7 @@ rule cc
     description = $in -> $out
 rule cc_cmi
     command = $bsc -bs-read-cmi -bs-cmi -bs-cmj $bsc_flags  -I others  $in
-    description = $in -> $out    
+    description = $in -> $out
 
 o others/belt.cmj others/belt.cmi : cc others/belt.res | $bsc
     bsc_flags = $bsc_primitive_flags
diff --git a/jscomp/runtime/release.ninja b/jscomp/runtime/release.ninja
@@ -7,7 +7,7 @@ rule cc
     description = $in -> $out
 rule cc_cmi
     command = $bsc -bs-read-cmi -bs-cmi -bs-cmj $bsc_flags  -I runtime  $in
-    description = $in -> $out    
+    description = $in -> $out
 
 o runtime/bs_stdlib_mini.cmi : cc runtime/bs_stdlib_mini.resi
     bsc_flags = -nopervasives
diff --git a/jscomp/stdlib-406/release.ninja b/jscomp/stdlib-406/release.ninja
diff --git a/jscomp/test/build.ninja b/jscomp/test/build.ninja
diff --git a/jsconfig.json b/jsconfig.json
diff --git a/package.json b/package.json
diff --git a/packages/artifacts.txt b/packages/artifacts.txt
diff --git a/rescript b/rescript
diff --git a/scripts/.npmignore b/scripts/.npmignore
diff --git a/scripts/copyExes.js b/scripts/copyExes.js
diff --git a/scripts/ninja.js b/scripts/ninja.js
