web-infra-dev · hardfist · Nov 14, 2023 · Jul 30, 2023
diff --git a/crates/node_binding/tsconfig.json b/crates/node_binding/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "noEmit": true
+  }
+}
diff --git a/examples/arco-pro/tsconfig.json b/examples/arco-pro/tsconfig.json
@@ -8,6 +8,7 @@
       "esnext"
     ],
     "allowJs": true,
+    // TODO: Remove skipLibCheck when fix upstream type bug
     "skipLibCheck": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,

diff --git a/examples/react-storybook/tsconfig.json b/examples/react-storybook/tsconfig.json
@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "strict": true,
+    // TODO: Remove skipLibCheck when fix upstream type bug
     "skipLibCheck": true,
     "jsx": "react-jsx",
     "moduleResolution": "node"

diff --git a/packages/create-rspack/template-react-ts/tsconfig.json b/packages/create-rspack/template-react-ts/tsconfig.json
@@ -3,6 +3,7 @@
     "target": "ES6",
     "lib": ["DOM", "DOM.Iterable", "ESNext"],
     "module": "ESNext",
+    // TODO: Remove skipLibCheck when fix upstream type bug
     "skipLibCheck": true,
     "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,

diff --git a/packages/rspack-cli/jest.config.js b/packages/rspack-cli/jest.config.js
@@ -1,11 +1,16 @@
-/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
+/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
 const config = {
 	preset: "ts-jest",
 	testEnvironment: "../../scripts/test/patch-node-env.cjs",
 	testTimeout: process.env.CI ? 200000 : 30000,
 	testMatch: ["<rootDir>/tests/**/*.test.ts", "<rootDir>/tests/**/*.test.js"],
 	watchPathIgnorePatterns: ["<rootDir>/tests/.*/dist"],
-	extensionsToTreatAsEsm: [".mts"]
+	extensionsToTreatAsEsm: [".mts"],
+	globals: {
+		"ts-jest": {
+			tsconfig: "<rootDir>/tests/tsconfig.json"
+		}
+	}
 };
 
 module.exports = config;
diff --git a/packages/rspack-cli/src/commands/build.ts b/packages/rspack-cli/src/commands/build.ts
@@ -22,12 +22,14 @@ export class BuildCommand implements RspackCommand {
 				}),
 			async options => {
 				const logger = cli.getLogger();
+				// @ts-expect-error
 				let createJsonStringifyStream;
 				if (options.json) {
 					const jsonExt = await import("@discoveryjs/json-ext");
 					createJsonStringifyStream = jsonExt.default.stringifyStream;
 				}
 
+				// @ts-expect-error
 				const callback = (error, stats: Stats | MultiStats) => {
 					if (error) {
 						logger.error(error);
@@ -45,10 +47,14 @@ export class BuildCommand implements RspackCommand {
 									compiler.options ? compiler.options.stats : undefined
 								)
 						  }
-						: compiler.options
-						? compiler.options.stats
+						: // @ts-expect-error
+						compiler.options
+						? // @ts-expect-error
+						  compiler.options.stats
 						: undefined;
+					// @ts-expect-error
 					if (options.json && createJsonStringifyStream) {
+						// @ts-expect-error
 						const handleWriteError = error => {
 							logger.error(error);
 							process.exit(2);
@@ -84,6 +90,7 @@ export class BuildCommand implements RspackCommand {
 
 				const rspackOptions = { ...options, argv: { ...options } };
 
+				// @ts-expect-error
 				const errorHandler = (err, Stats) => {
 					callback(err, Stats);
 				};

diff --git a/packages/rspack-cli/src/rspack-cli.ts b/packages/rspack-cli/src/rspack-cli.ts
@@ -58,6 +58,7 @@ export class RspackCLI {
 			? (config as MultiRspackOptions).some(i => i.watch)
 			: (config as RspackOptions).watch;
 
+		// @ts-expect-error
 		return rspack(config, isWatch ? callback : undefined);
 	}
 	createColors(useColor?: boolean): RspackCLIColors {

diff --git a/packages/rspack-cli/src/utils/options.ts b/packages/rspack-cli/src/utils/options.ts
@@ -82,13 +82,16 @@ export const previewOptions = (yargs: yargs.Argv) => {
 		});
 };
 
+// @ts-expect-error
 export function normalizeEnv(argv) {
+	// @ts-expect-error
 	function parseValue(previous, value) {
 		const [allKeys, val] = value.split(/=(.+)/, 2);
 		const splitKeys = allKeys.split(/\.(?!$)/);
 
 		let prevRef = previous;
 
+		// @ts-expect-error
 		splitKeys.forEach((someKey, index) => {
 			// https://github.com/webpack/webpack-cli/issues/3284
 			if (someKey.endsWith("=")) {

diff --git a/packages/rspack-cli/src/utils/profile.ts b/packages/rspack-cli/src/utils/profile.ts
@@ -167,13 +167,15 @@ function resolveLoggingOptions(value: string): LoggingOptions {
 class RspackProfileJSCPUProfilePlugin {
 	constructor(private output: string) {}
 
+	// @ts-expect-error
 	apply(compiler) {
 		const session = new inspector.Session();
 		session.connect();
 		session.post("Profiler.enable");
 		session.post("Profiler.start");
 		compiler.hooks.done.tapAsync(
 			RspackProfileJSCPUProfilePlugin.name,
+			// @ts-expect-error
 			(stats, callback) => {
 				if (compiler.watchMode) return callback();
 				session.post("Profiler.stop", (error, param) => {
@@ -192,9 +194,11 @@ class RspackProfileJSCPUProfilePlugin {
 class RspackProfileLoggingPlugin {
 	constructor(private output: string) {}
 
+	// @ts-expect-error
 	apply(compiler) {
 		compiler.hooks.done.tapAsync(
 			RspackProfileLoggingPlugin.name,
+			// @ts-expect-error
 			(stats, callback) => {
 				if (compiler.watchMode) return callback();
 				const logging = stats.toJson({

diff --git a/packages/rspack-cli/tests/tsconfig.json b/packages/rspack-cli/tests/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "strict": false,
+    "checkJs": false,
+    "rootDir": "."
+  },
+  "include": ["."],
+  "references": []
+}
diff --git a/packages/rspack-cli/tsconfig.json b/packages/rspack-cli/tsconfig.json
@@ -2,10 +2,10 @@
   "extends": "../../tsconfig.base.json",
   "include": ["src"],
   "compilerOptions": {
-    "strictNullChecks": true,
+    // TODO: Remove skipLibCheck when fix upstream type bug
+    "skipLibCheck": true,
     "outDir": "dist",
-    "rootDir": "src",
-    "moduleResolution": "nodenext"
+    "rootDir": "src"
   },
   "references": [
     {

diff --git a/packages/rspack-dev-server/jest.config.js b/packages/rspack-dev-server/jest.config.js
@@ -1,12 +1,17 @@
-/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
+/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
 const config = {
 	preset: "ts-jest",
 	testEnvironmentOptions: {
 		url: "http://localhost/"
 	},
 	testMatch: ["<rootDir>/tests/*.test.ts", "<rootDir>/tests/e2e/*.test.ts"],
 	cache: false,
-	testTimeout: process.env.CI ? 120000 : 30000
+	testTimeout: process.env.CI ? 120000 : 30000,
+	globals: {
+		"ts-jest": {
+			tsconfig: "<rootDir>/tests/tsconfig.json"
+		}
+	}
 };
 
 module.exports = config;
diff --git a/packages/rspack-dev-server/package.json b/packages/rspack-dev-server/package.json
@@ -7,7 +7,6 @@
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
     "./package.json": "./package.json"

diff --git a/packages/rspack-dev-server/src/middleware.ts b/packages/rspack-dev-server/src/middleware.ts
@@ -27,11 +27,15 @@ export function getRspackMemoryAssets(
 		}
 
 		// css hmr will append query string, so here need to remove query string
+		// @ts-expect-error
 		const path = parse(url).pathname;
 		// asset name is not start with /, so path need to slice 1
+		// @ts-expect-error
 		const filename = path.startsWith(publicPath)
-			? path.slice(publicPath.length)
-			: path.slice(1);
+			? // @ts-expect-error
+			  path.slice(publicPath.length)
+			: // @ts-expect-error
+			  path.slice(1);
 		const buffer =
 			compiler.getAsset(filename) ??
 			(() => {
@@ -50,6 +54,7 @@ export function getRspackMemoryAssets(
 			contentType = "text/html; charset=utf-8";
 		} else {
 			contentType =
+				// @ts-expect-error
 				mime.contentType(extname(path)) || "text/plain; charset=utf-8";
 		}
 

diff --git a/packages/rspack-dev-server/src/patch.ts b/packages/rspack-dev-server/src/patch.ts
@@ -17,6 +17,7 @@ function applyDevServerPatch() {
 
 	// @ts-expect-error private API
 	WebpackDevServer.prototype.sendStats = function sendStats__rspack_patched(
+		// @ts-expect-error
 		...args
 	) {
 		let stats = args[1];

diff --git a/packages/rspack-dev-server/src/server.ts b/packages/rspack-dev-server/src/server.ts
@@ -25,16 +25,21 @@ export class RspackDevServer extends WebpackDevServer {
 	/**
 	 * resolved after `normalizedOptions`
 	 */
+	// @ts-expect-error
 	options: ResolvedDevServer;
+	// @ts-expect-error
 	staticWatchers: FSWatcher[];
+	// @ts-expect-error
 	sockets: Socket[];
+	// @ts-expect-error
 	server: Server;
 	// @ts-expect-error
 	public compiler: Compiler | MultiCompiler;
 	webSocketServer: WebpackDevServer.WebSocketServerImplementation | undefined;
 
 	constructor(options: DevServer, compiler: Compiler | MultiCompiler) {
 		super(
+			// @ts-expect-error
 			{
 				...options,
 				setupMiddlewares: (middlewares, devServer) => {
@@ -54,6 +59,7 @@ export class RspackDevServer extends WebpackDevServer {
 												path: publicPath,
 												middleware: getRspackMemoryAssets(
 													compiler,
+													// @ts-expect-error
 													this.middleware
 												)
 											};
@@ -69,6 +75,7 @@ export class RspackDevServer extends WebpackDevServer {
 						}
 					}
 
+					// @ts-expect-error
 					options.setupMiddlewares?.call(this, middlewares, devServer);
 					return middlewares;
 				}
@@ -136,6 +143,7 @@ export class RspackDevServer extends WebpackDevServer {
 			);
 		}
 
+		// @ts-expect-error
 		return clientImplementation;
 	}
 
@@ -158,6 +166,7 @@ export class RspackDevServer extends WebpackDevServer {
 				compiler.options.devServer ??= {};
 				compiler.options.devServer.hot = true;
 				if (
+					// @ts-expect-error
 					!compiler.options.experiments.rspackFuture.disableTransformByDefault
 				) {
 					compiler.options.builtins.react ??= {};
@@ -298,6 +307,7 @@ export class RspackDevServer extends WebpackDevServer {
 		compilers.forEach(compiler => {
 			if (compiler.options.experiments.lazyCompilation) {
 				middlewares.push({
+					// @ts-expect-error
 					middleware: (req, res) => {
 						if (req.url.indexOf("/lazy-compilation-web/") > -1) {
 							const path = req.url.replace("/lazy-compilation-web/", "");
@@ -319,10 +329,13 @@ export class RspackDevServer extends WebpackDevServer {
 
 		middlewares.forEach(middleware => {
 			if (typeof middleware === "function") {
+				// @ts-expect-error
 				this.app.use(middleware);
 			} else if (typeof middleware.path !== "undefined") {
+				// @ts-expect-error
 				this.app.use(middleware.path, middleware.middleware);
 			} else {
+				// @ts-expect-error
 				this.app.use(middleware.middleware);
 			}
 		});

diff --git a/packages/rspack-dev-server/tests/normalizeOptions.test.ts b/packages/rspack-dev-server/tests/normalizeOptions.test.ts
@@ -2,6 +2,7 @@ import { RspackOptions, rspack } from "@rspack/core";
 import { RspackDevServer, Configuration } from "@rspack/dev-server";
 import { createCompiler } from "@rspack/core";
 import ReactRefreshPlugin from "@rspack/plugin-react-refresh";
+// @ts-expect-error
 import serializer from "jest-serializer-path";
 expect.addSnapshotSerializer(serializer);
 
@@ -174,16 +175,20 @@ async function getAdditionEntries(
 		.reduce<Object>((acc, cur: any) => {
 			const name = cur.options.name;
 			const request = cur.entry;
+			// @ts-expect-error
 			if (acc[name]) {
+				// @ts-expect-error
 				acc[name].import.push(request);
 			} else {
+				// @ts-expect-error
 				acc[name] = { import: [request] };
 			}
 			return acc;
 		}, {});
 	// some hack for snapshot
 	const value = Object.fromEntries(
 		Object.entries(entries).map(([key, item]) => {
+			// @ts-expect-error
 			const replaced = item.import?.map(entry => {
 				const array = entry
 					.replace(/\\/g, "/")

diff --git a/packages/rspack-dev-server/tests/tsconfig.json b/packages/rspack-dev-server/tests/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "checkJs": false,
+    "rootDir": "."
+  },
+  "include": ["."],
+  "references": []
+}
diff --git a/packages/rspack-dev-server/tsconfig.json b/packages/rspack-dev-server/tsconfig.json
@@ -4,6 +4,8 @@
     "src"
   ],
   "compilerOptions": {
+    // TODO: Remove skipLibCheck when fix upstream type bug
+    "skipLibCheck": true,
     "outDir": "dist",
     "rootDir": "src"
   }

diff --git a/packages/rspack-plugin-html/package.json b/packages/rspack-plugin-html/package.json
@@ -7,7 +7,6 @@
   "typings": "dist/index.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
     "./package.json": "./package.json"
@@ -34,7 +33,6 @@
     "directory": "packages/rspack-plugin-html"
   },
   "dependencies": {
-    "@types/html-minifier-terser": "7.0.0",
     "html-minifier-terser": "7.0.0",
     "lodash.template": "^4.5.0",
     "parse5": "7.1.1",
@@ -50,6 +48,7 @@
   },
   "devDependencies": {
     "@rspack/core": "workspace:*",
+    "@types/html-minifier-terser": "7.0.0",
     "@types/lodash.template": "^4.5.1",
     "@types/pug": "^2.0.6",
     "html-loader": "^4.2.0",