#891 fix entry point call missing from bundles created from pre-compi…

…led .js
dotnet-websharper · Jan 31, 2018 · 6634534 · 6634534
1 parent 407ee74
commit 6634534
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/src/compiler/WebSharper.CSharp/Program.fs b/src/compiler/WebSharper.CSharp/Program.fs
@@ -153,9 +153,7 @@ let Compile config =
     match config.ProjectType with
     | Some (Bundle | BundleOnly) ->
         let currentJS =
-            if isBundleOnly then
-                lazy CreateBundleJSOutput refMeta currentMeta
-            else lazy js
+            lazy CreateBundleJSOutput refMeta currentMeta
         Bundling.Bundle config metas currentMeta currentJS sources refs
         TimedStage "Bundling"
     | Some Html ->

diff --git a/src/compiler/WebSharper.Compiler/FrontEnd.fs b/src/compiler/WebSharper.Compiler/FrontEnd.fs
@@ -122,12 +122,10 @@ let CreateBundleJSOutput refMeta current =
 
         let getCodeWriter() = WebSharper.Core.JavaScript.Writer.CodeWriter()    
 
-        let pu = P.PathUtility.VirtualPaths("/")
-        let inline getBytes (x: string) = System.Text.Encoding.UTF8.GetBytes x
         let js, _ = pkg |> WebSharper.Compiler.Packager.exprToString WebSharper.Core.JavaScript.Readable getCodeWriter
-        TimedStage "Writing .js"
+        TimedStage "Writing .js for bundle"
         let minJs, _ = pkg |> WebSharper.Compiler.Packager.exprToString WebSharper.Core.JavaScript.Compact getCodeWriter
-        TimedStage "Writing .min.js"
+        TimedStage "Writing .min.js for bundle"
 
         Some (js, minJs)
 

diff --git a/src/compiler/WebSharper.FSharp/Program.fs b/src/compiler/WebSharper.FSharp/Program.fs
@@ -210,9 +210,7 @@ let Compile (config : WsConfig) (warnSettings: WarnSettings) =
             | Some (metas, _) -> metas
             | _ -> []
         let currentJS =
-            if isBundleOnly then
-                lazy CreateBundleJSOutput (getRefMeta()) currentMeta
-            else lazy js
+            lazy CreateBundleJSOutput (getRefMeta()) currentMeta
         Bundling.Bundle config metas currentMeta currentJS sources refs
         TimedStage "Bundling"
     | Some Html ->