Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream

Conflicts:
- `.eslintrc.js`:
  Upstream moved a configuration block in which we had added a glitch-only
  path.
  Moved the configuration block as upstream did.
- other files:
  Upstream reordered imports, and those files had different ones.
  Kept our version and reordered imports using the same rules.

config/webpack/configuration.js

@@ -1,10 +1,11 @@
 // Common configuration for webpacker loaded from config/webpacker.yml
 
+const { lstatSync, readFileSync } = require('fs');
 const { basename, dirname, extname, join, resolve } = require('path');
 const { env } = require('process');
-const { load } = require('js-yaml');
-const { lstatSync, readFileSync } = require('fs');
+
 const glob = require('glob');
+const { load } = require('js-yaml');
 
 const configPath = resolve('config', 'webpacker.yml');
 const settings = load(readFileSync(configPath), 'utf8')[env.RAILS_ENV || env.NODE_ENV];

config/webpack/development.js

@@ -1,8 +1,9 @@
 // Note: You must restart bin/webpack-dev-server for changes to take effect
 
 const { merge } = require('webpack-merge');
-const sharedConfig = require('./shared');
+
 const { settings, output } = require('./configuration');
+const sharedConfig = require('./shared');
 
 const watchOptions = {};
 

config/webpack/generateLocalePacks.js

@@ -11,8 +11,10 @@
 
 const { existsSync, readdirSync, writeFileSync } = require('fs');
 const { join, resolve } = require('path');
-const rimraf = require('rimraf');
+
 const { mkdirp } = require('mkdirp');
+const rimraf = require('rimraf');
+
 const { flavours } = require('./configuration');
 
 module.exports = Object.keys(flavours).reduce(function (map, entry) {

config/webpack/production.js

@@ -3,11 +3,13 @@
 const { createHash } = require('crypto');
 const { readFileSync } = require('fs');
 const { resolve } = require('path');
-const { merge } = require('webpack-merge');
-const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
-const TerserPlugin = require('terser-webpack-plugin');
+
 const CompressionPlugin = require('compression-webpack-plugin');
+const TerserPlugin = require('terser-webpack-plugin');
+const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
+const { merge } = require('webpack-merge');
 const { InjectManifest } = require('workbox-webpack-plugin');
+
 const sharedConfig = require('./shared');
 
 const root = resolve(__dirname, '..', '..');

config/webpack/rules/babel.js

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

config/webpack/rules/file.js

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

config/webpack/rules/index.js

@@ -1,8 +1,8 @@
 const babel = require('./babel');
 const css = require('./css');
 const file = require('./file');
-const tesseract = require('./tesseract');
 const nodeModules = require('./node_modules');
+const tesseract = require('./tesseract');
 
 // Webpack loaders are processed in reverse order
 // https://webpack.js.org/concepts/loaders/#loader-features

config/webpack/rules/node_modules.js

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

config/webpack/shared.js

@@ -1,12 +1,14 @@
 // Note: You must restart bin/webpack-dev-server for changes to take effect
 
-const webpack = require('webpack');
 const { resolve } = require('path');
+
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const webpack = require('webpack');
 const AssetsManifestPlugin = require('webpack-assets-manifest');
+
 const { env, settings, core, flavours, output } = require('./configuration');
-const rules = require('./rules');
 const localePacks = require('./generateLocalePacks');
+const rules = require('./rules');
 
 function reducePacks (data, into = {}) {
   if (!data.pack) return into;

config/webpack/tests.js

@@ -1,6 +1,7 @@
 // Note: You must restart bin/webpack-dev-server for changes to take effect
 
 const { merge } = require('webpack-merge');
+
 const sharedConfig = require('./shared');
 
 module.exports = merge(sharedConfig, {

config/webpack/translationRunner.js

@@ -1,5 +1,7 @@
 const fs = require('fs');
 const path = require('path');
+
+// eslint-disable-next-line import/order
 const { default: manageTranslations, readMessageFiles } = require('react-intl-translations-manager');
 
 const RFC5646_REGEXP = /^[a-z]{2,3}(?:-(?:x|[A-Za-z]{2,4}))*$/;