Merge pull request #82 from delneg/fable-3

Tried to update to Fable 3

Author: krauthaufen

.config/dotnet-tools.json

@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "paket": {
+      "version": "5.257.0",
+      "commands": [
+        "paket"
+      ]
+    },
+    "fable": {
+      "version": "3.1.12",
+      "commands": [
+        "fable"
+      ]
+    }
+  }
+}

.gitignore

@@ -2,6 +2,8 @@ bin/Release
 bin/Debug
 bin/Fable
 bin/Fable.Splitter
+*.fs.js
+*.fs.js.map
 *.swp
 *.userprefs
 **/obj

build.cmd

@@ -18,5 +18,7 @@ if NOT exist packages\build\fake-cli\tools\netcoreapp2.1\any\fake-cli.dll (
 	.paket\paket.exe restore
 )
 
+dotnet tool restore
+
 dotnet "packages\build\fake-cli\tools\netcoreapp2.1\any\fake-cli.dll" build %* 
 

build.fsx

@@ -179,28 +179,19 @@ Target.create "NpmInstall" (fun _ ->
 )
 
 Target.create "CompileFable" (fun _ ->
-    let npx = "node_modules/npx/index.js" |> Path.GetFullPath
-
-    CreateProcess.fromRawCommand "node" [npx; "fable-splitter"; "-c"; "splitter-config.js"]
-    |> CreateProcess.withWorkingDirectory Environment.CurrentDirectory
-    |> CreateProcess.withStandardError StreamSpecification.Inherit
-    |> CreateProcess.withStandardOutput StreamSpecification.Inherit
-    |> CreateProcess.ensureExitCode
-    |> Proc.run
+    DotNet.exec (fun o -> o) "fable" "src/Demo/Fable/Fable.fsproj"
     |> ignore
+    //CreateProcess.fromRawCommand "node" [npx; "fable-splitter"; "-c"; "splitter-config.js"]
+    //|> CreateProcess.withWorkingDirectory Environment.CurrentDirectory
+    //|> CreateProcess.withStandardError StreamSpecification.Inherit
+    //|> CreateProcess.withStandardOutput StreamSpecification.Inherit
+    //|> CreateProcess.ensureExitCode
+    //|> Proc.run
+    //|> ignore
 )
 
 Target.create "WatchFable" (fun _ ->
-    let wpds = "node_modules/webpack-dev-server/bin/webpack-dev-server.js" |> Path.GetFullPath
-    //let proj = "src/FSharp.Data.Adaptive/FSharp.Data.Adaptive.fsproj" |> Path.GetFullPath
-    //let old = Environment.CurrentDirectory
-    //Environment.CurrentDirectory <- Path.GetDirectoryName proj
-    CreateProcess.fromRawCommand "node" [wpds]
-    |> CreateProcess.withWorkingDirectory Environment.CurrentDirectory
-    |> CreateProcess.withStandardError StreamSpecification.Inherit
-    |> CreateProcess.withStandardOutput StreamSpecification.Inherit
-    |> CreateProcess.ensureExitCode
-    |> Proc.run
+    DotNet.exec (fun o -> o) "fable" "watch src/Demo/Fable  -s --run webpack serve"
     |> ignore
 
 )

build.sh

@@ -15,4 +15,6 @@ if [ ! -f packages/build/fake-cli/tools/netcoreapp2.1/any/fake-cli.dll ]; then
     .paket/paket install
 fi
 
+dotnet tool restore
+
 dotnet packages/build/fake-cli/tools/netcoreapp2.1/any/fake-cli.dll build $@