lichess-org · ornicar · Apr 17, 2024 · Mar 30, 2024 · Mar 30, 2024 · Mar 30, 2024
diff --git a/.github/workflows/assets.yml b/.github/workflows/assets.yml
@@ -39,7 +39,7 @@ jobs:
         id: ab
       - run: pnpm link "$GITHUB_WORKSPACE/ab"
         if: steps.ab.outcome == 'success'
-      - run: ./ui/build --no-install -ps
+      - run: ./ui/build --no-install -p
       - run: cd ui && pnpm run test && cd -
       - run: mkdir assets && mv public assets/ && cp bin/download-lifat LICENSE COPYING.md README.md assets/ && git log -n 1 --pretty=oneline > assets/commit.txt
       - run: cd assets && tar --zstd -cvpf ../assets.tar.zst . && cd -

diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@
 project/.bloop/
 conf/application.conf
 conf/version.conf
+conf/manifest.*
 
 logs
 project/metals.sbt
@@ -21,6 +22,7 @@ data/
 dist/
 node_modules/
 local/
+gen/
 ui/common/**/*.js
 ui/common/**/*.d.ts
 ui/chess/**/*.js

diff --git a/.ignore b/.ignore
@@ -1,7 +1,6 @@
 # search ignores
 vendor
 translation/dest
-ui/*/css/build
 public/font
 public/sound
 public/piece

diff --git a/app/Env.scala b/app/Env.scala
@@ -23,6 +23,7 @@ final class Env(
     SessionCookieBaker
 ):
   val net: NetConfig = config.get[NetConfig]("net")
+
   export net.{ domain, baseUrl, assetBaseUrlInternal }
 
   given Mode                   = environment.mode
@@ -138,6 +139,7 @@ given ConfigLoader[NetConfig] = ConfigLoader(config =>
       assetBaseUrl = get[AssetBaseUrl]("asset.base_url"),
       assetBaseUrlInternal = get[AssetBaseUrlInternal]("asset.base_url_internal"),
       minifiedAssets = get[Boolean]("asset.minified"),
+      externalManifest = get[Boolean]("asset.external_manifest"),
       stageBanner = get[Boolean]("stage.banner"),
       siteName = get[String]("site.name"),
       socketDomains = get[List[String]]("socket.domains"),

diff --git a/app/controllers/Plan.scala b/app/controllers/Plan.scala
@@ -84,6 +84,7 @@ final class Plan(env: Env) extends LilaController(env):
     res <- info match
       case Some(info: CustomerInfo.Monthly) =>
         Ok.page(html.plan.indexStripe(me, patron, info, env.plan.stripePublicKey, pricing, gifts))
+
       case Some(CustomerInfo.OneTime(cus)) =>
         renderIndex(cus.email.map { EmailAddress(_) }, patron.some)
       case None =>

diff --git a/app/controllers/RelayRound.scala b/app/controllers/RelayRound.scala
@@ -220,7 +220,9 @@ final class RelayRound(
         page <- renderPage:
           html.relay.show(rt.withStudy(sc.study), data, chat, sVersion, crossSiteIsolation)
         _ = if HTTPRequest.isHuman(req) then lila.mon.http.path(rt.tour.path).increment()
-      yield if crossSiteIsolation then Ok(page).enforceCrossSiteIsolation else Ok(page)
+      yield
+        if crossSiteIsolation then Ok(page).enforceCrossSiteIsolation
+        else Ok(page).withHeaders(crossOriginPolicy.unsafe*)
     )(
       studyC.privateUnauthorizedFu(oldSc.study),
       studyC.privateForbiddenFu(oldSc.study)

diff --git a/app/templating/AssetHelper.scala b/app/templating/AssetHelper.scala
@@ -7,6 +7,7 @@ import lila.core.net.AssetVersion
 import lila.core.data.SafeJsonStr
 import lila.common.String.html.safeJsonValue
 import lila.web.ui.*
+import lila.web.Nonce
 import lila.web.ContentSecurityPolicy
 
 trait AssetHelper:
@@ -16,6 +17,12 @@ trait AssetHelper:
   def env: Env
 
   case class PageModule(name: String, data: JsValue | SafeJsonStr)
+  case class EsmInit(key: String, init: Frag)
+  type EsmList = List[Option[EsmInit]]
+  given Conversion[EsmInit, EsmList] with
+    def apply(esmInit: EsmInit): EsmList = List(Some(esmInit))
+  given Conversion[Option[EsmInit], EsmList] with
+    def apply(esmOption: Option[EsmInit]): EsmList = List(esmOption)
 
   private lazy val netDomain      = env.net.domain
   private lazy val assetDomain    = env.net.assetDomain
@@ -30,6 +37,8 @@ trait AssetHelper:
 
   def assetVersion = AssetVersion.current
 
+  def updateManifest() = if !env.net.isProd then env.web.manifest.update()
+
   // bump flairs version if a flair is changed only (not added or removed)
   val flairVersion = "______2"
 
@@ -40,26 +49,8 @@ trait AssetHelper:
 
   def flairSrc(flair: Flair): String = staticAssetUrl(s"$flairVersion/flair/img/$flair.webp")
 
-  def cssTag(name: String)(using ctx: Context): Frag =
-    cssTagWithTheme(name, ctx.pref.currentBg)
-
-  def cssTagWithTheme(name: String, theme: String): Frag =
-    if theme == "system" then
-      frag(
-        cssTagWithSimpleTheme(name, "light")(media := "(prefers-color-scheme: light)"),
-        cssTagWithSimpleTheme(name, "dark")(media  := "(prefers-color-scheme: dark)")
-      )
-    else cssTagWithSimpleTheme(name, theme)
-
-  private def cssTagWithSimpleTheme(name: String, theme: String): Tag =
-    cssAt:
-      s"css/$name.$theme.${if minifiedAssets then "min" else "dev"}.css"
-
-  def cssTagNoTheme(name: String): Frag =
-    cssAt(s"css/$name.${if minifiedAssets then "min" else "dev"}.css")
-
-  private def cssAt(path: String): Tag =
-    link(href := assetUrl(path), rel := "stylesheet")
+  def cssTag(key: String)(using ctx: Context): Frag =
+    link(href := staticAssetUrl(s"css/${env.web.manifest.css(key).getOrElse(key)}"), rel := "stylesheet")
 
   def jsonScript(json: JsValue | SafeJsonStr, id: String = "page-init-data") =
     script(tpe := "application/json", st.id := id):
@@ -68,40 +59,39 @@ trait AssetHelper:
           case json: JsValue => safeJsonValue(json).value
           case json          => json.toString
 
-  val systemThemePolyfillJs = """
-if (window.matchMedia('(prefers-color-scheme: dark)').media === 'not all')
-    document.querySelectorAll('[media="(prefers-color-scheme: dark)"]').forEach(e=>e.media='')
-"""
-
   // load iife scripts in <head> and defer
   def iifeModule(path: String): Frag = script(deferAttr, src := assetUrl(path))
 
-  private val loadEsmFunction = "site.asset.loadEsm"
-
-  // jsModule is esm, no defer needed
-  def jsModule(name: String): Frag =
-    script(tpe := "module", src := assetUrl(s"compiled/$name${minifiedAssets.so(".min")}.js"))
-
-  def jsModuleInit(name: String)(using PageContext): Frag =
-    frag(jsModule(name), embedJsUnsafeLoadThen(s"$loadEsmFunction('$name')"))
-  def jsModuleInit(name: String, json: SafeJsonStr)(using PageContext): Frag =
-    frag(jsModule(name), embedJsUnsafeLoadThen(s"$loadEsmFunction('$name',{init:$json})"))
-  def jsModuleInit[A: Writes](name: String, value: A)(using PageContext): Frag =
-    jsModuleInit(name, safeJsonValue(Json.toJson(value)))
-
-  def jsModuleInit(name: String, text: SafeJsonStr, nonce: lila.web.Nonce): Frag =
-    frag(jsModule(name), embedJsUnsafeLoadThen(s"$loadEsmFunction('$name',{init:$text})", nonce))
-  def jsModuleInit(name: String, json: JsValue, nonce: lila.web.Nonce): Frag =
-    jsModuleInit(name, safeJsonValue(json), nonce)
-
-  def jsPageModule(name: String)(using PageContext) =
-    frag(jsModule(name), embedJsUnsafeLoadThen(s"site.asset.loadPageEsm('$name')"))
-
-  def analyseNvuiTag(using ctx: PageContext) = ctx.blind.option(jsModule("analysisBoard.nvui"))
+  private val load = "site.asset.loadEsm"
+
+  def jsName(key: String): String =
+    env.web.manifest.js(key).fold(key)(_.name)
+  def jsTag(key: String): Frag =
+    script(tpe := "module", src := staticAssetUrl(s"compiled/${jsName(key)}"))
+  def jsDeps(keys: List[String]): Frag = frag:
+    env.web.manifest.deps(keys).map { dep =>
+      script(tpe := "module", src := staticAssetUrl(s"compiled/$dep"))
+    }
+  def jsModule(key: String): EsmInit =
+    EsmInit(key, emptyFrag)
+  def jsModuleInit(key: String)(using PageContext): EsmInit =
+    EsmInit(key, embedJsUnsafeLoadThen(s"$load('${jsName(key)}')"))
+  def jsModuleInit(key: String, json: SafeJsonStr)(using PageContext): EsmInit =
+    EsmInit(key, embedJsUnsafeLoadThen(s"$load('${jsName(key)}',{init:$json})"))
+  def jsModuleInit[A: Writes](key: String, value: A)(using PageContext): EsmInit =
+    jsModuleInit(key, safeJsonValue(Json.toJson(value)))
+  def jsModuleInit(key: String, text: SafeJsonStr, nonce: Nonce): EsmInit =
+    EsmInit(key, embedJsUnsafeLoadThen(s"$load('${jsName(key)}',{init:$text})", nonce))
+  def jsModuleInit(key: String, json: JsValue, nonce: Nonce): EsmInit =
+    jsModuleInit(key, safeJsonValue(json), nonce)
+  def jsPageModule(key: String)(using PageContext): EsmInit =
+    EsmInit(key, embedJsUnsafeLoadThen(s"site.asset.loadPageEsm('${jsName(key)}')"))
+
+  def analyseNvuiTag(using ctx: PageContext) = ctx.blind.option(jsModule("analyse.nvui"))
   def puzzleNvuiTag(using ctx: PageContext)  = ctx.blind.option(jsModule("puzzle.nvui"))
   def roundNvuiTag(using ctx: PageContext)   = ctx.blind.option(jsModule("round.nvui"))
-  def infiniteScrollTag(using PageContext)   = jsModuleInit("infiniteScroll")
-  def captchaTag                             = jsModule("captcha")
+  def infiniteScrollTag(using PageContext)   = jsModuleInit("bits.infiniteScroll")
+  def captchaTag                             = jsModule("bits.captcha")
   def cashTag                                = iifeModule("javascripts/vendor/cash.min.js")
   def fingerprintTag                         = iifeModule("javascripts/fipr.js")
   def chessgroundTag = script(tpe := "module", src := assetUrl("npm/chessground.min.js"))
@@ -126,13 +116,13 @@ if (window.matchMedia('(prefers-color-scheme: dark)').media === 'not all')
       s""" nonce="$nonce""""
     s"""<script$nonce>$js</script>"""
 
-  def embedJsUnsafe(js: String, nonce: lila.web.Nonce): Frag = raw:
+  def embedJsUnsafe(js: String, nonce: Nonce): Frag = raw:
     s"""<script nonce="$nonce">$js</script>"""
 
   private val onLoadFunction = "site.load.then"
 
   def embedJsUnsafeLoadThen(js: String)(using PageContext): Frag =
     embedJsUnsafe(s"""$onLoadFunction(()=>{$js})""")
 
-  def embedJsUnsafeLoadThen(js: String, nonce: lila.web.Nonce): Frag =
+  def embedJsUnsafeLoadThen(js: String, nonce: Nonce): Frag =
     embedJsUnsafe(s"""$onLoadFunction(()=>{$js})""", nonce)
diff --git a/app/views/account/layout.scala b/app/views/account/layout.scala
@@ -11,12 +11,14 @@ object layout:
       title: String,
       active: String,
       evenMoreCss: Frag = emptyFrag,
-      evenMoreJs: Frag = emptyFrag
+      evenMoreJs: Frag = emptyFrag,
+      modules: EsmList = Nil
   )(body: Frag)(using ctx: PageContext): Frag =
     views.html.base.layout(
       title = title,
       moreCss = frag(cssTag("account"), evenMoreCss),
-      moreJs = frag(jsModule("account"), evenMoreJs)
+      moreJs = evenMoreJs,
+      modules = jsModule("bits.account") ++ modules
     ):
       def activeCls(c: String) = cls := active.activeO(c)
       main(cls := "account page-menu")(

diff --git a/app/views/account/passwd.scala b/app/views/account/passwd.scala
@@ -12,7 +12,7 @@ object passwd:
     account.layout(
       title = trans.site.changePassword.txt(),
       active = "password",
-      evenMoreJs = jsModuleInit("passwordComplexity")
+      modules = jsModuleInit("bits.passwordComplexity")
     ):
       div(cls := "box box-pad")(
         h1(cls := "box__top")(trans.site.changePassword()),

diff --git a/app/views/analyse/bits.scala b/app/views/analyse/bits.scala
@@ -13,12 +13,14 @@ object bits:
       pageModule: PageModule,
       moreCss: Frag = emptyFrag,
       moreJs: Frag = emptyFrag,
+      modules: EsmList = Nil,
       openGraph: Option[lila.web.OpenGraph] = None
   )(body: Frag)(using PageContext): Frag =
     views.html.base.layout(
       title = title,
       moreCss = moreCss,
       moreJs = moreJs,
+      modules = modules,
       pageModule = pageModule.some,
       openGraph = openGraph,
       robots = false,
@@ -29,4 +31,4 @@ object bits:
   def csp(using PageContext) = analysisCsp.withPeer.withInlineIconFont.withChessDbCn.some
 
   def analyseModule(mode: String, json: JsObject)(using ctx: PageContext) =
-    PageModule("analysisBoard", Json.obj("mode" -> mode, "cfg" -> json))
+    PageModule("analyse", Json.obj("mode" -> mode, "cfg" -> json))
diff --git a/app/views/analyse/embed.scala b/app/views/analyse/embed.scala
@@ -16,7 +16,7 @@ object embed:
       cssModule = "lpv.embed"
     )(
       div(cls := "is2d")(div(pgn)),
-      jsModule("lpv.embed"),
+      jsTag("site.lpv.embed"),
       lpvJs(orientation, getPgn)
     )
 

diff --git a/app/views/analyse/replay.scala b/app/views/analyse/replay.scala
@@ -122,7 +122,7 @@ object replay:
         (pov.game.variant == Crazyhouse).option(cssTag("analyse.zh")),
         ctx.blind.option(cssTag("round.nvui"))
       ),
-      moreJs = analyseNvuiTag,
+      modules = analyseNvuiTag,
       pageModule = bits.analyseModule(
         "replay",
         Json

diff --git a/app/views/appeal/bits.scala b/app/views/appeal/bits.scala
@@ -14,8 +14,5 @@ object bits:
         cssTag("appeal"),
         isGranted(_.UserModView).option(cssTag("mod.user"))
       ),
-      moreJs = frag(
-        jsModule("appeal"),
-        isGranted(_.UserModView).option(jsModule("mod.user"))
-      )
+      modules = jsModule("mod.appeal") ++ isGranted(_.UserModView).so(jsModule("mod.user"))
     )(body)
diff --git a/app/views/auth/bits.scala b/app/views/auth/bits.scala
@@ -73,7 +73,7 @@ object bits:
     views.html.base.layout(
       title = s"${me.username} - ${trans.site.changePassword.txt()}",
       moreCss = cssTag("form3"),
-      moreJs = jsModuleInit("passwordComplexity")
+      modules = jsModuleInit("bits.passwordComplexity")
     ):
       main(cls := "page-small box box-pad")(
         boxTop(

diff --git a/app/views/auth/login.scala b/app/views/auth/login.scala
@@ -14,7 +14,7 @@ object login:
   def apply(form: Form[?], referrer: Option[String])(using PageContext) =
     views.html.base.layout(
       title = trans.site.signIn.txt(),
-      moreJs = jsModuleInit("login", "login"),
+      modules = jsModuleInit("bits.login", "login"),
       moreCss = cssTag("auth"),
       withHrefLangs = lila.core.app.LangPath(routes.Auth.login).some
     ) {

diff --git a/app/views/auth/signup.scala b/app/views/auth/signup.scala
@@ -14,11 +14,8 @@ object signup:
   def apply(form: lila.core.security.HcaptchaForm[?])(using ctx: PageContext) =
     views.html.base.layout(
       title = trans.site.signUp.txt(),
-      moreJs = frag(
-        jsModuleInit("login", "signup"),
-        lila.web.views.hcaptcha.script(form),
-        fingerprintTag
-      ),
+      modules = jsModuleInit("bits.login", "signup"),
+      moreJs = frag(lila.web.views.hcaptcha.script(form), fingerprintTag),
       moreCss = cssTag("auth"),
       csp = defaultCsp.withHcaptcha.some,
       withHrefLangs = LangPath(routes.Auth.signup).some

diff --git a/app/views/base/embed.scala b/app/views/base/embed.scala
@@ -15,9 +15,10 @@ object embed:
           layout.bits.viewport,
           layout.bits.metaCsp(basicCsp.withNonce(ctx.nonce).withInlineIconFont),
           st.headTitle(title),
+          layout.bits.systemThemeEmbedScript,
           layout.bits.pieceSprite(ctx.pieceSet),
-          cssTagWithTheme(cssModule, ctx.bg),
-          (ctx.bg == "system").option(embedJsUnsafe(systemThemePolyfillJs, ctx.nonce))
+          cssTag("theme-light"), // includes both light & dark colors
+          cssTag(cssModule)
         ),
         st.body(cls := s"${ctx.bg} highlight ${ctx.boardClass}")(
           layout.dataSoundSet := SoundSet.silent.key,