Merge remote-tracking branch 'origin/develop' into typescript

webpack/development.js

@@ -2,7 +2,9 @@
 console.log('Running in development mode'); // eslint-disable-line no-console
 
 const { join } = require('path');
+
 const { merge } = require('webpack-merge');
+
 const sharedConfig = require('./shared');
 
 const watchOptions = {};

webpack/production.js

@@ -2,9 +2,11 @@
 console.log('Running in production mode'); // eslint-disable-line no-console
 
 const { join } = require('path');
-const { merge } = require('webpack-merge');
-const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
+
 const OfflinePlugin = require('@lcdp/offline-plugin');
+const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
+const { merge } = require('webpack-merge');
+
 const sharedConfig = require('./shared');
 
 const { FE_SUBDIRECTORY } = require(join(__dirname, '..', 'app', 'soapbox', 'build_config'));
@@ -104,7 +106,11 @@ module.exports = merge(sharedConfig, {
           ];
 
           const isBackendRoute = ({ pathname }) => {
-            return backendRoutes.some(pathname.startsWith);
+            if (pathname) {
+              return backendRoutes.some(pathname.startsWith);
+            } else {
+              return false;
+            }
           };
 
           return isBackendRoute(requestUrl) && requestUrl;

webpack/rules/babel-build-config.js

@@ -1,4 +1,5 @@
 const { resolve } = require('path');
+
 const { env } = require('../configuration');
 
 // This is a hack, used to force build_config @preval to recompile

webpack/rules/babel-git.js

@@ -1,4 +1,5 @@
 const { resolve } = require('path');
+
 const { env } = require('../configuration');
 
 // This is a hack, used in conjunction with rules/git-refresh.js

webpack/rules/babel.js

@@ -1,4 +1,5 @@
 const { join, resolve } = require('path');
+
 const { env, settings } = require('../configuration');
 
 module.exports = {

webpack/rules/index.js

@@ -1,9 +1,9 @@
-const babel = require('./babel');
-const git = require('./babel-git');
-const gitRefresh = require('./git-refresh');
-const buildConfig = require('./babel-build-config');
-const css = require('./css');
 const assets = require('./assets');
+const babel = require('./babel');
+const buildConfig = require('./babel-build-config');
+const git = require('./babel-git');
+const css = require('./css');
+const gitRefresh = require('./git-refresh');
 const nodeModules = require('./node_modules');
 
 // Webpack loaders are processed in reverse order

webpack/rules/node_modules.js

@@ -1,4 +1,5 @@
 const { join } = require('path');
+
 const { settings, env } = require('../configuration');
 
 module.exports = {

webpack/shared.js

@@ -1,13 +1,15 @@
 // Note: You must restart bin/webpack-dev-server for changes to take effect
 
-const webpack = require('webpack');
 const { join, resolve } = require('path');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const AssetsManifestPlugin = require('webpack-assets-manifest');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const HtmlWebpackHarddiskPlugin = require('html-webpack-harddisk-plugin');
+
 const CopyPlugin = require('copy-webpack-plugin');
 const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
+const HtmlWebpackHarddiskPlugin = require('html-webpack-harddisk-plugin');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const webpack = require('webpack');
+const AssetsManifestPlugin = require('webpack-assets-manifest');
+
 const { env, settings, output } = require('./configuration');
 const rules = require('./rules');
 

webpack/test.js

@@ -2,6 +2,7 @@
 console.log('Running in test mode'); // eslint-disable-line no-console
 
 const { merge } = require('webpack-merge');
+
 const sharedConfig = require('./shared');
 
 module.exports = merge(sharedConfig, {

webpack/translationRunner.js

@@ -1,7 +1,8 @@
 const fs = require('fs');
 const path = require('path');
+
 const parser = require('intl-messageformat-parser');
-const { default: manageTranslations, readMessageFiles  } = require('react-intl-translations-manager');
+const { default: manageTranslations, readMessageFiles } = require('react-intl-translations-manager'); // eslint-disable-line import/order
 
 const RFC5646_REGEXP = /^[a-z]{2,3}(?:-(?:x|[A-Za-z]{2,4}))*$/;
 
@@ -152,7 +153,7 @@ const extractedMessages = extractedMessagesFiles.reduce((acc, messageFile) => {
 const translations = languages.map((language) => {
   return {
     language: language,
-    data : JSON.parse(fs.readFileSync(path.join(translationsDirectory, language + '.json'), 'utf8')),
+    data: JSON.parse(fs.readFileSync(path.join(translationsDirectory, language + '.json'), 'utf8')),
   };
 });