Export as a module first

This fixes using v86 in bundlers like vite.
copy · Aug 10, 2024 · 0c3e2f8 · 0c3e2f8
1 parent fbb6a1e
commit 0c3e2f8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/src/browser/filestorage.js b/src/browser/filestorage.js
@@ -148,16 +148,16 @@ ServerFileStorageWrapper.prototype.uncache = function(sha256sum)
 };
 
 // Closure Compiler's way of exporting
-if(typeof window !== "undefined")
-{
-    window["MemoryFileStorage"] = MemoryFileStorage;
-    window["ServerFileStorageWrapper"] = ServerFileStorageWrapper;
-}
-else if(typeof module !== "undefined" && typeof module.exports !== "undefined")
+if(typeof module !== "undefined" && typeof module.exports !== "undefined")
 {
     module.exports["MemoryFileStorage"] = MemoryFileStorage;
     module.exports["ServerFileStorageWrapper"] = ServerFileStorageWrapper;
 }
+else if(typeof window !== "undefined")
+{
+    window["MemoryFileStorage"] = MemoryFileStorage;
+    window["ServerFileStorageWrapper"] = ServerFileStorageWrapper;
+}
 else if(typeof importScripts === "function")
 {
     // web worker

diff --git a/src/browser/starter.js b/src/browser/starter.js
@@ -1403,16 +1403,16 @@ function FileNotFoundError(message)
 FileNotFoundError.prototype = Error.prototype;
 
 // Closure Compiler's way of exporting
-if(typeof window !== "undefined")
-{
-    window["V86Starter"] = V86;
-    window["V86"] = V86;
-}
-else if(typeof module !== "undefined" && typeof module.exports !== "undefined")
+if(typeof module !== "undefined" && typeof module.exports !== "undefined")
 {
     module.exports["V86Starter"] = V86;
     module.exports["V86"] = V86;
 }
+else if(typeof window !== "undefined")
+{
+    window["V86Starter"] = V86;
+    window["V86"] = V86;
+}
 else if(typeof importScripts === "function")
 {
     // web worker

diff --git a/src/cpu.js b/src/cpu.js
@@ -1676,13 +1676,13 @@ CPU.prototype.device_lower_irq = function(i)
 };
 
 // Closure Compiler's way of exporting
-if(typeof window !== "undefined")
+if(typeof module !== "undefined" && typeof module.exports !== "undefined")
 {
-    window["CPU"] = CPU;
+    module.exports["CPU"] = CPU;
 }
-else if(typeof module !== "undefined" && typeof module.exports !== "undefined")
+else if(typeof window !== "undefined")
 {
-    module.exports["CPU"] = CPU;
+    window["CPU"] = CPU;
 }
 else if(typeof importScripts === "function")
 {