From 53e25ff2472e2f1bc22613415ad3263c011c187f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 1 Mar 2019 11:32:37 +0000
Subject: [PATCH 1/2] Set a resuire alias for the webapp directory

So languagehandler can pull the languages json from there
---
 scripts/package.sh | 6 +-----
 webpack.config.js  | 9 ++-------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/scripts/package.sh b/scripts/package.sh
index 008803cac9..23d0925b05 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -14,11 +14,7 @@ else
 fi
 
 npm run clean
-# riot-web is at `workspace`.
-# matrix-react-sdk is at `workspace/node_modules/matrix-react-sdk`, but this is
-# symlinked to a repo at `workspace/matrix-react-sdk`.
-# To get from `workspace/matrix-react-sdk/lib` up to the lang file, we use:
-RIOT_LANGUAGES_FILE="../../webapp/i18n/languages.json" npm run build$dev
+npm run build$dev
 
 # include the sample config in the tarball. Arguably this should be done by
 # `npm run build`, but it's just too painful.
diff --git a/webpack.config.js b/webpack.config.js
index 70ef0574a7..2b3423007f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -6,12 +6,6 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 let og_image_url = process.env.RIOT_OG_IMAGE_URL;
 if (!og_image_url) og_image_url = 'https://riot.im/app/themes/riot/img/logos/riot-im-logo-black-text.png';
 
-// relative to languageHandler.js in matrix-react-sdk
-let RIOT_LANGUAGES_FILE = process.env.RIOT_LANGUAGES_FILE;
-if (!RIOT_LANGUAGES_FILE) {
-    RIOT_LANGUAGES_FILE = "../../riot-web/webapp/i18n/languages.json";
-}
-
 module.exports = {
     entry: {
         // Load babel-polyfill first to avoid issues where some imports (namely react)
@@ -157,6 +151,8 @@ module.exports = {
 
             // same goes for js-sdk
             "matrix-js-sdk": path.resolve('./node_modules/matrix-js-sdk'),
+
+            "Webapp": path.resolve('./webapp'),
         },
     },
     plugins: [
@@ -164,7 +160,6 @@ module.exports = {
             'process.env': {
                 NODE_ENV: JSON.stringify(process.env.NODE_ENV),
             },
-            'LANGUAGES_FILE': JSON.stringify(RIOT_LANGUAGES_FILE),
         }),
         new ExtractTextPlugin("bundles/[hash]/[name].css", {
             allChunks: true,

From bf1ab7f4204840c658814168b4a6a3b351a3cc5f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 1 Mar 2019 12:03:19 +0000
Subject: [PATCH 2/2] Use $webapp rather than Webapp

---
 webpack.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webpack.config.js b/webpack.config.js
index 2b3423007f..9cdc9cae45 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -152,7 +152,7 @@ module.exports = {
             // same goes for js-sdk
             "matrix-js-sdk": path.resolve('./node_modules/matrix-js-sdk'),
 
-            "Webapp": path.resolve('./webapp'),
+            "$webapp": path.resolve('./webapp'),
         },
     },
     plugins: [