From 2929db5ba4c64cbcb24ebf308afbf3e4affa0169 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Wed, 10 Jul 2019 08:18:04 -0700
Subject: [PATCH] Fix fonts precaching (#3338)

* Fix font urls

* Don't zopfli nonexisting fonts
---
 build-scripts/gulp/gather-static.js | 6 +-----
 src/html/authorize.html.template    | 4 ++--
 src/html/onboarding.html.template   | 4 ++--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/build-scripts/gulp/gather-static.js b/build-scripts/gulp/gather-static.js
index 274581f322..2bdfda5f75 100644
--- a/build-scripts/gulp/gather-static.js
+++ b/build-scripts/gulp/gather-static.js
@@ -69,10 +69,6 @@ function copyMapPanel(staticDir) {
 
 function compressStatic(staticDir) {
   const staticPath = genStaticPath(staticDir);
-  const fonts = gulp
-    .src(staticPath("fonts/**/*.ttf"))
-    .pipe(zopfli())
-    .pipe(gulp.dest(staticPath("fonts")));
   const polyfills = gulp
     .src(staticPath("polyfills/*.js"))
     .pipe(zopfli())
@@ -82,7 +78,7 @@ function compressStatic(staticDir) {
     .pipe(zopfli())
     .pipe(gulp.dest(staticPath("translations")));
 
-  return merge(fonts, polyfills, translations);
+  return merge(polyfills, translations);
 }
 
 gulp.task("copy-static", (done) => {
diff --git a/src/html/authorize.html.template b/src/html/authorize.html.template
index 6833ede06e..9b057978f9 100644
--- a/src/html/authorize.html.template
+++ b/src/html/authorize.html.template
@@ -5,13 +5,13 @@
     <link rel="preload" href="<%= latestPageJS %>" as="script" crossorigin="use-credentials" />
     <link
       rel="preload"
-      href="/static/fonts/roboto/Roboto-Light.ttf"
+      href="/static/fonts/roboto/Roboto-Light.woff2"
       as="font"
       crossorigin
     />
     <link
       rel="preload"
-      href="/static/fonts/roboto/Roboto-Regular.ttf"
+      href="/static/fonts/roboto/Roboto-Regular.woff2"
       as="font"
       crossorigin
     />
diff --git a/src/html/onboarding.html.template b/src/html/onboarding.html.template
index c63949ae87..8f98f28290 100644
--- a/src/html/onboarding.html.template
+++ b/src/html/onboarding.html.template
@@ -5,13 +5,13 @@
     <link rel="preload" href="<%= latestPageJS %>" as="script" crossorigin="use-credentials" />
     <link
       rel="preload"
-      href="/static/fonts/roboto/Roboto-Light.ttf"
+      href="/static/fonts/roboto/Roboto-Light.woff2"
       as="font"
       crossorigin
     />
     <link
       rel="preload"
-      href="/static/fonts/roboto/Roboto-Regular.ttf"
+      href="/static/fonts/roboto/Roboto-Regular.woff2"
       as="font"
       crossorigin
     />