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/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 = {