fix MV2 build

openstyles · tophf · Sep 30, 2024 · Sep 29, 2024 · Oct 1, 2024 · Oct 1, 2024
commit a6a46b089499943aa0cad2cc05abf9447a83753b
diff --git a/src/background/common.js b/src/background/common.js
@@ -33,4 +33,3 @@ export let isVivaldi = !!(browserWindows && CHROME) && (async () => {
 })();
 
 window._ready = bgReady;
-if (!process.env.MV3) window._bg = true; // for IS_BG check
diff --git a/src/background/intro.js b/src/background/intro.js
@@ -1 +1,2 @@
 process.env.API = {}; // `global.API` will be used by msg.js
+if (!process.env.MV3) global._bg = true; // for IS_BG check
diff --git a/src/background/tab-manager.js b/src/background/tab-manager.js
@@ -47,12 +47,12 @@ export const set = (tabId, ...args) => {
   }
   if (!del) obj[lastKey] = value;
   else if (obj) delete obj[lastKey];
-  stateDb.set(tabId, obj0);
+  if (process.env.MV3) stateDb.set(tabId, obj0);
 };
 
 export const remove = tabId => {
   cache.delete(tabId);
-  stateDb.remove(tabId);
+  if (process.env.MV3) stateDb.remove(tabId);
 };
 
 bgReady.then(() => {
@@ -62,7 +62,7 @@ bgReady.then(() => {
     if ((obj = cache.get(tabId))) oldUrl = obj.url;
     else cache.set(tabId, obj = {});
     obj.url = url;
-    stateDb.set(tabId, obj);
+    if (process.env.MV3) stateDb.set(tabId, obj);
     for (const fn of onUrl) fn(tabId, url, oldUrl);
   });
 });

diff --git a/src/js/browser.js b/src/js/browser.js
@@ -61,3 +61,19 @@ if (process.env.MV3) {
     });
   global.browser = createProxy(chrome);
 }
+
+if (!process.env.MV3 && !DOMTokenList.prototype.replace) {
+  // TODO: remove when minimum_chrome_version >= 61
+  global.URLSearchParams = class extends URLSearchParams {
+    constructor(init) {
+      if (init && typeof init === 'object') {
+        super();
+        for (const [key, val] of init[Symbol.iterator] ? init : Object.entries(init)) {
+          this.set(key, val);
+        }
+      } else {
+        super(...arguments);
+      }
+    }
+  };
+}
diff --git a/src/js/dom-on-load.js b/src/js/dom-on-load.js
@@ -26,7 +26,7 @@ onExtension(request => {
 });
 // Removing transition-suppressor rule
 if (!CHROME || CHROME < 93) {
-  nextSheet: for (const {sheet} of document.styleSheets) {
+  nextSheet: for (const sheet of document.styleSheets) {
     for (let i = 0, rule; (rule = sheet.cssRules[i]); i++) {
       if (/#\\1\s?transition-suppressor/.test(rule.cssText)) {
         sheet.deleteRule(i);

diff --git a/src/js/prefs.js b/src/js/prefs.js
@@ -6,7 +6,7 @@ import {onStorageChanged} from './util-webext';
 let busy, setReady;
 
 /** @type {StylusClientData & {then: (cb: (data: StylusClientData) => ?) => Promise}} */
-export const clientData = process.env.ENTRY === true && (
+export const clientData = !process.env.IS_BG && (
   global[process.env.CLIENT_DATA] ??= API.setClientData(null, {
     url: location.href,
     dark: isCssDarkScheme(),

diff --git a/src/js/util.js b/src/js/util.js
@@ -61,7 +61,7 @@ export const debounce = /*@__PURE__*/(() => {
   }
 })();
 
-export const makePropertyPopProxy = () => new Proxy({}, {
+export const makePropertyPopProxy = data => new Proxy(data, {
   get: (obj, k, v) => ((
     (v = obj[k]),
     delete obj[k],

diff --git a/webpack.config.js b/webpack.config.js
@@ -80,8 +80,8 @@ const VARS = {
 };
 const RAW_VARS = {
   API: 'global.API', // hiding the global from IDE
-  DEBUGLOG: process.env.DEBUG ? 'console.log' : 'null?.',
-  DEBUGWARN: process.env.DEBUG ? 'console.warn' : 'null?.',
+  DEBUGLOG: (process.env.DEBUG ? '' : 'null&&') + 'console.log',
+  DEBUGWARN: (process.env.DEBUG ? '' : 'null&&') + 'console.warn',
   KEEP_ALIVE: '1&&',
 };
 const BANNER = '{const global = this, window = global;';
@@ -139,7 +139,7 @@ const getBaseConfig = () => ({
         test: /\.(png|svg|jpe?g|gif|ttf)$/i,
         type: 'asset/resource',
       }, {
-        test: /\.m?js$/,
+        test: /\.m?js(\?.*)?$/,
         exclude: [ROOT + 'node_modules/'],
         loader: 'babel-loader',
         options: {root: ROOT},