rock-n-code/ccn
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Activity

Improved the static assets definitions in the Website service (#18)

Browse Source 
This PR contains the work done to overhaul the static asset definitions for the Website service.

To provide further details about the work:

* Website library
  * Overhauled the `StateFile` enumeration to reduce the number of cases to one case per logical file name, each exposing a `fileExtensions` list.
  * Wired everything into the pages with a consistent ordering convention: stylesheets load shared-first so the page sheet wins the CSS cascade; scripts load page-first with shared.js last. The error page also gained the shared stylesheet and its scripts; the index page gained its page CSS/JS and the new touch icon link.
  * Used the `StaticFile` enumeration as a single source of truth for every _href_/_src_ in the `IndexPage` and the `ErrorPage` pages, eliminating hardcoded asset paths.

* Website service
  * Added new assets to the Resources folder:
    * `apple-touch-icon.png`
    * `css/index.css`
    * `js/index.js`
    * `js/error.js`
    * `sitemap.xml`
  * Renamed existing assets within the Resources folder:
    * `css/style.css` → `css/shared.css`
    * `js/app.js` → `js/shared.js`
  * Fixed the working-directory location for the scheme in the Xcode project.

Reviewed-on: rock-n-code/loud-amsterdam#18
Co-authored-by: Javier Cicchelli <javier@rock-n-code.com>
Co-committed-by: Javier Cicchelli <javier@rock-n-code.com>
This commit is contained in:
javier
2026-07-19 02:08:59 +00:00
committed by javier
parent a045a23519
commit daf275b121
16 changed files with 279 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Services/Website/Tests/App/AppTests.swift
+15 -13
View File
@@ -94,20 +94,22 @@ struct AppTests {
try await app(
staticFilesPath: staticFilesPath
).test(.router) { client in
try await client.execute(
uri: "/\(file.relativePath)",
method: .get
) { response in
#expect(response.status == .ok)
#expect(response.headers[.contentType] == file.contentType)
let cacheControl = try #require(response.headers[.cacheControl])
for fileExtension in file.fileExtensions {
try await client.execute(
uri: "/\(file.relativePath(for: fileExtension))",
method: .get
) { response in
#expect(response.status == .ok)
#expect(response.headers[.contentType] == fileExtension.contentType)
#expect(cacheControl.contains("public") == true)
#expect(cacheControl.contains("max-age=") == true)
if textExtensions.contains(file.fileExtension) {
#expect(cacheControl.contains("must-revalidate") == true)
let cacheControl = try #require(response.headers[.cacheControl])
#expect(cacheControl.contains("public") == true)
#expect(cacheControl.contains("max-age=") == true)
if textExtensions.contains(fileExtension) {
#expect(cacheControl.contains("must-revalidate") == true)
}
}
}
}