Merge commit '06f070d86d' into glitch-soc/merge-upstream

config/webpack/rules/babel.js

@@ -2,19 +2,19 @@ const { join, resolve } = require('path');
 
 const { env, settings } = require('../configuration');
 
+// Those modules contain modern ES code that need to be transpiled for Webpack to process it
+const nodeModulesToProcess = [
+  '@reduxjs', 'fuzzysort'
+];
+
 module.exports = {
   test: /\.(js|jsx|mjs|ts|tsx)$/,
   include: [
     settings.source_path,
     ...settings.resolved_paths,
-    'node_modules/@reduxjs'
+    ...nodeModulesToProcess.map(p => resolve(`node_modules/${p}`)),
   ].map(p => resolve(p)),
-  exclude: function(modulePath) {
-    return (
-      /node_modules/.test(modulePath) &&
-      !/@reduxjs/.test(modulePath)
-    );
-  },
+  exclude: new RegExp('node_modules\\/(?!(' + nodeModulesToProcess.join('|')+')\\/).*'),
   use: [
     {
       loader: 'babel-loader',