From abe487ffef8675ee93c168319656a1d0e1406eeb Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Sun, 10 Apr 2022 14:25:41 +0200
Subject: [PATCH] rm window load

---
 apps/remix-ide/src/assets/js/loader.js |  2 +-
 apps/remix-ide/src/index.tsx           | 36 +++++++++++---------------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/apps/remix-ide/src/assets/js/loader.js b/apps/remix-ide/src/assets/js/loader.js
index cbf0ab92ca..78edd692fa 100644
--- a/apps/remix-ide/src/assets/js/loader.js
+++ b/apps/remix-ide/src/assets/js/loader.js
@@ -9,11 +9,11 @@ fetch('assets/version.json').then(response => {
   response.text().then(function(data) {
     const version = JSON.parse(data).version;
     console.log(`Loading Remix ${version}`);
-    createScriptTag(`main.${version}.js`, 'text/javascript');
     createScriptTag(`polyfills.${version}.js`, 'module');
     if (version.includes('dev')) {
       createScriptTag(`vendor.${version}.js`, 'module');
       createScriptTag(`runtime.js`, 'module');
     }
+    createScriptTag(`main.${version}.js`, 'text/javascript');
   });
 });
diff --git a/apps/remix-ide/src/index.tsx b/apps/remix-ide/src/index.tsx
index ed32b38c03..7d4e34b983 100644
--- a/apps/remix-ide/src/index.tsx
+++ b/apps/remix-ide/src/index.tsx
@@ -8,26 +8,20 @@ import Config from './config'
 import Registry from './app/state/registry'
 import { Storage } from '@remix-project/remix-lib'
 
-window.onload = () => {
-  function loadApp() {
-      // load current theme befor anything else
-      try {
-        const configStorage = new Storage('config-v0.8:')
-        const config = new Config(configStorage);
-        Registry.getInstance().put({ api: config, name: 'config' })
-      } catch (e) {}
-      const theme = new ThemeModule()
-      theme.initTheme()
-    
-      render(
-        <React.StrictMode>
-          <Preload></Preload>
-        </React.StrictMode>,
-        document.getElementById('root')
-      ) 
-  }
-  loadApp()
-  return
-}
+try {
+  const configStorage = new Storage('config-v0.8:')
+  const config = new Config(configStorage);
+  Registry.getInstance().put({ api: config, name: 'config' })
+} catch (e) { }
+const theme = new ThemeModule()
+theme.initTheme()
+
+render(
+  <React.StrictMode>
+    <Preload></Preload>
+  </React.StrictMode>,
+  document.getElementById('root')
+)
+