From fa29858a4e563cf2ede067ba927759c962fefef7 Mon Sep 17 00:00:00 2001
From: webzwo0i <webzwo0i@c3d2.de>
Date: Thu, 25 Feb 2021 14:17:36 +0100
Subject: [PATCH] avoid manually including require-kernel in ace.js

---
 src/node/utils/Minify.js |  2 --
 src/static/js/ace.js     | 11 ++---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js
index 32f33bf36..b5ac28b15 100644
--- a/src/node/utils/Minify.js
+++ b/src/node/utils/Minify.js
@@ -226,8 +226,6 @@ const getAceFile = async () => {
       filenames.push(matches[2]);
     }
   }
-  // Always include the require kernel.
-  filenames.push('../static/js/require-kernel.js');
 
   data += ';\n';
   data += 'Ace2Editor.EMBEDED = Ace2Editor.EMBEDED || {};\n';
diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index e648df07e..40b8625c8 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -24,8 +24,6 @@
 // requires: top
 // requires: undefined
 
-const KERNEL_SOURCE = '../static/js/require-kernel.js';
-
 const hooks = require('./pluginfw/hooks');
 const pluginUtils = require('./pluginfw/shared');
 
@@ -196,15 +194,10 @@ const Ace2Editor = function () {
           `../static/skins/${clientVars.skinName}/pad.css?v=${clientVars.randomVersionString}`);
 
       pushStyleTagsFor(iframeHTML, includedCSS);
-
-      if (!Ace2Editor.EMBEDED || !Ace2Editor.EMBEDED[KERNEL_SOURCE]) {
-        // Remotely src'd script tag will not work in IE; it must be embedded, so
-        // throw an error if it is not.
-        throw new Error('Require kernel could not be found.');
-      }
+      iframeHTML.push(`<script type="text/javascript" src="../static/js/require-kernel.js?v=${clientVars.randomVersionString}"></script>`);
 
       iframeHTML.push(scriptTag(
-          `${Ace2Editor.EMBEDED[KERNEL_SOURCE]}\n\
+          `\n\
 require.setRootURI("../javascripts/src");\n\
 require.setLibraryURI("../javascripts/lib");\n\
 require.setGlobalKeyPath("require");\n\