switch back bin_path resolution to use imports

cometkim · cometkim · commit dd9bb74e1aed · 2024-06-21T00:07:55.000+09:00
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 { dirName: artifactDirName } = require("rescript/bin_path");
+const { dirName: artifactDirName } = require("../../cli/bin_path.js");
 
 // Pass artifactDirName to subsequent GitHub actions
 fs.appendFileSync(
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("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/bin_path");
+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,7 +2,7 @@ var p = require("child_process");
 
 var assert = require("assert");
 
-var { bsc_exe: bsc_exe_path } = require("rescript/bin_path");
+var { bsc_exe: bsc_exe_path } = require("#cli/bin_path");
 
 var react = `
 type u
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("rescript/bin_path");
+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("rescript/bin_path");
+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");
-const { rescript_exe } = require("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/bin_path");
+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");
 
-const { bsc_exe: bsc } = require("rescript/bin_path");
+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("rescript/bin_path");
+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/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("rescript/bin_path");
+var { rescript_exe } = require("#cli/bin_path");
 
 console.log(
   child_process.execSync(rescript_exe, { encoding: "utf8", cwd: "./a" })
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("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/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("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/bin_path");
+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("rescript/bin_path");
+var { rescript_exe } = require("#cli/bin_path");
 var out = p.spawnSync(rescript_exe, { encoding: "utf8", cwd: __dirname });
 assert(out.status == 0);
diff --git a/package.json b/package.json
@@ -41,9 +41,11 @@
     "cli"
   ],
   "exports": {
-    "./bin_path": "./cli/bin_path.js",
     "./package.json": "./package.json"
   },
+  "imports": {
+    "#cli/bin_path": "./cli/bin_path.js"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/rescript-lang/rescript-compiler.git"
diff --git a/scripts/copyExes.js b/scripts/copyExes.js
@@ -5,7 +5,7 @@ const path = require("path");
 const fs = require("fs");
 const child_process = require("child_process");
 const { duneBinDir } = require("./dune");
-const { absolutePath: platformBinDir } = require("rescript/bin_path");
+const { absolutePath: platformBinDir } = require("#cli/bin_path");
 
 const ninjaDir = path.join(__dirname, "..", "ninja");
 const rewatchDir = path.join(__dirname, "..", "rewatch");
diff --git a/scripts/ninja.js b/scripts/ninja.js
@@ -39,7 +39,7 @@ var {
   absolutePath: my_target,
   bsc_exe,
   ninja_exe: vendorNinjaPath,
-} = require("rescript/bin_path");
+} = require("#cli/bin_path");
 
 // Let's enforce a Node version >= 16 to make sure M1 users don't trip up on
 // cryptic issues caused by mismatching assembly architectures Node 16 ships
