Switch to using @fontsource for Inter & Inconsolata (#28540)

* Switch to using @fontsource for Inter & Inconsolata

Signed-off-by: Michael Telatynski <[email protected]>

* Remove unused font Open_Sans

Signed-off-by: Michael Telatynski <[email protected]>

* Switch to less broken imports

Signed-off-by: Michael Telatynski <[email protected]>

* Switch to Ubuntu 24.04

Signed-off-by: Michael Telatynski <[email protected]>

* Discard changes to res/themes/dark/css/dark.pcss

* Discard changes to res/themes/legacy-light/css/_fonts.pcss

* Discard changes to res/themes/light-high-contrast/css/light-high-contrast.pcss

* Discard changes to res/themes/light/css/light.pcss

* Discard changes to .github/workflows/end-to-end-tests.yaml

* Set outputDir for fonts

Signed-off-by: Michael Telatynski <[email protected]>

* Use headed mode for Playwright

Signed-off-by: Michael Telatynski <[email protected]>

* Switch to new Chrome headless mode instead

Signed-off-by: Michael Telatynski <[email protected]>

* Cache bust playwright browser install in CI

Signed-off-by: Michael Telatynski <[email protected]>

* Update screenshots

Signed-off-by: Michael Telatynski <[email protected]>

* Try with 22.04

Signed-off-by: Michael Telatynski <[email protected]>

* Update to Ubuntu Noble

Signed-off-by: Michael Telatynski <[email protected]>

---------

Signed-off-by: Michael Telatynski <[email protected]>

.github/workflows/end-to-end-tests.yaml

@@ -83,7 +83,7 @@ jobs:
         name: "Run Tests ${{ matrix.runner }}/${{ strategy.job-total }}"
         needs: build
         if: inputs.skip != true
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-24.04
         permissions:
             actions: read
             issues: read
@@ -124,11 +124,11 @@ jobs:
               with:
                   path: |
                       ~/.cache/ms-playwright
-                  key: ${{ runner.os }}-playwright-${{ steps.playwright.outputs.version }}
+                  key: ${{ runner.os }}-playwright-${{ steps.playwright.outputs.version }}-chromium
 
-            - name: Install Playwright browsers
+            - name: Install Playwright browser
               if: steps.playwright-cache.outputs.cache-hit != 'true'
-              run: yarn playwright install --with-deps
+              run: yarn playwright install --with-deps --no-shell chromium
 
             - name: Run Playwright tests
               run: yarn playwright test --shard ${{ matrix.runner }}/${{ strategy.job-total }}

package.json

@@ -79,6 +79,8 @@
     },
     "dependencies": {
         "@babel/runtime": "^7.12.5",
+        "@fontsource/inconsolata": "^5",
+        "@fontsource/inter": "^5",
         "@formatjs/intl-segmenter": "^11.5.7",
         "@matrix-org/analytics-events": "^0.29.0",
         "@matrix-org/emojibase-bindings": "^1.3.3",

playwright.config.ts

@@ -6,11 +6,12 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
 Please see LICENSE files in the repository root for full details.
 */
 
-import { defineConfig } from "@playwright/test";
+import { defineConfig, devices } from "@playwright/test";
 
 const baseURL = process.env["BASE_URL"] ?? "http://localhost:8080";
 
 export default defineConfig({
+    projects: [{ name: "Chrome", use: { ...devices["Desktop Chrome"], channel: "chromium" } }],
     use: {
         viewport: { width: 1280, height: 720 },
         ignoreHTTPSErrors: true,

playwright/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/playwright:v1.49.0-jammy
+FROM mcr.microsoft.com/playwright:v1.49.0-noble
 
 WORKDIR /work