chore: upgrade TypeScript to ^6.0.2 (#170)

Author: chenjiahan

client-src/overlay.ts

@@ -11,7 +11,7 @@
 // The error overlay is inspired (and mostly copied) from Create React App (https://github.com/facebookincubator/create-react-app)
 // They, in turn, got inspired by webpack-hot-middleware (https://github.com/glenjamin/webpack-hot-middleware).
 
-import ansiHTML from './utils/ansiHTML';
+import ansiHTML from './utils/ansiHTML.js';
 
 const getCodePoint = !!String.prototype.codePointAt
   ? (input: string, position: number): number | undefined =>
@@ -422,13 +422,17 @@ type CreateOverlayOptions = {
   catchRuntimeError?: boolean | ((error: Error) => void);
 };
 
+type OverlayTrustedTypePolicy = {
+  createHTML: (value: string) => string;
+};
+
 declare global {
   interface Window {
     trustedTypes?: {
       createPolicy: (
         name: string,
         policy: { createHTML: (value: string) => string },
-      ) => TrustedTypePolicy;
+      ) => OverlayTrustedTypePolicy;
     };
   }
 }
@@ -438,9 +442,7 @@ const createOverlay = (options: CreateOverlayOptions): StateMachine => {
   let containerElement: HTMLDivElement | null | undefined;
   let headerElement: HTMLDivElement | null | undefined;
   let onLoadQueue: ((element: HTMLDivElement) => void)[] = [];
-  let overlayTrustedTypesPolicy:
-    | Omit<TrustedTypePolicy, 'createScript' | 'createScriptURL'>
-    | undefined;
+  let overlayTrustedTypesPolicy: OverlayTrustedTypePolicy | undefined;
 
   type CSSStyleDeclarationKeys = Extract<keyof CSSStyleDeclaration, 'string'>;
 
@@ -645,8 +647,7 @@ const createOverlay = (options: CreateOverlayOptions): StateMachine => {
       const errorObject =
         error instanceof Error
           ? error
-          : // @ts-expect-error error options
-            new Error(error || fallbackMessage, { cause: error });
+          : new Error(error || fallbackMessage, { cause: error });
 
       const shouldDisplay =
         typeof options.catchRuntimeError === 'function'

package.json

@@ -84,7 +84,7 @@
     "selfsigned": "^5.5.0",
     "simple-git-hooks": "^2.13.1",
     "style-loader": "^4.0.0",
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.2"
   },
   "peerDependencies": {
     "@rspack/core": "^2.0.0-0",

pnpm-lock.yaml

@@ -6,7 +6,7 @@ import type {
   ServerConfiguration,
   WatchFiles,
   WebSocketServerConfiguration,
-} from './types';
+} from './types.js';
 
 export interface ResolvedDevServer extends DevServer {
   port: number | string;

src/config.ts

@@ -1,2 +1,2 @@
-export { Server as RspackDevServer } from './server';
+export { Server as RspackDevServer } from './server.js';
 export type { DevServer as Configuration } from '@rspack/core';

src/index.ts

@@ -35,8 +35,8 @@ import type {
 import compression from 'http-compression';
 import ipaddr from 'ipaddr.js';
 import type { App } from 'open';
-import { getPort } from './getPort';
-import { WebsocketServer } from './servers/WebsocketServer';
+import { getPort } from './getPort.js';
+import { WebsocketServer } from './servers/WebsocketServer.js';
 import type {
   AddressInfo,
   BasicApplication,
@@ -78,8 +78,8 @@ import type {
   WebSocketServer,
   WebSocketServerConfiguration,
   WebSocketServerImplementation,
-} from './types';
-import type { ConnectApplication } from './types';
+} from './types.js';
+import type { ConnectApplication } from './types.js';
 
 const { styleText } = util;
 const require = createRequire(import.meta.url);
@@ -574,7 +574,7 @@ class Server<
       // Configuration with the `devServer` options
       const compilerWithDevServer = (
         this.compiler as MultiCompiler
-      ).compilers.find((config) => config.options.devServer);
+      ).compilers.find((config: Compiler) => config.options.devServer);
 
       if (compilerWithDevServer) {
         return compilerWithDevServer.options;
@@ -583,7 +583,7 @@ class Server<
       // Compiler for `web` target
       const compilerWithWebTarget = (
         this.compiler as MultiCompiler
-      ).compilers.find((compiler) => Boolean(compiler.platform.web));
+      ).compilers.find((compiler: Compiler) => Boolean(compiler.platform.web));
 
       if (compilerWithWebTarget) {
         return compilerWithWebTarget.options;
@@ -1396,7 +1396,7 @@ class Server<
 
         if (this.options.hot) {
           const HMRPluginExists = compiler.options.plugins.find(
-            (plugin) =>
+            (plugin: EXPECTED_ANY) =>
               plugin && plugin.constructor === HotModuleReplacementPlugin,
           );
 

src/server.ts

@@ -8,8 +8,8 @@
  * https://github.com/webpack/webpack-dev-server/blob/main/LICENSE
  */
 
-import type { Server } from '../server';
-import type { ClientConnection } from '../types';
+import type { Server } from '../server.js';
+import type { ClientConnection } from '../types.js';
 
 // base class that users should extend if they are making their own
 // server implementation

src/servers/BaseServer.ts

@@ -9,9 +9,12 @@
  */
 
 import * as Ws from 'ws';
-import type { Server } from '../server';
-import type { ClientConnection, WebSocketServerConfiguration } from '../types';
-import BaseServer from './BaseServer';
+import type { Server } from '../server.js';
+import type {
+  ClientConnection,
+  WebSocketServerConfiguration,
+} from '../types.js';
+import BaseServer from './BaseServer.js';
 
 export class WebsocketServer extends BaseServer {
   static heartbeatInterval = 1000;

src/servers/WebsocketServer.ts

@@ -2,7 +2,10 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "rootDir": "client-src",
-    "outDir": "client"
+    "outDir": "client",
+    "module": "esnext",
+    "moduleResolution": "bundler",
+    "composite": true
   },
   "include": ["client-src/**/*"]
 }

tsconfig.client.json

@@ -1,24 +1,20 @@
 {
   "compilerOptions": {
-    "module": "preserve",
-    "moduleResolution": "bundler",
-    "target": "ES2021",
-    "esModuleInterop": true,
+    "rootDir": "./src",
+    "outDir": "./dist",
+    "target": "ES2023",
+    "types": ["node"],
+    "lib": ["DOM", "ESNext"],
     "declaration": true,
     "isolatedModules": true,
-    "composite": true,
-    "forceConsistentCasingInFileNames": true,
-    "checkJs": true,
-    "strict": true,
     "skipLibCheck": true,
-    "noUnusedLocals": true,
-    "outDir": "dist",
-    "rootDir": "src"
+    "module": "nodenext",
+    "moduleResolution": "nodenext"
   },
   "references": [
     {
       "path": "./tsconfig.client.json"
     }
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }