messages

Author: cometkim

jscomp/bsb/bsb_build_util.ml

@@ -168,7 +168,7 @@ let rec walk_all_deps_aux (visited : string Hash_string.t) (paths : string list)
                     "package name is expected to be %s but got %s" s str);
             str
         | Some _ | None ->
-            Bsb_exception.errorf ~loc "package name missing in %s/bsconfig.json"
+            Bsb_exception.errorf ~loc "package name missing in %s/rescript.json"
               dir
       in
       if Ext_list.mem_string paths cur_package_name then (

jscomp/bsb/bsb_config_interpret.ml

@@ -352,8 +352,8 @@ let interpret_json ~(package_kind : Bsb_package_kind.t) ~(per_proj_dir : string)
             filename;
           }
       | None ->
-          Bsb_exception.invalid_spec "no sources specified in bsconfig.json")
-  | _, _, _ -> Bsb_exception.invalid_spec "bsconfig.json expect a json object {}"
+          Bsb_exception.invalid_spec ("no sources specified in " ^ filename))
+  | filename, _, _ -> Bsb_exception.invalid_spec (filename ^ " expect a json object {}")
 
 let deps_from_bsconfig () =
   let cwd = Bsb_global_paths.cwd in

jscomp/bsb/bsb_exception.ml

@@ -58,13 +58,13 @@ let print (fmt : Format.formatter) (x : error) =
       let name = Bsb_pkg_types.to_string name in
       if Ext_string.equal name !Bs_version.package_name then
         Format.fprintf fmt
-          "File \"bsconfig.json\", line 1\n\
+          "File \"rescript.json\", line 1\n\
            @{<error>Error:@} package @{<error>%s@} is not found %s\n\
            It's the basic, required package. If you have it installed globally,\n\
            Please run `npm link rescript` to make it available" name in_json
       else
         Format.fprintf fmt
-          "File \"bsconfig.json\", line 1\n\
+          "File \"rescript.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
@@ -76,7 +76,7 @@ let print (fmt : Format.formatter) (x : error) =
          https://rescript-lang.org/docs/manual/latest/build-configuration-schema"
         pos.pos_fname pos.pos_lnum s
   | Invalid_spec s ->
-      Format.fprintf fmt "@{<error>Error: Invalid bsconfig.json %s@}" s
+      Format.fprintf fmt "@{<error>Error: Invalid rescript.json %s@}" s
   | Invalid_json s ->
       Format.fprintf fmt
         "File %S, line 1\n@{<error>Error: Invalid json format@}" s

jscomp/bsb/bsb_world.ml

@@ -30,7 +30,7 @@ let make_world_deps cwd (config : Bsb_config_types.t option)
   let package_specs, jsx, uncurried, pinned_dependencies =
     match config with
     | None ->
-        (* When this running bsb does not read bsconfig.json,
+        (* When this running bsb does not read rescript.json,
            we will read such json file to know which [package-specs]
            it wants
         *)

jscomp/bsb_exe/rescript_main.ml

@@ -148,7 +148,7 @@ let build_subcommand ~start argv argv_len =
       ( "-regen",
         unit_set_spec force_regenerate,
         "*internal* \n\
-         Always regenerate build.ninja no matter bsconfig.json is changed or \
+         Always regenerate build.ninja no matter rescript.json is changed or \
          not" );
       ("-verbose", call_spec Bsb_log.verbose, "Set the output to be verbose");
     |]

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

@@ -7,7 +7,7 @@
 
   The module or file Foo can't be found.
   - If it's a third-party dependency:
-    - Did you list it in bsconfig.json?
+    - Did you list it in rescript.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?
+  - Did you include the file's directory in rescript.json?

jscomp/ml/typetexp.ml

@@ -993,10 +993,10 @@ let report_error env ppf = function
           Format.fprintf ppf "@[<v>\
                               @{<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 list it in rescript.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?@]\
+                              - Did you include the file's directory in rescript.json?@]\
                               @]"
             Printtyp.longident lid
         end

packages/std/README.md

@@ -4,7 +4,7 @@ The motiviation of this repo is that when ReScript users want to share their lib
 
 It shares the same version schema with ReScript compiler.
 
-When you use this library, the config would be adding such things in bsconfig.json
+When you use this library, the config would be adding such things in rescript.json
 
 ```json
 "external-stdlib" : "@rescript/std"