Add extra variants for suffixes in bsconfig.json

CHANGELOG.md

@@ -19,6 +19,10 @@
   - `rescript convert <reason files>`
 - 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

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": {

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, .mjs, .cjs or .bs.js, .bs.mjs, .bs.cjs here"
       else s
   | Some config ->
       Bsb_exception.config_error config

jscomp/ext/ext_js_suffix.ml

@@ -1,17 +1,28 @@
-type t = Js | Bs_js | Mjs | Cjs | Unknown_extension
+type t =
+  | Js
+  | 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
   | 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_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

jscomp/ext/literals.ml

@@ -123,8 +123,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"

lib/4.06.1/bsb_helper.ml

@@ -1311,8 +1311,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"

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"
@@ -7094,22 +7098,33 @@ end
 module Ext_js_suffix
 = struct
 #1 "ext_js_suffix.ml"
-type t = Js | Bs_js | Mjs | Cjs | Unknown_extension
+type t =
+  | Js
+  | 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
   | 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_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
 
 end
@@ -7849,7 +7864,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, .mjs, .cjs or .bs.js, .bs.mjs, .bs.cjs here"
       else s
   | Some config ->
       Bsb_exception.config_error config

lib/4.06.1/unstable/all_ounit_tests.ml

@@ -5804,8 +5804,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"
@@ -38344,22 +38348,33 @@ end
 module Ext_js_suffix
 = struct
 #1 "ext_js_suffix.ml"
-type t = Js | Bs_js | Mjs | Cjs | Unknown_extension
+type t =
+  | Js
+  | 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
   | 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_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
 
 end

lib/4.06.1/unstable/js_compiler.ml

@@ -6500,8 +6500,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"
@@ -46750,22 +46754,33 @@ end
 module Ext_js_suffix
 = struct
 #1 "ext_js_suffix.ml"
-type t = Js | Bs_js | Mjs | Cjs | Unknown_extension
+type t =
+  | Js
+  | 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
   | 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_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
 
 end

lib/4.06.1/unstable/js_playground_compiler.ml

@@ -6500,8 +6500,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"
@@ -46750,22 +46754,33 @@ end
 module Ext_js_suffix
 = struct
 #1 "ext_js_suffix.ml"
-type t = Js | Bs_js | Mjs | Cjs | Unknown_extension
+type t =
+  | Js
+  | 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
   | 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_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
 
 end

lib/4.06.1/whole_compiler.ml

@@ -180965,8 +180965,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"
@@ -222827,22 +222831,33 @@ end
 module Ext_js_suffix
 = struct
 #1 "ext_js_suffix.ml"
-type t = Js | Bs_js | Mjs | Cjs | Unknown_extension
+type t =
+  | Js
+  | 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
   | 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_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
 
 end