javier
9774454bba
This PR contains the work done to get the Website service building and running correctly in its Linux container. The service depends on the local _Localization_ package, whose String-Catalog localization was Darwin-only and broke the Docker build. Thus the localization internals have been reworked to be platform-agnostic and fixes the container build context so the local package is actually available during the build. * Localization package * Replaced the Darwin-only `String.LocalizationValue` / `String(localized:)` path with a StringCatalog type that reads raw JSON from a given `.xcstrings` file, so lookups resolve identically on macOS and Linux. * The `LanguageList` now derives available languages from the catalog instead of `Bundle.localizations` * The `Negotiate` does explicit _Accept-Language_ matching (exact tag, then primary subtag) instead of the Linux-broken `Bundle.preferredLocalizations`. * Switched the catalog resource rule from `.process` to `.copy` (in both Localization and Website manifests) so the raw `.xcstrings` ships verbatim on every platform. * Introduced a `CatalogResolving` protocol as a seam between the localizers and the storage backend, enabling test injection and a future native-Apple backend without changing callers. * Website Docker build * Build context moved to the repository root so the relative-path `Localization` package is inside the context; `Dockerfile`, `docker-compose.override.yml`, and the _img-release_ make target updated to the new context/paths. * Added a root `.dockerignore` to keep the context lean. Reviewed-on: rock-n-code/loud-amsterdam#12 Co-authored-by: Javier Cicchelli <javier@rock-n-code.com> Co-committed-by: Javier Cicchelli <javier@rock-n-code.com>
131 lines
3.7 KiB
Swift
131 lines
3.7 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",
|
|
"WebsiteCore",
|
|
]
|
|
)
|
|
],
|
|
dependencies: [
|
|
.package(
|
|
path: "../../Packages/Localization"
|
|
),
|
|
.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: "WebsiteCore"),
|
|
.product(
|
|
name: "Configuration",
|
|
package: "swift-configuration"
|
|
),
|
|
.product(
|
|
name: "Hummingbird",
|
|
package: "hummingbird"
|
|
),
|
|
.product(
|
|
name: "HummingbirdCompression",
|
|
package: "hummingbird-compression"
|
|
),
|
|
],
|
|
path: "Sources/App"
|
|
),
|
|
.target(
|
|
name: "WebsiteCore",
|
|
dependencies: [
|
|
.byName(name: "Localization"),
|
|
.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: "WebsiteCoreTests",
|
|
dependencies: [
|
|
.byName(name: "WebsiteCore"),
|
|
.product(
|
|
name: "Elementary",
|
|
package: "elementary"
|
|
),
|
|
.product(
|
|
name: "Hummingbird",
|
|
package: "hummingbird"
|
|
),
|
|
.product(
|
|
name: "HummingbirdTesting",
|
|
package: "hummingbird"
|
|
),
|
|
],
|
|
path: "Tests/Library"
|
|
),
|
|
]
|
|
)
|