SAFE-Stack · theimowski · Jun 28, 2021 · Nov 13, 2020 · Nov 13, 2020 · Nov 16, 2020
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -2,14 +2,8 @@
   "version": 1,
   "isRoot": true,
   "tools": {
-    "fake-cli": {
-      "version": "5.19.1",
-      "commands": [
-        "fake"
-      ]
-    },
     "paket": {
-      "version": "5.242.2",
+      "version": "6.0.0-beta8",
       "commands": [
         "paket"
       ]

diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
@@ -27,10 +27,16 @@
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperExeDir Condition=" Exists('$(PaketBootStrapperExePath)') " >$([System.IO.Path]::GetDirectoryName("$(PaketBootStrapperExePath)"))\</PaketBootStrapperExeDir>
-    
+
     <PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT' ">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
     <PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
 
+    <!-- Disable automagic references for F# DotNet SDK -->
+    <!-- This will not do anything for other project types -->
+    <!-- see https://github.com/fsharp/fslang-design/blob/master/tooling/FST-1002-fsharp-in-dotnet-sdk.md -->
+    <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+    <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
+
     <!-- Disable Paket restore under NCrunch build -->
     <PaketRestoreDisabled Condition="'$(NCrunch)' == '1'">True</PaketRestoreDisabled>
 
@@ -130,7 +136,7 @@
         <!-- Parse our simple 'paket.restore.cached' json ...-->
         <PaketRestoreCachedSplitObject Include="$([System.Text.RegularExpressions.Regex]::Split(`$(PaketRestoreCachedContents)`, `{|}|,`))"></PaketRestoreCachedSplitObject>
         <!-- Keep Key, Value ItemGroup-->
-        <PaketRestoreCachedKeyValue Include="@(PaketRestoreCachedSplitObject)" 
+        <PaketRestoreCachedKeyValue Include="@(PaketRestoreCachedSplitObject)"
             Condition=" $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `&quot;: &quot;`).Length) &gt; 1 ">
           <Key>$([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[0].Replace(`"`, ``).Replace(` `, ``))</Key>
           <Value>$([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[1].Replace(`"`, ``).Replace(` `, ``))</Value>
@@ -163,7 +169,7 @@
     <Exec Command='$(PaketBootStrapperCommand)' Condition=" '$(PaketBootstrapperStyle)' == 'classic' AND Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
     <Error Text="Stop build because of PAKET_ERROR_ON_MSBUILD_EXEC and we need a full restore (hashes don't match)" Condition=" '$(PAKET_ERROR_ON_MSBUILD_EXEC)' == 'true' AND '$(PaketRestoreRequired)' == 'true' AND '$(PaketDisableGlobalRestore)' != 'true'" />
     <Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(PaketDisableGlobalRestore)' != 'true' " ContinueOnError="false" />
-    
+
     <!-- Step 2 Detect project specific changes -->
     <ItemGroup>
       <MyTargetFrameworks Condition="'$(TargetFramework)' != '' " Include="$(TargetFramework)"></MyTargetFrameworks>

diff --git a/.travis.yml b/.travis.yml
@@ -1,29 +1,15 @@
 language: csharp
-sudo: required
-dist: xenial
-dotnet: 3.1.300
+dotnet: 5.0.100
 mono: none
-
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - libstdc++-4.9-dev
-      - libunwind8-dev
+os:
+  - linux
+  - osx
 
 before_install:
   - nvm install 10.12.0
   - nvm use 10.12.0
-  # Yarn
-  - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
-  - echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
-  - sudo apt-get update && sudo apt-get install yarn
-
-cache:
-  directories:
-  - $HOME/.yarn-cache
 
 script:
   - dotnet tool restore
-  - dotnet fake build -t tests
+  - dotnet paket restore
+  - dotnet run --project tests/tests.fsproj
diff --git a/build.fsx → Build.fs b/build.fsx → Build.fs
@@ -1,10 +1,3 @@
-#r "paket: groupref build //"
-#load "./.fake/build.fsx/intellisense.fsx"
-
-#if !FAKE
-#r "netstandard"
-#endif
-
 open System
 
 open Fake.Core
@@ -14,6 +7,9 @@ open Fake.IO.FileSystemOperators
 open Fake.IO.Globbing.Operators
 open Fake.Tools
 
+let execContext = Context.FakeExecutionContext.Create false "build.fsx" [ ]
+Context.setExecutionContext (Context.RuntimeContext.Fake execContext)
+
 let templatePath = "./Content/.template.config/template.json"
 let templateProj = "SAFE.Template.proj"
 let templateName = "SAFE-Stack Web App"
@@ -115,4 +111,13 @@ open Fake.Core.TargetOperators
     ==> "Push"
     ==> "Release"
 
-Target.runOrDefaultWithArguments "Install"
+[<EntryPoint>]
+let main args =
+    try
+        match args with
+        | [| target |] -> Target.runOrDefault target
+        | _ -> Target.runOrDefault "Install"
+        0
+    with e ->
+        printfn "%A" e
+        1
diff --git a/Build.fsproj b/Build.fsproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Build.fs" />
+  </ItemGroup>
+
+  <Import Project=".paket\Paket.Restore.targets" />
+</Project>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -8,7 +8,7 @@ To test your changes simply navigate to `Content\minimal` or `Content\default` a
 
 ## Testing template bundle
 
-To build whole template invoke `dotnet fake build` - default target is `Install`, which will build the template and invoke `dotnet new -i <<repo-path>>/nupkg/SAFE.Template.<<version>>.nupkg`
+To build whole template invoke `dotnet run -p Build.fsproj` - default target is `Install`, which will build the template and invoke `dotnet new -i <<repo-path>>/nupkg/SAFE.Template.<<version>>.nupkg`
 
 You can now test the local build of template using `dotnet new SAFE`
 

diff --git a/Content/.template.config/template.json b/Content/.template.config/template.json
@@ -8,7 +8,7 @@
         "Fable",
         "Elmish"
     ],
-    "name": "SAFE-Stack Web App v2.2.2",
+    "name": "SAFE-Stack Web App v3.0.0-beta004",
     "tags": {
         "language": "F#",
         "type": "project"

diff --git a/Content/default/.config/dotnet-tools.json b/Content/default/.config/dotnet-tools.json
@@ -3,15 +3,21 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "6.0.0-alpha014",
+      "version": "6.0.0-beta8",
       "commands": [
         "paket"
       ]
     },
-    "fake-cli": {
-      "version": "5.19.1",
+    "fable": {
+      "version": "3.1.12",
       "commands": [
-        "fake"
+        "fable"
+      ]
+    },
+    "fantomas-tool": {
+      "version": "4.4.0",
+      "commands": [
+        "fantomas"
       ]
     }
   }

diff --git a/Content/default/.editorconfig b/Content/default/.editorconfig
@@ -5,4 +5,8 @@ indent_style = space
 indent_size = 4
 charset = utf-8
 trim_trailing_whitespace = true
-insert_final_newline = false
+insert_final_newline = false
+
+[src/Client/*.fs]
+# Feliz style
+fsharp_single_argument_web_mode=true
diff --git a/Content/default/.gitignore b/Content/default/.gitignore
@@ -1,4 +1,5 @@
 .fable/
+*.fs.js
 .fake/
 .farmer/
 .idea/

diff --git a/Content/default/.paket/Paket.Restore.targets b/Content/default/.paket/Paket.Restore.targets
@@ -27,10 +27,16 @@
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperExeDir Condition=" Exists('$(PaketBootStrapperExePath)') " >$([System.IO.Path]::GetDirectoryName("$(PaketBootStrapperExePath)"))\</PaketBootStrapperExeDir>
-    
+
     <PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT' ">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
     <PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
 
+    <!-- Disable automagic references for F# DotNet SDK -->
+    <!-- This will not do anything for other project types -->
+    <!-- see https://github.com/fsharp/fslang-design/blob/master/tooling/FST-1002-fsharp-in-dotnet-sdk.md -->
+    <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+    <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
+
     <!-- Disable Paket restore under NCrunch build -->
     <PaketRestoreDisabled Condition="'$(NCrunch)' == '1'">True</PaketRestoreDisabled>
 
@@ -130,7 +136,7 @@
         <!-- Parse our simple 'paket.restore.cached' json ...-->
         <PaketRestoreCachedSplitObject Include="$([System.Text.RegularExpressions.Regex]::Split(`$(PaketRestoreCachedContents)`, `{|}|,`))"></PaketRestoreCachedSplitObject>
         <!-- Keep Key, Value ItemGroup-->
-        <PaketRestoreCachedKeyValue Include="@(PaketRestoreCachedSplitObject)" 
+        <PaketRestoreCachedKeyValue Include="@(PaketRestoreCachedSplitObject)"
             Condition=" $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `&quot;: &quot;`).Length) &gt; 1 ">
           <Key>$([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[0].Replace(`"`, ``).Replace(` `, ``))</Key>
           <Value>$([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[1].Replace(`"`, ``).Replace(` `, ``))</Value>
@@ -163,7 +169,7 @@
     <Exec Command='$(PaketBootStrapperCommand)' Condition=" '$(PaketBootstrapperStyle)' == 'classic' AND Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
     <Error Text="Stop build because of PAKET_ERROR_ON_MSBUILD_EXEC and we need a full restore (hashes don't match)" Condition=" '$(PAKET_ERROR_ON_MSBUILD_EXEC)' == 'true' AND '$(PaketRestoreRequired)' == 'true' AND '$(PaketDisableGlobalRestore)' != 'true'" />
     <Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(PaketDisableGlobalRestore)' != 'true' " ContinueOnError="false" />
-    
+
     <!-- Step 2 Detect project specific changes -->
     <ItemGroup>
       <MyTargetFrameworks Condition="'$(TargetFramework)' != '' " Include="$(TargetFramework)"></MyTargetFrameworks>

diff --git a/Content/default/Build.fs b/Content/default/Build.fs
@@ -0,0 +1,79 @@
+open Fake.Core
+open Fake.IO
+open Farmer
+open Farmer.Builders
+
+open Helpers
+
+initializeContext()
+
+let sharedPath = Path.getFullName "src/Shared"
+let serverPath = Path.getFullName "src/Server"
+let clientPath = Path.getFullName "src/Client"
+let deployPath = Path.getFullName "deploy"
+let sharedTestsPath = Path.getFullName "tests/Shared"
+let serverTestsPath = Path.getFullName "tests/Server"
+let clientTestsPath = Path.getFullName "tests/Client"
+
+Target.create "Clean" (fun _ -> Shell.cleanDir deployPath)
+
+Target.create "InstallClient" (fun _ -> run npm "install" ".")
+
+Target.create "Bundle" (fun _ ->
+    [ "server", dotnet $"publish -c Release -o \"{deployPath}\"" serverPath
+      "client", dotnet "fable --run webpack -p" clientPath ]
+    |> runParallel
+)
+
+Target.create "Azure" (fun _ ->
+    let web = webApp {
+        name "SAFE.App"
+        zip_deploy "deploy"
+    }
+    let deployment = arm {
+        location Location.WestEurope
+        add_resource web
+    }
+
+    deployment
+    |> Deploy.execute "SAFE.App" Deploy.NoParameters
+    |> ignore
+)
+
+Target.create "Run" (fun _ ->
+    run dotnet "build" sharedPath
+    [ "server", dotnet "watch run" serverPath
+      "client", dotnet "fable watch --run webpack-dev-server" clientPath ]
+    |> runParallel
+)
+
+Target.create "RunTests" (fun _ ->
+    run dotnet "build" sharedTestsPath
+    [ "server", dotnet "watch run" serverTestsPath
+      "client", dotnet "fable watch --run webpack-dev-server --config ../../webpack.tests.config.js" clientTestsPath ]
+    |> runParallel
+)
+
+Target.create "Format" (fun _ ->
+    run dotnet "fantomas . -r" "src"
+)
+
+open Fake.Core.TargetOperators
+
+let dependencies = [
+    "Clean"
+        ==> "InstallClient"
+        ==> "Bundle"
+        ==> "Azure"
+
+    "Clean"
+        ==> "InstallClient"
+        ==> "Run"
+
+    "Clean"
+        ==> "InstallClient"
+        ==> "RunTests"
+]
+
+[<EntryPoint>]
+let main args = runOrDefault args
diff --git a/Content/default/Build.fsproj b/Content/default/Build.fsproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Helpers.fs" />
+    <Compile Include="Build.fs" />
+  </ItemGroup>
+  <Import Project=".paket\Paket.Restore.targets" />
+</Project>