Merge pull request #2658 from matrix-org/bwindels/moarcachebustin

Cache-bust languages.json with file-loader
matrix-org · Feb 20, 2019 · 6455334 · 6455334
2 parents 338eafa + 44bedb2
commit 6455334
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -15,6 +15,9 @@ module.exports = {
       "flowtype",
       "babel"
     ],
+    globals: {
+        LANGUAGES_FILE: "readonly",
+    },
     env: {
         es6: true,
     },

diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh
@@ -23,5 +23,5 @@ ln -s "$REACT_SDK_DIR/node_modules/matrix-js-sdk" node_modules/matrix-js-sdk
 rm -r node_modules/matrix-react-sdk
 ln -s "$REACT_SDK_DIR" node_modules/matrix-react-sdk
 
-npm run build
+RIOT_LANGUAGES_FILE="../riot-web/webapp/i18n/languages.json" npm run build
 popd
diff --git a/src/languageHandler.js b/src/languageHandler.js
@@ -338,8 +338,10 @@ export function getCurrentLanguage() {
 
 function getLangsJson() {
     return new Promise((resolve, reject) => {
+        // LANGUAGES_FILE is a webpack compile-time define, see webpack config
+        const url = (typeof LANGUAGES_FILE === "string") ? require(LANGUAGES_FILE) : (i18nFolder + 'languages.json');
         request(
-            { method: "GET", url: i18nFolder + 'languages.json' },
+            { method: "GET", url },
             (err, response, body) => {
                 if (err || response.status < 200 || response.status >= 300) {
                     reject({err: err, response: response});