Merge branch 'develop'

giraffe-fsharp · Feb 9, 2018 · 6859512 · 6859512
2 parents d1edd92 + c82c45c
commit 6859512
Show file tree

Hide file tree

Showing 15 changed files with 1,944 additions and 1,933 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,10 @@
 Release Notes
 =============
 
+## 0.15.0
+
+Updated all templates to use the latest `Giraffe 1.0.0` release.
+
 ## 0.14.0
 
 #### New features

diff --git a/src/content/DotLiquid/paket.lock b/src/content/DotLiquid/paket.lock
diff --git a/src/content/DotLiquid/src/AppNamePlaceholder/AppNamePlaceholder.fsproj b/src/content/DotLiquid/src/AppNamePlaceholder/AppNamePlaceholder.fsproj
@@ -20,8 +20,8 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.*" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.*" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.*" />
-    <PackageReference Include="Giraffe" Version="0.1.0-beta-600" />
-    <PackageReference Include="Giraffe.DotLiquid" Version="0.1.0-beta-310" />
+    <PackageReference Include="Giraffe" Version="1.0.*" />
+    <PackageReference Include="Giraffe.DotLiquid" Version="1.0.*" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(UsePaket)' == false OR '$(UsePaket)' == ''">

diff --git a/src/content/DotLiquid/src/AppNamePlaceholder/Program.fs b/src/content/DotLiquid/src/AppNamePlaceholder/Program.fs
@@ -57,7 +57,8 @@ let configureApp (app : IApplicationBuilder) =
         .UseGiraffe(webApp)
 
 let configureServices (services : IServiceCollection) =
-    services.AddCors() |> ignore
+    services.AddCors()    |> ignore
+    services.AddGiraffe() |> ignore
 
 let configureLogging (builder : ILoggingBuilder) =
     let filter (l : LogLevel) = l.Equals LogLevel.Error

diff --git a/src/content/Giraffe/paket.lock b/src/content/Giraffe/paket.lock
diff --git a/src/content/Giraffe/src/AppNamePlaceholder/AppNamePlaceholder.fsproj b/src/content/Giraffe/src/AppNamePlaceholder/AppNamePlaceholder.fsproj
@@ -20,7 +20,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.*" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.*" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.*" />
-    <PackageReference Include="Giraffe" Version="0.1.0-beta-700" />
+    <PackageReference Include="Giraffe" Version="1.0.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/content/Giraffe/src/AppNamePlaceholder/Program.fs b/src/content/Giraffe/src/AppNamePlaceholder/Program.fs
@@ -8,7 +8,6 @@ open Microsoft.AspNetCore.Hosting
 open Microsoft.Extensions.Logging
 open Microsoft.Extensions.DependencyInjection
 open Giraffe
-open GiraffeViewEngine
 
 // ---------------------------------
 // Models
@@ -23,25 +22,28 @@ type Message =
 // Views
 // ---------------------------------
 
-let layout (content: XmlNode list) =
-    html [] [
-        head [] [
-            title []  [ encodedText "AppNamePlaceholder" ]
-            link [ _rel  "stylesheet"
-                   _type "text/css"
-                   _href "/main.css" ]
+module Views =
+    open GiraffeViewEngine
+
+    let layout (content: XmlNode list) =
+        html [] [
+            head [] [
+                title []  [ encodedText "AppNamePlaceholder" ]
+                link [ _rel  "stylesheet"
+                       _type "text/css"
+                       _href "/main.css" ]
+            ]
+            body [] content
         ]
-        body [] content
-    ]
 
-let partial () =
-    h1 [] [ encodedText "AppNamePlaceholder" ]
+    let partial () =
+        h1 [] [ encodedText "AppNamePlaceholder" ]
 
-let indexView (model : Message) =
-    [
-        partial()
-        p [] [ encodedText model.Text ]
-    ] |> layout
+    let index (model : Message) =
+        [
+            partial()
+            p [] [ encodedText model.Text ]
+        ] |> layout
 
 // ---------------------------------
 // Web app
@@ -50,8 +52,8 @@ let indexView (model : Message) =
 let indexHandler (name : string) =
     let greetings = sprintf "Hello %s, from Giraffe!" name
     let model     = { Text = greetings }
-    let view      = indexView model
-    renderHtml view
+    let view      = Views.index model
+    htmlView view
 
 let webApp =
     choose [
@@ -90,7 +92,8 @@ let configureApp (app : IApplicationBuilder) =
         .UseGiraffe(webApp)
 
 let configureServices (services : IServiceCollection) =
-    services.AddCors() |> ignore
+    services.AddCors()    |> ignore
+    services.AddGiraffe() |> ignore
 
 let configureLogging (builder : ILoggingBuilder) =
     let filter (l : LogLevel) = l.Equals LogLevel.Error

diff --git a/src/content/None/paket.lock b/src/content/None/paket.lock
diff --git a/src/content/None/src/AppNamePlaceholder/AppNamePlaceholder.fsproj b/src/content/None/src/AppNamePlaceholder/AppNamePlaceholder.fsproj
@@ -18,7 +18,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.*" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.*" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.*" />
-    <PackageReference Include="Giraffe" Version="0.1.0-beta-700" />
+    <PackageReference Include="Giraffe" Version="1.0.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/content/None/src/AppNamePlaceholder/HttpHandlers.fs b/src/content/None/src/AppNamePlaceholder/HttpHandlers.fs
@@ -4,9 +4,8 @@ module HttpHandlers =
 
     open Microsoft.AspNetCore.Http
     open Giraffe
-    open Giraffe.HttpHandlers
     open AppNamePlaceholder.Models
-    
+
     let handleGetHello =
         fun (next : HttpFunc) (ctx : HttpContext) ->
             task {

diff --git a/src/content/None/src/AppNamePlaceholder/Program.fs b/src/content/None/src/AppNamePlaceholder/Program.fs
@@ -50,9 +50,8 @@ let configureApp (app : IApplicationBuilder) =
         .UseGiraffe(webApp)
 
 let configureServices (services : IServiceCollection) =
-    let sp  = services.BuildServiceProvider()
-    let env = sp.GetService<IHostingEnvironment>()
-    services.AddCors() |> ignore
+    services.AddCors()    |> ignore
+    services.AddGiraffe() |> ignore
 
 let configureLogging (builder : ILoggingBuilder) =
     let filter (l : LogLevel) = l.Equals LogLevel.Error