fable-standalone 1.1

fable-compiler · May 10, 2019 · b51d644 · b51d644
1 parent a45fc0f
commit b51d644
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/src/fable-standalone/RELEASE_NOTES.md b/src/fable-standalone/RELEASE_NOTES.md
@@ -1,3 +1,7 @@
+### 1.1.0
+
+* Update bundle and Worker dependencies
+
 ### 1.0.4
 
 * Fixed optimized patterns

diff --git a/src/fable-standalone/package.json b/src/fable-standalone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fable-standalone",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "main": "dist/bundle.min.js",
   "description": "Fable compiler",
   "keywords": [

diff --git a/src/fable-standalone/src/Worker/Shared.fs b/src/fable-standalone/src/Worker/Shared.fs
@@ -4,7 +4,6 @@ open System
 open System.Collections.Generic
 open Fable.Core
 open Fable.Core.JsInterop
-open Fable.Import
 open Thoth.Json
 
 type WorkerRequest =
@@ -36,7 +35,7 @@ type WorkerAnswer =
     static member Decoder =
         Decode.Auto.generateDecoder<WorkerAnswer>()
 
-type ObservableWorker<'InMsg>(worker: obj, decoder: Decode.Decoder<'InMsg>, ?name: string) =
+type ObservableWorker<'InMsg>(worker: obj, decoder: Decoder<'InMsg>, ?name: string) =
     let name = defaultArg name "FABLE WORKER"
     let listeners = new Dictionary<Guid, IObserver<'InMsg>>()
     do worker?addEventListener("message", fun ev ->
@@ -49,11 +48,12 @@ type ObservableWorker<'InMsg>(worker: obj, decoder: Decode.Decoder<'InMsg>, ?nam
                     listener.OnNext(msg)
             | Error err -> JS.console.error("[" + name + "] Cannot decode:", err)
         | _ -> ())
+    member __.Worker = worker
     member __.HasListeners =
         listeners.Count > 0
-    member __.Post msg =
-        worker?postMessage(Encode.Auto.toString(0, msg))
-    member this.PostAndAwaitResponse(msg, picker) =
+    member inline this.Post(msg: 'OutMsg): unit =
+        this.Worker?postMessage(Encode.Auto.toString(0, msg))
+    member inline this.PostAndAwaitResponse(msg: 'OutMsg, picker: 'InMsg -> 'Res option): Async<'Res> =
         Async.FromContinuations(fun (cont, err, cancel) ->
             let mutable disp = Unchecked.defaultof<IDisposable>
             disp <- this |> Observable.subscribe(fun msg ->
@@ -62,7 +62,7 @@ type ObservableWorker<'InMsg>(worker: obj, decoder: Decode.Decoder<'InMsg>, ?nam
                     disp.Dispose()
                     cont res
                 | None -> ())
-            worker?postMessage(Encode.Auto.toString(0, msg))
+            this.Worker?postMessage(Encode.Auto.toString(0, msg))
         )
     member __.Subscribe obs =
         let id = Guid.NewGuid()

diff --git a/src/fable-standalone/src/Worker/Worker.fs b/src/fable-standalone/src/Worker/Worker.fs
@@ -2,7 +2,6 @@ module Fable.WebWorker.Main
 
 open Fable.Core
 open Fable.Core.JsInterop
-open Fable.Import
 open Fable.Standalone
 open Fable.WebWorker
 

diff --git a/src/fable-standalone/src/Worker/Worker.fsproj b/src/fable-standalone/src/Worker/Worker.fsproj
@@ -2,6 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="../Interfaces.fs" />
@@ -10,7 +11,8 @@
     <Compile Include="Worker.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Fable.Core" Version="2.0.3" />
-    <PackageReference Include="Thoth.Json" Version="2.5.0" />
+    <PackageReference Include="FSharp.Core" Version="4.6.2" />
+    <PackageReference Include="Fable.Core" Version="3.0.0" />
+    <PackageReference Include="Thoth.Json" Version="3.1.0" />
   </ItemGroup>
 </Project>