Skip to content

Commit 366f1b1

Browse files
zthzth
committed
rename, config, etc
1 parent 0bd7367 commit 366f1b1

File tree

11 files changed

+83
-87
lines changed

11 files changed

+83
-87
lines changed

Diff for: ‎jscomp/bsb/bsb_jsx.ml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
type version = Jsx_v3 | Jsx_v4
2-
type module_ = React
2+
type module_ = React | Generic of {moduleName: string}
33
type mode = Classic | Automatic
44
type dependencies = string list
55

@@ -15,7 +15,7 @@ let encode_no_nl jsx =
1515
| None -> ""
1616
| Some Jsx_v3 -> "3"
1717
| Some Jsx_v4 -> "4")
18-
^ (match jsx.module_ with None -> "" | Some React -> "React")
18+
^ (match jsx.module_ with None -> "" | Some React -> "React" | Some Generic {moduleName} -> moduleName)
1919
^
2020
match jsx.mode with
2121
| None -> ""
@@ -55,10 +55,10 @@ let from_map map =
5555
`Obj
5656
(fun m ->
5757
match m.?(Bsb_build_schemas.jsx_module) with
58-
| Some (Str { loc; str }) -> (
58+
| Some (Str { str }) -> (
5959
match str with
6060
| "react" -> module_ := Some React
61-
| _ -> Bsb_exception.errorf ~loc "Unsupported jsx module %s" str)
61+
| moduleName -> module_ := Some (Generic {moduleName}))
6262
| Some x ->
6363
Bsb_exception.config_error x
6464
"Unexpected input (jsx module name) for jsx module"

Diff for: ‎jscomp/bsb/bsb_ninja_rule.ml

+2-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,8 @@ let make_custom_rules ~(gentype_config : Bsb_config_types.gentype_config)
169169
| None, None -> ());
170170
(match jsx.module_ with
171171
| None -> ()
172-
| Some React -> Ext_buffer.add_string buf " -bs-jsx-module react");
172+
| Some React -> Ext_buffer.add_string buf " -bs-jsx-module react"
173+
| Some Generic {moduleName} -> Ext_buffer.add_string buf (" -bs-jsx-module " ^ moduleName));
173174
(match jsx.mode with
174175
| None -> ()
175176
| Some Classic -> Ext_buffer.add_string buf " -bs-jsx-mode classic"

Diff for: ‎jscomp/common/js_config.ml

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
(** Browser is not set via command line only for internal use *)
2626

2727
type jsx_version = Jsx_v3 | Jsx_v4
28-
type jsx_module = React
28+
type jsx_module = React | Generic of {moduleName: string}
2929
type jsx_mode = Classic | Automatic
3030

3131
let no_version_header = ref false
@@ -64,6 +64,7 @@ let int_of_jsx_version = function
6464

6565
let string_of_jsx_module = function
6666
| React -> "react"
67+
| Generic {moduleName} -> moduleName
6768

6869
let string_of_jsx_mode = function
6970
| Classic -> "classic"
@@ -76,7 +77,7 @@ let jsx_version_of_int = function
7677

7778
let jsx_module_of_string = function
7879
| "react" -> React
79-
| _ -> React
80+
| moduleName -> Generic {moduleName}
8081

8182
let jsx_mode_of_string = function
8283
| "classic" -> Classic

Diff for: ‎jscomp/common/js_config.mli

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
2424

2525
type jsx_version = Jsx_v3 | Jsx_v4
26-
type jsx_module = React
26+
type jsx_module = React | Generic of {moduleName: string}
2727
type jsx_mode = Classic | Automatic
2828

2929
(* val get_packages_info :

Diff for: ‎jscomp/frontend/ppx_entry.ml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ let rewrite_signature (ast : Parsetree.signature) : Parsetree.signature =
3535
let jsxVersion = int_of_jsx_version jsxVersion in
3636
let jsxModule = string_of_jsx_module !jsx_module in
3737
let jsxMode = string_of_jsx_mode !jsx_mode in
38-
Reactjs_jsx_ppx.rewrite_signature ~jsxVersion ~jsxModule ~jsxMode ast
38+
Jsx_ppx.rewrite_signature ~jsxVersion ~jsxModule ~jsxMode ast
3939
in
4040
if !Js_config.no_builtin_ppx then ast
4141
else
@@ -55,7 +55,7 @@ let rewrite_implementation (ast : Parsetree.structure) : Parsetree.structure =
5555
let jsxVersion = int_of_jsx_version jsxVersion in
5656
let jsxModule = string_of_jsx_module !jsx_module in
5757
let jsxMode = string_of_jsx_mode !jsx_mode in
58-
Reactjs_jsx_ppx.rewrite_implementation ~jsxVersion ~jsxModule ~jsxMode ast
58+
Jsx_ppx.rewrite_implementation ~jsxVersion ~jsxModule ~jsxMode ast
5959
in
6060
if !Js_config.no_builtin_ppx then ast
6161
else

Diff for: ‎jscomp/syntax/cli/res_cli.ml

+2-2
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ module CliArgProcessor = struct
284284
else exit 1)
285285
else
286286
let parsetree =
287-
Reactjs_jsx_ppx.rewrite_signature ~jsxVersion ~jsxModule ~jsxMode
287+
Jsx_ppx.rewrite_signature ~jsxVersion ~jsxModule ~jsxMode
288288
parseResult.parsetree
289289
in
290290
printEngine.printInterface ~width ~filename
@@ -300,7 +300,7 @@ module CliArgProcessor = struct
300300
else exit 1)
301301
else
302302
let parsetree =
303-
Reactjs_jsx_ppx.rewrite_implementation ~jsxVersion ~jsxModule ~jsxMode
303+
Jsx_ppx.rewrite_implementation ~jsxVersion ~jsxModule ~jsxMode
304304
parseResult.parsetree
305305
in
306306
printEngine.printImplementation ~width ~filename

Diff for: ‎jscomp/syntax/src/react_jsx_common.ml renamed to ‎jscomp/syntax/src/jsx_common.ml

File renamed without changes.

Diff for: ‎jscomp/syntax/src/reactjs_jsx_ppx.ml renamed to ‎jscomp/syntax/src/jsx_ppx.ml

+5-5
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ let updateConfig config payload =
5050
let fields = getPayloadFields payload in
5151
(match getInt ~key:"version" fields with
5252
| None -> ()
53-
| Some i -> config.React_jsx_common.version <- i);
53+
| Some i -> config.Jsx_common.version <- i);
5454
(match getString ~key:"module" fields with
5555
| None -> ()
5656
| Some s -> config.module_ <- s);
@@ -68,7 +68,7 @@ let getMapper ~config =
6868
Reactjs_jsx_v3.jsxMapper ~config
6969
in
7070
let expr4, module_binding4, transformSignatureItem4, transformStructureItem4 =
71-
Reactjs_jsx_v4.jsxMapper ~config
71+
Jsx_v4.jsxMapper ~config
7272
in
7373

7474
let expr mapper e =
@@ -93,7 +93,7 @@ let getMapper ~config =
9393
}
9494
in
9595
let restoreConfig oldConfig =
96-
config.version <- oldConfig.React_jsx_common.version;
96+
config.version <- oldConfig.Jsx_common.version;
9797
config.module_ <- oldConfig.module_;
9898
config.mode <- oldConfig.mode;
9999
config.hasReactComponent <- oldConfig.hasReactComponent
@@ -143,7 +143,7 @@ let rewrite_implementation ~jsxVersion ~jsxModule ~jsxMode
143143
(code : Parsetree.structure) : Parsetree.structure =
144144
let config =
145145
{
146-
React_jsx_common.version = jsxVersion;
146+
Jsx_common.version = jsxVersion;
147147
module_ = jsxModule;
148148
mode = jsxMode;
149149
nestedModules = [];
@@ -157,7 +157,7 @@ let rewrite_signature ~jsxVersion ~jsxModule ~jsxMode
157157
(code : Parsetree.signature) : Parsetree.signature =
158158
let config =
159159
{
160-
React_jsx_common.version = jsxVersion;
160+
Jsx_common.version = jsxVersion;
161161
module_ = jsxModule;
162162
mode = jsxMode;
163163
nestedModules = [];

Diff for: ‎jscomp/syntax/src/reactjs_jsx_ppx.mli renamed to ‎jscomp/syntax/src/jsx_ppx.mli

File renamed without changes.

0 commit comments

Comments
 (0)