Clean up -with-deps from the codebase

rescript-lang · Aug 16, 2023 · c7231fe · c7231fe
1 parent d4e9ca1
commit c7231fe
Show file tree

Hide file tree

Showing 31 changed files with 29 additions and 34 deletions.
diff --git a/jscomp/bsb/bsb_exception.ml b/jscomp/bsb/bsb_exception.ml
@@ -66,8 +66,7 @@ let print (fmt : Format.formatter) (x : error) =
         Format.fprintf fmt
           "File \"bsconfig.json\", line 1\n\
            @{<error>Error:@} package @{<error>%s@} not found or built %s\n\
-           - Did you install it?\n\
-           - If you did, did you run `rescript build -with-deps`?" name in_json
+           - Did you install it?" name in_json
   | Json_config (pos, s) ->
       Format.fprintf fmt
         "File %S, line %d:\n\

diff --git a/jscomp/build_tests/case/package.json b/jscomp/build_tests/case/package.json
@@ -2,7 +2,7 @@
   "name": "case",
   "version": "0.1.0",
   "scripts": {
-    "clean": "rescript clean -with-deps",
+    "clean": "rescript clean",
     "build": "rescript build",
     "watch": "rescript build -w"
   },

diff --git a/jscomp/build_tests/case2/package.json b/jscomp/build_tests/case2/package.json
@@ -2,7 +2,7 @@
   "name": "case2",
   "version": "0.1.0",
   "scripts": {
-    "clean": "rescript clean -with-deps",
+    "clean": "rescript clean",
     "build": "rescript build",
     "watch": "rescript build -w"
   },

diff --git a/jscomp/build_tests/case3/package.json b/jscomp/build_tests/case3/package.json
@@ -2,7 +2,7 @@
   "name": "case3",
   "version": "0.1.0",
   "scripts": {
-    "clean": "rescript clean -with-deps",
+    "clean": "rescript clean",
     "build": "rescript build",
     "watch": "rescript build -w"
   },

diff --git a/jscomp/build_tests/custom_namespace/input.js b/jscomp/build_tests/custom_namespace/input.js
@@ -4,7 +4,7 @@ var path = require("path");
 var assert = require("assert");
 var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
 
-child_process.execSync(`${rescript_exe} clean -with-deps && ${rescript_exe} build`, {
+child_process.execSync(`${rescript_exe} clean && ${rescript_exe} build`, {
   cwd: __dirname,
 });
 

diff --git a/jscomp/build_tests/custom_namespace/package.json b/jscomp/build_tests/custom_namespace/package.json
@@ -2,7 +2,7 @@
   "name": "namespace",
   "version": "0.1.0",
   "scripts": {
-    "clean": "rescript clean -with-deps",
+    "clean": "rescript clean",
     "build": "rescript build",
     "watch": "rescript build -w"
   },

diff --git a/jscomp/build_tests/cycle/package.json b/jscomp/build_tests/cycle/package.json
@@ -2,7 +2,7 @@
   "name": "cycle",
   "version": "0.1.0",
   "scripts": {
-    "clean": "rescript clean -with-deps",
+    "clean": "rescript clean",
     "build": "rescript build",
     "watch": "rescript build -w"
   },

diff --git a/jscomp/build_tests/cycle1/input.js b/jscomp/build_tests/cycle1/input.js
@@ -5,7 +5,7 @@ const fs = require('fs')
 const path = require('path')
 var rescript_exe = require("../../../scripts/bin_path").rescript_exe
 
-cp.execSync(`${rescript_exe} clean -with-deps`, { cwd: __dirname, });
+cp.execSync(`${rescript_exe} clean`, { cwd: __dirname, });
 
 var output = cp.spawnSync(rescript_exe, { encoding: "utf8", shell: true });
 

diff --git a/jscomp/build_tests/devdeps/package.json b/jscomp/build_tests/devdeps/package.json
@@ -2,7 +2,7 @@
   "name": "devdeps",
   "version": "0.1.0",
   "scripts": {
-    "clean": "rescript clean -with-deps",
+    "clean": "rescript clean",
     "build": "rescript build",
     "watch": "rescript build -w"
   },

diff --git a/jscomp/build_tests/devonly/package.json b/jscomp/build_tests/devonly/package.json
@@ -2,7 +2,7 @@
   "name": "devonly",
   "version": "0.1.0",
   "scripts": {
-    "clean": "rescript clean -with-deps",
+    "clean": "rescript clean",
     "build": "rescript build",
     "watch": "rescript build -w"
   },

diff --git a/jscomp/build_tests/duplicated_symlinked_packages/a/package.json b/jscomp/build_tests/duplicated_symlinked_packages/a/package.json
@@ -4,7 +4,7 @@
   "scripts": {
     "build": "rescript build",
     "start": "rescript build -w",
-    "clean": "rescript clean -with-deps"
+    "clean": "rescript clean"
   },
   "keywords": [
     "BuckleScript"

diff --git a/jscomp/build_tests/duplicated_symlinked_packages/b/package.json b/jscomp/build_tests/duplicated_symlinked_packages/b/package.json
@@ -4,7 +4,7 @@
   "scripts": {
     "build": "rescript build",
     "start": "rescript build -w",
-    "clean": "rescript clean -with-deps"
+    "clean": "rescript clean"
   },
   "keywords": [
     "BuckleScript"

diff --git a/jscomp/build_tests/duplicated_symlinked_packages/c/package.json b/jscomp/build_tests/duplicated_symlinked_packages/c/package.json
@@ -4,7 +4,7 @@
   "scripts": {
     "build": "rescript build",
     "start": "rescript build -w",
-    "clean": "rescript clean -with-deps"
+    "clean": "rescript clean"
   },
   "keywords": [
     "BuckleScript"

diff --git a/jscomp/build_tests/duplicated_symlinked_packages/input.js b/jscomp/build_tests/duplicated_symlinked_packages/input.js
@@ -12,7 +12,7 @@ function postProcessErrorOutput (output) {
   output = output.replace(new RegExp(__dirname, 'gi'), '.')
   return output
 }
-child_process.execSync(`${rescript_exe} clean -with-deps`,{cwd:__dirname})
+child_process.execSync(`${rescript_exe} clean`,{cwd:__dirname})
 child_process.exec(rescript_exe, {cwd: __dirname}, (err, stdout, stderr) => {
   const actualErrorOutput = postProcessErrorOutput(stderr.toString())
   if (updateTests) {

diff --git a/jscomp/build_tests/duplicated_symlinked_packages/package.json b/jscomp/build_tests/duplicated_symlinked_packages/package.json
@@ -2,7 +2,7 @@
   "name": "duplicated-symlinked-packages",
   "version": "0.1.0",
   "scripts": {
-    "clean": "rescript clean -with-deps",
+    "clean": "rescript clean",
     "build": "rescript build",
     "watch": "rescript build -w"
   },

diff --git a/jscomp/build_tests/exports/package.json b/jscomp/build_tests/exports/package.json
@@ -2,7 +2,7 @@
   "name": "exports",
   "version": "0.1.0",
   "scripts": {
-    "clean": "rescript clean -with-deps",
+    "clean": "rescript clean",
     "build": "rescript build",
     "watch": "rescript build -w"
   },

diff --git a/jscomp/build_tests/hyphen2/package.json b/jscomp/build_tests/hyphen2/package.json
@@ -2,7 +2,7 @@
   "name": "hyphen2",
   "version": "0.1.0",
   "scripts": {
-    "clean": "rescript clean -with-deps",
+    "clean": "rescript clean",
     "build": "rescript build",
     "watch": "rescript build -w"
   },

diff --git a/jscomp/build_tests/install/package.json b/jscomp/build_tests/install/package.json
@@ -2,7 +2,7 @@
     "name": "install",
     "version": "0.1.0",
     "scripts": {
-      "clean": "rescript clean -with-deps",
+      "clean": "rescript clean",
       "build": "rescript build",
       "install": "rescript build -install",
       "watch": "rescript build -w"

diff --git a/jscomp/build_tests/nested/package.json b/jscomp/build_tests/nested/package.json
@@ -2,7 +2,7 @@
   "name": "nested",
   "version": "0.1.0",
   "scripts": {
-    "clean": "rescript clean -with-deps",
+    "clean": "rescript clean",
     "build": "rescript build",
     "watch": "rescript build -w"
   },

diff --git a/jscomp/build_tests/nnest/package.json b/jscomp/build_tests/nnest/package.json
@@ -2,7 +2,7 @@
   "name": "nested",
   "version": "0.1.0",
   "scripts": {
-    "clean": "rescript clean -with-deps",
+    "clean": "rescript clean",
     "build": "rescript build",
     "watch": "rescript build -w"
   },

diff --git a/jscomp/build_tests/ns/package.json b/jscomp/build_tests/ns/package.json
@@ -2,7 +2,7 @@
   "name": "ns",
   "version": "0.1.0",
   "scripts": {
-    "clean": "rescript clean -with-deps",
+    "clean": "rescript clean",
     "build": "rescript build",
     "watch": "rescript build -w"
   },

diff --git a/jscomp/build_tests/post-build/package.json b/jscomp/build_tests/post-build/package.json
@@ -2,7 +2,7 @@
   "name": "post-build",
   "version": "0.1.0",
   "scripts": {
-    "clean": "rescript clean -with-deps",
+    "clean": "rescript clean",
     "build": "rescript build",
     "watch": "rescript build -w"
   },

diff --git a/jscomp/build_tests/rerror/input.js b/jscomp/build_tests/rerror/input.js
@@ -1,7 +1,7 @@
 var child_process = require("child_process");
 var assert = require("assert");
 var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-child_process.spawnSync(`${rescript_exe} clean -with-deps`, {
+child_process.spawnSync(`${rescript_exe} clean`, {
   cwd: __dirname,
   encoding: "utf8",
 });

diff --git a/jscomp/build_tests/rerror/package.json b/jscomp/build_tests/rerror/package.json
@@ -2,7 +2,7 @@
   "name": "rerror",
   "version": "0.1.0",
   "scripts": {
-    "clean": "rescript clean -with-deps",
+    "clean": "rescript clean",
     "build": "rescript",
     "watch": "rescript build -w"
   },

diff --git a/jscomp/build_tests/super_errors/expected/modules1.res.expected b/jscomp/build_tests/super_errors/expected/modules1.res.expected
@@ -8,6 +8,4 @@
   [1;33mThe module or file Foo can't be found.[0m
   - If it's a third-party dependency:
     - Did you list it in bsconfig.json?
-    - Did you run `rescript build` instead of `rescript build -with-deps`
-      (latter builds third-parties)?
   - Did you include the file's directory in bsconfig.json?
diff --git a/jscomp/build_tests/uncurried-always/input.js b/jscomp/build_tests/uncurried-always/input.js
@@ -5,5 +5,5 @@ const fs = require('fs')
 const path = require('path')
 var rescript_exe = require("../../../scripts/bin_path").rescript_exe
 
-cp.execSync(`${rescript_exe} clean -with-deps`, { cwd: __dirname, });
+cp.execSync(`${rescript_exe} clean`, { cwd: __dirname, });
 cp.execSync(`${rescript_exe}`, { cwd: __dirname, });
diff --git a/jscomp/build_tests/weird_names/package.json b/jscomp/build_tests/weird_names/package.json
@@ -2,7 +2,7 @@
   "name": "weird_names",
   "version": "0.1.0",
   "scripts": {
-    "clean": "rescript clean -with-deps",
+    "clean": "rescript clean",
     "build": "rescript build",
     "watch": "rescript build -w"
   },

diff --git a/jscomp/build_tests/x-y/package.json b/jscomp/build_tests/x-y/package.json
@@ -2,7 +2,7 @@
   "name": "x-y",
   "version": "0.1.0",
   "scripts": {
-    "clean": "rescript clean -with-deps",
+    "clean": "rescript clean",
     "build": "rescript",
     "watch": "rescript build -w"
   },

diff --git a/jscomp/build_tests/zerocycle/package.json b/jscomp/build_tests/zerocycle/package.json
@@ -2,7 +2,7 @@
   "name": "zerocycle",
   "version": "0.1.0",
   "scripts": {
-    "clean": "rescript clean -with-deps",
+    "clean": "rescript clean",
     "build": "rescript build",
     "watch": "rescript build -w"
   },

diff --git a/jscomp/gentype_tests/typescript-react-example/package.json b/jscomp/gentype_tests/typescript-react-example/package.json
@@ -10,7 +10,7 @@
   "scripts": {
     "start": "rescript build -w",
     "build": "rescript",
-    "clean": "rescript clean -with-deps",
+    "clean": "rescript clean",
     "tsc": "tsc -p tsconfig.json"
   },
   "devDependencies": {

diff --git a/jscomp/ml/typetexp.ml b/jscomp/ml/typetexp.ml
@@ -994,8 +994,6 @@ let report_error env ppf = function
                               @{<info>The module or file %a can't be found.@}@,\
                               @[<v 2>- If it's a third-party dependency:@,\
                               - Did you list it in bsconfig.json?@,\
-                              - @[Did you run `rescript build` instead of `rescript build -with-deps`@ (latter builds third-parties)@]?\
-                              @]@,\
                               - Did you include the file's directory in bsconfig.json?@]\
                               @]"
             Printtyp.longident lid