Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add extra variants for suffixes in bsconfig.json #5631

Merged
merged 4 commits into from
Sep 29, 2022
Merged

Add extra variants for suffixes in bsconfig.json #5631

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a64c2b9
Add extra variants for suffixes in bsconfig.json
nkrkv Sep 1, 2022
0f3890d
Step back and revoke `.res.*` suffix options
nkrkv Sep 28, 2022
3f4613f
Refactor: sort filename suffixes for better readability
nkrkv Sep 29, 2022
8f7d7e2
Update CHANGELOG
nkrkv Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add extra variants for suffixes in bsconfig.json 
- `.bs.mjs`, `.bs.cjs` to fill the gap between `.bs.js` and `.mjs`
- `.res.js`, `.res.mjs`, `.res.cjs` to assist BS → ReScript rebranding
  • Loading branch information
@nkrkv
nkrkv committed Sep 28, 2022
commit a64c2b95a67c621331963c850a49f34862bd4b63
3 changes: 2 additions & 1 deletion jscomp/bsb/bsb_package_specs.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ let extract_bs_suffix_exn (map : json_map) : Ext_js_suffix.t =
| Some (Str { str; loc }) ->
let s = Ext_js_suffix.of_string str in
if s = Unknown_extension then
Bsb_exception.errorf ~loc "expect .bs.js, .js, .cjs, .mjs here"
Bsb_exception.errorf ~loc
"expect .js, .bs.js, .res.js, .mjs, .bs.mjs, .res.mjs, .cjs, .bs.cjs, .res.cjs here"
else s
| Some config ->
Bsb_exception.config_error config
Expand Down
22 changes: 21 additions & 1 deletion jscomp/ext/ext_js_suffix.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,37 @@
type t = Js | Bs_js | Mjs | Cjs | Unknown_extension
type t =
| Js
| Bs_js
| Res_js
| Mjs
| Bs_mjs
| Res_mjs
| Cjs
| Bs_cjs
| Res_cjs
| Unknown_extension

let to_string (x : t) =
match x with
| Js -> Literals.suffix_js
| Bs_js -> Literals.suffix_bs_js
| Res_js -> Literals.suffix_res_js
| Mjs -> Literals.suffix_mjs
| Bs_mjs -> Literals.suffix_bs_mjs
| Res_mjs -> Literals.suffix_res_mjs
| Cjs -> Literals.suffix_cjs
| Bs_cjs -> Literals.suffix_bs_cjs
| Res_cjs -> Literals.suffix_res_cjs
| Unknown_extension -> assert false

let of_string (x : string) : t =
match () with
| () when x = Literals.suffix_js -> Js
| () when x = Literals.suffix_bs_js -> Bs_js
| () when x = Literals.suffix_res_js -> Res_js
| () when x = Literals.suffix_mjs -> Mjs
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
| () when x = Literals.suffix_res_mjs -> Res_mjs
| () when x = Literals.suffix_cjs -> Cjs
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
| () when x = Literals.suffix_res_cjs -> Res_cjs
| _ -> Unknown_extension
10 changes: 10 additions & 0 deletions jscomp/ext/literals.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,20 @@ let suffix_js = ".js"

let suffix_bs_js = ".bs.js"

let suffix_res_js = ".res.js"

let suffix_mjs = ".mjs"

let suffix_bs_mjs = ".bs.mjs"

let suffix_res_mjs = ".res.mjs"

let suffix_cjs = ".cjs"

let suffix_bs_cjs = ".bs.cjs"

let suffix_res_cjs = ".res.cjs"

let suffix_gen_js = ".gen.js"

let suffix_gen_tsx = ".gen.tsx"
Expand Down
10 changes: 10 additions & 0 deletions lib/4.06.1/bsb_helper.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1309,10 +1309,20 @@ let suffix_js = ".js"

let suffix_bs_js = ".bs.js"

let suffix_res_js = ".res.js"

let suffix_mjs = ".mjs"

let suffix_bs_mjs = ".bs.mjs"

let suffix_res_mjs = ".res.mjs"

let suffix_cjs = ".cjs"

let suffix_bs_cjs = ".bs.cjs"

let suffix_res_cjs = ".res.cjs"

let suffix_gen_js = ".gen.js"

let suffix_gen_tsx = ".gen.tsx"
Expand Down
25 changes: 23 additions & 2 deletions lib/4.06.1/rescript.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7094,22 +7094,42 @@ end
module Ext_js_suffix
= struct
#1 "ext_js_suffix.ml"
type t = Js | Bs_js | Mjs | Cjs | Unknown_extension
type t =
| Js
| Bs_js
| Res_js
| Mjs
| Bs_mjs
| Res_mjs
| Cjs
| Bs_cjs
| Res_cjs
| Unknown_extension

let to_string (x : t) =
match x with
| Js -> Literals.suffix_js
| Bs_js -> Literals.suffix_bs_js
| Res_js -> Literals.suffix_res_js
| Mjs -> Literals.suffix_mjs
| Bs_mjs -> Literals.suffix_bs_mjs
| Res_mjs -> Literals.suffix_res_mjs
| Cjs -> Literals.suffix_cjs
| Bs_cjs -> Literals.suffix_bs_cjs
| Res_cjs -> Literals.suffix_res_cjs
| Unknown_extension -> assert false

let of_string (x : string) : t =
match () with
| () when x = Literals.suffix_js -> Js
| () when x = Literals.suffix_bs_js -> Bs_js
| () when x = Literals.suffix_res_js -> Res_js
| () when x = Literals.suffix_mjs -> Mjs
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
| () when x = Literals.suffix_res_mjs -> Res_mjs
| () when x = Literals.suffix_cjs -> Cjs
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
| () when x = Literals.suffix_res_cjs -> Res_cjs
| _ -> Unknown_extension

end
Expand Down Expand Up @@ -7849,7 +7869,8 @@ let extract_bs_suffix_exn (map : json_map) : Ext_js_suffix.t =
| Some (Str { str; loc }) ->
let s = Ext_js_suffix.of_string str in
if s = Unknown_extension then
Bsb_exception.errorf ~loc "expect .bs.js, .js, .cjs, .mjs here"
Bsb_exception.errorf ~loc
"expect .js, .bs.js, .res.js, .mjs, .bs.mjs, .res.mjs, .cjs, .bs.cjs, .res.cjs here"
else s
| Some config ->
Bsb_exception.config_error config
Expand Down
32 changes: 31 additions & 1 deletion lib/4.06.1/unstable/all_ounit_tests.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5802,10 +5802,20 @@ let suffix_js = ".js"

let suffix_bs_js = ".bs.js"

let suffix_res_js = ".res.js"

let suffix_mjs = ".mjs"

let suffix_bs_mjs = ".bs.mjs"

let suffix_res_mjs = ".res.mjs"

let suffix_cjs = ".cjs"

let suffix_bs_cjs = ".bs.cjs"

let suffix_res_cjs = ".res.cjs"

let suffix_gen_js = ".gen.js"

let suffix_gen_tsx = ".gen.tsx"
Expand Down Expand Up @@ -38344,22 +38354,42 @@ end
module Ext_js_suffix
= struct
#1 "ext_js_suffix.ml"
type t = Js | Bs_js | Mjs | Cjs | Unknown_extension
type t =
| Js
| Bs_js
| Res_js
| Mjs
| Bs_mjs
| Res_mjs
| Cjs
| Bs_cjs
| Res_cjs
| Unknown_extension

let to_string (x : t) =
match x with
| Js -> Literals.suffix_js
| Bs_js -> Literals.suffix_bs_js
| Res_js -> Literals.suffix_res_js
| Mjs -> Literals.suffix_mjs
| Bs_mjs -> Literals.suffix_bs_mjs
| Res_mjs -> Literals.suffix_res_mjs
| Cjs -> Literals.suffix_cjs
| Bs_cjs -> Literals.suffix_bs_cjs
| Res_cjs -> Literals.suffix_res_cjs
| Unknown_extension -> assert false

let of_string (x : string) : t =
match () with
| () when x = Literals.suffix_js -> Js
| () when x = Literals.suffix_bs_js -> Bs_js
| () when x = Literals.suffix_res_js -> Res_js
| () when x = Literals.suffix_mjs -> Mjs
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
| () when x = Literals.suffix_res_mjs -> Res_mjs
| () when x = Literals.suffix_cjs -> Cjs
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
| () when x = Literals.suffix_res_cjs -> Res_cjs
| _ -> Unknown_extension

end
Expand Down
32 changes: 31 additions & 1 deletion lib/4.06.1/unstable/js_compiler.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6498,10 +6498,20 @@ let suffix_js = ".js"

let suffix_bs_js = ".bs.js"

let suffix_res_js = ".res.js"

let suffix_mjs = ".mjs"

let suffix_bs_mjs = ".bs.mjs"

let suffix_res_mjs = ".res.mjs"

let suffix_cjs = ".cjs"

let suffix_bs_cjs = ".bs.cjs"

let suffix_res_cjs = ".res.cjs"

let suffix_gen_js = ".gen.js"

let suffix_gen_tsx = ".gen.tsx"
Expand Down Expand Up @@ -46750,22 +46760,42 @@ end
module Ext_js_suffix
= struct
#1 "ext_js_suffix.ml"
type t = Js | Bs_js | Mjs | Cjs | Unknown_extension
type t =
| Js
| Bs_js
| Res_js
| Mjs
| Bs_mjs
| Res_mjs
| Cjs
| Bs_cjs
| Res_cjs
| Unknown_extension

let to_string (x : t) =
match x with
| Js -> Literals.suffix_js
| Bs_js -> Literals.suffix_bs_js
| Res_js -> Literals.suffix_res_js
| Mjs -> Literals.suffix_mjs
| Bs_mjs -> Literals.suffix_bs_mjs
| Res_mjs -> Literals.suffix_res_mjs
| Cjs -> Literals.suffix_cjs
| Bs_cjs -> Literals.suffix_bs_cjs
| Res_cjs -> Literals.suffix_res_cjs
| Unknown_extension -> assert false

let of_string (x : string) : t =
match () with
| () when x = Literals.suffix_js -> Js
| () when x = Literals.suffix_bs_js -> Bs_js
| () when x = Literals.suffix_res_js -> Res_js
| () when x = Literals.suffix_mjs -> Mjs
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
| () when x = Literals.suffix_res_mjs -> Res_mjs
| () when x = Literals.suffix_cjs -> Cjs
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
| () when x = Literals.suffix_res_cjs -> Res_cjs
| _ -> Unknown_extension

end
Expand Down
32 changes: 31 additions & 1 deletion lib/4.06.1/unstable/js_playground_compiler.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6498,10 +6498,20 @@ let suffix_js = ".js"

let suffix_bs_js = ".bs.js"

let suffix_res_js = ".res.js"

let suffix_mjs = ".mjs"

let suffix_bs_mjs = ".bs.mjs"

let suffix_res_mjs = ".res.mjs"

let suffix_cjs = ".cjs"

let suffix_bs_cjs = ".bs.cjs"

let suffix_res_cjs = ".res.cjs"

let suffix_gen_js = ".gen.js"

let suffix_gen_tsx = ".gen.tsx"
Expand Down Expand Up @@ -46750,22 +46760,42 @@ end
module Ext_js_suffix
= struct
#1 "ext_js_suffix.ml"
type t = Js | Bs_js | Mjs | Cjs | Unknown_extension
type t =
| Js
| Bs_js
| Res_js
| Mjs
| Bs_mjs
| Res_mjs
| Cjs
| Bs_cjs
| Res_cjs
| Unknown_extension

let to_string (x : t) =
match x with
| Js -> Literals.suffix_js
| Bs_js -> Literals.suffix_bs_js
| Res_js -> Literals.suffix_res_js
| Mjs -> Literals.suffix_mjs
| Bs_mjs -> Literals.suffix_bs_mjs
| Res_mjs -> Literals.suffix_res_mjs
| Cjs -> Literals.suffix_cjs
| Bs_cjs -> Literals.suffix_bs_cjs
| Res_cjs -> Literals.suffix_res_cjs
| Unknown_extension -> assert false

let of_string (x : string) : t =
match () with
| () when x = Literals.suffix_js -> Js
| () when x = Literals.suffix_bs_js -> Bs_js
| () when x = Literals.suffix_res_js -> Res_js
| () when x = Literals.suffix_mjs -> Mjs
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
| () when x = Literals.suffix_res_mjs -> Res_mjs
| () when x = Literals.suffix_cjs -> Cjs
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
| () when x = Literals.suffix_res_cjs -> Res_cjs
| _ -> Unknown_extension

end
Expand Down
Loading