Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit c7231fe

Browse files
DZakhDZakh
committedAug 16, 2023
Clean up -with-deps from the codebase
1 parent d4e9ca1 commit c7231fe

File tree

31 files changed

+29
-34
lines changed

31 files changed

+29
-34
lines changed
 

‎jscomp/bsb/bsb_exception.ml

+1-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ let print (fmt : Format.formatter) (x : error) =
6666
Format.fprintf fmt
6767
"File \"bsconfig.json\", line 1\n\
6868
@{<error>Error:@} package @{<error>%s@} not found or built %s\n\
69-
- Did you install it?\n\
70-
- If you did, did you run `rescript build -with-deps`?" name in_json
69+
- Did you install it?" name in_json
7170
| Json_config (pos, s) ->
7271
Format.fprintf fmt
7372
"File %S, line %d:\n\

‎jscomp/build_tests/case/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "case",
33
"version": "0.1.0",
44
"scripts": {
5-
"clean": "rescript clean -with-deps",
5+
"clean": "rescript clean",
66
"build": "rescript build",
77
"watch": "rescript build -w"
88
},

‎jscomp/build_tests/case2/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "case2",
33
"version": "0.1.0",
44
"scripts": {
5-
"clean": "rescript clean -with-deps",
5+
"clean": "rescript clean",
66
"build": "rescript build",
77
"watch": "rescript build -w"
88
},

‎jscomp/build_tests/case3/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "case3",
33
"version": "0.1.0",
44
"scripts": {
5-
"clean": "rescript clean -with-deps",
5+
"clean": "rescript clean",
66
"build": "rescript build",
77
"watch": "rescript build -w"
88
},

‎jscomp/build_tests/custom_namespace/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var path = require("path");
44
var assert = require("assert");
55
var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
66

7-
child_process.execSync(`${rescript_exe} clean -with-deps && ${rescript_exe} build`, {
7+
child_process.execSync(`${rescript_exe} clean && ${rescript_exe} build`, {
88
cwd: __dirname,
99
});
1010

‎jscomp/build_tests/custom_namespace/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "namespace",
33
"version": "0.1.0",
44
"scripts": {
5-
"clean": "rescript clean -with-deps",
5+
"clean": "rescript clean",
66
"build": "rescript build",
77
"watch": "rescript build -w"
88
},

‎jscomp/build_tests/cycle/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "cycle",
33
"version": "0.1.0",
44
"scripts": {
5-
"clean": "rescript clean -with-deps",
5+
"clean": "rescript clean",
66
"build": "rescript build",
77
"watch": "rescript build -w"
88
},

‎jscomp/build_tests/cycle1/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const fs = require('fs')
55
const path = require('path')
66
var rescript_exe = require("../../../scripts/bin_path").rescript_exe
77

8-
cp.execSync(`${rescript_exe} clean -with-deps`, { cwd: __dirname, });
8+
cp.execSync(`${rescript_exe} clean`, { cwd: __dirname, });
99

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

‎jscomp/build_tests/devdeps/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "devdeps",
33
"version": "0.1.0",
44
"scripts": {
5-
"clean": "rescript clean -with-deps",
5+
"clean": "rescript clean",
66
"build": "rescript build",
77
"watch": "rescript build -w"
88
},

‎jscomp/build_tests/devonly/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "devonly",
33
"version": "0.1.0",
44
"scripts": {
5-
"clean": "rescript clean -with-deps",
5+
"clean": "rescript clean",
66
"build": "rescript build",
77
"watch": "rescript build -w"
88
},

‎jscomp/build_tests/duplicated_symlinked_packages/a/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"scripts": {
55
"build": "rescript build",
66
"start": "rescript build -w",
7-
"clean": "rescript clean -with-deps"
7+
"clean": "rescript clean"
88
},
99
"keywords": [
1010
"BuckleScript"

‎jscomp/build_tests/duplicated_symlinked_packages/b/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"scripts": {
55
"build": "rescript build",
66
"start": "rescript build -w",
7-
"clean": "rescript clean -with-deps"
7+
"clean": "rescript clean"
88
},
99
"keywords": [
1010
"BuckleScript"

‎jscomp/build_tests/duplicated_symlinked_packages/c/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"scripts": {
55
"build": "rescript build",
66
"start": "rescript build -w",
7-
"clean": "rescript clean -with-deps"
7+
"clean": "rescript clean"
88
},
99
"keywords": [
1010
"BuckleScript"

‎jscomp/build_tests/duplicated_symlinked_packages/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function postProcessErrorOutput (output) {
1212
output = output.replace(new RegExp(__dirname, 'gi'), '.')
1313
return output
1414
}
15-
child_process.execSync(`${rescript_exe} clean -with-deps`,{cwd:__dirname})
15+
child_process.execSync(`${rescript_exe} clean`,{cwd:__dirname})
1616
child_process.exec(rescript_exe, {cwd: __dirname}, (err, stdout, stderr) => {
1717
const actualErrorOutput = postProcessErrorOutput(stderr.toString())
1818
if (updateTests) {

‎jscomp/build_tests/duplicated_symlinked_packages/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "duplicated-symlinked-packages",
33
"version": "0.1.0",
44
"scripts": {
5-
"clean": "rescript clean -with-deps",
5+
"clean": "rescript clean",
66
"build": "rescript build",
77
"watch": "rescript build -w"
88
},

‎jscomp/build_tests/exports/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "exports",
33
"version": "0.1.0",
44
"scripts": {
5-
"clean": "rescript clean -with-deps",
5+
"clean": "rescript clean",
66
"build": "rescript build",
77
"watch": "rescript build -w"
88
},

‎jscomp/build_tests/hyphen2/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "hyphen2",
33
"version": "0.1.0",
44
"scripts": {
5-
"clean": "rescript clean -with-deps",
5+
"clean": "rescript clean",
66
"build": "rescript build",
77
"watch": "rescript build -w"
88
},

‎jscomp/build_tests/install/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "install",
33
"version": "0.1.0",
44
"scripts": {
5-
"clean": "rescript clean -with-deps",
5+
"clean": "rescript clean",
66
"build": "rescript build",
77
"install": "rescript build -install",
88
"watch": "rescript build -w"

‎jscomp/build_tests/nested/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "nested",
33
"version": "0.1.0",
44
"scripts": {
5-
"clean": "rescript clean -with-deps",
5+
"clean": "rescript clean",
66
"build": "rescript build",
77
"watch": "rescript build -w"
88
},

‎jscomp/build_tests/nnest/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "nested",
33
"version": "0.1.0",
44
"scripts": {
5-
"clean": "rescript clean -with-deps",
5+
"clean": "rescript clean",
66
"build": "rescript build",
77
"watch": "rescript build -w"
88
},

‎jscomp/build_tests/ns/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "ns",
33
"version": "0.1.0",
44
"scripts": {
5-
"clean": "rescript clean -with-deps",
5+
"clean": "rescript clean",
66
"build": "rescript build",
77
"watch": "rescript build -w"
88
},

‎jscomp/build_tests/post-build/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "post-build",
33
"version": "0.1.0",
44
"scripts": {
5-
"clean": "rescript clean -with-deps",
5+
"clean": "rescript clean",
66
"build": "rescript build",
77
"watch": "rescript build -w"
88
},

‎jscomp/build_tests/rerror/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var child_process = require("child_process");
22
var assert = require("assert");
33
var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
4-
child_process.spawnSync(`${rescript_exe} clean -with-deps`, {
4+
child_process.spawnSync(`${rescript_exe} clean`, {
55
cwd: __dirname,
66
encoding: "utf8",
77
});

‎jscomp/build_tests/rerror/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "rerror",
33
"version": "0.1.0",
44
"scripts": {
5-
"clean": "rescript clean -with-deps",
5+
"clean": "rescript clean",
66
"build": "rescript",
77
"watch": "rescript build -w"
88
},

‎jscomp/build_tests/super_errors/expected/modules1.res.expected

-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,4 @@
88
The module or file Foo can't be found.
99
- If it's a third-party dependency:
1010
- Did you list it in bsconfig.json?
11-
- Did you run `rescript build` instead of `rescript build -with-deps`
12-
(latter builds third-parties)?
1311
- Did you include the file's directory in bsconfig.json?

‎jscomp/build_tests/uncurried-always/input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ const fs = require('fs')
55
const path = require('path')
66
var rescript_exe = require("../../../scripts/bin_path").rescript_exe
77

8-
cp.execSync(`${rescript_exe} clean -with-deps`, { cwd: __dirname, });
8+
cp.execSync(`${rescript_exe} clean`, { cwd: __dirname, });
99
cp.execSync(`${rescript_exe}`, { cwd: __dirname, });

‎jscomp/build_tests/weird_names/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "weird_names",
33
"version": "0.1.0",
44
"scripts": {
5-
"clean": "rescript clean -with-deps",
5+
"clean": "rescript clean",
66
"build": "rescript build",
77
"watch": "rescript build -w"
88
},

‎jscomp/build_tests/x-y/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "x-y",
33
"version": "0.1.0",
44
"scripts": {
5-
"clean": "rescript clean -with-deps",
5+
"clean": "rescript clean",
66
"build": "rescript",
77
"watch": "rescript build -w"
88
},

‎jscomp/build_tests/zerocycle/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "zerocycle",
33
"version": "0.1.0",
44
"scripts": {
5-
"clean": "rescript clean -with-deps",
5+
"clean": "rescript clean",
66
"build": "rescript build",
77
"watch": "rescript build -w"
88
},

‎jscomp/gentype_tests/typescript-react-example/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"scripts": {
1111
"start": "rescript build -w",
1212
"build": "rescript",
13-
"clean": "rescript clean -with-deps",
13+
"clean": "rescript clean",
1414
"tsc": "tsc -p tsconfig.json"
1515
},
1616
"devDependencies": {

‎jscomp/ml/typetexp.ml

-2
Original file line numberDiff line numberDiff line change
@@ -994,8 +994,6 @@ let report_error env ppf = function
994994
@{<info>The module or file %a can't be found.@}@,\
995995
@[<v 2>- If it's a third-party dependency:@,\
996996
- Did you list it in bsconfig.json?@,\
997-
- @[Did you run `rescript build` instead of `rescript build -with-deps`@ (latter builds third-parties)@]?\
998-
@]@,\
999997
- Did you include the file's directory in bsconfig.json?@]\
1000998
@]"
1001999
Printtyp.longident lid

0 commit comments

Comments
 (0)
Please sign in to comment.