Skip to content

Commit 0a99ed4

Browse files
committed
fix package.json error
1 parent 0c5927f commit 0a99ed4

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

jscomp/bsb/bsb_build_schemas.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,4 +127,4 @@ let ignored_dirs = "ignored-dirs"
127127
module PackageJson = struct
128128
let dependencies = "dependencies"
129129
let devDependencies = "devDependencies"
130-
end
130+
end

jscomp/bsb/bsb_build_util.ml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ let rec walk_all_deps_aux (visited : string Hash_string.t) (paths : string list)
182182
in
183183
let bsconfig = dep_dir // Literals.bsconfig_json in
184184
(* NOTE: "rescript" package should be ignore *)
185-
dep <> "rescript" && Sys.file_exists bsconfig)
185+
dep <> Literals.rescript && Sys.file_exists bsconfig)
186186
in
187187
List.iter
188188
(fun dep ->
@@ -194,8 +194,7 @@ let rec walk_all_deps_aux (visited : string Hash_string.t) (paths : string list)
194194
~top:(Expect_name dep) package_dir queue
195195
~pinned_dependencies)
196196
bsb_deps
197-
| Some _ | None ->
198-
Bsb_exception.invalid_package_json_spec "expect a json object {}"
197+
| _ -> ()
199198
in
200199
explore_deps_in_package_json Bsb_build_schemas.PackageJson.dependencies;
201200
(match top with

jscomp/bsb/bsb_config_parse.ml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,7 @@ let extract_dependencies_from_package_json (map : json_map) cwd (field : string)
203203
Ext_list.map bsb_deps (fun dep ->
204204
resolve_package cwd (Bsb_pkg_types.string_as_package dep))
205205
| Some config ->
206-
Bsb_exception.package_json_config_error config
207-
(field ^ " expect a object")
206+
Bsb_exception.package_json_config_error config (field ^ " expect a object")
208207

209208
(* return an empty array if not found *)
210209
let extract_string_list (map : json_map) (field : string) : string list =

jscomp/ext/literals.ml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,3 +178,5 @@ let lazy_done = "LAZY_DONE"
178178
let lazy_val = "VAL"
179179

180180
let pure = "@__PURE__"
181+
182+
let rescript = "rescript"

0 commit comments

Comments
 (0)