Skip to content

Commit 98165eb

Browse files
fix: remove several ts-expect-error (#2409)
1 parent 1aebd6d commit 98165eb

File tree

1 file changed

+7
-30
lines changed

1 file changed

+7
-30
lines changed

packages/rspack/src/config/adapter-rule-use.ts

Lines changed: 7 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ function createRawModuleRuleUsesImpl(
158158
use.loader.startsWith(BUILTIN_LOADER_PREFIX)
159159
);
160160
if (index < 0) {
161-
// @ts-expect-error
162-
return [composeJsUse(uses, options, allUses)];
161+
// cast to non-null since we know `uses` is not empty
162+
return [composeJsUse(uses, options, allUses)!];
163163
}
164164

165165
const before = uses.slice(0, index);
@@ -205,14 +205,10 @@ function composeJsUse(
205205
let isSync = true;
206206
let isError = false; // internal error
207207
let reportedError = false;
208-
// @ts-expect-error
209-
const fileDependencies = [];
210-
// @ts-expect-error
211-
const contextDependencies = [];
212-
// @ts-expect-error
213-
const missingDependencies = [];
214-
// @ts-expect-error
215-
const buildDependencies = [];
208+
const fileDependencies: string[] = [];
209+
const contextDependencies: string[] = [];
210+
const missingDependencies: string[] = [];
211+
const buildDependencies: string[] = [];
216212

217213
function callback(
218214
err: Error | null,
@@ -238,13 +234,9 @@ function composeJsUse(
238234
content,
239235
sourceMap,
240236
additionalData,
241-
// @ts-expect-error
242237
fileDependencies,
243-
// @ts-expect-error
244238
contextDependencies,
245-
// @ts-expect-error
246239
missingDependencies,
247-
// @ts-expect-error
248240
buildDependencies
249241
});
250242
}
@@ -476,15 +468,12 @@ function composeJsUse(
476468
missingDependencies.length = 0;
477469
},
478470
getDependencies() {
479-
// @ts-expect-error
480471
return fileDependencies.slice();
481472
},
482473
getContextDependencies() {
483-
// @ts-expect-error
484474
return contextDependencies.slice();
485475
},
486476
getMissingDependencies() {
487-
// @ts-expect-error
488477
return missingDependencies.slice();
489478
},
490479
_compiler: compiler,
@@ -519,16 +508,12 @@ function composeJsUse(
519508
if (result === undefined) {
520509
resolve({
521510
content,
522-
// @ts-expect-error
523511
buildDependencies,
524512
sourceMap,
525513
additionalData,
526514
cacheable,
527-
// @ts-expect-error
528515
fileDependencies,
529-
// @ts-expect-error
530516
contextDependencies,
531-
// @ts-expect-error
532517
missingDependencies
533518
});
534519
return;
@@ -537,32 +522,24 @@ function composeJsUse(
537522
return result.then(function (result) {
538523
resolve({
539524
content: result,
540-
// @ts-expect-error
541525
buildDependencies,
542526
sourceMap,
543527
additionalData,
544528
cacheable,
545-
// @ts-expect-error
546529
fileDependencies,
547-
// @ts-expect-error
548530
contextDependencies,
549-
// @ts-expect-error
550531
missingDependencies
551532
});
552533
}, reject);
553534
}
554535
return resolve({
555536
content: result,
556-
// @ts-expect-error
557537
buildDependencies,
558538
sourceMap,
559539
additionalData,
560540
cacheable,
561-
// @ts-expect-error
562541
fileDependencies,
563-
// @ts-expect-error
564542
contextDependencies,
565-
// @ts-expect-error
566543
missingDependencies
567544
});
568545
}
@@ -614,7 +591,7 @@ function composeJsUse(
614591
typeof sourceMap === "string"
615592
? sourceMap
616593
: JSON.stringify(sourceMap)
617-
)
594+
)
618595
: undefined,
619596
additionalData: additionalData
620597
? toBuffer(JSON.stringify(additionalData))

0 commit comments

Comments
 (0)