From 958b55764e46203b7969cf1e0bb4fec8a28b00b6 Mon Sep 17 00:00:00 2001 From: Gengkun Date: Wed, 10 Apr 2024 18:42:38 +0800 Subject: [PATCH] chore: use prettier3 to format code (#6181) chore: use prettier3! --- package.json | 6 +- packages/rspack-cli/src/commands/build.ts | 6 +- packages/rspack-cli/src/commands/preview.ts | 2 +- packages/rspack-dev-server/src/middleware.ts | 4 +- packages/rspack-plugin-minify/src/index.js | 2 +- packages/rspack-test-tools/src/case/watch.ts | 4 +- .../webpack-module-placeholder-plugin.ts | 7 +-- .../rspack-test-tools/src/processor/multi.ts | 6 +- .../rspack-test-tools/src/processor/normal.ts | 4 +- .../rspack-test-tools/src/runner/basic.ts | 5 +- .../src/runner/runner/basic.ts | 8 ++- packages/rspack/src/Compilation.ts | 4 +- packages/rspack/src/MultiStats.ts | 4 +- .../src/builtin-plugin/HtmlRspackPlugin.ts | 4 +- .../src/builtin-plugin/css-extract/index.ts | 4 +- .../src/builtin-plugin/css-extract/loader.ts | 16 ++--- packages/rspack/src/builtin-plugin/index.ts | 4 +- packages/rspack/src/config/adapter.ts | 53 ++++++++-------- .../src/config/browserslistTargetHandler.js | 10 +-- packages/rspack/src/config/defaults.ts | 8 +-- packages/rspack/src/config/normalization.ts | 18 +++--- .../rspack/src/container/default.runtime.js | 2 +- packages/rspack/src/lite-tapable/index.ts | 2 +- packages/rspack/src/node/nodeConsole.ts | 4 +- packages/rspack/src/rspack.ts | 6 +- .../rspack/src/sharing/ConsumeSharedPlugin.ts | 10 +-- packages/rspack/src/sharing/SharePlugin.ts | 4 +- .../src/stats/DefaultStatsFactoryPlugin.ts | 4 +- .../src/stats/DefaultStatsPrinterPlugin.ts | 63 ++++++++++--------- .../rspack/src/stats/statsFactoryUtils.ts | 4 +- .../rspack/src/util/bindingVersionCheck.ts | 9 ++- packages/rspack/src/util/cleverMerge.js | 8 +-- packages/rspack/src/util/createSource.ts | 4 +- packages/rspack/src/util/identifier.js | 4 +- packages/rspack/src/util/index.ts | 8 +-- packages/rspack/src/util/smartGrouping.ts | 2 +- .../tests/cssExtract/manual/src/index.js | 10 +-- 37 files changed, 168 insertions(+), 155 deletions(-) diff --git a/package.json b/package.json index 68234606263..0e2daee95c4 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,8 @@ "build:viewer": "pnpm --filter \"@rspack/*\" build:viewer", "test:js": "pnpm -r run test", "format:rs": "pnpm --filter @rspack/core... build", - "format:js": "prettier \"packages/**/src/**/*.{ts,js}\" \"crates/rspack_plugin_runtime/**/*.{ts,js}\" \"x.mjs\" --check --write", - "format-ci:js": "prettier \"packages/**/src/**/*.{ts,js}\" \"crates/rspack_plugin_runtime/**/*.{ts,js}\" \"x.mjs\" --check", + "format:js": "pnpm run format-ci:js --write", + "format-ci:js": "node ./node_modules/prettier/bin/prettier.cjs \"packages/**/src/**/*.{ts,js}\" \"crates/rspack_plugin_runtime/**/*.{ts,js}\" \"x.mjs\" --check", "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", @@ -71,4 +71,4 @@ "why-is-node-running": "2.2.2" }, "packageManager": "pnpm@8.14.3" -} +} \ No newline at end of file diff --git a/packages/rspack-cli/src/commands/build.ts b/packages/rspack-cli/src/commands/build.ts index 47e89c9fb82..4d063c18b90 100644 --- a/packages/rspack-cli/src/commands/build.ts +++ b/packages/rspack-cli/src/commands/build.ts @@ -58,10 +58,10 @@ export class BuildCommand implements RspackCommand { children: compiler.compilers.map(compiler => compiler.options ? compiler.options.stats : undefined ) - } + } : compiler.options - ? compiler.options.stats - : undefined; + ? compiler.options.stats + : undefined; if (options.json && createJsonStringifyStream) { const handleWriteError = (error: Error) => { logger.error(error); diff --git a/packages/rspack-cli/src/commands/preview.ts b/packages/rspack-cli/src/commands/preview.ts index 1b40a23dba2..404bac8e565 100644 --- a/packages/rspack-cli/src/commands/preview.ts +++ b/packages/rspack-cli/src/commands/preview.ts @@ -69,7 +69,7 @@ async function getPreviewConfig( directory: options.dir ? path.join(item.context ?? process.cwd(), options.dir) : item.output?.path ?? - path.join(item.context ?? process.cwd(), defaultRoot), + path.join(item.context ?? process.cwd(), defaultRoot), publicPath: options.publicPath ?? "/" }, port: options.port ?? 8080, diff --git a/packages/rspack-dev-server/src/middleware.ts b/packages/rspack-dev-server/src/middleware.ts index 63d25607d47..d31d00cc901 100644 --- a/packages/rspack-dev-server/src/middleware.ts +++ b/packages/rspack-dev-server/src/middleware.ts @@ -33,9 +33,9 @@ export function getRspackMemoryAssets( // @ts-expect-error const filename = path.startsWith(publicPath) ? // @ts-expect-error - path.slice(publicPath.length) + path.slice(publicPath.length) : // @ts-expect-error - path.slice(1); + path.slice(1); const buffer = compiler.getAsset(filename) ?? (() => { diff --git a/packages/rspack-plugin-minify/src/index.js b/packages/rspack-plugin-minify/src/index.js index 3e51f58c061..c8250bef777 100644 --- a/packages/rspack-plugin-minify/src/index.js +++ b/packages/rspack-plugin-minify/src/index.js @@ -82,7 +82,7 @@ module.exports = class RspackMinifyPlugin { sourceAsString, map, true - ) + ) : new RawSource(result.code), { ...asset.info, diff --git a/packages/rspack-test-tools/src/case/watch.ts b/packages/rspack-test-tools/src/case/watch.ts index 1484f41cc8e..b11f6b942b2 100644 --- a/packages/rspack-test-tools/src/case/watch.ts +++ b/packages/rspack-test-tools/src/case/watch.ts @@ -32,13 +32,13 @@ const creator = new BasicCaseCreator({ stepName: run.name, tempDir: temp!, runable: true - }) + }) : new RspackWatchStepProcessor({ name, stepName: run.name, tempDir: temp!, runable: true - }) + }) ); } }); diff --git a/packages/rspack-test-tools/src/plugin/webpack-module-placeholder-plugin.ts b/packages/rspack-test-tools/src/plugin/webpack-module-placeholder-plugin.ts index 6da870440c3..1ed7a8ed8a9 100644 --- a/packages/rspack-test-tools/src/plugin/webpack-module-placeholder-plugin.ts +++ b/packages/rspack-test-tools/src/plugin/webpack-module-placeholder-plugin.ts @@ -62,10 +62,9 @@ export class WebpackModulePlaceholderPlugin { const webpackLibPath = which(compiler.constructor).path; const Template = require(path.join(webpackLibPath, "Template.js")); Template.renderRuntimeModules = createRenderRuntimeModulesFn(Template); - const JavascriptModulesPlugin = require(path.join( - webpackLibPath, - "javascript/JavascriptModulesPlugin.js" - )); + const JavascriptModulesPlugin = require( + path.join(webpackLibPath, "javascript/JavascriptModulesPlugin.js") + ); compiler.hooks.compilation.tap("RuntimeDiffPlugin", compilation => { const hooks = JavascriptModulesPlugin.getCompilationHooks(compilation); hooks.inlineInRuntimeBailout.tap( diff --git a/packages/rspack-test-tools/src/processor/multi.ts b/packages/rspack-test-tools/src/processor/multi.ts index 9aa614fce9e..34de601b226 100644 --- a/packages/rspack-test-tools/src/processor/multi.ts +++ b/packages/rspack-test-tools/src/processor/multi.ts @@ -56,8 +56,8 @@ export class MultiTaskProcessor const bundles = Array.isArray(curBundles) ? curBundles : curBundles - ? [curBundles] - : []; + ? [curBundles] + : []; const multiFileIndexMap: Record = context.getValue(_multiOptions.name, "multiFileIndexMap") || {}; @@ -91,7 +91,7 @@ export class MultiTaskProcessor ) ? readConfigFile( this._multiOptions.configFiles!.map(i => context.getSource(i)) - ) + ) : [{}]; for (let [index, options] of caseOptions.entries()) { diff --git a/packages/rspack-test-tools/src/processor/normal.ts b/packages/rspack-test-tools/src/processor/normal.ts index 6a0f587aca2..32b70e738e9 100644 --- a/packages/rspack-test-tools/src/processor/normal.ts +++ b/packages/rspack-test-tools/src/processor/normal.ts @@ -67,7 +67,7 @@ export class RspackNormalProcessor extends BasicTaskProcessor implements TRunnerFactory { - constructor(protected name: string, protected context: ITestContext) {} + constructor( + protected name: string, + protected context: ITestContext + ) {} create( file: string, diff --git a/packages/rspack-test-tools/src/runner/runner/basic.ts b/packages/rspack-test-tools/src/runner/runner/basic.ts index 98fa8455ade..e703fae8470 100644 --- a/packages/rspack-test-tools/src/runner/runner/basic.ts +++ b/packages/rspack-test-tools/src/runner/runner/basic.ts @@ -155,9 +155,11 @@ export class BasicRunner 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 + ); } }; } diff --git a/packages/rspack/src/Compilation.ts b/packages/rspack/src/Compilation.ts index b61ba885b89..bea464e016e 100644 --- a/packages/rspack/src/Compilation.ts +++ b/packages/rspack/src/Compilation.ts @@ -475,8 +475,8 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si assetInfoUpdateOrFunction === undefined ? assetInfoUpdateOrFunction : typeof assetInfoUpdateOrFunction === "function" - ? jsAssetInfo => toJsAssetInfo(assetInfoUpdateOrFunction(jsAssetInfo)) - : toJsAssetInfo(assetInfoUpdateOrFunction) + ? jsAssetInfo => toJsAssetInfo(assetInfoUpdateOrFunction(jsAssetInfo)) + : toJsAssetInfo(assetInfoUpdateOrFunction) ); } diff --git a/packages/rspack/src/MultiStats.ts b/packages/rspack/src/MultiStats.ts index e4316dc9714..aaaecf3b864 100644 --- a/packages/rspack/src/MultiStats.ts +++ b/packages/rspack/src/MultiStats.ts @@ -53,8 +53,8 @@ export default class MultiStats { ...(typeof childOptions === "string" ? { preset: childOptions } : childOptions && typeof childOptions === "object" - ? childOptions - : undefined) + ? childOptions + : undefined) }, context ); diff --git a/packages/rspack/src/builtin-plugin/HtmlRspackPlugin.ts b/packages/rspack/src/builtin-plugin/HtmlRspackPlugin.ts index 2c3e782f265..84f5f0a00bb 100644 --- a/packages/rspack/src/builtin-plugin/HtmlRspackPlugin.ts +++ b/packages/rspack/src/builtin-plugin/HtmlRspackPlugin.ts @@ -47,8 +47,8 @@ export const HtmlRspackPlugin = create( ? "body" : "head" : configInject === false - ? "false" - : configInject; + ? "false" + : configInject; return { ...c, meta, diff --git a/packages/rspack/src/builtin-plugin/css-extract/index.ts b/packages/rspack/src/builtin-plugin/css-extract/index.ts index 44b903598d3..660158e1b9a 100644 --- a/packages/rspack/src/builtin-plugin/css-extract/index.ts +++ b/packages/rspack/src/builtin-plugin/css-extract/index.ts @@ -100,8 +100,8 @@ export class CssExtractRspackPlugin { typeof options.linkType === "undefined" ? JSON.stringify("text/css") : options.linkType === false - ? undefined - : JSON.stringify(options.linkType), + ? undefined + : JSON.stringify(options.linkType), attributes: options.attributes ? (Reflect.ownKeys(options.attributes) .map(k => [ diff --git a/packages/rspack/src/builtin-plugin/css-extract/loader.ts b/packages/rspack/src/builtin-plugin/css-extract/loader.ts index 5d05501cb64..f756e3e905d 100644 --- a/packages/rspack/src/builtin-plugin/css-extract/loader.ts +++ b/packages/rspack/src/builtin-plugin/css-extract/loader.ts @@ -53,9 +53,9 @@ function hotLoader( context.loaderContext, path.join(__dirname, "./hmr/hotModuleReplacement.js") )})(module.id, ${JSON.stringify({ - ...context.options, - locals: !!context.locals - })}); + ...context.options, + locals: !!context.locals + })}); module.hot.dispose(cssReload); ${accept} } @@ -132,7 +132,7 @@ export const pitch: LoaderDefinition["pitch"] = function (request, _, data) { : `${ABSOLUTE_PUBLIC_PATH}${publicPath.replace( /\./g, SINGLE_DOT_PATH_SEGMENT - )}`; + )}`; } else { publicPathForExtract = publicPath; } @@ -200,7 +200,7 @@ export const pitch: LoaderDefinition["pitch"] = function (request, _, data) { sourceMap: sourceMap ? JSON.stringify(sourceMap) : // eslint-disable-next-line no-undefined - undefined, + undefined, filepath }; }) @@ -224,10 +224,10 @@ export const pitch: LoaderDefinition["pitch"] = function (request, _, data) { .join("") : `\n${ esModule ? "export default" : "module.exports =" - } ${JSON.stringify(locals)};` + } ${JSON.stringify(locals)};` : esModule - ? `\nexport {};` - : ""; + ? `\nexport {};` + : ""; let resultSource = `// extracted by ${CssExtractRspackPlugin.pluginName}`; diff --git a/packages/rspack/src/builtin-plugin/index.ts b/packages/rspack/src/builtin-plugin/index.ts index d4609d4bf2b..01a955fb2cc 100644 --- a/packages/rspack/src/builtin-plugin/index.ts +++ b/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 { diff --git a/packages/rspack/src/config/adapter.ts b/packages/rspack/src/config/adapter.ts index f2b4945454a..4d1a6459436 100644 --- a/packages/rspack/src/config/adapter.ts +++ b/packages/rspack/src/config/adapter.ts @@ -186,7 +186,7 @@ function getRawResolve(resolve: Resolve): RawOptions["resolve"] { referencesType: references == "auto" ? "auto" : references ? "manual" : "disabled", references: references == "auto" ? undefined : references - } + } : undefined, byDependency: getRawResolveByDependency(resolve.byDependency) }; @@ -267,7 +267,7 @@ export function getRawLibrary(library: LibraryOptions): RawLibraryOptions { commonjs2: auxiliaryComment, amd: auxiliaryComment, root: auxiliaryComment - } + } : auxiliaryComment, libraryType: type, name: isNil(name) ? name : getRawLibraryName(name), @@ -410,7 +410,7 @@ const getRawModuleRule = ( k, getRawRuleSetCondition(v) ]) - ) + ) : undefined, resource: rule.resource ? getRawRuleSetCondition(rule.resource) : undefined, resourceQuery: rule.resourceQuery @@ -432,7 +432,7 @@ const getRawModuleRule = ( `${path}.use`, options ) - }, + }, type: rule.type, parser: rule.parser ? getRawParserOptions(rule.parser, rule.type ?? "javascript/auto") @@ -444,12 +444,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 }; @@ -468,27 +468,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; }; @@ -605,8 +608,8 @@ function getRawJavascriptParserOptions(parser: JavascriptParserOptions) { parser.url === false ? "false" : parser.url === "relative" - ? parser.url - : "true" + ? parser.url + : "true" }; } diff --git a/packages/rspack/src/config/browserslistTargetHandler.js b/packages/rspack/src/config/browserslistTargetHandler.js index 74a77a3f4e1..f605e18e460 100644 --- a/packages/rspack/src/config/browserslistTargetHandler.js +++ b/packages/rspack/src/config/browserslistTargetHandler.js @@ -65,11 +65,11 @@ const load = (input, context) => { const config = query ? query : configPath - ? browserslist.loadConfig({ - config: configPath, - env - }) - : browserslist.loadConfig({ path: context, env }); + ? browserslist.loadConfig({ + config: configPath, + env + }) + : browserslist.loadConfig({ path: context, env }); if (!config) return null; return browserslist(config); diff --git a/packages/rspack/src/config/defaults.ts b/packages/rspack/src/config/defaults.ts index 1577b9e8bd6..907ce43481f 100644 --- a/packages/rspack/src/config/defaults.ts +++ b/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 }); diff --git a/packages/rspack/src/config/normalization.ts b/packages/rspack/src/config/normalization.ts index 44c2c8d9a7c..9d3a815bdab 100644 --- a/packages/rspack/src/config/normalization.ts +++ b/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, @@ -106,7 +106,7 @@ export const getNormalizedRspackOptions = ( ? { main: {} } : getNormalizedEntryStatic( typeof config.entry === "function" ? config.entry() : config.entry - ), + ), output: nestedConfig(config.output, output => { const { library } = output; const libraryAsName = library; @@ -117,10 +117,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, @@ -342,8 +342,8 @@ const getNormalizedEntryStatic = (entry: EntryStatic) => { dependOn: Array.isArray(value.dependOn) ? value.dependOn : value.dependOn - ? [value.dependOn] - : undefined + ? [value.dependOn] + : undefined }; } } @@ -406,7 +406,7 @@ const keyedNestedConfig = ( obj ), {} as Record - ); + ); if (customKeys) { for (const key of Object.keys(customKeys)) { if (!(key in result)) { diff --git a/packages/rspack/src/container/default.runtime.js b/packages/rspack/src/container/default.runtime.js index 9beb44dea25..0cb06ee4a52 100644 --- a/packages/rspack/src/container/default.runtime.js +++ b/packages/rspack/src/container/default.runtime.js @@ -230,7 +230,7 @@ module.exports = function () { throw new Error( 'Module "' + module + '" does not exist in container.' ); - }); + }); __webpack_require__.R = undefined; return getScope; }); diff --git a/packages/rspack/src/lite-tapable/index.ts b/packages/rspack/src/lite-tapable/index.ts index 2955c822052..902f91e87e5 100644 --- a/packages/rspack/src/lite-tapable/index.ts +++ b/packages/rspack/src/lite-tapable/index.ts @@ -3,7 +3,7 @@ type FixedSizeArray = T extends 0 : ReadonlyArray & { 0: U; length: T; - }; + }; type Measure = T extends 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 ? T : never; diff --git a/packages/rspack/src/node/nodeConsole.ts b/packages/rspack/src/node/nodeConsole.ts index 109490d3cd9..9e8c2c8d15b 100644 --- a/packages/rspack/src/node/nodeConsole.ts +++ b/packages/rspack/src/node/nodeConsole.ts @@ -131,7 +131,7 @@ export = ({ colors, appendOnly, stream }) => { status: appendOnly ? writeColored(" ", "", "") : // @ts-expect-error - (name, ...args) => { + (name, ...args) => { args = args.filter(Boolean); if (name === undefined && args.length === 0) { clearStatusMessage(); @@ -149,6 +149,6 @@ export = ({ colors, appendOnly, stream }) => { currentStatusMessage = [name, ...args]; writeStatusMessage(); } - } + } }; }; diff --git a/packages/rspack/src/rspack.ts b/packages/rspack/src/rspack.ts index e80bdff1eb5..64d33f0ec51 100644 --- a/packages/rspack/src/rspack.ts +++ b/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; } diff --git a/packages/rspack/src/sharing/ConsumeSharedPlugin.ts b/packages/rspack/src/sharing/ConsumeSharedPlugin.ts index deac1620243..295580c1a26 100644 --- a/packages/rspack/src/sharing/ConsumeSharedPlugin.ts +++ b/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) => ({ diff --git a/packages/rspack/src/sharing/SharePlugin.ts b/packages/rspack/src/sharing/SharePlugin.ts index ca4281d98bc..6524219d3dd 100644 --- a/packages/rspack/src/sharing/SharePlugin.ts +++ b/packages/rspack/src/sharing/SharePlugin.ts @@ -42,11 +42,11 @@ export class SharePlugin { item === key || !isRequiredVersion(item) ? { import: item - } + } : { import: key, requiredVersion: item - }; + }; return config; }, item => item diff --git a/packages/rspack/src/stats/DefaultStatsFactoryPlugin.ts b/packages/rspack/src/stats/DefaultStatsFactoryPlugin.ts index acce193525e..64f832dbd66 100644 --- a/packages/rspack/src/stats/DefaultStatsFactoryPlugin.ts +++ b/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) - }; + }; } }); }; diff --git a/packages/rspack/src/stats/DefaultStatsPrinterPlugin.ts b/packages/rspack/src/stats/DefaultStatsPrinterPlugin.ts index b87d6ddd8d5..03ea48e1add 100644 --- a/packages/rspack/src/stats/DefaultStatsPrinterPlugin.ts +++ b/packages/rspack/src/stats/DefaultStatsPrinterPlugin.ts @@ -95,7 +95,7 @@ const SIMPLE_PRINTERS: Record< warningsCount && warningsCount > 0 ? yellow( `${warningsCount} ${plural(warningsCount, "warning", "warnings")}` - ) + ) : ""; const errorsMessage = errorsCount && errorsCount > 0 @@ -111,10 +111,10 @@ const SIMPLE_PRINTERS: Record< root && name ? bold(name) : name - ? `Child ${bold(name)}` - : root - ? "" - : "Child"; + ? `Child ${bold(name)}` + : root + ? "" + : "Child"; const subjectMessage = nameMessage && versionMessage ? `${nameMessage} (${versionMessage})` @@ -148,7 +148,7 @@ const SIMPLE_PRINTERS: Record< count, "warning has", "warnings have" - )} detailed information that is not shown.\nUse 'stats.errorDetails: true' resp. '--stats-error-details' to show it.` + )} detailed information that is not shown.\nUse 'stats.errorDetails: true' resp. '--stats-error-details' to show it.` : undefined, "compilation.filteredErrorDetailsCount": (count, { yellow }) => count @@ -158,7 +158,7 @@ const SIMPLE_PRINTERS: Record< "error has", "errors have" )} detailed information that is not shown.\nUse 'stats.errorDetails: true' resp. '--stats-error-details' to show it.` - ) + ) : undefined, "compilation.env": (env, { bold }) => env @@ -172,7 +172,7 @@ const SIMPLE_PRINTERS: Record< : printer.print(context.type, Object.values(entrypoints), { ...context, chunkGroupKind: "Entrypoint" - }), + }), "compilation.namedChunkGroups": ( namedChunkGroups: StatsChunkGroup, context, @@ -206,15 +206,18 @@ const SIMPLE_PRINTERS: Record< filteredModules, "module", "modules" - )}` + )}` : undefined, - "compilation.filteredAssets": (filteredAssets, { compilation: { assets } }) => + "compilation.filteredAssets": ( + filteredAssets, + { compilation: { assets } } + ) => filteredAssets > 0 ? `${moreCount(assets, filteredAssets)} ${plural( filteredAssets, "asset", "assets" - )}` + )}` : undefined, "compilation.logging": (logging, context, printer) => Array.isArray(logging) @@ -226,7 +229,7 @@ const SIMPLE_PRINTERS: Record< name })), context - ), + ), "compilation.warningsInChildren!": (_, { yellow, compilation }) => { if ( !compilation.children && @@ -301,7 +304,7 @@ const SIMPLE_PRINTERS: Record< sourceFilename === true ? "from source file" : `from: ${sourceFilename}` - ) + ) : undefined, "asset.info.development": (development, { green, formatFlag }) => development ? green(formatFlag("dev")) : undefined, @@ -316,7 +319,7 @@ const SIMPLE_PRINTERS: Record< filteredRelated, "asset", "assets" - )}` + )}` : undefined, "asset.filteredChildren": (filteredChildren, { asset: { children } }) => filteredChildren > 0 @@ -324,7 +327,7 @@ const SIMPLE_PRINTERS: Record< filteredChildren, "asset", "assets" - )}` + )}` : undefined, assetChunk: (id, { formatChunkId }) => formatChunkId(id), @@ -370,22 +373,22 @@ const SIMPLE_PRINTERS: Record< formatFlag( `${assets.length} ${plural(assets.length, "asset", "assets")}` ) - ) + ) : undefined, "module.warnings": (warnings, { formatFlag, yellow }) => warnings === true ? yellow(formatFlag("warnings")) : warnings - ? yellow( - formatFlag(`${warnings} ${plural(warnings, "warning", "warnings")}`) - ) - : undefined, + ? yellow( + formatFlag(`${warnings} ${plural(warnings, "warning", "warnings")}`) + ) + : undefined, "module.errors": (errors, { formatFlag, red }) => errors === true ? red(formatFlag("errors")) : errors - ? red(formatFlag(`${errors} ${plural(errors, "error", "errors")}`)) - : undefined, + ? red(formatFlag(`${errors} ${plural(errors, "error", "errors")}`)) + : undefined, "module.providedExports": (providedExports, { formatFlag, cyan }) => { if (Array.isArray(providedExports)) { if (providedExports.length === 0) return cyan(formatFlag("no exports")); @@ -426,7 +429,7 @@ const SIMPLE_PRINTERS: Record< filteredModules, "module", "modules" - )}` + )}` : undefined, "module.filteredReasons": (filteredReasons, { module: { reasons } }) => filteredReasons > 0 @@ -434,7 +437,7 @@ const SIMPLE_PRINTERS: Record< filteredReasons, "reason", "reasons" - )}` + )}` : undefined, "module.filteredChildren": (filteredChildren, { module: { children } }) => filteredChildren > 0 @@ -442,7 +445,7 @@ const SIMPLE_PRINTERS: Record< filteredChildren, "module", "modules" - )}` + )}` : undefined, "module.separator!": () => "\n", @@ -469,7 +472,7 @@ const SIMPLE_PRINTERS: Record< filteredChildren, "reason", "reasons" - )}` + )}` : undefined, "module.profile.total": (value, { formatTime }) => formatTime(value), @@ -510,7 +513,7 @@ const SIMPLE_PRINTERS: Record< n, "asset", "assets" - )}` + )}` : undefined, "chunkGroup.is!": () => "=", "chunkGroupAsset.name": (asset, { green }) => green(asset), @@ -529,7 +532,7 @@ const SIMPLE_PRINTERS: Record< children: children[key] })), context - ), + ), "chunkGroupChildGroup.type": type => `${type}:`, "chunkGroupChild.assets[]": (file, { formatFilename }) => formatFilename(file), @@ -581,7 +584,7 @@ const SIMPLE_PRINTERS: Record< filteredModules, "module", "modules" - )}` + )}` : undefined, "chunk.separator!": () => "\n", @@ -1374,7 +1377,7 @@ export class DefaultStatsPrinterPlugin { ? str.replace( /((\u001b\[39m|\u001b\[22m|\u001b\[0m)+)/g, `$1${start}` - ) + ) : str }\u001b[39m\u001b[22m`; } else { diff --git a/packages/rspack/src/stats/statsFactoryUtils.ts b/packages/rspack/src/stats/statsFactoryUtils.ts index 3a9cc7181fe..8629dbefcc7 100644 --- a/packages/rspack/src/stats/statsFactoryUtils.ts +++ b/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 = ( diff --git a/packages/rspack/src/util/bindingVersionCheck.ts b/packages/rspack/src/util/bindingVersionCheck.ts index d59f43752a2..c5622e4f723 100644 --- a/packages/rspack/src/util/bindingVersionCheck.ts +++ b/packages/rspack/src/util/bindingVersionCheck.ts @@ -112,12 +112,11 @@ export const checkVersion = () => { ADDON_VERSION = BINDING_VERSION; } else { // Fetch addon package if installed from remote - ADDON_VERSION = require(require.resolve( - `@rspack/binding-${platformArchAbi}/package.json`, - { + ADDON_VERSION = require( + require.resolve(`@rspack/binding-${platformArchAbi}/package.json`, { paths: [BINDING_PKG_DIR] - } - )).version; + }) + ).version; } } catch (error: any) { if (error instanceof Error) { diff --git a/packages/rspack/src/util/cleverMerge.js b/packages/rspack/src/util/cleverMerge.js index 081cb40f6e3..15751397ce6 100644 --- a/packages/rspack/src/util/cleverMerge.js +++ b/packages/rspack/src/util/cleverMerge.js @@ -478,8 +478,8 @@ const mergeSingleValue = (a, b, internalCaching) => { return aType !== VALUE_TYPE_OBJECT ? b : internalCaching - ? cachedCleverMerge(a, b) - : cleverMerge(a, b); + ? cachedCleverMerge(a, b) + : cleverMerge(a, b); } case VALUE_TYPE_UNDEFINED: return a; @@ -488,8 +488,8 @@ const mergeSingleValue = (a, b, internalCaching) => { aType !== VALUE_TYPE_ATOM ? aType : Array.isArray(a) - ? VALUE_TYPE_ARRAY_EXTEND - : VALUE_TYPE_OBJECT + ? VALUE_TYPE_ARRAY_EXTEND + : VALUE_TYPE_OBJECT ) { case VALUE_TYPE_UNDEFINED: return b; diff --git a/packages/rspack/src/util/createSource.ts b/packages/rspack/src/util/createSource.ts index ea0d02789b1..07900b54d1a 100644 --- a/packages/rspack/src/util/createSource.ts +++ b/packages/rspack/src/util/createSource.ts @@ -49,8 +49,8 @@ function createRawFromSource(source: Source): JsCompatSource { (isBuffer ? sourceSource : sourceSource instanceof ArrayBuffer - ? arrayBufferToBuffer(sourceSource) - : Buffer.from(sourceSource)); + ? arrayBufferToBuffer(sourceSource) + : Buffer.from(sourceSource)); const map = JSON.stringify( source.map?.({ columns: true diff --git a/packages/rspack/src/util/identifier.js b/packages/rspack/src/util/identifier.js index 7ffe4759d2d..4a4f3f6062e 100644 --- a/packages/rspack/src/util/identifier.js +++ b/packages/rspack/src/util/identifier.js @@ -389,6 +389,6 @@ exports.getUndoPath = (filename, outputPath, enforceRelative) => { return depth > 0 ? `${"../".repeat(depth)}${append}` : enforceRelative - ? `./${append}` - : append; + ? `./${append}` + : append; }; diff --git a/packages/rspack/src/util/index.ts b/packages/rspack/src/util/index.ts index 8659809b210..a7f60dfd726 100644 --- a/packages/rspack/src/util/index.ts +++ b/packages/rspack/src/util/index.ts @@ -77,10 +77,10 @@ export function concatErrorMsgAndStack(err: Error | JsStatsError): string { return isJsStatsError(err) ? err.formatted : err.stack - ? err.stack.startsWith(`${stackStartPrefix}${err.message}`) - ? `${err.stack}` - : `${err.message}\n${err.stack}` - : `${err.message}`; + ? err.stack.startsWith(`${stackStartPrefix}${err.message}`) + ? `${err.stack}` + : `${err.message}\n${err.stack}` + : `${err.message}`; } export function indent(str: string, prefix: string) { diff --git a/packages/rspack/src/util/smartGrouping.ts b/packages/rspack/src/util/smartGrouping.ts index 7bf7a757fd4..e9bb88d1c45 100644 --- a/packages/rspack/src/util/smartGrouping.ts +++ b/packages/rspack/src/util/smartGrouping.ts @@ -140,7 +140,7 @@ export const smartGrouping = ( (totalSize * 2) / targetGroupCount + itemsWithGroups.size - items.size - ); + ); if ( sizeValue > bestGroupSize || (force && (!bestGroupOptions || !bestGroupOptions.force)) diff --git a/packages/rspack/tests/cssExtract/manual/src/index.js b/packages/rspack/tests/cssExtract/manual/src/index.js index 2a006cfb824..08f5933b07d 100644 --- a/packages/rspack/tests/cssExtract/manual/src/index.js +++ b/packages/rspack/tests/cssExtract/manual/src/index.js @@ -70,11 +70,13 @@ makeButton(".lazy-module-button", () => }) ); -makeButton(".preloaded-button1", () => - import(/* webpackChunkName: "preloaded1" */ "./preloaded1") +makeButton( + ".preloaded-button1", + () => import(/* webpackChunkName: "preloaded1" */ "./preloaded1") ); -makeButton(".preloaded-button2", () => - import(/* webpackChunkName: "preloaded2" */ "./preloaded2") +makeButton( + ".preloaded-button2", + () => import(/* webpackChunkName: "preloaded2" */ "./preloaded2") ); makeButton(".lazy-failure-button", () => import("./lazy-failure"), false);