more wip

Author: jsjoeio

src/browser/pages/vscode.html

@@ -41,6 +41,26 @@
   <!-- Startup (do not modify order of script tags!) -->
   <script data-cfasync="false" src="{{CS_STATIC_BASE}}/out/browser/pages/vscode.browserified.js"></script>
   <script data-cfasync="false" type="module" src="{{CS_STATIC_BASE}}/out/browser/register.browserified.js"></script>
+  <script>
+    self.require = {
+      // Without the full URL VS Code will try to load file://.
+      baseUrl: `${window.location.origin}{{CS_STATIC_BASE}}/lib/vscode/out`,
+      recordStats: true,
+      paths: {
+        "vscode-textmate": `../node_modules/vscode-textmate/release/main`,
+        "vscode-oniguruma": `../node_modules/vscode-oniguruma/release/main`,
+        xterm: `../node_modules/xterm/lib/xterm.js`,
+        "xterm-addon-search": `../node_modules/xterm-addon-search/lib/xterm-addon-search.js`,
+        "xterm-addon-unicode11": `../node_modules/xterm-addon-unicode11/lib/xterm-addon-unicode11.js`,
+        "xterm-addon-webgl": `../node_modules/xterm-addon-webgl/lib/xterm-addon-webgl.js`,
+        "tas-client-umd": `../node_modules/tas-client-umd/lib/tas-client-umd.js`,
+        "iconv-lite-umd": `../node_modules/iconv-lite-umd/lib/iconv-lite-umd.js`,
+        jschardet: `../node_modules/jschardet/dist/jschardet.min.js`,
+      },
+      // "vs/nls": nlsConfig,
+    }
+    require(["vs/code/browser/workbench/workbench"], function () {})
+  </script>
   <script data-cfasync="false" type="module" src="{{CS_STATIC_BASE}}/lib/vscode/out/vs/loader.js"></script>
   <script>
     performance.mark("code/willLoadWorkbenchMain")
@@ -49,7 +69,4 @@
   <script data-cfasync="false" src="{{CS_STATIC_BASE}}/lib/vscode/out/vs/workbench/workbench.web.api.nls.js"></script>
   <script data-cfasync="false" src="{{CS_STATIC_BASE}}/lib/vscode/out/vs/workbench/workbench.web.api.js"></script>
   END_PROD_ONLY -->
-  <script>
-    require(["vs/code/browser/workbench/workbench"], function () {})
-  </script>
 </html>

src/browser/pages/vscode.ts

@@ -30,24 +30,6 @@ try {
   /* Probably fine. */
 }
 
-;(self.require as any) = {
-  // Without the full URL VS Code will try to load file://.
-  baseUrl: `${window.location.origin}${options.csStaticBase}/lib/vscode/out`,
-  recordStats: true,
-  paths: {
-    "vscode-textmate": `../node_modules/vscode-textmate/release/main`,
-    "vscode-oniguruma": `../node_modules/vscode-oniguruma/release/main`,
-    xterm: `../node_modules/xterm/lib/xterm.js`,
-    "xterm-addon-search": `../node_modules/xterm-addon-search/lib/xterm-addon-search.js`,
-    "xterm-addon-unicode11": `../node_modules/xterm-addon-unicode11/lib/xterm-addon-unicode11.js`,
-    "xterm-addon-webgl": `../node_modules/xterm-addon-webgl/lib/xterm-addon-webgl.js`,
-    "tas-client-umd": `../node_modules/tas-client-umd/lib/tas-client-umd.js`,
-    "iconv-lite-umd": `../node_modules/iconv-lite-umd/lib/iconv-lite-umd.js`,
-    jschardet: `../node_modules/jschardet/dist/jschardet.min.js`,
-  },
-  "vs/nls": nlsConfig,
-}
-
 try {
   document.body.style.background = JSON.parse(localStorage.getItem("colorThemeData")!).colorMap["editor.background"]
 } catch (error) {