Fix jsx mode being ignored when set via @@jsxConfig (#5928)

cknitt · web-flow · commit 5be29e775b5b · 2023-01-05T22:03:33.000+01:00
diff --git a/lib/4.06.1/unstable/js_compiler.ml b/lib/4.06.1/unstable/js_compiler.ml
@@ -276194,7 +276194,8 @@ let getJsxConfigByKey ~key ~type_ recordFields =
           Some value
         | ( String,
             {txt = Lident k},
-            {pexp_desc = Pexp_constant (Pconst_string (value, None))} )
+            (* accept both normal strings and "js" strings *)
+            {pexp_desc = Pexp_constant (Pconst_string (value, _))} )
           when k = key ->
           Some value
         | _ -> None)
diff --git a/lib/4.06.1/unstable/js_playground_compiler.ml b/lib/4.06.1/unstable/js_playground_compiler.ml
@@ -276194,7 +276194,8 @@ let getJsxConfigByKey ~key ~type_ recordFields =
           Some value
         | ( String,
             {txt = Lident k},
-            {pexp_desc = Pexp_constant (Pconst_string (value, None))} )
+            (* accept both normal strings and "js" strings *)
+            {pexp_desc = Pexp_constant (Pconst_string (value, _))} )
           when k = key ->
           Some value
         | _ -> None)
diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml
@@ -286578,7 +286578,8 @@ let getJsxConfigByKey ~key ~type_ recordFields =
           Some value
         | ( String,
             {txt = Lident k},
-            {pexp_desc = Pexp_constant (Pconst_string (value, None))} )
+            (* accept both normal strings and "js" strings *)
+            {pexp_desc = Pexp_constant (Pconst_string (value, _))} )
           when k = key ->
           Some value
         | _ -> None)
diff --git a/syntax b/syntax
@@ -1 +1 @@
-Subproject commit 383504253c5c288902d41dd6cb90e0eabf73cd3e
+Subproject commit fff41d19bc58e9a5c79c8443763544a28998a007
