#1075 add support for UseJavaScriptSymbol

dotnet-websharper · Nov 29, 2019 · bd1527d · bd1527d
1 parent 5052671
commit bd1527d
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 2 deletions.
diff --git a/src/compiler/WebSharper.CSharp/Program.fs b/src/compiler/WebSharper.CSharp/Program.fs
@@ -273,6 +273,14 @@ let rec compileMain (argv: string[]) =
 
     wsArgs := SetScriptBaseUrl !wsArgs
 
+    if (!wsArgs).UseJavaScriptSymbol then
+        let cArgs = (!wsArgs).CompilerArgs
+        if cArgs |> Array.contains "-define:JAVASCRIPT" |> not then
+            wsArgs := 
+                { !wsArgs with 
+                    CompilerArgs = Array.append cArgs [|"-define:JAVASCRIPT"|]
+                }
+
     try
         Compile !wsArgs
         0

diff --git a/src/compiler/WebSharper.Compiler/CommandTools.fs b/src/compiler/WebSharper.Compiler/CommandTools.fs
@@ -82,6 +82,7 @@ type WsConfig =
         MinJSOutputPath : string option
         SingleNoJSErrors : bool
         ProxyTargetName : string option
+        UseJavaScriptSymbol : bool
     }
 
     member this.ProjectDir =
@@ -116,6 +117,7 @@ type WsConfig =
             MinJSOutputPath = None
             SingleNoJSErrors = false
             ProxyTargetName = None
+            UseJavaScriptSymbol = false
         }
 
     static member ParseAnalyzeClosures(c: string) =
@@ -220,6 +222,8 @@ type WsConfig =
                 res <- { res with SingleNoJSErrors = getBool k v }
             | "proxytargetname" ->
                 res <- { res with ProxyTargetName = Some (getString k v) }
+            | "usejavascriptsymbol" ->
+                res <- { res with UseJavaScriptSymbol = getBool k v }
             | "$schema" -> ()
             | _ -> failwithf "Unrecognized setting in wsconfig.json: %s" k 
         res

diff --git a/src/compiler/WebSharper.FSharp/Program.fs b/src/compiler/WebSharper.FSharp/Program.fs
@@ -179,6 +179,13 @@ let Compile (config : WsConfig) (warnSettings: WarnSettings) =
             | Some (_, _, m) -> Some m 
             | _ -> None
         )
+
+    let compilerArgs =
+        if not config.UseJavaScriptSymbol || compilerArgs |> Array.contains "--define:JAVASCRIPT" then
+            compilerArgs
+        else
+            Array.append compilerArgs [|"--define:JAVASCRIPT"|]
+
     let comp =
         compiler.Compile(refMeta, compilerArgs, config, thisName)
 

diff --git a/tests/ProxyProjectTest.Proxy/wsconfig.json b/tests/ProxyProjectTest.Proxy/wsconfig.json
@@ -1,4 +1,5 @@
 {
   "Project": "Proxy",
-  "ProxyTargetName": "ProxyProjectTest"
+  "ProxyTargetName": "ProxyProjectTest",
+  "UseJavaScriptSymbol": true
 }
diff --git a/tests/ProxyProjectTest/Library.fs b/tests/ProxyProjectTest/Library.fs
@@ -20,4 +20,11 @@
 
 module ProxyProjectTest.Functions
 
-let add x y = x + y
+let add x y = x + y
+
+let isJS() =
+#if JAVASCRIPT
+    true
+#else
+    false
+#endif
diff --git a/tests/WebSharper.Tests/Basis.fs b/tests/WebSharper.Tests/Basis.fs
@@ -581,5 +581,6 @@ let Tests =
 
         Test "Proxy project" {
             equal (ProxyProjectTest.Functions.add 1 2) 3
+            isTrue (ProxyProjectTest.Functions.isJS())
         }
     }