Skip to content

Commit 4ecc5cb

Browse files
authored
fix(lint): enable @typescript-eslint/return-await rule (#12665)
1 parent 9400b65 commit 4ecc5cb

File tree

6 files changed

+18
-26
lines changed

6 files changed

+18
-26
lines changed

packages/rspack/src/FileSystem.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,15 +242,15 @@ class ThreadsafeIntermediateNodeFS extends ThreadsafeOutputNodeFS {
242242
this.write = memoizeFn(() => {
243243
const writeFn = util.promisify(fs.write.bind(fs));
244244
return async (fd: number, content: Buffer, position: number) => {
245-
return await writeFn(fd, content, {
245+
return writeFn(fd, content, {
246246
position,
247247
});
248248
};
249249
});
250250
this.writeAll = memoizeFn(() => {
251251
const writeFn = util.promisify(fs.writeFile.bind(fs));
252252
return async (fd: number, content: Buffer) => {
253-
return await writeFn(fd, content);
253+
return writeFn(fd, content);
254254
};
255255
});
256256
this.read = memoizeFn(() => {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export class ExternalsPlugin extends RspackBuiltinPlugin {
7070
const processResolveResult = this.#processResolveResult;
7171

7272
return async (ctx: RawExternalItemFnCtx) => {
73-
return await new Promise((resolve, reject) => {
73+
return new Promise((resolve, reject) => {
7474
const data = ctx.data();
7575
const promise = item(
7676
{

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ export const createRsdoctorPluginHooksRegisters: CreatePartialRegisters<
161161
},
162162
function (queried) {
163163
return async function (data: JsRsdoctorModuleGraph) {
164-
return await queried.promise(data);
164+
return queried.promise(data);
165165
};
166166
},
167167
),
@@ -174,7 +174,7 @@ export const createRsdoctorPluginHooksRegisters: CreatePartialRegisters<
174174
},
175175
function (queried) {
176176
return async function (data: JsRsdoctorChunkGraph) {
177-
return await queried.promise(data);
177+
return queried.promise(data);
178178
};
179179
},
180180
),
@@ -187,7 +187,7 @@ export const createRsdoctorPluginHooksRegisters: CreatePartialRegisters<
187187
},
188188
function (queried) {
189189
return async function (data: JsRsdoctorModuleIdsPatch) {
190-
return await queried.promise(data);
190+
return queried.promise(data);
191191
};
192192
},
193193
),
@@ -200,7 +200,7 @@ export const createRsdoctorPluginHooksRegisters: CreatePartialRegisters<
200200
},
201201
function (queried) {
202202
return async function (data: JsRsdoctorModuleSourcesPatch) {
203-
return await queried.promise(data);
203+
return queried.promise(data);
204204
};
205205
},
206206
),
@@ -213,7 +213,7 @@ export const createRsdoctorPluginHooksRegisters: CreatePartialRegisters<
213213
},
214214
function (queried) {
215215
return async function (data: JsRsdoctorAssetPatch) {
216-
return await queried.promise(data);
216+
return queried.promise(data);
217217
};
218218
},
219219
),

packages/rspack/src/taps/compilation.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ export const createCompilationHooksRegisters: CreatePartialRegisters<
282282

283283
function (queried) {
284284
return async function () {
285-
return await queried.promise(
285+
return queried.promise(
286286
getCompiler().__internal__get_compilation()!.modules,
287287
);
288288
};
@@ -329,7 +329,7 @@ export const createCompilationHooksRegisters: CreatePartialRegisters<
329329

330330
function (queried) {
331331
return async function () {
332-
return await queried.promise(
332+
return queried.promise(
333333
getCompiler().__internal__get_compilation()!.chunks,
334334
getCompiler().__internal__get_compilation()!.modules,
335335
);
@@ -346,7 +346,7 @@ export const createCompilationHooksRegisters: CreatePartialRegisters<
346346

347347
function (queried) {
348348
return async function () {
349-
return await queried.promise(
349+
return queried.promise(
350350
getCompiler().__internal__get_compilation()!.chunks,
351351
getCompiler().__internal__get_compilation()!.modules,
352352
);
@@ -403,7 +403,7 @@ export const createCompilationHooksRegisters: CreatePartialRegisters<
403403

404404
function (queried) {
405405
return async function () {
406-
return await queried.promise(
406+
return queried.promise(
407407
getCompiler().__internal__get_compilation()!.assets,
408408
);
409409
};
@@ -447,7 +447,7 @@ export const createCompilationHooksRegisters: CreatePartialRegisters<
447447

448448
function (queried) {
449449
return async function () {
450-
return await queried.promise();
450+
return queried.promise();
451451
};
452452
},
453453
),

packages/rspack/src/taps/compiler.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ export const createCompilerHooksRegisters: CreatePartialRegisters<
4747

4848
function (queried) {
4949
return async function () {
50-
return await queried.promise(
51-
getCompiler().__internal__get_compilation()!,
52-
);
50+
return queried.promise(getCompiler().__internal__get_compilation()!);
5351
};
5452
},
5553
),
@@ -62,9 +60,7 @@ export const createCompilerHooksRegisters: CreatePartialRegisters<
6260

6361
function (queried) {
6462
return async function () {
65-
return await queried.promise(
66-
getCompiler().__internal__get_compilation()!,
67-
);
63+
return queried.promise(getCompiler().__internal__get_compilation()!);
6864
};
6965
},
7066
),
@@ -90,9 +86,7 @@ export const createCompilerHooksRegisters: CreatePartialRegisters<
9086

9187
function (queried) {
9288
return async function () {
93-
return await queried.promise(
94-
getCompiler().__internal__get_compilation()!,
95-
);
89+
return queried.promise(getCompiler().__internal__get_compilation()!);
9690
};
9791
},
9892
),
@@ -105,9 +99,7 @@ export const createCompilerHooksRegisters: CreatePartialRegisters<
10599

106100
function (queried) {
107101
return async function () {
108-
return await queried.promise(
109-
getCompiler().__internal__get_compilation()!,
110-
);
102+
return queried.promise(getCompiler().__internal__get_compilation()!);
111103
};
112104
},
113105
),

rslint.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@typescript-eslint/use-unknown-in-catch-callback-variable": "off",
2828
"@typescript-eslint/require-await": "error",
2929
"@typescript-eslint/switch-exhaustiveness-check": "off",
30-
"@typescript-eslint/return-await": "off",
30+
"@typescript-eslint/return-await": "error",
3131
"@typescript-eslint/non-nullable-type-assertion-style": "off",
3232
"@typescript-eslint/no-misused-spread": "off",
3333
"@typescript-eslint/unbound-method": "off",

0 commit comments

Comments
 (0)