wip

packages/backend/src/core/MetaService.ts

@@ -16,7 +16,7 @@ import type { OnApplicationShutdown } from '@nestjs/common';
 @Injectable()
 export class MetaService implements OnApplicationShutdown {
 	private cache: MiMeta | undefined;
-	private intervalId: NodeJS.Timer;
+	private intervalId: NodeJS.Timeout;
 
 	constructor(
 		@Inject(DI.redisForSub)

packages/backend/src/core/chart/ChartManagementService.ts

@@ -23,7 +23,7 @@ import type { OnApplicationShutdown } from '@nestjs/common';
 @Injectable()
 export class ChartManagementService implements OnApplicationShutdown {
 	private charts;
-	private saveIntervalId: NodeJS.Timer;
+	private saveIntervalId: NodeJS.Timeout;
 
 	constructor(
 		private federationChart: FederationChart,

packages/backend/src/daemons/JanitorService.ts

@@ -14,7 +14,7 @@ const interval = 30 * 60 * 1000;
 
 @Injectable()
 export class JanitorService implements OnApplicationShutdown {
-	private intervalId: NodeJS.Timer;
+	private intervalId: NodeJS.Timeout;
 
 	constructor(
 		@Inject(DI.attestationChallengesRepository)

packages/backend/src/daemons/QueueStatsService.ts

@@ -19,7 +19,7 @@ const interval = 10000;
 
 @Injectable()
 export class QueueStatsService implements OnApplicationShutdown {
-	private intervalId: NodeJS.Timer;
+	private intervalId: NodeJS.Timeout;
 
 	constructor(
 		@Inject(DI.config)

packages/backend/src/misc/cache.ts

@@ -193,7 +193,7 @@ function nothingToDo<T, V = T>(value: T): V {
 export class MemoryKVCache<T, V = T> {
 	public cache: Map<string, { date: number; value: V; }>;
 	private lifetime: number;
-	private gcIntervalHandle: NodeJS.Timer;
+	private gcIntervalHandle: NodeJS.Timeout;
 	private toMapConverter: (value: T) => V;
 	private fromMapConverter: (cached: V) => T | undefined;
 

packages/backend/src/server/api/ApiCallService.ts

@@ -35,7 +35,7 @@ const accessDenied = {
 export class ApiCallService implements OnApplicationShutdown {
 	private logger: Logger;
 	private userIpHistories: Map<MiUser['id'], Set<string>>;
-	private userIpHistoriesClearIntervalId: NodeJS.Timer;
+	private userIpHistoriesClearIntervalId: NodeJS.Timeout;
 
 	constructor(
 		@Inject(DI.userIpsRepository)

packages/backend/src/server/api/stream/channels/user-list.ts

@@ -19,7 +19,7 @@ class UserListChannel extends Channel {
 	public static requireCredential = false;
 	private listId: string;
 	public listUsers: MiUser['id'][] = [];
-	private listUsersClock: NodeJS.Timer;
+	private listUsersClock: NodeJS.Timeout;
 
 	constructor(
 		private userListsRepository: UserListsRepository,

packages/backend/test/tsconfig.json

@@ -10,7 +10,7 @@
 		"declaration": false,
 		"sourceMap": true,
 		"target": "ES2022",
-		"module": "es2020",
+		"module": "node16",
 		"moduleResolution": "node16",
 		"allowSyntheticDefaultImports": true,
 		"removeComments": false,

packages/backend/tsconfig.json

@@ -10,7 +10,7 @@
 		"declaration": false,
 		"sourceMap": false,
 		"target": "ES2022",
-		"module": "ESNext",
+		"module": "node16",
 		"moduleResolution": "node16",
 		"allowSyntheticDefaultImports": true,
 		"removeComments": false,

packages/frontend/test/tsconfig.json

@@ -10,7 +10,7 @@
 		"declaration": false,
 		"sourceMap": true,
 		"target": "ES2022",
-		"module": "es2020",
+		"module": "node16",
 		"moduleResolution": "node16",
 		"allowSyntheticDefaultImports": true,
 		"removeComments": false,

packages/frontend/tsconfig.json

@@ -10,7 +10,7 @@
 		"declaration": false,
 		"sourceMap": false,
 		"target": "ES2022",
-		"module": "esnext",
+		"module": "node16",
 		"moduleResolution": "node16",
 		"removeComments": false,
 		"noLib": false,

packages/misskey-js/tsconfig.json

@@ -2,7 +2,7 @@
 	"$schema": "http://json.schemastore.org/tsconfig",
 	"compilerOptions": {
 		"target": "ES2022",
-		"module": "ES2020",
+		"module": "node16",
 		"moduleResolution": "node16",
 		"declaration": true,
 		"declarationMap": true,

packages/sw/tsconfig.json

@@ -10,7 +10,7 @@
 		"declaration": false,
 		"sourceMap": false,
 		"target": "ES2022",
-		"module": "esnext",
+		"module": "node16",
 		"moduleResolution": "node16",
 		"removeComments": false,
 		"noLib": false,