Updated Leaf cache & Chapter 10 [wip]

Author: tib

Chapter 03/myProject/Package.resolved

@@ -10,7 +10,7 @@ let package = Package(
         // 💧 A server-side Swift web framework.
         .package(url: "https://github.com/vapor/vapor", from: "4.32.0"),
         //.package(url: "https://github.com/vapor/leaf", from: "4.0.0"),
-        .package(url: "https://github.com/tib/leaf", .branch("tau")),
+        .package(url: "https://github.com/tib/leaf", from: "4.0.0-rc"),
         .package(url: "https://github.com/lukaskubanek/LoremSwiftum", from: "2.2.1")
     ],
     targets: [

Chapter 03/myProject/Package.swift

@@ -0,0 +1,19 @@
+//
+//  File.swift
+//  
+//
+//  Created by Tibor Bodecs on 2020. 10. 14..
+//
+
+import Vapor
+
+struct ExtendPathMiddleware: Middleware {
+
+    func respond(to request: Request, chainingTo next: Responder) -> EventLoopFuture<Response> {
+        if !request.url.path.hasSuffix("/") {
+            let response = request.redirect(to: request.url.path + "/", type: .permanent)
+            return request.eventLoop.makeSucceededFuture(response)
+        }
+        return next.respond(to: request)
+    }
+}

Chapter 03/myProject/Sources/App/Middlewares/DropLeafCacheMiddleware.swift

@@ -1,3 +1,4 @@
+import Foundation
 import Leaf
 
 struct BlogPost {

Chapter 03/myProject/Sources/App/Middlewares/ExtendPathMiddleware.swift

@@ -4,7 +4,8 @@ import Leaf
 public func configure(_ app: Application) throws {
 
     app.middleware.use(FileMiddleware(publicDirectory: app.directory.publicDirectory))
-
+    app.middleware.use(ExtendPathMiddleware())
+    
     let detected = LeafEngine.rootDirectory ?? app.directory.viewsDirectory
     LeafEngine.rootDirectory = detected
 
@@ -15,10 +16,11 @@ public func configure(_ app: Application) throws {
                                                     defaultExtension: "html"))
 
     if !app.environment.isRelease {
-        app.middleware.use(DropLeafCacheMiddleware())
+        LeafRenderer.Option.caching = .bypass
     }
+
     app.views.use(.leaf)
-    
+
     let routers: [RouteCollection] = [
         FrontendRouter(),
         BlogRouter(),

Chapter 03/myProject/Sources/App/Modules/Blog/BlogPost.swift

@@ -10,7 +10,7 @@ let package = Package(
         // 💧 A server-side Swift web framework.
         .package(url: "https://github.com/vapor/vapor", from: "4.32.0"),
         //.package(url: "https://github.com/vapor/leaf", from: "4.0.0"),
-        .package(url: "https://github.com/tib/leaf", .branch("tau")),
+        .package(url: "https://github.com/tib/leaf", from: "4.0.0-rc"),
         .package(url: "https://github.com/vapor/fluent", from: "4.0.0"),
         .package(url: "https://github.com/vapor/fluent-sqlite-driver", from: "4.0.0"),
         .package(url: "https://github.com/lukaskubanek/LoremSwiftum", from: "2.2.1"),

Chapter 03/myProject/Sources/App/configure.swift

@@ -19,7 +19,7 @@ public func configure(_ app: Application) throws {
                                                     defaultExtension: "html"))
 
     if !app.environment.isRelease {
-        app.middleware.use(DropLeafCacheMiddleware())
+        LeafRenderer.Option.caching = .bypass
     }
     app.views.use(.leaf)
 

Chapter 04/myProject/Package.swift

@@ -10,7 +10,7 @@ let package = Package(
         // 💧 A server-side Swift web framework.
         .package(url: "https://github.com/vapor/vapor", from: "4.32.0"),
         //.package(url: "https://github.com/vapor/leaf", from: "4.0.0"),
-        .package(url: "https://github.com/tib/leaf", .branch("tau")),
+        .package(url: "https://github.com/tib/leaf", from: "4.0.0-rc"),
         .package(url: "https://github.com/vapor/fluent", from: "4.0.0"),
         .package(url: "https://github.com/vapor/fluent-sqlite-driver", from: "4.0.0"),
         .package(url: "https://github.com/lukaskubanek/LoremSwiftum", from: "2.2.1"),