Skip to content

Commit ab49cf1

Browse files
authored
chore(deps): update TypeScript to v6 (#1338)
1 parent a82b140 commit ab49cf1

33 files changed

Lines changed: 212 additions & 252 deletions

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"tailwindcss": "^3.4.19",
8484
"tinyspy": "^4.0.4",
8585
"totp-generator": "2.0.1",
86-
"typescript": "^5.9.3"
86+
"typescript": "^6.0.3"
8787
},
8888
"engines": {
8989
"pnpm": "^10.18.3",

pnpm-lock.yaml

Lines changed: 38 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/background/services/background.ts

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,20 @@ export class Background {
5252
heartbeat,
5353
telemetry,
5454
}: Cradle) {
55-
Object.assign(this, {
56-
browser,
57-
browserName,
58-
walletService,
59-
monetizationService,
60-
storage,
61-
sendToPopup,
62-
sendToApp,
63-
tabState,
64-
tabEvents,
65-
windowState,
66-
logger,
67-
events,
68-
heartbeat,
69-
telemetry,
70-
});
55+
this.browser = browser;
56+
this.browserName = browserName;
57+
this.walletService = walletService;
58+
this.monetizationService = monetizationService;
59+
this.storage = storage;
60+
this.sendToPopup = sendToPopup;
61+
this.sendToApp = sendToApp;
62+
this.tabState = tabState;
63+
this.tabEvents = tabEvents;
64+
this.windowState = windowState;
65+
this.logger = logger;
66+
this.events = events;
67+
this.heartbeat = heartbeat;
68+
this.telemetry = telemetry;
7169
}
7270

7371
async start() {
@@ -219,10 +217,8 @@ export class Background {
219217
}
220218

221219
// TODO: type ReturnType based on message
222-
onMessage = async (
223-
message: ToBackgroundMessage,
224-
sender: Runtime.MessageSender,
225-
) => {
220+
onMessage = async (msg: unknown, sender: Runtime.MessageSender) => {
221+
const message = msg as ToBackgroundMessage;
226222
this.logger.debug('Received message', message.action, message.payload);
227223
try {
228224
switch (message.action) {
@@ -511,7 +507,9 @@ export class Background {
511507
}
512508

513509
const allTabs = await this.browser.tabs.query({});
514-
const tabs = allTabs.filter((t) => t.id && t.url && isSecureContext(t.url));
510+
const tabs = allTabs.filter(
511+
(t) => t.id && t.url && isSecureContext(t.url),
512+
) as Tab[];
515513
const injectPolyfill = (tab: Tab) => {
516514
return this.browser.scripting.executeScript({
517515
target: { tabId: tab.id },

src/background/services/deduplicator.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import type { Cradle } from '../container';
22

3-
type AsyncFn<T> = (...args: unknown[]) => Promise<T>;
3+
// biome-ignore lint/suspicious/noExplicitAny: as intended
4+
type AsyncFn<T> = (...args: any[]) => Promise<T>;
45

56
interface CacheEntry<T> {
67
promise: Promise<T>;
@@ -18,7 +19,7 @@ export class Deduplicator {
1819
private cache: Map<string, CacheEntry<unknown>> = new Map();
1920

2021
constructor({ logger }: Pick<Cradle, 'logger'>) {
21-
Object.assign(this, { logger });
22+
this.logger = logger;
2223
}
2324

2425
dedupe<T>(

src/background/services/events.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ export class EventsService extends EventEmitter {
6161
* @deprecated
6262
*/
6363
removeListener(): this {
64+
// @ts-expect-error
6465
// biome-ignore lint/complexity/noArguments: it's cleaner and simpler
6566
return super.removeListener.apply(this, arguments);
6667
}

src/background/services/heartbeat.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export class Heartbeat {
44
private browser: Cradle['browser'];
55

66
constructor({ browser }: Cradle) {
7-
Object.assign(this, { browser });
7+
this.browser = browser;
88
}
99

1010
start() {

src/background/services/keyAutoAdd.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ export class KeyAutoAddService {
4646
telemetry,
4747
t,
4848
}: Pick<Cradle, 'browser' | 'storage' | 'telemetry' | 't'>) {
49-
Object.assign(this, { browser, storage, telemetry, t });
49+
this.browser = browser;
50+
this.storage = storage;
51+
this.telemetry = telemetry;
52+
this.t = t;
5053
}
5154

5255
async addPublicKeyToWallet(
@@ -134,10 +137,8 @@ export class KeyAutoAddService {
134137
});
135138
};
136139

137-
const onMessageListener: OnPortMessageListener = (
138-
message: KeyAutoAddToBackgroundMessage,
139-
port,
140-
) => {
140+
const onMessageListener: OnPortMessageListener = (msg: unknown, port) => {
141+
const message = msg as KeyAutoAddToBackgroundMessage;
141142
if (message.action === 'SUCCESS') {
142143
removeListeners();
143144
this.telemetry.capture('key_auto_add_success', {

0 commit comments

Comments
 (0)