Integrate browser.js into exports_init.js, and streamline the result

2 files changed, 11 insertions, 28 deletions

diff --git a/build.sh b/build.sh
index f38b5e0..e954ce8 100755
--- a/build.sh
+++ b/build.sh
@@ -150,7 +150,7 @@ compute_scripts_list_rec() {
 	fi
     done
 
-    echo $FILE
+    [ "x$FILE" = "xexports_init.js" ] || echo $FILE # exports_init.js is hardcoded to load first; the entire export system depends on it
     map_set FILESTATES $FILEKEY "processed"
 }
 
@@ -194,6 +194,11 @@ set_browser() {
 
 main() {
     set_browser "$1"
+    
+    # placate importers of these, as they are exported by the yet-to-be-created exports_init.js
+    EXPORTS__browser=exports_init.js
+    EXPORTS__is_chrome=exports_init.js
+    EXPORTS__is_mozilla=exports_init.js
 
     SCRIPTDIRS='background html common content'
 
@@ -288,10 +293,11 @@ $(map_get EXPORTCODES $FILEKEY)
 	fi
     done
 
-    echo "\
-window.killtheweb={};
-window.browser = this.browser; /* fix for stupid Firefox */
-" > $BUILDDIR/exports_init.js
+    if [ "$BROWSER" = "chromium" ]; then
+	echo "window.killtheweb={is_chrome: true, browser: window.chrome};" > $BUILDDIR/exports_init.js
+    else
+	echo "window.killtheweb={is_mozilla: true, browser: this.browser};" > $BUILDDIR/exports_init.js
+    fi
 
     cp -r icons/ copyright licenses/ $BUILDDIR
 }
diff --git a/common/browser.js b/common/browser.js
deleted file mode 100644
index e50a121..0000000
--- a/common/browser.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Myext WebExtension API access normalization
- *
- * Copyright (C) 2021 Wojtek Kosior
- * Redistribution terms are gathered in the `copyright' file.
- */
-
-/*
- * This module normalizes access to WebExtension apis between
- * chrome-based and firefox-based browsers.
- */
-
-const is_mozilla = typeof window.browser === "object";
-const is_chrome = !is_mozilla;
-const browser = window[is_chrome ? "chrome" : "browser"];
-
-/*
- * EXPORTS_START
- * EXPORT browser
- * EXPORT is_chrome
- * EXPORT is_mozilla
- * EXPORTS_END
- */