javier
a045a23519
This PR contains the work done to introduce a new Web Swift package that provides a reusable, declarative way to register route controllers on a Hummingbird router, then adopt it in the Website service.
To provide further details about the work:
* Web package
* The `RouterController` protocol — a Sendable protocol to group controllers behind one `routes` property.
* The `RouteCollectionBuilder` — a result builder that collects controllers' route collections into a stack, with full support for optionals, conditionals, and arrays.
* The `addController(_:)` method — a `RouterMethods` extension letting controllers be listed declaratively and adding each one's routes at the router root.
* Website service
* Added Web as a dependency of the _WebsiteLibrary_ target.
* Conformed the `RootController` and `HealthController`controllers to the `RouterController` protocol.
* Updated the `App+Build` extension to to use the cleaner `router.addController { … }` instead.
Reviewed-on: rock-n-code/loud-amsterdam#17
Co-authored-by: Javier Cicchelli <javier@rock-n-code.com>
Co-committed-by: Javier Cicchelli <javier@rock-n-code.com>
142 lines
4.1 KiB
Swift
142 lines
4.1 KiB
Swift
// swift-tools-version: 6.3
|
|
|
|
import PackageDescription
|
|
|
|
let package = Package(
|
|
name: "Website",
|
|
defaultLocalization: "en",
|
|
platforms: [
|
|
.macOS(.v15),
|
|
.iOS(.v18),
|
|
.tvOS(.v18),
|
|
],
|
|
products: [
|
|
.executable(
|
|
name: "Website",
|
|
targets: [
|
|
"Website",
|
|
"WebsiteLibrary",
|
|
]
|
|
)
|
|
],
|
|
dependencies: [
|
|
.package(
|
|
path: "../../Packages/Localization"
|
|
),
|
|
.package(
|
|
path: "../../Packages/Persistence"
|
|
),
|
|
.package(
|
|
path: "../../Packages/Web"
|
|
),
|
|
.package(
|
|
url: "https://github.com/elementary-swift/elementary.git",
|
|
from: "0.6.0"
|
|
),
|
|
.package(
|
|
url: "https://github.com/hummingbird-community/hummingbird-elementary.git",
|
|
from: "0.3.0"
|
|
),
|
|
.package(
|
|
url: "https://github.com/hummingbird-project/hummingbird.git",
|
|
from: "2.25.0"
|
|
),
|
|
.package(
|
|
url: "https://github.com/hummingbird-project/hummingbird-compression.git",
|
|
from: "2.0.0"
|
|
),
|
|
.package(
|
|
url: "https://github.com/apple/swift-configuration.git",
|
|
from: "1.0.0",
|
|
traits: [
|
|
.defaults,
|
|
"CommandLineArguments",
|
|
]
|
|
),
|
|
],
|
|
targets: [
|
|
.executableTarget(
|
|
name: "Website",
|
|
dependencies: [
|
|
.byName(name: "Persistence"),
|
|
.byName(name: "WebsiteLibrary"),
|
|
.product(
|
|
name: "Configuration",
|
|
package: "swift-configuration"
|
|
),
|
|
.product(
|
|
name: "Hummingbird",
|
|
package: "hummingbird"
|
|
),
|
|
.product(
|
|
name: "HummingbirdCompression",
|
|
package: "hummingbird-compression"
|
|
),
|
|
],
|
|
path: "Sources/App"
|
|
),
|
|
.target(
|
|
name: "WebsiteLibrary",
|
|
dependencies: [
|
|
.byName(name: "Localization"),
|
|
.byName(name: "Persistence"),
|
|
.byName(name: "Web"),
|
|
.product(
|
|
name: "Configuration",
|
|
package: "swift-configuration"
|
|
),
|
|
.product(
|
|
name: "Elementary",
|
|
package: "elementary"
|
|
),
|
|
.product(
|
|
name: "Hummingbird",
|
|
package: "hummingbird"
|
|
),
|
|
.product(
|
|
name: "HummingbirdElementary",
|
|
package: "hummingbird-elementary"
|
|
),
|
|
],
|
|
path: "Sources/Library",
|
|
resources: [
|
|
// Copied verbatim rather than processed: the String Catalog is read as raw JSON at
|
|
// runtime so it resolves identically on Darwin and Linux (which cannot compile it).
|
|
.copy("Catalogs/Localizable.xcstrings")
|
|
]
|
|
),
|
|
.testTarget(
|
|
name: "WebsiteTests",
|
|
dependencies: [
|
|
.byName(name: "Website"),
|
|
.product(
|
|
name: "HummingbirdTesting",
|
|
package: "hummingbird"
|
|
),
|
|
],
|
|
path: "Tests/App"
|
|
),
|
|
.testTarget(
|
|
name: "WebsiteLibraryTests",
|
|
dependencies: [
|
|
.byName(name: "Persistence"),
|
|
.byName(name: "Web"),
|
|
.byName(name: "WebsiteLibrary"),
|
|
.product(
|
|
name: "Elementary",
|
|
package: "elementary"
|
|
),
|
|
.product(
|
|
name: "Hummingbird",
|
|
package: "hummingbird"
|
|
),
|
|
.product(
|
|
name: "HummingbirdTesting",
|
|
package: "hummingbird"
|
|
),
|
|
],
|
|
path: "Tests/Library"
|
|
),
|
|
]
|
|
)
|