From 971bdfa31b0f63afd6ea29b9f576ac93663b9252 Mon Sep 17 00:00:00 2001
From: dperolio <dustin@dperolio.com>
Date: Sun, 27 Feb 2022 12:01:47 -0500
Subject: [PATCH] enable legacy babel5 module interop for compiler

---
 injector/index.js             | 4 ++--
 injector/preload.js           | 2 +-
 injector/renderer.js          | 2 +-
 renderer/src/compilers/JS.js  | 1 +
 renderer/src/compilers/JSX.js | 1 +
 renderer/src/compilers/TS.js  | 1 +
 renderer/src/compilers/TSX.js | 1 +
 7 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/injector/index.js b/injector/index.js
index e4dee42b..6df7886e 100644
--- a/injector/index.js
+++ b/injector/index.js
@@ -68,8 +68,8 @@ electron.protocol.registerSchemesAsPrivileged([
 electron.app.once('ready', () => {
   if (reactDeveloperTools) {
     installExtension(REACT_DEVELOPER_TOOLS)
-      .then(name => console.log(`Added Extension:  ${name}`))
-      .catch(err => console.error('An error occurred: ', err));
+      .then(name => console.log(`Added Extension: ${name}`))
+      .catch(err => console.error(`An error occurred: ${err}`));
   }
   /**
    * @todo Possibly add whitelists instead of just disabling CSP.
diff --git a/injector/preload.js b/injector/preload.js
index 207e0709..0687718a 100644
--- a/injector/preload.js
+++ b/injector/preload.js
@@ -75,7 +75,7 @@ require('./renderer');
 /**
  * Instantiate Vizality.
  */
-const Vizality = require('../renderer/src').default;
+const Vizality = require('../renderer/src');
 window.vizality = new Vizality();
 
 /**
diff --git a/injector/renderer.js b/injector/renderer.js
index 149dd4c0..8188e017 100644
--- a/injector/renderer.js
+++ b/injector/renderer.js
@@ -75,7 +75,7 @@ const WHITELISTED_MODULES = [
 if (window && !window.__SPLASH__) {
   window.require = module => {
     try {
-      if (WHITELISTED_MODULES.includes(module) || module.startsWith('@vizality')) {
+      if (WHITELISTED_MODULES.includes(module) || module.startsWith('@vizality') || module.startsWith('@discord')) {
         return require(module);
       }
       throw new Error(`Node module "${module.toString()}" is not whitelisted and cannot be used in this scope.`);
diff --git a/renderer/src/compilers/JS.js b/renderer/src/compilers/JS.js
index 003ea305..234895cb 100644
--- a/renderer/src/compilers/JS.js
+++ b/renderer/src/compilers/JS.js
@@ -12,6 +12,7 @@ module.exports = class JS extends Compiler {
     const js = readFileSync(this.file, 'utf8');
     return sucrase.transform(js, {
       transforms: [ 'jsx', 'imports' ],
+      enableLegacyBabel5ModuleInterop: true,
       filePath: this.file
     }).code;
   }
diff --git a/renderer/src/compilers/JSX.js b/renderer/src/compilers/JSX.js
index 7f1591da..c8e824d1 100644
--- a/renderer/src/compilers/JSX.js
+++ b/renderer/src/compilers/JSX.js
@@ -12,6 +12,7 @@ module.exports = class JSX extends Compiler {
     const jsx = readFileSync(this.file, 'utf8');
     return sucrase.transform(jsx, {
       transforms: [ 'jsx', 'imports' ],
+      enableLegacyBabel5ModuleInterop: true,
       filePath: this.file
     }).code;
   }
diff --git a/renderer/src/compilers/TS.js b/renderer/src/compilers/TS.js
index a73ca6c7..662b7648 100644
--- a/renderer/src/compilers/TS.js
+++ b/renderer/src/compilers/TS.js
@@ -12,6 +12,7 @@ module.exports = class TS extends Compiler {
     const ts = readFileSync(this.file, 'utf8');
     return sucrase.transform(ts, {
       transforms: [ 'jsx', 'imports', 'typescript' ],
+      enableLegacyBabel5ModuleInterop: true,
       filePath: this.file
     }).code;
   }
diff --git a/renderer/src/compilers/TSX.js b/renderer/src/compilers/TSX.js
index 737e24be..24a7a1db 100644
--- a/renderer/src/compilers/TSX.js
+++ b/renderer/src/compilers/TSX.js
@@ -12,6 +12,7 @@ module.exports = class TSX extends Compiler {
     const tsx = readFileSync(this.file, 'utf8');
     return sucrase.transform(tsx, {
       transforms: [ 'jsx', 'imports', 'typescript' ],
+      enableLegacyBabel5ModuleInterop: true,
       filePath: this.file
     }).code;
   }