Use util packages

SAFE.Meta.sln

@@ -11,9 +11,9 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SAFE.Server", "src\SAFE.Ser
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Build", "Build\Build.fsproj", "{F49104E3-DBA9-4A2D-B839-B4E60BCAE698}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{387BFC82-96EA-4C10-A08E-C25588EE2223}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{30BCECCE-E11D-4028-A9DE-6A83DF2E3EEC}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SAFE.Client.Tests", "test\SAFE.Client.Tests\SAFE.Client.Tests.fsproj", "{ECC5C643-1340-4718-8381-E3D1E835C3E3}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SAFE.Client.Tests", "test\SAFE.Client.Tests\SAFE.Client.Tests.fsproj", "{66BAE342-23E0-4904-B98E-B0679D9370D7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -36,13 +36,14 @@ Global
 		{F49104E3-DBA9-4A2D-B839-B4E60BCAE698}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F49104E3-DBA9-4A2D-B839-B4E60BCAE698}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F49104E3-DBA9-4A2D-B839-B4E60BCAE698}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ECC5C643-1340-4718-8381-E3D1E835C3E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ECC5C643-1340-4718-8381-E3D1E835C3E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ECC5C643-1340-4718-8381-E3D1E835C3E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ECC5C643-1340-4718-8381-E3D1E835C3E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{66BAE342-23E0-4904-B98E-B0679D9370D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66BAE342-23E0-4904-B98E-B0679D9370D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66BAE342-23E0-4904-B98E-B0679D9370D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{66BAE342-23E0-4904-B98E-B0679D9370D7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{5BCFE180-027E-40F9-847B-7B36F10BD5D7} = {59161B7D-F517-4F4B-B28D-33E34B8A930E}
 		{0C8F62AC-D5D8-43E6-A4C7-159E530C3CE5} = {59161B7D-F517-4F4B-B28D-33E34B8A930E}
+		{66BAE342-23E0-4904-B98E-B0679D9370D7} = {30BCECCE-E11D-4028-A9DE-6A83DF2E3EEC}
 	EndGlobalSection
-EndGlobal
+EndGlobal

paket.dependencies

@@ -7,6 +7,8 @@ nuget Fake.JavaScript.Npm
 nuget FSharp.Core ~> 8
 
 nuget Fable.Remoting.Giraffe ~> 5
+nuget SAFE.Client.Utils ~> 5
+nuget SAFE.Server.Utils ~> 5
 nuget Saturn ~> 0
 
 nuget Fable.Core ~> 4

paket.lock

@@ -163,6 +163,13 @@ NUGET
       Microsoft.IdentityModel.Logging (>= 7.7.1)
     Microsoft.IO.RecyclableMemoryStream (3.0.1)
     Newtonsoft.Json (13.0.3)
+    SAFE.Client.Utils (5.0.1)
+      Fable.Browser.Dom (>= 2.18.1)
+      Fable.Remoting.Client (>= 7.32)
+      Fable.SimpleJson (>= 3.24)
+      FSharp.Core (>= 8.0.403 < 9.0)
+    SAFE.Server.Utils (5.0)
+      Fable.Remoting.Giraffe (>= 5.21)
     Saturn (0.17)
       FSharp.Control.Websockets (>= 0.2.2)
       Giraffe (>= 6.4)
@@ -172,5 +179,4 @@ NUGET
       Microsoft.IdentityModel.JsonWebTokens (>= 7.7.1)
       Microsoft.IdentityModel.Tokens (>= 7.7.1)
     System.Reactive (5.0)
-    System.Text.Encodings.Web (8.0)
     System.Text.Json (8.0.5)

readme.md

@@ -1,7 +1,7 @@
 This repository contains the two metapackages used by the SAFE Template.
 
 ## SAFE.Server
-Contains dependencies required for the SAFE Stack server component, as well as a set of helper types and utilities.
+Contains dependencies required for the SAFE Stack server component
 
 ## SAFE.Client
-Contains dependencies required for the SAFE Stack client component, as well as a set of helper types and utilities, including `AsyncMsg` and `Deferred` types.
+Contains dependencies required for the SAFE Stack client component

src/SAFE.Client/SAFE.Client.fsproj

@@ -28,7 +28,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <Compile Include="SAFE.fs" />
         <Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
     </ItemGroup>
 

src/SAFE.Client/paket.references

@@ -6,4 +6,5 @@ Fable.Elmish.HMR
 Fable.Mocha
 Fable.Remoting.Client
 Feliz
-Fable.SimpleJson
+Fable.SimpleJson
+SAFE.Client.Utils

src/SAFE.Client/readme.md

@@ -1 +1 @@
-Contains dependencies required for the SAFE Stack client component, as well as a set of helper types and utilities, including `AsyncMsg` and `Deferred` types.
+Contains dependencies required for the SAFE Stack client component

src/SAFE.Server/SAFE.Server.fsproj

@@ -1,4 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <RootNamespace>SAFE</RootNamespace>
@@ -26,8 +27,5 @@
         <None Include="../../safe-logo.png" Pack="true" PackagePath="" />
     </ItemGroup>
 
-    <ItemGroup>
-        <Compile Include="SAFE.fs" />
-    </ItemGroup>
     <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>

src/SAFE.Server/paket.references

@@ -1,3 +1,4 @@
 FSharp.Core
 Saturn
-Fable.Remoting.Giraffe
+Fable.Remoting.Giraffe
+SAFE.Server.Utils

src/SAFE.Server/readme.md

@@ -1 +1 @@
-Contains dependencies required for the SAFE Stack server component, as well as a set of helper types and utilities.
+Contains dependencies required for the SAFE Stack server component

test/SAFE.Client.Tests/package.json

@@ -1,9 +1,9 @@
 {
-"type" : "module",
-    "scripts": {
-        "pretest": "dotnet fable -o bld",
-        "test": "mocha bld"
-    },
+  "type": "module",
+  "scripts": {
+    "pretest": "dotnet fable -o bld --noCache",
+    "test": "mocha bld"
+  },
   "devDependencies": {
     "mocha": "^10.8.2"
   }