Skip to content

Commit 98b5b5f

Browse files
committed
make it official entrypoint that can be referenced by outside
1 parent 92d7b3d commit 98b5b5f

File tree

43 files changed

+50
-49
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+50
-49
lines changed

jscomp/build_tests/build_warn_as_error/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var p = require("child_process");
22
var assert = require("assert");
3-
var { rescript_exe } = require("#cli/bin_path.js");
3+
var { rescript_exe } = require("rescript/bin_path");
44

55
var o = p.spawnSync(rescript_exe, ["build", "-warn-error", "+110"], {
66
encoding: "utf8",

jscomp/build_tests/case/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var p = require("child_process");
22
var assert = require("assert");
3-
var { rescript_exe } = require("#cli/bin_path.js");
3+
var { rescript_exe } = require("rescript/bin_path");
44
var o = p.spawnSync(rescript_exe, { encoding: "utf8", cwd: __dirname });
55

66
if (

jscomp/build_tests/case2/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var p = require("child_process");
22
var assert = require("assert");
3-
var { rescript_exe } = require("#cli/bin_path.js");
3+
var { rescript_exe } = require("rescript/bin_path");
44
var o = p.spawnSync(rescript_exe, { encoding: "utf8", cwd: __dirname });
55

66
if (

jscomp/build_tests/case3/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var p = require("child_process");
44
var fs = require("fs");
55
var path = require("path");
66
var assert = require("assert");
7-
var { rescript_exe } = require("#cli/bin_path.js");
7+
var { rescript_exe } = require("rescript/bin_path");
88
p.spawnSync(`${rescript_exe} clean && ${rescript_exe} build`, {
99
encoding: "utf8",
1010
cwd: __dirname,

jscomp/build_tests/cmd/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var p = require("child_process");
22

33
var assert = require("assert");
44

5-
var { bsc_exe: bsc_exe_path } = require("#cli/bin_path.js");
5+
var { bsc_exe: bsc_exe_path } = require("rescript/bin_path");
66

77
var react = `
88
type u

jscomp/build_tests/custom_namespace/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var child_process = require("child_process");
22
var assert = require("assert");
3-
var { rescript_exe } = require("#cli/bin_path.js");
3+
var { rescript_exe } = require("rescript/bin_path");
44

55
child_process.execSync(`${rescript_exe} clean && ${rescript_exe} build`, {
66
cwd: __dirname,

jscomp/build_tests/cycle/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const cp = require("child_process");
33
const assert = require("assert");
44
const fs = require("fs");
55
const path = require("path");
6-
var { rescript_exe } = require("#cli/bin_path.js");
6+
var { rescript_exe } = require("rescript/bin_path");
77

88
var output = cp.spawnSync(rescript_exe, { encoding: "utf8", shell: true });
99

jscomp/build_tests/cycle1/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const cp = require("child_process");
33
const assert = require("assert");
44
const fs = require("fs");
55
const path = require("path");
6-
const { rescript_exe } = require("#cli/bin_path.js");
6+
const { rescript_exe } = require("rescript/bin_path");
77

88
cp.execSync(`${rescript_exe} clean`, { cwd: __dirname });
99

jscomp/build_tests/deprecated-package-specs/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const child_process = require("child_process");
22
const assert = require("assert");
3-
const { rescript_exe } = require("#cli/bin_path.js");
3+
const { rescript_exe } = require("rescript/bin_path");
44

55
const out = child_process.spawnSync(rescript_exe, { encoding: "utf8" });
66
assert.match(

jscomp/build_tests/devonly/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//@ts-check
22
var cp = require("child_process");
3-
var { rescript_exe } = require("#cli/bin_path.js");
3+
var { rescript_exe } = require("rescript/bin_path");
44

55
cp.execSync(rescript_exe, { cwd: __dirname, encoding: "utf8" });

jscomp/build_tests/duplicated_symlinked_packages/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const fs = require("fs");
22
const path = require("path");
33
const child_process = require("child_process");
4-
const { rescript_exe } = require("#cli/bin_path.js");
4+
const { rescript_exe } = require("rescript/bin_path");
55

66
const expectedFilePath = path.join(__dirname, "out.expected");
77

jscomp/build_tests/exports/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var child_process = require("child_process");
2-
var { rescript_exe } = require("#cli/bin_path.js");
2+
var { rescript_exe } = require("rescript/bin_path");
33

44
child_process.execSync(rescript_exe, {
55
cwd: __dirname,

jscomp/build_tests/hyphen2/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
var p = require("child_process");
2-
var { rescript_exe } = require("#cli/bin_path.js");
2+
var { rescript_exe } = require("rescript/bin_path");
33

44
p.execSync(rescript_exe, { cwd: __dirname });

jscomp/build_tests/in_source/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var child_process = require("child_process");
22

33
var assert = require("assert");
44

5-
var { rescript_exe } = require("#cli/bin_path.js");
5+
var { rescript_exe } = require("rescript/bin_path");
66

77
assert.throws(
88
() => {

jscomp/build_tests/install/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var p = require("child_process");
22
var fs = require("fs");
33
var path = require("path");
44
var assert = require("assert");
5-
var { rescript_exe } = require("#cli/bin_path.js");
5+
var { rescript_exe } = require("rescript/bin_path");
66

77
p.spawnSync(rescript_exe, [`clean`], {
88
encoding: "utf8",

jscomp/build_tests/nested/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var p = require("child_process");
22
var assert = require("assert");
33
var fs = require("fs");
44
var path = require("path");
5-
var { rescript_exe } = require("#cli/bin_path.js");
5+
var { rescript_exe } = require("rescript/bin_path");
66
p.execSync(rescript_exe, { cwd: __dirname });
77

88
var content = fs.readFileSync(path.join(__dirname, "src", "demo.js"), "utf8");

jscomp/build_tests/nnest/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var p = require("child_process");
44
var assert = require("assert");
55
var fs = require("fs");
66
var path = require("path");
7-
var { rescript_exe } = require("#cli/bin_path.js");
7+
var { rescript_exe } = require("rescript/bin_path");
88
p.execSync(rescript_exe, { cwd: __dirname });
99

1010
var content = fs.readFileSync(path.join(__dirname, "src", "demo.js"), "utf8");

jscomp/build_tests/ns/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
var child_process = require("child_process");
2-
var { rescript_exe } = require("#cli/bin_path.js");
2+
var { rescript_exe } = require("rescript/bin_path");
33

44
child_process.execSync(rescript_exe, { cwd: __dirname });

jscomp/build_tests/post-build/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var child_process = require("child_process");
22
var assert = require("assert");
3-
var { rescript_exe } = require("#cli/bin_path.js");
3+
var { rescript_exe } = require("rescript/bin_path");
44

55
var out = child_process.spawnSync(rescript_exe, { encoding: "utf8" });
66

jscomp/build_tests/react_ppx/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//@ts-check
22
var cp = require("child_process");
3-
var { rescript_exe } = require("#cli/bin_path.js");
3+
var { rescript_exe } = require("rescript/bin_path");
44

55
cp.execSync(rescript_exe, { cwd: __dirname });

jscomp/build_tests/rerror/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var child_process = require("child_process");
22
var assert = require("assert");
3-
var { rescript_exe } = require("#cli/bin_path.js");
3+
var { rescript_exe } = require("rescript/bin_path");
44
child_process.spawnSync(`${rescript_exe} clean`, {
55
cwd: __dirname,
66
encoding: "utf8",

jscomp/build_tests/scoped_ppx/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var cp = require("child_process");
22
var assert = require("assert");
3-
var { rescript_exe } = require("#cli/bin_path.js");
3+
var { rescript_exe } = require("rescript/bin_path");
44
cp.execSync(rescript_exe, { cwd: __dirname, encoding: "utf8" });
55

66
var output = cp.execSync(`${rescript_exe} build -- -t commands src/hello.ast`, {

jscomp/build_tests/super_errors/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const fs = require("fs");
22
const path = require("path");
33
const child_process = require("child_process");
44

5-
const { bsc_exe: bsc } = require("#cli/bin_path.js");
5+
const { bsc_exe: bsc } = require("rescript/bin_path");
66

77
const expectedDir = path.join(__dirname, "expected");
88

jscomp/build_tests/transitive_pinned_dependency1/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var child_process = require("child_process");
33
var assert = require("assert");
44
var fs = require("fs");
5-
var { rescript_exe } = require("#cli/bin_path.js");
5+
var { rescript_exe } = require("rescript/bin_path");
66

77
console.log(
88
child_process.execSync(rescript_exe, { encoding: "utf8", cwd: "./a" })

jscomp/build_tests/transitive_pinned_dependency2/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var child_process = require("child_process");
33
var assert = require("assert");
44
var fs = require("fs");
5-
var { rescript_exe } = require("#cli/bin_path.js");
5+
var { rescript_exe } = require("rescript/bin_path");
66

77
console.log(
88
child_process.execSync(rescript_exe, { encoding: "utf8", cwd: "./a" })

jscomp/build_tests/unboxed_bool_with_const/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
var cp = require("child_process");
44
var assert = require("assert");
5-
var { rescript_exe } = require("#cli/bin_path.js");
5+
var { rescript_exe } = require("rescript/bin_path");
66

77
var out = cp.spawnSync(rescript_exe, {
88
cwd: __dirname,
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@ts-check
22
const cp = require("child_process");
3-
var { rescript_exe } = require("#cli/bin_path.js");
3+
var { rescript_exe } = require("rescript/bin_path");
44

55
cp.execSync(`${rescript_exe} clean`, { cwd: __dirname });
66
cp.execSync(`${rescript_exe}`, { cwd: __dirname });

jscomp/build_tests/unicode/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@ts-check
22
var child_process = require("child_process");
3-
var { rescript_exe } = require("#cli/bin_path.js");
3+
var { rescript_exe } = require("rescript/bin_path");
44

55
console.log(child_process.execSync(rescript_exe, { encoding: "utf8" }));
66

jscomp/build_tests/warn_legacy_config/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const { spawnSync } = require("child_process");
22
const assert = require("assert");
3-
const { rescript_exe } = require("#cli/bin_path.js");
3+
const { rescript_exe } = require("rescript/bin_path");
44

55
const output = spawnSync(rescript_exe, { encoding: "utf8" });
66
assert(

jscomp/build_tests/weird_deps/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
var cp = require("child_process");
44
var assert = require("assert");
5-
var { rescript_exe } = require("#cli/bin_path.js");
5+
var { rescript_exe } = require("rescript/bin_path");
66

77
var out = cp.spawnSync(rescript_exe, {
88
cwd: __dirname,

jscomp/build_tests/weird_devdeps/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
var cp = require("child_process");
44
var assert = require("assert");
5-
var rescript_exe = require("#cli/bin_path.js").rescript_exe;
5+
var rescript_exe = require("rescript/bin_path").rescript_exe;
66

77
var out = cp.spawnSync(rescript_exe, {
88
cwd: __dirname,

jscomp/build_tests/weird_names/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var cp = require("child_process");
22
var assert = require("assert");
33
var path = require("path");
4-
var { rescript_exe } = require("#cli/bin_path.js");
4+
var { rescript_exe } = require("rescript/bin_path");
55

66
var out = cp.spawnSync(rescript_exe, { encoding: "utf8" });
77

jscomp/build_tests/weird_names_not_found_bug/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var cp = require("child_process");
22
var assert = require("assert");
3-
var { rescript_exe } = require("#cli/bin_path.js");
3+
var { rescript_exe } = require("rescript/bin_path");
44

55
var out = cp.spawnSync(rescript_exe, { encoding: "utf8" });
66
if (out.stderr !== "") {

jscomp/build_tests/x-y/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
var p = require("child_process");
2-
var { rescript_exe } = require("#cli/bin_path.js");
2+
var { rescript_exe } = require("rescript/bin_path");
33

44
p.execSync(rescript_exe);

jscomp/build_tests/xpkg/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var p = require("child_process");
22
var assert = require("assert");
3-
var { rescript_exe } = require("#cli/bin_path.js");
3+
var { rescript_exe } = require("rescript/bin_path");
44
try {
55
var output = p.spawnSync(`${rescript_exe} build -regen`, {
66
shell: true,

jscomp/build_tests/zerocycle/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var p = require("child_process");
22
var assert = require("assert");
3-
var { rescript_exe } = require("#cli/bin_path.js");
3+
var { rescript_exe } = require("rescript/bin_path");
44
var out = p.spawnSync(rescript_exe, { encoding: "utf8", cwd: __dirname });
55
assert(out.status == 0);

jscomp/others/release.ninja

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ rule cc
77
description = $in -> $out
88
rule cc_cmi
99
command = $bsc -bs-read-cmi -bs-cmi -bs-cmj $bsc_flags -I others $in
10-
description = $in -> $out
10+
description = $in -> $out
1111

1212
o others/belt.cmj others/belt.cmi : cc others/belt.res | $bsc
1313
bsc_flags = $bsc_primitive_flags

jscomp/runtime/release.ninja

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ rule cc
77
description = $in -> $out
88
rule cc_cmi
99
command = $bsc -bs-read-cmi -bs-cmi -bs-cmj $bsc_flags -I runtime $in
10-
description = $in -> $out
10+
description = $in -> $out
1111

1212
o runtime/bs_stdlib_mini.cmi : cc runtime/bs_stdlib_mini.resi
1313
bsc_flags = -nopervasives

jscomp/stdlib-406/release.ninja

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ rule cc
66
description = $in -> $out
77
rule cc_cmi
88
command = $bsc -bs-read-cmi -bs-cmi -bs-cmj $bsc_flags -I stdlib-406 $in
9-
description = $in -> $out
9+
description = $in -> $out
1010

1111
o stdlib-406/pervasives.cmj : cc_cmi stdlib-406/pervasives.res | stdlib-406/pervasives.cmi $bsc others
1212
bsc_flags = $bsc_flags -nopervasives

jscomp/test/build.ninja

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ rule cc
66
description = $in -> $out
77
rule cc_cmi
88
command = $bsc -bs-read-cmi -bs-cmi -bs-cmj $bsc_flags -I test $in
9-
description = $in -> $out
9+
description = $in -> $out
1010

1111

1212

package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@
4040
"lib",
4141
"cli"
4242
],
43-
"imports": {
44-
"#cli/*": "./cli/*"
43+
"exports": {
44+
"./bin_path": "./cli/bin_path.js",
45+
"./package.json": "./package.json"
4546
},
4647
"repository": {
4748
"type": "git",

scripts/copyExes.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const path = require("path");
55
const fs = require("fs");
66
const child_process = require("child_process");
77
const { duneBinDir } = require("./dune");
8-
const { absolutePath: platformBinDir } = require("#cli/bin_path.js");
8+
const { absolutePath: platformBinDir } = require("rescript/bin_path");
99

1010
const ninjaDir = path.join(__dirname, "..", "ninja");
1111
const rewatchDir = path.join(__dirname, "..", "rewatch");

scripts/ninja.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ var {
3939
absolutePath: my_target,
4040
bsc_exe,
4141
ninja_exe: vendorNinjaPath,
42-
} = require("#cli/bin_path.js");
42+
} = require("rescript/bin_path");
4343

4444
// Let's enforce a Node version >= 16 to make sure M1 users don't trip up on
4545
// cryptic issues caused by mismatching assembly architectures Node 16 ships
@@ -127,7 +127,7 @@ rule cc
127127
description = $in -> $out
128128
rule cc_cmi
129129
command = $bsc -bs-read-cmi -bs-cmi -bs-cmj $bsc_flags -I ${ninjaCwd} $in
130-
description = $in -> $out
130+
description = $in -> $out
131131
`;
132132
}
133133
/**
@@ -1299,10 +1299,10 @@ o all: phony runtime others $stdlib test
12991299
writeFileAscii(
13001300
path.join(jscompDir, "..", "lib", "build.ninja"),
13011301
`
1302-
ocamlopt = ocamlopt.opt
1302+
ocamlopt = ocamlopt.opt
13031303
ext = exe
13041304
INCL= "4.06.1+BS"
1305-
include body.ninja
1305+
include body.ninja
13061306
`
13071307
);
13081308

@@ -1360,7 +1360,7 @@ ${cppoList("others", [
13601360
13611361
rule copy
13621362
command = cp $in $out
1363-
description = $in -> $out
1363+
description = $in -> $out
13641364
`;
13651365
var cppoNinjaFile = "cppoVendor.ninja";
13661366
writeFileSync(path.join(jscompDir, cppoNinjaFile), cppoNative);
@@ -1432,7 +1432,7 @@ function main() {
14321432
break;
14331433
case "help":
14341434
console.log(`supported subcommands:
1435-
[exe] config
1435+
[exe] config
14361436
[exe] build
14371437
[exe] cleanbuild
14381438
[exe] help

0 commit comments

Comments
 (0)