Merge pull request #124 from nodes-vapor/feature/remove-mutable-leaf-tag-config

Remove MutableLeafTagConfig

Author: steffendsommer

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.2
+// swift-tools-version:4.1
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -17,12 +17,12 @@ let package = Package(
         .package(url: "https://github.com/vapor/leaf.git", from: "3.0.0"),
         .package(url: "https://github.com/vapor/auth.git", from: "2.0.0"),
 
-        .package(url: "https://github.com/nodes-vapor/sugar.git", from: "3.0.0-rc"),
-        .package(url: "https://github.com/nodes-vapor/flash.git", from: "3.0.0"),
-        .package(url: "https://github.com/nodes-vapor/bootstrap.git", from: "2.0.0"),
+        .package(url: "https://github.com/nodes-vapor/sugar.git", from: "3.0.0"),
+        .package(url: "https://github.com/nodes-vapor/flash.git", from: "4.0.0"),
+        .package(url: "https://github.com/nodes-vapor/bootstrap.git", from: "3.0.0"),
         .package(url: "https://github.com/nodes-vapor/reset.git", from: "1.0.0-rc"),
         .package(url: "https://github.com/nodes-vapor/submissions.git", from: "1.0.0-beta"),
-        .package(url: "https://github.com/nodes-vapor/paginator.git", from: "3.0.0-rc"),
+        .package(url: "https://github.com/nodes-vapor/paginator.git", from: "3.0.0"),
 
         .package(url: "https://github.com/twof/VaporMailgunService.git", from: "1.1.0"),
     ],

Sources/AdminPanel/Providers/AdminPanelProvider.swift

@@ -53,7 +53,6 @@ public final class AdminPanelProvider<U: AdminPanelUserType>: Provider {
         try services.register(CurrentURLProvider())
         try services.register(CurrentUserProvider<U>())
         try services.register(FlashProvider())
-        try services.register(MutableLeafTagConfigProvider())
         try services.register(LeafProvider())
 
         try services.register(ResetProvider<U>(
@@ -85,8 +84,18 @@ public final class AdminPanelProvider<U: AdminPanelUserType>: Provider {
 
     /// See Service.Provider.boot
     public func didBoot(_ container: Container) throws -> Future<Void> {
-        let tags: MutableLeafTagConfig = try container.make()
-        tags.use([
+        return .done(on: container)
+    }
+}
+
+public extension LeafTagConfig {
+    public mutating func useAdminPanelLeafTags<U: AdminPanelUserType>(
+        _ type: U.Type,
+        on container: Container
+    ) throws {
+        let config: AdminPanelConfig<U> = try container.make()
+
+        use([
             "adminPanel:avatarURL": AvatarURLTag(),
             "adminPanel:config": AdminPanelConfigTag<U>(),
             "adminPanel:sidebar:heading": SidebarHeadingTag(),
@@ -97,7 +106,5 @@ public final class AdminPanelProvider<U: AdminPanelUserType>: Provider {
             "submissions:WYSIWYG": InputTag(templatePath: config.tagTemplatePaths.wysiwygField),
             "offsetPaginator": OffsetPaginatorTag(templatePath: "Paginator/offsetpaginator")
         ])
-
-        return .done(on: container)
     }
 }