chore: fix lint-staged prettier (#5935)

* fix version

* fix

lint-staged.config.mjs

@@ -1,8 +1,6 @@
 export default {
   "*.rs": "rustfmt --edition 2021",
-  "packages/**/*.{ts,js}": "prettier --write",
-  "x.mjs": "prettier --write",
-  "crates/rspack_plugin_runtime/**/*.{ts,js}": "prettier --write",
+  "*.{ts,js}": "pnpm run format:js",
   "*.toml": "npx @taplo/cli format",
   "*.{ts,js,mjs}": () => "pnpm run lint:js"
 }

package.json

@@ -20,7 +20,7 @@
     "build:viewer": "pnpm --filter \"@rspack/*\" build:viewer",
     "test:js": "pnpm -r run test",
     "format:rs": "pnpm --filter @rspack/core... build",
-    "format:js": "npx prettier 'packages/**/src/**/*.{ts,js}' 'crates/rspack_plugin_runtime/**/*.{ts,js}' --check --write",
+    "format:js": "./node_modules/prettier/bin/prettier.cjs 'packages/**/src/**/*.{ts,js}' 'crates/rspack_plugin_runtime/**/*.{ts,js}' 'x.mjs' --check --write",
     "format-ci:toml": "npx @taplo/cli format --check '.cargo/*.toml' './crates/**/Cargo.toml' './Cargo.toml'",
     "format:toml": "npx @taplo/cli format '.cargo/*.toml' './crates/**/Cargo.toml' './Cargo.toml'",
     "lint:js": "oxlint --deny-warnings -c .eslintrc.json",
@@ -60,8 +60,8 @@
     "lint-staged": "^15.0.0",
     "npm-run-all": "4.1.5",
     "oxlint": "0.2.10",
-    "prettier": "3.2",
-    "prettier-2": "npm:prettier@^2",
+    "prettier": "3.2.5",
+    "prettier-2": "npm:prettier@2.8.8",
     "rimraf": "3.0.2",
     "ts-jest": "29.1.2",
     "typescript": "5.0.2",

packages/rspack-plugin-minify/src/index.js

@@ -82,7 +82,7 @@ module.exports = class RspackMinifyPlugin {
 											sourceAsString,
 											map,
 											true
-									  )
+										)
 									: new RawSource(result.code),
 								{
 									...asset.info,

packages/rspack-test-tools/src/case/watch.ts

@@ -57,13 +57,13 @@ const creator = new WatchCaseCreator({
 						stepName: run.name,
 						tempDir: temp!,
 						runable: true
-				  })
+					})
 				: new RspackWatchStepProcessor({
 						name,
 						stepName: run.name,
 						tempDir: temp!,
 						runable: true
-				  })
+					})
 		);
 	}
 });

packages/rspack-test-tools/src/processor/multi.ts

@@ -56,8 +56,8 @@ export class MultiTaskProcessor<T extends ECompilerType = ECompilerType.Rspack>
 						const bundles = Array.isArray(curBundles)
 							? curBundles
 							: curBundles
-							? [curBundles]
-							: [];
+								? [curBundles]
+								: [];
 
 						const multiFileIndexMap: Record<string, number[]> =
 							context.getValue(_multiOptions.name, "multiFileIndexMap") || {};
@@ -91,7 +91,7 @@ export class MultiTaskProcessor<T extends ECompilerType = ECompilerType.Rspack>
 		)
 			? readConfigFile(
 					this._multiOptions.configFiles!.map(i => context.getSource(i))
-			  )
+				)
 			: [{}];
 
 		for (let [index, options] of caseOptions.entries()) {

packages/rspack-test-tools/src/processor/normal.ts

@@ -64,7 +64,7 @@ export class RspackNormalProcessor extends BasicTaskProcessor<ECompilerType.Rspa
 							// emitOnErrors: true,
 							minimizer: [terserForTesting],
 							...testConfig.optimization
-					  }
+						}
 					: {
 							removeAvailableModules: true,
 							removeEmptyChunks: true,
@@ -87,7 +87,7 @@ export class RspackNormalProcessor extends BasicTaskProcessor<ECompilerType.Rspa
 							chunkIds: "named",
 							minimizer: [terserForTesting],
 							...compilerOptions?.optimization
-					  },
+						},
 				// CHANGE: rspack does not support `performance` yet.
 				// performance: {
 				// 	hints: false

packages/rspack-test-tools/src/runner/basic.ts

@@ -12,7 +12,10 @@ import { EsmRunner } from "./runner/esm";
 export class BasicRunnerFactory<T extends ECompilerType>
 	implements TRunnerFactory<T>
 {
-	constructor(protected name: string, protected context: ITestContext) {}
+	constructor(
+		protected name: string,
+		protected context: ITestContext
+	) {}
 
 	create(
 		file: string,

packages/rspack-test-tools/src/runner/runner/basic.ts

@@ -155,9 +155,11 @@ export class BasicRunner<T extends ECompilerType = ECompilerType.Rspack>
 			if (modules && modulePathStr in modules) {
 				return modules[modulePathStr];
 			} else {
-				return require(modulePathStr.startsWith("node:")
-					? modulePathStr.slice(5)
-					: modulePathStr);
+				return require(
+					modulePathStr.startsWith("node:")
+						? modulePathStr.slice(5)
+						: modulePathStr
+				);
 			}
 		};
 	}

packages/rspack/src/builtin-plugin/index.ts

@@ -69,8 +69,8 @@ function resolveTreeShaking(
 	return treeShaking !== undefined
 		? treeShaking.toString()
 		: production
-		? "true"
-		: "false";
+			? "true"
+			: "false";
 }
 
 export interface Builtins {
@@ -97,7 +97,7 @@ export function deprecated_resolveBuiltins(
 						...builtins.css?.modules
 					},
 					namedExports: builtins.css?.namedExports
-			  }
+				}
 			: undefined,
 		treeShaking: resolveTreeShaking(builtins.treeShaking, production)
 	};

packages/rspack/src/config/adapter.ts

@@ -174,7 +174,7 @@ function getRawResolve(resolve: Resolve): RawOptions["resolve"] {
 					referencesType:
 						references == "auto" ? "auto" : references ? "manual" : "disabled",
 					references: references == "auto" ? undefined : references
-			  }
+				}
 			: undefined,
 		byDependency: getRawResolveByDependency(resolve.byDependency)
 	};
@@ -255,7 +255,7 @@ export function getRawLibrary(library: LibraryOptions): RawLibraryOptions {
 						commonjs2: auxiliaryComment,
 						amd: auxiliaryComment,
 						root: auxiliaryComment
-				  }
+					}
 				: auxiliaryComment,
 		libraryType: type,
 		name: isNil(name) ? name : getRawLibraryName(name),
@@ -398,7 +398,7 @@ const getRawModuleRule = (
 						k,
 						getRawRuleSetCondition(v)
 					])
-			  )
+				)
 			: undefined,
 		resource: rule.resource ? getRawRuleSetCondition(rule.resource) : undefined,
 		resourceQuery: rule.resourceQuery
@@ -420,7 +420,7 @@ const getRawModuleRule = (
 							`${path}.use`,
 							options
 						)
-				  },
+					},
 		type: rule.type,
 		parser: rule.parser
 			? getRawParserOptions(rule.parser, rule.type ?? "javascript/auto")
@@ -432,12 +432,12 @@ const getRawModuleRule = (
 		oneOf: rule.oneOf
 			? rule.oneOf.map((rule, index) =>
 					getRawModuleRule(rule, `${path}.oneOf[${index}]`, options)
-			  )
+				)
 			: undefined,
 		rules: rule.rules
 			? rule.rules.map((rule, index) =>
 					getRawModuleRule(rule, `${path}.rules[${index}]`, options)
-			  )
+				)
 			: undefined,
 		enforce: rule.enforce
 	};
@@ -456,27 +456,30 @@ const getRawModuleRule = (
 		delete rawModuleRule.resourceQuery;
 		delete rawModuleRule.resourceFragment;
 
-		rawModuleRule.rspackResource = getRawRuleSetCondition(function (
-			resourceQueryFragment
-		) {
-			const { path, query, fragment } = parseResource(resourceQueryFragment);
+		rawModuleRule.rspackResource = getRawRuleSetCondition(
+			function (resourceQueryFragment) {
+				const { path, query, fragment } = parseResource(resourceQueryFragment);
 
-			if (rule.test && !tryMatch(path, rule.test)) {
-				return false;
-			} else if (rule.resource && !tryMatch(path, rule.resource)) {
-				return false;
-			}
+				if (rule.test && !tryMatch(path, rule.test)) {
+					return false;
+				} else if (rule.resource && !tryMatch(path, rule.resource)) {
+					return false;
+				}
 
-			if (rule.resourceQuery && !tryMatch(query, rule.resourceQuery)) {
-				return false;
-			}
+				if (rule.resourceQuery && !tryMatch(query, rule.resourceQuery)) {
+					return false;
+				}
 
-			if (rule.resourceFragment && !tryMatch(fragment, rule.resourceFragment)) {
-				return false;
-			}
+				if (
+					rule.resourceFragment &&
+					!tryMatch(fragment, rule.resourceFragment)
+				) {
+					return false;
+				}
 
-			return true;
-		});
+				return true;
+			}
+		);
 	}
 	return rawModuleRule;
 };
@@ -579,8 +582,8 @@ function getRawJavascriptParserOptions(parser: JavascriptParserOptions) {
 			parser.url === false
 				? "false"
 				: parser.url === "relative"
-				? parser.url
-				: "true"
+					? parser.url
+					: "true"
 	};
 }
 

packages/rspack/src/config/defaults.ts

@@ -60,8 +60,8 @@ export const applyRspackOptionsDefaults = (
 		target === false
 			? false
 			: typeof target === "string"
-			? getTargetProperties(target, options.context!)
-			: getTargetsProperties(target, options.context!);
+				? getTargetProperties(target, options.context!)
+				: getTargetsProperties(target, options.context!);
 
 	const development = mode === "development";
 	const production = mode === "production" || !mode;
@@ -114,8 +114,8 @@ export const applyRspackOptionsDefaults = (
 		return options.output.library
 			? options.output.library.type
 			: options.output.module
-			? "module"
-			: "var";
+				? "module"
+				: "var";
 	});
 
 	applyNodeDefaults(options.node, { targetProperties });

packages/rspack/src/config/normalization.ts

@@ -95,7 +95,7 @@ export const getNormalizedRspackOptions = (
 								return ignore.test(warning.message);
 							};
 						}
-				  })
+					})
 				: undefined,
 		name: config.name,
 		dependencies: config.dependencies,
@@ -115,10 +115,10 @@ export const getNormalizedRspackOptions = (
 				"type" in library
 					? library
 					: libraryAsName || output.libraryTarget
-					? ({
-							name: libraryAsName
-					  } as LibraryOptions)
-					: undefined;
+						? ({
+								name: libraryAsName
+							} as LibraryOptions)
+						: undefined;
 			return {
 				path: output.path,
 				publicPath: output.publicPath,
@@ -396,7 +396,7 @@ const keyedNestedConfig = <T, R>(
 						obj
 					),
 					{} as Record<string, R>
-			  );
+				);
 	if (customKeys) {
 		for (const key of Object.keys(customKeys)) {
 			if (!(key in result)) {

packages/rspack/src/lite-tapable/index.ts

@@ -3,7 +3,7 @@ type FixedSizeArray<T extends number, U> = T extends 0
 	: ReadonlyArray<U> & {
 			0: U;
 			length: T;
-	  };
+		};
 type Measure<T extends number> = T extends 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8
 	? T
 	: never;

packages/rspack/src/rspack.ts

@@ -147,8 +147,10 @@ function rspack(
 	} else {
 		const { compiler, watch } = create();
 		if (watch) {
-			util.deprecate(() => {},
-			"A 'callback' argument needs to be provided to the 'rspack(options, callback)' function when the 'watch' option is set. There is no way to handle the 'watch' option without a callback.")();
+			util.deprecate(
+				() => {},
+				"A 'callback' argument needs to be provided to the 'rspack(options, callback)' function when the 'watch' option is set. There is no way to handle the 'watch' option without a callback."
+			)();
 		}
 		return compiler;
 	}

packages/rspack/src/sharing/ConsumeSharedPlugin.ts

@@ -48,7 +48,7 @@ export class ConsumeSharedPlugin extends RspackBuiltinPlugin {
 					let result =
 						item === key || !isRequiredVersion(item)
 							? // item is a request/key
-							  {
+								{
 									import: key,
 									shareScope: options.shareScope || "default",
 									shareKey: key,
@@ -57,10 +57,10 @@ export class ConsumeSharedPlugin extends RspackBuiltinPlugin {
 									strictVersion: false,
 									singleton: false,
 									eager: false
-							  }
+								}
 							: // key is a request/key
-							  // item is a version
-							  {
+								// item is a version
+								{
 									import: key,
 									shareScope: options.shareScope || "default",
 									shareKey: key,
@@ -69,7 +69,7 @@ export class ConsumeSharedPlugin extends RspackBuiltinPlugin {
 									packageName: undefined,
 									singleton: false,
 									eager: false
-							  };
+								};
 					return result;
 				},
 				(item, key) => ({

packages/rspack/src/stats/DefaultStatsFactoryPlugin.ts

@@ -112,13 +112,13 @@ const ASSETS_GROUPERS: Record<
 								[name]: !!key,
 								filteredChildren: assets.length,
 								...assetGroup(children)
-						  }
+							}
 						: {
 								type: "assets by status",
 								[name]: !!key,
 								children,
 								...assetGroup(children)
-						  };
+							};
 				}
 			});
 		};

packages/rspack/src/stats/statsFactoryUtils.ts

@@ -309,8 +309,8 @@ const getItemSize = (item: Child) => {
 	return !item.children
 		? 1
 		: item.filteredChildren
-		? 2 + getTotalSize(item.children)
-		: 1 + getTotalSize(item.children);
+			? 2 + getTotalSize(item.children)
+			: 1 + getTotalSize(item.children);
 };
 
 export const spaceLimited = (