Merge branch 'main' into bug-iframe-navigate-notMonetized

biome.jsonc

@@ -20,7 +20,6 @@
     "rules": {
       "recommended": true,
       "style": {
-        "noUnusedTemplateLiteral": "off", // TODO: turn on, too many cases
         "noUselessElse": "off", // TODO: turn on, too many cases
         "noNonNullAssertion": "off" // TODO: turn on, too many cases
       },

esbuild/prod.ts

@@ -103,10 +103,10 @@ function preservePolyfillClassNamesPlugin({
         const minifiedName = match[1];
 
         const result = polyfillContent
-          .replace(definitionRegex, `class MonetizationEvent extends Event`)
+          .replace(definitionRegex, 'class MonetizationEvent extends Event')
           .replace(
             `window.MonetizationEvent=${minifiedName}`,
-            `window.MonetizationEvent=MonetizationEvent`,
+            'window.MonetizationEvent=MonetizationEvent',
           )
           .replaceAll(`new ${minifiedName}`, 'new MonetizationEvent');
 

src/background/services/background.ts

@@ -89,10 +89,10 @@ export class Background {
       // Firefox <128 will throw saying world: MAIN isn't supported. So, we'll
       // inject via contentScript later. Injection via contentScript is slow,
       // but apart from WM detection on page-load, everything else works fine.
-      if (!error.message.includes(`world`)) {
+      if (!error.message.includes('world')) {
         this.logger.error(
-          `Content script execution world \`MAIN\` not supported by your browser.\n` +
-            `Check https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/scripting/ExecutionWorld#browser_compatibility for browser compatibility.`,
+          'Content script execution world `MAIN` not supported by your browser.\n' +
+            'Check https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/scripting/ExecutionWorld#browser_compatibility for browser compatibility.',
           error,
         );
       }

src/background/services/monetization.ts

@@ -473,7 +473,7 @@ export class MonetizationService {
 
   private onKeyRevoked() {
     this.events.once('open_payments.key_revoked', async () => {
-      this.logger.warn(`Key revoked. Stopping all payment sessions.`);
+      this.logger.warn('Key revoked. Stopping all payment sessions.');
       this.stopAllSessions();
       await this.storage.setState({ key_revoked: true });
       this.onKeyRevoked(); // setup listener again once all is done
@@ -482,7 +482,7 @@ export class MonetizationService {
 
   private onOutOfFunds() {
     this.events.once('open_payments.out_of_funds', async () => {
-      this.logger.warn(`Out of funds. Stopping all payment sessions.`);
+      this.logger.warn('Out of funds. Stopping all payment sessions.');
       this.stopAllSessions();
       await this.storage.setState({ out_of_funds: true });
       this.onOutOfFunds(); // setup listener again once all is done
@@ -502,7 +502,7 @@ export class MonetizationService {
     for (const session of this.tabState.getAllSessions()) {
       session.stop();
     }
-    this.logger.debug(`All payment sessions stopped.`);
+    this.logger.debug('All payment sessions stopped.');
   }
 
   async getPopupData(tab: Pick<Tabs.Tab, 'id' | 'url'>): Promise<PopupStore> {

src/content/keyAutoAdd/chimoney.ts

@@ -53,7 +53,7 @@ const findWallet: Run<{ walletAddressId: string }> = async (
     match(el) {
       const prefix = walletAddress.hostname;
       const text = el.textContent?.trim() ?? '';
-      return text.startsWith(`Wallet Address:`) && text.includes(prefix);
+      return text.startsWith('Wallet Address:') && text.includes(prefix);
     },
   }).catch(() => {
     throw new Error(

src/content/keyAutoAdd/lib/helpers.ts

@@ -67,7 +67,7 @@ export async function waitForURL(
   const abortSignal = AbortSignal.timeout(timeout);
   abortSignal.addEventListener('abort', (e) => {
     observer.disconnect();
-    reject(new TimeoutError(`Timeout waiting for URL`, { cause: e }));
+    reject(new TimeoutError('Timeout waiting for URL', { cause: e }));
   });
 
   let url = window.location.href;

src/content/polyfill.ts

@@ -87,7 +87,8 @@ import type { MonetizationEventPayload } from '@/shared/messages';
 
     get detail() {
       if (!eventDetailDeprecationEmitted) {
-        const msg = `MonetizationEvent.detail is deprecated. Access attributes directly instead.`;
+        const msg =
+          'MonetizationEvent.detail is deprecated. Access attributes directly instead.';
         // biome-ignore lint/suspicious/noConsole: warning meant for website devs
         console.warn(msg);
         eventDetailDeprecationEmitted = true;

src/pages/shared/components/ui/RadioGroup.tsx

@@ -54,9 +54,7 @@ export const Radio = ({
       />
 
       <label htmlFor={inputId} className="group flex items-center">
-        <span
-          className={`inline-block h-6 w-6 rounded-full border-2 border-base peer-checked:group-[]:border-blue-500 peer-checked:group-[]:bg-primary peer-checked:group-[]:ring-4 peer-checked:group-[]:ring-inset peer-checked:group-[]:ring-white`}
-        />
+        <span className="inline-block h-6 w-6 rounded-full border-2 border-base peer-checked:group-[]:border-blue-500 peer-checked:group-[]:bg-primary peer-checked:group-[]:ring-4 peer-checked:group-[]:ring-inset peer-checked:group-[]:ring-white" />
         {label ? (
           <p className="ms-2 text-base leading-6 text-medium">{label}</p>
         ) : (

tests/e2e/connectAutoKeyChimoney.spec.ts

@@ -48,7 +48,7 @@ test('Connect to Chimoney wallet with automatic key addition when not logged-in
       timeout: 5000,
     });
     expect(page.url()).toContain(URLS.login);
-    expect(page.url()).toContain(`?next=`);
+    expect(page.url()).toContain('?next=');
     await page.close();
   });
 

tests/e2e/fixtures/helpers.ts

@@ -152,7 +152,7 @@ export async function loadContext(
     context = await chromium.launchPersistentContext('', {
       channel,
       args: [
-        `--headless=new`,
+        '--headless=new',
         `--disable-extensions-except=${pathToExtension}`,
         `--load-extension=${pathToExtension}`,
       ],

tests/e2e/helpers/common.ts

@@ -2,7 +2,7 @@ import type { BrowserContext, Page } from '@playwright/test';
 import type { ConnectDetails } from '../pages/popup';
 import { getWalletInformation } from '@/shared/helpers';
 
-const OPEN_PAYMENTS_REDIRECT_URL = `https://webmonetization.org/welcome`;
+const OPEN_PAYMENTS_REDIRECT_URL = 'https://webmonetization.org/welcome';
 
 export async function waitForWelcomePage(page: Page) {
   await page.waitForURL(

tests/e2e/helpers/fynbos.ts

@@ -1,8 +1,9 @@
 import type { Page } from '@playwright/test';
 import { waitForWelcomePage } from './common';
 
-export const KEYS_PAGE_URL = `https://eu1.fynbos.dev/settings/keys`;
-export const LOGIN_PAGE_URL = `https://eu1.fynbos.dev/login?returnTo=%2Fsettings%2Fkeys`;
+export const KEYS_PAGE_URL = 'https://eu1.fynbos.dev/settings/keys';
+export const LOGIN_PAGE_URL =
+  'https://eu1.fynbos.dev/login?returnTo=%2Fsettings%2Fkeys';
 
 export async function completeGrant(page: Page, continueWaitMs: number) {
   await waitForGrantConsentPage(page);

tests/e2e/helpers/testWallet.ts

@@ -8,9 +8,11 @@ import {
 import { fillPopup, type Popup, type ConnectDetails } from '../pages/popup';
 import { getContinueWaitTime, waitForWelcomePage } from './common';
 
-export const KEYS_PAGE_URL = `https://wallet.interledger-test.dev/settings/developer-keys`;
-export const LOGIN_PAGE_URL = `https://wallet.interledger-test.dev/auth/login?callbackUrl=%2Fsettings%2Fdeveloper-keys`;
-export const API_URL_ORIGIN = `https://api.wallet.interledger-test.dev`;
+export const KEYS_PAGE_URL =
+  'https://wallet.interledger-test.dev/settings/developer-keys';
+export const LOGIN_PAGE_URL =
+  'https://wallet.interledger-test.dev/auth/login?callbackUrl=%2Fsettings%2Fdeveloper-keys';
+export const API_URL_ORIGIN = 'https://api.wallet.interledger-test.dev';
 export const DEFAULT_CONTINUE_WAIT_MS = 1000;
 
 export async function connectWallet(