Skip to content

Commit 92d7b3d

Browse files
cometkimcometkim
committed
refactor: split dir for CLI and dev scripts
1 parent 08c6345 commit 92d7b3d

File tree

55 files changed

+82
-102
lines changed

Some content is hidden

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

55 files changed

+82
-102
lines changed

‎.github/workflows/get_artifact_dir_name.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const fs = require("fs");
22
const os = require("os");
33

4-
const artifactDirName = require("../../scripts/bin_path").dirName;
4+
const artifactDirName = require("../../cli/bin_path").dirName;
55

66
// Pass artifactDirName to subsequent GitHub actions
77
fs.appendFileSync(

‎bsc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"use strict";
33

44
var child_process = require("child_process");
5-
var bsc_exe = require("./scripts/bin_path").bsc_exe;
5+
var { bsc_exe } = require("./cli/bin_path");
66

77
var delegate_args = process.argv.slice(2);
88

‎scripts/bin_path.js renamed to ‎cli/bin_path.js

File renamed without changes.

‎scripts/rescript_arg.js renamed to ‎cli/rescript_arg.js

File renamed without changes.

‎scripts/rescript_bsb.js renamed to ‎cli/rescript_bsb.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const fs = require("fs");
44
const path = require("path");
55
var os = require("os");
66
const child_process = require("child_process");
7-
const rescript_exe = require("./bin_path").rescript_exe;
7+
const { rescript_exe } = require("./bin_path");
88

99
const cwd = process.cwd();
1010
const lockFileName = path.join(cwd, ".bsb.lock");

‎scripts/rescript_convert.js renamed to ‎cli/rescript_convert.js

File renamed without changes.

‎scripts/rescript_dump.js renamed to ‎cli/rescript_dump.js

File renamed without changes.

‎scripts/rescript_format.js renamed to ‎cli/rescript_format.js

File renamed without changes.

‎scripts/rescript_postinstall.js renamed to ‎cli/rescript_postinstall.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
const child_process = require("child_process");
33
const fs = require("fs");
44

5-
const bsc_exe = require("./bin_path").bsc_exe;
6-
const ninja_exe = require("./bin_path").ninja_exe;
5+
const { bsc_exe, ninja_exe }= require("./bin_path");
76

87
function checkNinja() {
98
if (!fs.existsSync(ninja_exe)) {

‎scripts/rewatch renamed to ‎cli/rewatch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
const path = require("path");
66
const child_process = require("child_process");
77

8-
const binAbsolutePath = require("./bin_path").absolutePath;
8+
const { absolutePath: binAbsolutePath } = require("./bin_path");
99
const rewatchExe = path.join(binAbsolutePath, "rewatch.exe");
1010

1111
const args = process.argv.slice(2);

‎jscomp/build_tests/build_warn_as_error/input.js

Lines changed: 1 addition & 1 deletion
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("../../../scripts/bin_path").rescript_exe;
3+
var { rescript_exe } = require("#cli/bin_path.js");
44

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

‎jscomp/build_tests/case/input.js

Lines changed: 1 addition & 1 deletion
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("../../../scripts/bin_path").rescript_exe;
3+
var { rescript_exe } = require("#cli/bin_path.js");
44
var o = p.spawnSync(rescript_exe, { encoding: "utf8", cwd: __dirname });
55

66
if (

‎jscomp/build_tests/case2/input.js

Lines changed: 1 addition & 1 deletion
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("../../../scripts/bin_path").rescript_exe;
3+
var { rescript_exe } = require("#cli/bin_path.js");
44
var o = p.spawnSync(rescript_exe, { encoding: "utf8", cwd: __dirname });
55

66
if (

‎jscomp/build_tests/case3/input.js

Lines changed: 1 addition & 1 deletion
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("../../../scripts/bin_path").rescript_exe;
7+
var { rescript_exe } = require("#cli/bin_path.js");
88
p.spawnSync(`${rescript_exe} clean && ${rescript_exe} build`, {
99
encoding: "utf8",
1010
cwd: __dirname,

‎jscomp/build_tests/cli_help/input.js

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ async function test() {
8181
});
8282
assert.equal(out.stdout, buildHelp);
8383
assert.equal(out.stderr, "");
84-
assert.equal(out.status, 0);
84+
assert.equal(out.code, 0);
8585
}
8686

8787
{
@@ -90,7 +90,7 @@ async function test() {
9090
});
9191
assert.equal(out.stdout, buildHelp);
9292
assert.equal(out.stderr, "");
93-
assert.equal(out.status, 0);
93+
assert.equal(out.code, 0);
9494
}
9595

9696
{
@@ -99,7 +99,7 @@ async function test() {
9999
});
100100
assert.equal(out.stdout, cliHelp);
101101
assert.equal(out.stderr, "");
102-
assert.equal(out.status, 0);
102+
assert.equal(out.code, 0);
103103
}
104104

105105
{
@@ -109,7 +109,7 @@ async function test() {
109109
});
110110
assert.equal(out.stdout, cliHelp);
111111
assert.equal(out.stderr, "");
112-
assert.equal(out.status, 0);
112+
assert.equal(out.code, 0);
113113
}
114114

115115
{
@@ -119,7 +119,7 @@ async function test() {
119119
});
120120
assert.equal(out.stdout, buildHelp);
121121
assert.equal(out.stderr, "");
122-
assert.equal(out.status, 0);
122+
assert.equal(out.code, 0);
123123
}
124124

125125
{
@@ -129,7 +129,7 @@ async function test() {
129129
});
130130
assert.equal(out.stdout, "");
131131
assert.equal(out.stderr, 'Error: Unknown option "-foo".\n' + buildHelp);
132-
assert.equal(out.status, 2);
132+
assert.equal(out.code, 2);
133133
}
134134

135135
{
@@ -139,7 +139,7 @@ async function test() {
139139
});
140140
assert.equal(out.stdout, cliHelp);
141141
assert.equal(out.stderr, "");
142-
assert.equal(out.status, 0);
142+
assert.equal(out.code, 0);
143143
}
144144

145145
{
@@ -149,7 +149,7 @@ async function test() {
149149
});
150150
assert.equal(out.stdout, cliHelp);
151151
assert.equal(out.stderr, "");
152-
assert.equal(out.status, 0);
152+
assert.equal(out.code, 0);
153153
}
154154

155155
{
@@ -159,7 +159,7 @@ async function test() {
159159
});
160160
assert.equal(out.stdout, cliHelp);
161161
assert.equal(out.stderr, "");
162-
assert.equal(out.status, 0);
162+
assert.equal(out.code, 0);
163163
}
164164

165165
{
@@ -169,7 +169,7 @@ async function test() {
169169
});
170170
assert.equal(out.stdout, "");
171171
assert.equal(out.stderr, `Error: Unknown command "built".\n` + cliHelp);
172-
assert.equal(out.status, 2);
172+
assert.equal(out.code, 2);
173173
}
174174

175175
{
@@ -179,7 +179,7 @@ async function test() {
179179
});
180180
assert.equal(out.stdout, "");
181181
assert.equal(out.stderr, 'Error: Unknown option "-foo".\n' + buildHelp);
182-
assert.equal(out.status, 2);
182+
assert.equal(out.code, 2);
183183
}
184184

185185
{
@@ -189,7 +189,7 @@ async function test() {
189189
});
190190
assert.equal(out.stdout, cleanHelp);
191191
assert.equal(out.stderr, "");
192-
assert.equal(out.status, 0);
192+
assert.equal(out.code, 0);
193193
}
194194

195195
{
@@ -199,7 +199,7 @@ async function test() {
199199
});
200200
assert.equal(out.stdout, cleanHelp);
201201
assert.equal(out.stderr, "");
202-
assert.equal(out.status, 0);
202+
assert.equal(out.code, 0);
203203
}
204204

205205
{
@@ -209,7 +209,7 @@ async function test() {
209209
});
210210
assert.equal(out.stdout, "");
211211
assert.equal(out.stderr, 'Error: Unknown option "-foo".\n' + cleanHelp);
212-
assert.equal(out.status, 2);
212+
assert.equal(out.code, 2);
213213
}
214214

215215
{
@@ -219,7 +219,7 @@ async function test() {
219219
});
220220
assert.equal(out.stdout, formatHelp);
221221
assert.equal(out.stderr, "");
222-
assert.equal(out.status, 0);
222+
assert.equal(out.code, 0);
223223
}
224224

225225
{
@@ -229,7 +229,7 @@ async function test() {
229229
});
230230
assert.equal(out.stdout, formatHelp);
231231
assert.equal(out.stderr, "");
232-
assert.equal(out.status, 0);
232+
assert.equal(out.code, 0);
233233
}
234234

235235
{
@@ -239,7 +239,7 @@ async function test() {
239239
});
240240
assert.equal(out.stdout, convertHelp);
241241
assert.equal(out.stderr, "");
242-
assert.equal(out.status, 0);
242+
assert.equal(out.code, 0);
243243
}
244244

245245
{
@@ -249,7 +249,7 @@ async function test() {
249249
});
250250
assert.equal(out.stdout, convertHelp);
251251
assert.equal(out.stderr, "");
252-
assert.equal(out.status, 0);
252+
assert.equal(out.code, 0);
253253
}
254254

255255
{
@@ -259,7 +259,7 @@ async function test() {
259259
});
260260
assert.equal(out.stdout, dumpHelp);
261261
assert.equal(out.stderr, "");
262-
assert.equal(out.status, 0);
262+
assert.equal(out.code, 0);
263263
}
264264

265265
{
@@ -269,7 +269,7 @@ async function test() {
269269
});
270270
assert.equal(out.stdout, dumpHelp);
271271
assert.equal(out.stderr, "");
272-
assert.equal(out.status, 0);
272+
assert.equal(out.code, 0);
273273
}
274274
}
275275

‎jscomp/build_tests/cmd/input.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ var p = require("child_process");
22

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

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

77
var react = `
8-
type u
8+
type u
99
1010
external a : u = "react" [@@module]
1111
@@ -23,7 +23,7 @@ external foo : bla = "foo.react" [@@module]
2323
2424
external bar : unit -> bla = "bar" [@@val] [@@module "foo.react"]
2525
26-
let c = foo
26+
let c = foo
2727
2828
let d = bar ()
2929
`;

‎jscomp/build_tests/custom_namespace/input.js

Lines changed: 1 addition & 1 deletion
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("../../../scripts/bin_path").rescript_exe;
3+
var { rescript_exe } = require("#cli/bin_path.js");
44

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

‎jscomp/build_tests/cycle/input.js

Lines changed: 1 addition & 1 deletion
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("../../../scripts/bin_path").rescript_exe;
6+
var { rescript_exe } = require("#cli/bin_path.js");
77

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

‎jscomp/build_tests/cycle1/input.js

Lines changed: 1 addition & 1 deletion
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("../../../scripts/bin_path").rescript_exe;
6+
const { rescript_exe } = require("#cli/bin_path.js");
77

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

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

Lines changed: 1 addition & 1 deletion
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("../../../scripts/bin_path").rescript_exe;
3+
const { rescript_exe } = require("#cli/bin_path.js");
44

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

‎jscomp/build_tests/devonly/input.js

Lines changed: 1 addition & 1 deletion
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("../../../scripts/bin_path").rescript_exe;
3+
var { rescript_exe } = require("#cli/bin_path.js");
44

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

‎jscomp/build_tests/duplicated_symlinked_packages/input.js

Lines changed: 1 addition & 1 deletion
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("../../../scripts/bin_path").rescript_exe;
4+
const { rescript_exe } = require("#cli/bin_path.js");
55

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

‎jscomp/build_tests/exports/input.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var child_process = require("child_process");
2-
var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
2+
var { rescript_exe } = require("#cli/bin_path.js");
33

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

‎jscomp/build_tests/hyphen2/input.js

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

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

‎jscomp/build_tests/in_source/input.js

Lines changed: 1 addition & 1 deletion
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("../../../scripts/bin_path").rescript_exe;
5+
var { rescript_exe } = require("#cli/bin_path.js");
66

77
assert.throws(
88
() => {

‎jscomp/build_tests/install/input.js

Lines changed: 1 addition & 1 deletion
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("../../../scripts/bin_path").rescript_exe;
5+
var { rescript_exe } = require("#cli/bin_path.js");
66

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

‎jscomp/build_tests/nested/input.js

Lines changed: 1 addition & 1 deletion
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("../../../scripts/bin_path").rescript_exe;
5+
var { rescript_exe } = require("#cli/bin_path.js");
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

Lines changed: 1 addition & 1 deletion
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("../../../scripts/bin_path").rescript_exe;
7+
var { rescript_exe } = require("#cli/bin_path.js");
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
var child_process = require("child_process");
2-
var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
2+
var { rescript_exe } = require("#cli/bin_path.js");
33

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

‎jscomp/build_tests/post-build/input.js

Lines changed: 1 addition & 1 deletion
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("../../../scripts/bin_path").rescript_exe;
3+
var { rescript_exe } = require("#cli/bin_path.js");
44

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

0 commit comments

Comments
 (0)