Merge pull request #16938 from schlawg/always-be-hashing

always be hashing
lichess-org · Feb 10, 2025 · 59c7274 · 59c7274
2 parents 47624e2 + f83f02f
commit 59c7274
Show file tree

Hide file tree

Showing 62 changed files with 956 additions and 723 deletions.
diff --git a/app/views/base/embed.scala b/app/views/base/embed.scala
@@ -21,7 +21,6 @@ object embed:
           (ctx.bg == "system").option(page.ui.systemThemeScript(ctx.nonce.some)),
           page.ui.pieceSprite(ctx.pieceSet.name),
           cssTag("common.theme.embed"),
-          link(rel := "stylesheet", href := assetUrl("css/theme/font-face.css")),
           cssKeys.map(cssTag),
           page.ui.scriptsPreload(modules.flatMap(_.map(_.key)))
         ),
@@ -67,7 +66,6 @@ object embed:
           (ctx.bg == "system").option(page.ui.systemThemeScript(ctx.nonce.some)),
           page.ui.pieceSprite(ctx.pieceSet.name),
           cssTag("common.theme.embed"),
-          link(rel := "stylesheet", href := assetUrl("css/theme/font-face.css")),
           cssKeys.map(cssTag),
           page.ui.sitePreload(
             List[I18nModule.Selector](_.site, _.timeago) ++ i18nModules,

diff --git a/app/views/base/page.scala b/app/views/base/page.scala
@@ -21,10 +21,10 @@ object page:
     raw(s"""<meta name="theme-color" content="${ctx.pref.themeColor}">""")
 
   private def boardPreload(using ctx: Context) = frag(
-    preload(staticAssetUrl(s"images/board/${ctx.pref.currentTheme.file}"), "image", crossorigin = false),
+    preload(assetUrl(s"images/board/${ctx.pref.currentTheme.file}"), "image", crossorigin = false),
     ctx.pref.is3d.option(
       preload(
-        staticAssetUrl(s"images/staunton/board/${ctx.pref.currentTheme3d.file}"),
+        assetUrl(s"images/staunton/board/${ctx.pref.currentTheme3d.file}"),
         "image",
         crossorigin = false
       )
@@ -61,7 +61,6 @@ object page:
             else s"${ctx.me.so(_.username.value + " ")} $prodTitle"
           ,
           cssTag("common.theme.all"),
-          link(rel := "stylesheet", href := assetUrl("css/theme/font-face.css")),
           cssTag("site"),
           pref.is3d.option(cssTag("common.board-3d")),
           ctx.data.inquiry.isDefined.option(cssTag("mod.inquiry")),
@@ -81,8 +80,10 @@ object page:
           noTranslate,
           p.openGraph.map(lila.web.ui.openGraph),
           p.atomLinkTag | dailyNewsAtom,
-          (pref.bg == lila.pref.Pref.Bg.TRANSPARENT).option(pref.bgImgOrDefault).map { img =>
-            val url = escapeHtmlRaw(img).replace("&amp;", "&")
+          (pref.bg == lila.pref.Pref.Bg.TRANSPARENT).option(pref.bgImgOrDefault).map { loc =>
+            val url =
+              if loc.startsWith("/assets/") then assetUrl(loc.drop(8))
+              else escapeHtmlRaw(loc).replace("&amp;", "&")
             raw(s"""<style id="bg-data">html.transp::before{background-image:url("$url");}</style>""")
           },
           fontPreload,

diff --git a/modules/web/src/main/AssetManifest.scala b/modules/web/src/main/AssetManifest.scala
@@ -101,7 +101,7 @@ final class AssetManifest(environment: Environment, net: NetConfig, ws: Standalo
       .map { (k, asset) =>
         val hash   = (asset \ "hash").as[String]
         val name   = k.substring(k.lastIndexOf('/') + 1)
-        val extPos = name.indexOf('.')
+        val extPos = name.lastIndexOf('.')
         val hashedName =
           if extPos < 0 then s"${name}.$hash"
           else s"${name.slice(0, extPos)}.$hash${name.substring(extPos)}"

diff --git a/package.json b/package.json
@@ -24,14 +24,14 @@
   },
   "dependencies": {
     "@types/lichess": "workspace:*",
-    "@types/web": "^0.0.194",
-    "@typescript-eslint/eslint-plugin": "^8.20.0",
-    "@typescript-eslint/parser": "^8.20.0",
+    "@types/web": "^0.0.201",
+    "@typescript-eslint/eslint-plugin": "^8.23.0",
+    "@typescript-eslint/parser": "^8.23.0",
     "ab": "github:lichess-org/ab-stub",
     "chessground": "^9.1.1",
     "chessops": "^0.14.2",
-    "eslint": "^9.18.0",
-    "lint-staged": "^15.3.0",
+    "eslint": "^9.20.0",
+    "lint-staged": "^15.4.3",
     "onchange": "^7.1.0",
     "prettier": "^3.4.2",
     "snabbdom": "3.5.1",