Merge pull request #1689 from googlefonts/lang-cache-bust-issue-1655

Make json paths used in js file use the cache busting version token
googlefonts · Oct 1, 2024 · 190b42e · 190b42e
2 parents 021ef65 + 1a48dca
commit 190b42e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/fontra/client/core/localization.js b/src/fontra/client/core/localization.js
@@ -18,7 +18,10 @@ export const ensureLanguageHasLoaded = new Promise((resolve) => {
 });
 
 function languageChanged(locale) {
-  fetchJSON(`/lang/${locale}.json`).then((data) => {
+  // Do explicit .replace() because our cache busting mechanism is simplistic,
+  // and backtick strings don't work.
+  const translationsPath = "/lang/locale.json".replace("locale", locale);
+  fetchJSON(translationsPath).then((data) => {
     localizationData = data;
     resolveLanguageHasLoaded();
   });

diff --git a/src/fontra/core/server.py b/src/fontra/core/server.py
@@ -299,7 +299,7 @@ async def viewPathHandler(
     def _addVersionTokenToReferences(self, data: bytes, contentType: str) -> bytes:
         if self.versionToken is None:
             return data
-        jsAllowedFileExtensions = ["css", "js", "svg"]
+        jsAllowedFileExtensions = ["css", "js", "svg", "json"]
         extensionMapping = {
             "text/html": self.allowedFileExtensions,
             "text/css": ["woff2", "svg"],