diff --git a/multipart-form/Package.swift b/multipart-form/Package.swift index ad04ca63..27bc5651 100644 --- a/multipart-form/Package.swift +++ b/multipart-form/Package.swift @@ -26,6 +26,7 @@ let package = Package( .product(name: "ExtrasBase64", package: "swift-extras-base64"), .product(name: "MultipartKit", package: "multipart-kit"), ], + resources: [.process("Resources")], swiftSettings: [ // Enable better optimizations when building in Release configuration. Despite the use of // the `.unsafeFlags` construct required by SwiftPM, this flag is recommended for Release diff --git a/multipart-form/Sources/App/Application+build.swift b/multipart-form/Sources/App/Application+build.swift index 037fd9a5..4a1d2e4c 100644 --- a/multipart-form/Sources/App/Application+build.swift +++ b/multipart-form/Sources/App/Application+build.swift @@ -1,3 +1,4 @@ +import Foundation import Hummingbird import MultipartKit import Mustache @@ -8,7 +9,7 @@ protocol AppArguments { } func buildApplication(_ args: AppArguments) async throws -> some ApplicationProtocol { - let library = try await MustacheLibrary(directory: "templates") + let library = try await MustacheLibrary(directory: Bundle.module.bundleURL.path) assert(library.getTemplate(named: "page") != nil, "Set your working directory to the root folder of this example to get it to work") let router = Router(context: MultipartRequestContext.self) diff --git a/multipart-form/templates/details-entered.mustache b/multipart-form/Sources/App/Resources/templates/details-entered.mustache similarity index 100% rename from multipart-form/templates/details-entered.mustache rename to multipart-form/Sources/App/Resources/templates/details-entered.mustache diff --git a/multipart-form/templates/enter-details.mustache b/multipart-form/Sources/App/Resources/templates/enter-details.mustache similarity index 100% rename from multipart-form/templates/enter-details.mustache rename to multipart-form/Sources/App/Resources/templates/enter-details.mustache diff --git a/multipart-form/templates/page.mustache b/multipart-form/Sources/App/Resources/templates/page.mustache similarity index 100% rename from multipart-form/templates/page.mustache rename to multipart-form/Sources/App/Resources/templates/page.mustache diff --git a/multipart-form/public/images/hummingbird.png b/multipart-form/public/images/hummingbird.png index 3dedb1b9..ec5a5dc9 100644 Binary files a/multipart-form/public/images/hummingbird.png and b/multipart-form/public/images/hummingbird.png differ