Revert "allow simplified @@jsxConfig"

zth · zth · commit 8deb5ec4944d · 2024-01-22T20:48:19.000+01:00
This reverts commit 7dcd211.
diff --git a/jscomp/syntax/src/jsx_ppx.ml b/jscomp/syntax/src/jsx_ppx.ml
@@ -3,29 +3,16 @@ open Asttypes
 open Parsetree
 open Longident
 
-type configPayload =
-  | ModuleName of string
-  | Fields of (t loc * expression) list
-  | Invalid
-
-let getConfigPayload payload =
+let getPayloadFields payload =
   match payload with
   | PStr
       ({
          pstr_desc =
            Pstr_eval ({pexp_desc = Pexp_record (recordFields, None)}, _);
        }
       :: _rest) ->
-    Fields recordFields
-  | PStr
-      ({
-         pstr_desc =
-           Pstr_eval
-             ({pexp_desc = Pexp_constant (Pconst_string (moduleName, _))}, _);
-       }
-      :: _rest) ->
-    ModuleName moduleName
-  | _ -> Invalid
+    recordFields
+  | _ -> []
 
 type configKey = Int | String
 
@@ -60,24 +47,16 @@ let getInt ~key fields =
 let getString ~key fields = fields |> getJsxConfigByKey ~key ~type_:String
 
 let updateConfig config payload =
-  match getConfigPayload payload with
-  | Invalid -> () (* TODO(generic-jsx): Report error? *)
-  | ModuleName moduleName ->
-    config.Jsx_common.module_ <- moduleName;
-    if String.lowercase_ascii moduleName <> "react" then (
-      (* Force set automatic/version for anything but React *)
-      config.version <- 4;
-      config.mode <- "automatic")
-  | Fields fields -> (
-    (match getInt ~key:"version" fields with
-    | None -> ()
-    | Some i -> config.Jsx_common.version <- i);
-    (match getString ~key:"module_" fields with
-    | None -> ()
-    | Some s -> config.module_ <- s);
-    match getString ~key:"mode" fields with
-    | None -> ()
-    | Some s -> config.mode <- s)
+  let fields = getPayloadFields payload in
+  (match getInt ~key:"version" fields with
+  | None -> ()
+  | Some i -> config.Jsx_common.version <- i);
+  (match getString ~key:"module_" fields with
+  | None -> ()
+  | Some s -> config.module_ <- s);
+  match getString ~key:"mode" fields with
+  | None -> ()
+  | Some s -> config.mode <- s
 
 let isJsxConfigAttr ((loc, _) : attribute) = loc.txt = "jsxConfig"
 
diff --git a/jscomp/syntax/src/jsx_v4.ml b/jscomp/syntax/src/jsx_v4.ml
@@ -502,7 +502,7 @@ let transformLowercaseCall3 ~config mapper jsxExprLoc callExprLoc attrs
     let domBinding =
       match moduleAccessName config with
       | "React" -> Lident "ReactDOM"
-      | generic -> Ldot (Lident generic, "Elements")
+      | generic -> Ldot (Lident generic, "DOM")
     in
 
     let children, nonChildrenProps =
