Skip to content

Commit b28261b

Browse files
committed
fix: build
1 parent 7878c8f commit b28261b

3 files changed

Lines changed: 1094 additions & 946 deletions

File tree

src/after-compile.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -268,15 +268,15 @@ function provideErrorsToWebpack(
268268
compilation.compiler.context
269269
);
270270

271-
if (!moduleHasErrors(module, instance.isWebpack5)) {
271+
// if (!moduleHasErrors(module, instance.isWebpack5)) {
272272
formattedErrors.forEach(error => {
273273
if (module.addError) {
274274
module.addError(error);
275275
} else {
276276
module.errors.push(error);
277277
}
278278
});
279-
}
279+
// }
280280

281281
compilation.errors.push(...formattedErrors);
282282
});
@@ -338,15 +338,15 @@ function provideSolutionErrorsToWebpack(
338338
compilation.compiler.context
339339
);
340340

341-
if (!moduleHasErrors(module, instance.isWebpack5)) {
341+
// if (!moduleHasErrors(module, instance.isWebpack5)) {
342342
formattedErrors.forEach(error => {
343343
if (module.addError) {
344344
module.addError(error);
345345
} else {
346346
module.errors.push(error);
347347
}
348348
});
349-
}
349+
// }
350350

351351
compilation.errors.push(...formattedErrors);
352352
});
@@ -528,21 +528,21 @@ function removeModuleTSLoaderError(
528528
isWebpack5: boolean
529529
) {
530530
if (isWebpack5) {
531-
const warnings: webpack.WebpackError[] = Array.from(
531+
const warnings = Array.from(
532532
module.getWarnings!() || []
533533
);
534-
const errors: webpack.WebpackError[] = Array.from(
534+
const errors = Array.from(
535535
module.getErrors!() || []
536536
);
537537
module.clearWarningsAndErrors!();
538-
warnings.forEach((warning: webpack.WebpackError) => {
538+
warnings.forEach(warning => {
539539
module.addWarning!(warning);
540540
});
541541
errors
542542
.filter(
543-
(error: any) => !isTSLoaderModuleError(error, loaderOptions)
543+
(error) => !isTSLoaderModuleError(error, loaderOptions)
544544
)
545-
.forEach((error: webpack.WebpackError) => {
545+
.forEach((error) => {
546546
module.addError!(error);
547547
});
548548
} else {
@@ -579,9 +579,9 @@ function isTSLoaderModuleError(error: any, loaderOptions: LoaderOptions) {
579579
);
580580
}
581581

582-
function moduleHasErrors(module: webpack.Module, isWebpack5: boolean) {
583-
return isWebpack5
584-
? Array.from(module.getErrors!() || []).length > 0
585-
: (((module as any).errors as webpack.WebpackError[] | undefined) || [])
586-
.length > 0;
587-
}
582+
// function moduleHasErrors(module: webpack.Module, isWebpack5: boolean) {
583+
// return isWebpack5
584+
// ? Array.from(module.getErrors!() || []).length > 0
585+
// : (((module as any).errors as webpack.WebpackError[] | undefined) || [])
586+
// .length > 0;
587+
// }

src/watch-run.ts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,20 @@ export function makeWatchRun(
3535
const key = instance.filePathKeyMapper(filePath);
3636
const lastTime = lastTimes.get(key) || startTime;
3737

38-
if (
39-
!date ||
40-
date === 'ignore' ||
41-
(date.timestamp || date.safeTime) <= lastTime
42-
) {
38+
if (!date || date === 'ignore') {
39+
continue;
40+
}
41+
42+
// Webpack may provide entries without timestamp values; skip those.
43+
const fileTime =
44+
('timestamp' in date ? date.timestamp : undefined) ??
45+
('safeTime' in date ? date.safeTime : undefined);
46+
47+
if (fileTime === undefined || fileTime <= lastTime) {
4348
continue;
4449
}
4550

46-
lastTimes.set(key, date.timestamp || date.safeTime);
51+
lastTimes.set(key, fileTime);
4752
promises.push(updateFile(instance, key, filePath, loader, loaderIndex));
4853
}
4954

0 commit comments

Comments
 (0)