Fixes for FF105 (close #25)

README.md

@@ -8,12 +8,12 @@ Search for or filter the Tabs in TST's sidebar, and quickly find and activate th
 <!-- AMO long description: (AMO keeps line breaks, and supports a few HTML tags. Copy from here till the first MarkDown heading, but do remove the image tags.) -->
 
 This is an extension for the browser extension <a href="https://github.com/piroor/treestyletab#readme">Tree Style Tabs</a> (TST). It adds a search box to TST's sidebar, allowing to search the tabs in the current window. With TST Tab Search you can: <ul>
-    <li> start searching with a global search hotkey (Ctrl+Shift+F) </li>
-    <li> customize the filtered tabs and the search panel </li>
-    <li> cycle through results and then switch to the tabs </li>
-    <li> search by full text, keywords or regular expression, optionally case sensitive, as whole word </li>
-    <li> show and search by tab ID </li>
-    <li> search by any tab property </li>
+    <li> Start searching with a global search hotkey (Ctrl+Shift+F). </li>
+    <li> Customize the filtered tabs and the search panel. </li>
+    <li> Cycle through results and then switch to the tabs. </li>
+    <li> Search by full text, keywords or regular expression, optionally case sensitive, as whole word. </li>
+    <li> Show and search by tab IDs. </li>
+    <li> Search by any tab property. </li>
 </ul>
 
 <img alt="Tab searches with different settings" src="./resources/screenshot-merged.png" width="600px"> <!-- remove this for AMO -->

package.json

@@ -26,7 +26,7 @@
 		"pbq": "0.6.1",
 		"web-ext-build": "0.2.4",
 		"web-ext-event": "0.3.0",
-		"web-ext-utils": "0.2.2"
+		"web-ext-utils": "0.2.3"
 	},
 	"devDependencies": {
 		"@typescript-eslint/eslint-plugin": "^4.1.1",

src/background/index.esm.js

@@ -4,18 +4,12 @@ import tstApi from './tst-api.esm.js';
 import { updateCommand, debounce, } from './util.esm.js';
 import Browser from 'web-ext-utils/browser/index.esm.js';
 const { manifest, Commands, BrowserAction, Runtime, Tabs, Windows, } = Browser;
+import Views from 'web-ext-utils/loader/views.esm.js';
 import notify from 'web-ext-utils/utils/notify.esm.js';
 import Port, { web_ext_Port, } from 'multiport/index.esm.js';
 import Events, { setEvent, } from 'web-ext-event'; void Events;
 import options from '../common/options.esm.js';
 
-if (false) { /* `define`ed dependencies, for static tracking as `import` dependencies */ // eslint-disable-line
-	// @ts-ignore
-	import('web-ext-utils/loader/views.js');
-}
-// Can't be proted to ESM yet: https://github.com/mozilla/addons-linter/issues/3741
-let Views; globalThis.require.async('node_modules/web-ext-utils/loader/views').then(exp => (Views = exp));
-
 let debug = false; options.debug.whenChange(([ value, ]) => { debug = value; });
 
 
@@ -159,7 +153,7 @@ async function doSearch({
 	cached = false, seek = undefined,
 } = { }) { try {
 	(windowId != null && windowId !== -1) || (windowId = (await Windows.getCurrent()).id);
-	debug && console.info('TST Search: doSearch', windowId, this, ...arguments); // eslint-disable-line no-invalid-this
+	debug && console.info('TST Tab Search: doSearch', windowId, this, ...arguments); // eslint-disable-line no-invalid-this
 
 	// save search flags
 	[ 'matchCase', 'wholeWord', 'regExp', ].forEach(name => {

src/background/tst-api.esm.js

@@ -33,7 +33,7 @@ export default function tstAPI({ getManifest, methods = [ ], events = { __proto_
 
 	async function register() {
 		const tstManifest = { listeningTypes: [ ...Object.keys(events), 'wait-for-shutdown', ], ...getManifest(), };
-		API.debug && console.info(ownName +': registering with TST ...', tstManifest);
+		//API.debug && console.info(ownName +': registering with TST ...', tstManifest);
 		(await TST.registerSelf(tstManifest));
 		API.isRegistered = true;
 	}

src/views/index.esm.js

@@ -0,0 +1,2 @@
+import Views from 'web-ext-utils/loader/views.esm.js';
+export default Views.createRedirect('options');

src/views/options.esm.js

@@ -3,6 +3,7 @@
 import Browser from 'web-ext-utils/browser/index.esm.js'; const { manifest, } = Browser;
 import notify from 'web-ext-utils/utils/notify.esm.js';
 import Storage from 'web-ext-utils/browser/storage.esm.js'; const { sync: storage, } = Storage;
+import OptionsPage from 'web-ext-utils/options/editor/inline.esm.js';
 import options from '../common/options.esm.js';
 import Background from '../background/index.esm.js'; const { TST, } = Background;
 
@@ -45,7 +46,6 @@ async function onCommand({ name, }, buttonId) { try { switch (name) {
 	} break;
 } } catch (error) { notify.error(error); } }
 
-if (false) { import('web-ext-utils/options/editor/inline.js'); } // eslint-disable-line
-(await (await globalThis.require.async('node_modules/web-ext-utils/options/editor/inline'))({ document, onCommand, }, location));
+OptionsPage({ document, onCommand, }, location);
 
 }

web-ext-build.yaml

@@ -23,3 +23,4 @@ stages:
         commands:
           globalFocusKey:
             description: 'Focus the TST Tab Search bar'
+        web_accessible_resources: [ '*' ]