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/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;