Merge branch 'main' into glitch-soc/merge-upstream

2021-09-02 10:52:09 +02:00
parent e7e04b46d7 2b18f7a943
commit f9185c72a9
7 changed files with 825 additions and 1103 deletions
--- a/config/webpack/tests.js
+++ b/config/webpack/tests.js
@ -1,7 +1,7 @@
 // Note: You must restart bin/webpack-dev-server for changes to take effect

 const { merge } = require('webpack-merge');
-const sharedConfig = require('./shared.js');
+const sharedConfig = require('./shared');

 module.exports = merge(sharedConfig, {
  mode: 'development',