From a64c2b95a67c621331963c850a49f34862bd4b63 Mon Sep 17 00:00:00 2001 From: Victor Nakoryakov Date: Thu, 1 Sep 2022 12:45:45 +0300 Subject: [PATCH 1/4] Add extra variants for suffixes in bsconfig.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - `.bs.mjs`, `.bs.cjs` to fill the gap between `.bs.js` and `.mjs` - `.res.js`, `.res.mjs`, `.res.cjs` to assist BS → ReScript rebranding --- jscomp/bsb/bsb_package_specs.ml | 3 +- jscomp/ext/ext_js_suffix.ml | 22 ++++++++++++- jscomp/ext/literals.ml | 10 ++++++ lib/4.06.1/bsb_helper.ml | 10 ++++++ lib/4.06.1/rescript.ml | 25 +++++++++++++-- lib/4.06.1/unstable/all_ounit_tests.ml | 32 ++++++++++++++++++- lib/4.06.1/unstable/js_compiler.ml | 32 ++++++++++++++++++- lib/4.06.1/unstable/js_playground_compiler.ml | 32 ++++++++++++++++++- lib/4.06.1/whole_compiler.ml | 32 ++++++++++++++++++- 9 files changed, 190 insertions(+), 8 deletions(-) diff --git a/jscomp/bsb/bsb_package_specs.ml b/jscomp/bsb/bsb_package_specs.ml index e9a180c6d9..d8209cd86d 100644 --- a/jscomp/bsb/bsb_package_specs.ml +++ b/jscomp/bsb/bsb_package_specs.ml @@ -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 diff --git a/jscomp/ext/ext_js_suffix.ml b/jscomp/ext/ext_js_suffix.ml index d11e2a9365..4b679e4a2f 100644 --- a/jscomp/ext/ext_js_suffix.ml +++ b/jscomp/ext/ext_js_suffix.ml @@ -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 diff --git a/jscomp/ext/literals.ml b/jscomp/ext/literals.ml index 576016e450..8cf2aa4ea0 100644 --- a/jscomp/ext/literals.ml +++ b/jscomp/ext/literals.ml @@ -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" diff --git a/lib/4.06.1/bsb_helper.ml b/lib/4.06.1/bsb_helper.ml index bb10c421db..7857ba3033 100644 --- a/lib/4.06.1/bsb_helper.ml +++ b/lib/4.06.1/bsb_helper.ml @@ -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" diff --git a/lib/4.06.1/rescript.ml b/lib/4.06.1/rescript.ml index c6973136e5..8c0e7878ba 100644 --- a/lib/4.06.1/rescript.ml +++ b/lib/4.06.1/rescript.ml @@ -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 @@ -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 diff --git a/lib/4.06.1/unstable/all_ounit_tests.ml b/lib/4.06.1/unstable/all_ounit_tests.ml index 4b06aa4891..dfc70cd407 100644 --- a/lib/4.06.1/unstable/all_ounit_tests.ml +++ b/lib/4.06.1/unstable/all_ounit_tests.ml @@ -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" @@ -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 diff --git a/lib/4.06.1/unstable/js_compiler.ml b/lib/4.06.1/unstable/js_compiler.ml index bc691bc4ba..438a55e736 100644 --- a/lib/4.06.1/unstable/js_compiler.ml +++ b/lib/4.06.1/unstable/js_compiler.ml @@ -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" @@ -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 diff --git a/lib/4.06.1/unstable/js_playground_compiler.ml b/lib/4.06.1/unstable/js_playground_compiler.ml index 1126b5794f..79da573d49 100644 --- a/lib/4.06.1/unstable/js_playground_compiler.ml +++ b/lib/4.06.1/unstable/js_playground_compiler.ml @@ -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" @@ -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 diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml index efaaff440e..30ae269449 100644 --- a/lib/4.06.1/whole_compiler.ml +++ b/lib/4.06.1/whole_compiler.ml @@ -180963,10 +180963,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" @@ -222827,22 +222837,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 From 0f3890d7ec2b19efdadcc54e02864582a771ad7a Mon Sep 17 00:00:00 2001 From: Victor Nakoryakov Date: Wed, 28 Sep 2022 20:06:03 +0300 Subject: [PATCH 2/4] Step back and revoke `.res.*` suffix options --- docs/docson/build-schema.json | 2 +- jscomp/bsb/bsb_package_specs.ml | 2 +- jscomp/ext/ext_js_suffix.ml | 9 --------- jscomp/ext/literals.ml | 6 ------ lib/4.06.1/bsb_helper.ml | 6 ------ lib/4.06.1/rescript.ml | 15 +++++---------- lib/4.06.1/unstable/all_ounit_tests.ml | 15 --------------- lib/4.06.1/unstable/js_compiler.ml | 15 --------------- lib/4.06.1/unstable/js_playground_compiler.ml | 15 --------------- lib/4.06.1/whole_compiler.ml | 15 --------------- 10 files changed, 7 insertions(+), 93 deletions(-) diff --git a/docs/docson/build-schema.json b/docs/docson/build-schema.json index eaca76b28f..dc163209f5 100644 --- a/docs/docson/build-schema.json +++ b/docs/docson/build-schema.json @@ -6,7 +6,7 @@ "description": "es6-global generate relative `require` paths instead of relying on NodeJS' module resolution. Default: commonjs." }, "suffix-spec": { - "enum": [".js", ".bs.js", ".mjs", ".cjs"], + "enum": [".js", ".mjs", ".cjs", ".bs.js", ".bs.mjs", ".bs.cjs"], "description": "suffix of generated js files, default to [.js] " }, "module-format-object": { diff --git a/jscomp/bsb/bsb_package_specs.ml b/jscomp/bsb/bsb_package_specs.ml index d8209cd86d..eed738e2cc 100644 --- a/jscomp/bsb/bsb_package_specs.ml +++ b/jscomp/bsb/bsb_package_specs.ml @@ -189,7 +189,7 @@ let extract_bs_suffix_exn (map : json_map) : Ext_js_suffix.t = let s = Ext_js_suffix.of_string str in if s = Unknown_extension then Bsb_exception.errorf ~loc - "expect .js, .bs.js, .res.js, .mjs, .bs.mjs, .res.mjs, .cjs, .bs.cjs, .res.cjs here" + "expect .js, .mjs, .cjs or .bs.js, .bs.mjs, .bs.cjs here" else s | Some config -> Bsb_exception.config_error config diff --git a/jscomp/ext/ext_js_suffix.ml b/jscomp/ext/ext_js_suffix.ml index 4b679e4a2f..c2d7429c11 100644 --- a/jscomp/ext/ext_js_suffix.ml +++ b/jscomp/ext/ext_js_suffix.ml @@ -1,37 +1,28 @@ 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 diff --git a/jscomp/ext/literals.ml b/jscomp/ext/literals.ml index 8cf2aa4ea0..85f85e0cde 100644 --- a/jscomp/ext/literals.ml +++ b/jscomp/ext/literals.ml @@ -121,20 +121,14 @@ 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" diff --git a/lib/4.06.1/bsb_helper.ml b/lib/4.06.1/bsb_helper.ml index 7857ba3033..ed6e801359 100644 --- a/lib/4.06.1/bsb_helper.ml +++ b/lib/4.06.1/bsb_helper.ml @@ -1309,20 +1309,14 @@ 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" diff --git a/lib/4.06.1/rescript.ml b/lib/4.06.1/rescript.ml index 8c0e7878ba..157a9d3e6c 100644 --- a/lib/4.06.1/rescript.ml +++ b/lib/4.06.1/rescript.ml @@ -5589,8 +5589,12 @@ let suffix_bs_js = ".bs.js" let suffix_mjs = ".mjs" +let suffix_bs_mjs = ".bs.mjs" + let suffix_cjs = ".cjs" +let suffix_bs_cjs = ".bs.cjs" + let suffix_gen_js = ".gen.js" let suffix_gen_tsx = ".gen.tsx" @@ -7097,39 +7101,30 @@ module Ext_js_suffix 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 @@ -7870,7 +7865,7 @@ let extract_bs_suffix_exn (map : json_map) : Ext_js_suffix.t = let s = Ext_js_suffix.of_string str in if s = Unknown_extension then Bsb_exception.errorf ~loc - "expect .js, .bs.js, .res.js, .mjs, .bs.mjs, .res.mjs, .cjs, .bs.cjs, .res.cjs here" + "expect .js, .mjs, .cjs or .bs.js, .bs.mjs, .bs.cjs here" else s | Some config -> Bsb_exception.config_error config diff --git a/lib/4.06.1/unstable/all_ounit_tests.ml b/lib/4.06.1/unstable/all_ounit_tests.ml index dfc70cd407..0fa071c636 100644 --- a/lib/4.06.1/unstable/all_ounit_tests.ml +++ b/lib/4.06.1/unstable/all_ounit_tests.ml @@ -5802,20 +5802,14 @@ 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" @@ -38357,39 +38351,30 @@ module Ext_js_suffix 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 diff --git a/lib/4.06.1/unstable/js_compiler.ml b/lib/4.06.1/unstable/js_compiler.ml index 438a55e736..e240d87287 100644 --- a/lib/4.06.1/unstable/js_compiler.ml +++ b/lib/4.06.1/unstable/js_compiler.ml @@ -6498,20 +6498,14 @@ 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" @@ -46763,39 +46757,30 @@ module Ext_js_suffix 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 diff --git a/lib/4.06.1/unstable/js_playground_compiler.ml b/lib/4.06.1/unstable/js_playground_compiler.ml index 79da573d49..a389a0abce 100644 --- a/lib/4.06.1/unstable/js_playground_compiler.ml +++ b/lib/4.06.1/unstable/js_playground_compiler.ml @@ -6498,20 +6498,14 @@ 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" @@ -46763,39 +46757,30 @@ module Ext_js_suffix 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 diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml index 30ae269449..b38d15e745 100644 --- a/lib/4.06.1/whole_compiler.ml +++ b/lib/4.06.1/whole_compiler.ml @@ -180963,20 +180963,14 @@ 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" @@ -222840,39 +222834,30 @@ module Ext_js_suffix 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 From 3f4613f8cdb95e59d11ce425aa77b78710cd4166 Mon Sep 17 00:00:00 2001 From: Victor Nakoryakov Date: Thu, 29 Sep 2022 14:26:41 +0300 Subject: [PATCH 3/4] Refactor: sort filename suffixes for better readability --- jscomp/ext/ext_js_suffix.ml | 12 ++++++------ lib/4.06.1/rescript.ml | 12 ++++++------ lib/4.06.1/unstable/all_ounit_tests.ml | 12 ++++++------ lib/4.06.1/unstable/js_compiler.ml | 12 ++++++------ lib/4.06.1/unstable/js_playground_compiler.ml | 12 ++++++------ lib/4.06.1/whole_compiler.ml | 12 ++++++------ 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/jscomp/ext/ext_js_suffix.ml b/jscomp/ext/ext_js_suffix.ml index c2d7429c11..ab09d7ec79 100644 --- a/jscomp/ext/ext_js_suffix.ml +++ b/jscomp/ext/ext_js_suffix.ml @@ -1,28 +1,28 @@ type t = | Js - | Bs_js | Mjs - | Bs_mjs | Cjs + | Bs_js + | Bs_mjs | Bs_cjs | Unknown_extension let to_string (x : t) = match x with | Js -> Literals.suffix_js - | Bs_js -> Literals.suffix_bs_js | Mjs -> Literals.suffix_mjs - | Bs_mjs -> Literals.suffix_bs_mjs | Cjs -> Literals.suffix_cjs + | Bs_js -> Literals.suffix_bs_js + | Bs_mjs -> Literals.suffix_bs_mjs | Bs_cjs -> Literals.suffix_bs_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_mjs -> Mjs - | () when x = Literals.suffix_bs_mjs -> Bs_mjs | () when x = Literals.suffix_cjs -> Cjs + | () when x = Literals.suffix_bs_js -> Bs_js + | () when x = Literals.suffix_bs_mjs -> Bs_mjs | () when x = Literals.suffix_bs_cjs -> Bs_cjs | _ -> Unknown_extension diff --git a/lib/4.06.1/rescript.ml b/lib/4.06.1/rescript.ml index 157a9d3e6c..df3a112b63 100644 --- a/lib/4.06.1/rescript.ml +++ b/lib/4.06.1/rescript.ml @@ -7100,30 +7100,30 @@ module Ext_js_suffix #1 "ext_js_suffix.ml" type t = | Js - | Bs_js | Mjs - | Bs_mjs | Cjs + | Bs_js + | Bs_mjs | Bs_cjs | Unknown_extension let to_string (x : t) = match x with | Js -> Literals.suffix_js - | Bs_js -> Literals.suffix_bs_js | Mjs -> Literals.suffix_mjs - | Bs_mjs -> Literals.suffix_bs_mjs | Cjs -> Literals.suffix_cjs + | Bs_js -> Literals.suffix_bs_js + | Bs_mjs -> Literals.suffix_bs_mjs | Bs_cjs -> Literals.suffix_bs_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_mjs -> Mjs - | () when x = Literals.suffix_bs_mjs -> Bs_mjs | () when x = Literals.suffix_cjs -> Cjs + | () when x = Literals.suffix_bs_js -> Bs_js + | () when x = Literals.suffix_bs_mjs -> Bs_mjs | () when x = Literals.suffix_bs_cjs -> Bs_cjs | _ -> Unknown_extension diff --git a/lib/4.06.1/unstable/all_ounit_tests.ml b/lib/4.06.1/unstable/all_ounit_tests.ml index 0fa071c636..2524808d9f 100644 --- a/lib/4.06.1/unstable/all_ounit_tests.ml +++ b/lib/4.06.1/unstable/all_ounit_tests.ml @@ -38350,30 +38350,30 @@ module Ext_js_suffix #1 "ext_js_suffix.ml" type t = | Js - | Bs_js | Mjs - | Bs_mjs | Cjs + | Bs_js + | Bs_mjs | Bs_cjs | Unknown_extension let to_string (x : t) = match x with | Js -> Literals.suffix_js - | Bs_js -> Literals.suffix_bs_js | Mjs -> Literals.suffix_mjs - | Bs_mjs -> Literals.suffix_bs_mjs | Cjs -> Literals.suffix_cjs + | Bs_js -> Literals.suffix_bs_js + | Bs_mjs -> Literals.suffix_bs_mjs | Bs_cjs -> Literals.suffix_bs_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_mjs -> Mjs - | () when x = Literals.suffix_bs_mjs -> Bs_mjs | () when x = Literals.suffix_cjs -> Cjs + | () when x = Literals.suffix_bs_js -> Bs_js + | () when x = Literals.suffix_bs_mjs -> Bs_mjs | () when x = Literals.suffix_bs_cjs -> Bs_cjs | _ -> Unknown_extension diff --git a/lib/4.06.1/unstable/js_compiler.ml b/lib/4.06.1/unstable/js_compiler.ml index e240d87287..eccc9aa6ff 100644 --- a/lib/4.06.1/unstable/js_compiler.ml +++ b/lib/4.06.1/unstable/js_compiler.ml @@ -46756,30 +46756,30 @@ module Ext_js_suffix #1 "ext_js_suffix.ml" type t = | Js - | Bs_js | Mjs - | Bs_mjs | Cjs + | Bs_js + | Bs_mjs | Bs_cjs | Unknown_extension let to_string (x : t) = match x with | Js -> Literals.suffix_js - | Bs_js -> Literals.suffix_bs_js | Mjs -> Literals.suffix_mjs - | Bs_mjs -> Literals.suffix_bs_mjs | Cjs -> Literals.suffix_cjs + | Bs_js -> Literals.suffix_bs_js + | Bs_mjs -> Literals.suffix_bs_mjs | Bs_cjs -> Literals.suffix_bs_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_mjs -> Mjs - | () when x = Literals.suffix_bs_mjs -> Bs_mjs | () when x = Literals.suffix_cjs -> Cjs + | () when x = Literals.suffix_bs_js -> Bs_js + | () when x = Literals.suffix_bs_mjs -> Bs_mjs | () when x = Literals.suffix_bs_cjs -> Bs_cjs | _ -> Unknown_extension diff --git a/lib/4.06.1/unstable/js_playground_compiler.ml b/lib/4.06.1/unstable/js_playground_compiler.ml index a389a0abce..7c3b9bdcdb 100644 --- a/lib/4.06.1/unstable/js_playground_compiler.ml +++ b/lib/4.06.1/unstable/js_playground_compiler.ml @@ -46756,30 +46756,30 @@ module Ext_js_suffix #1 "ext_js_suffix.ml" type t = | Js - | Bs_js | Mjs - | Bs_mjs | Cjs + | Bs_js + | Bs_mjs | Bs_cjs | Unknown_extension let to_string (x : t) = match x with | Js -> Literals.suffix_js - | Bs_js -> Literals.suffix_bs_js | Mjs -> Literals.suffix_mjs - | Bs_mjs -> Literals.suffix_bs_mjs | Cjs -> Literals.suffix_cjs + | Bs_js -> Literals.suffix_bs_js + | Bs_mjs -> Literals.suffix_bs_mjs | Bs_cjs -> Literals.suffix_bs_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_mjs -> Mjs - | () when x = Literals.suffix_bs_mjs -> Bs_mjs | () when x = Literals.suffix_cjs -> Cjs + | () when x = Literals.suffix_bs_js -> Bs_js + | () when x = Literals.suffix_bs_mjs -> Bs_mjs | () when x = Literals.suffix_bs_cjs -> Bs_cjs | _ -> Unknown_extension diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml index b38d15e745..5ecb520959 100644 --- a/lib/4.06.1/whole_compiler.ml +++ b/lib/4.06.1/whole_compiler.ml @@ -222833,30 +222833,30 @@ module Ext_js_suffix #1 "ext_js_suffix.ml" type t = | Js - | Bs_js | Mjs - | Bs_mjs | Cjs + | Bs_js + | Bs_mjs | Bs_cjs | Unknown_extension let to_string (x : t) = match x with | Js -> Literals.suffix_js - | Bs_js -> Literals.suffix_bs_js | Mjs -> Literals.suffix_mjs - | Bs_mjs -> Literals.suffix_bs_mjs | Cjs -> Literals.suffix_cjs + | Bs_js -> Literals.suffix_bs_js + | Bs_mjs -> Literals.suffix_bs_mjs | Bs_cjs -> Literals.suffix_bs_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_mjs -> Mjs - | () when x = Literals.suffix_bs_mjs -> Bs_mjs | () when x = Literals.suffix_cjs -> Cjs + | () when x = Literals.suffix_bs_js -> Bs_js + | () when x = Literals.suffix_bs_mjs -> Bs_mjs | () when x = Literals.suffix_bs_cjs -> Bs_cjs | _ -> Unknown_extension From 8f7d7e2a63ca8b73067a8ccd07db80f250d1726b Mon Sep 17 00:00:00 2001 From: Victor Nakoryakov Date: Thu, 29 Sep 2022 14:52:26 +0300 Subject: [PATCH 4/4] Update CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8abe41b5f6..ae0c324653 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,10 @@ - `rescript convert ` - Remove obsolete built-in project templates and the "rescript init" functionality. This will be replaced by the create-rescript-app project that is maintained separately. +#### :rocket: New Feature + +- Add extra variants for output filename suffixes in `bsconfig.json`: `.bs.mjs` and `.bs.cjs` are allowed https://github.com/rescript-lang/rescript-compiler/pull/5631 + # 10.1.0-alpha.2 #### :rocket: New Feature