Skip to content

Commit 30b3597

Browse files
committed
fix: nits
1 parent e1fe960 commit 30b3597

2 files changed

Lines changed: 19 additions & 35 deletions

File tree

src/after-compile.ts

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,7 @@ export function makeAfterCompile(
4646
callback();
4747
return;
4848
}
49-
removeCompilationTSLoaderErrors(
50-
compilation,
51-
instance.loaderOptions
52-
);
49+
removeCompilationTSLoaderErrors(compilation, instance.loaderOptions);
5350

5451
provideCompilerOptionDiagnosticErrorsToWebpack(
5552
getCompilerOptionDiagnostics,
@@ -247,10 +244,7 @@ function provideErrorsToWebpack(
247244
const associatedModules = modules.get(instance.filePathKeyMapper(fileName));
248245
if (associatedModules !== undefined) {
249246
associatedModules.forEach(module => {
250-
removeModuleTSLoaderError(
251-
module,
252-
loaderOptions,
253-
);
247+
removeModuleTSLoaderError(module, loaderOptions);
254248

255249
// append errors
256250
const formattedErrors = formatErrors(
@@ -316,10 +310,7 @@ function provideSolutionErrorsToWebpack(
316310
const associatedModules = modules.get(filePath);
317311
if (associatedModules !== undefined) {
318312
associatedModules.forEach(module => {
319-
removeModuleTSLoaderError(
320-
module,
321-
loaderOptions,
322-
);
313+
removeModuleTSLoaderError(module, loaderOptions);
323314

324315
// append errors
325316
const formattedErrors = formatErrors(
@@ -390,10 +381,7 @@ function provideDeclarationFilesToWebpack(
390381
continue;
391382
}
392383

393-
addDeclarationFilesAsAsset(
394-
getEmitOutput(instance, fileName),
395-
compilation,
396-
);
384+
addDeclarationFilesAsAsset(getEmitOutput(instance, fileName), compilation);
397385
}
398386
}
399387

@@ -457,10 +445,7 @@ function provideTsBuildInfoFilesToWebpack(
457445
// Ensure emit is complete
458446
getEmitFromWatchHost(instance);
459447
if (instance.watchHost.tsbuildinfo) {
460-
outputFileToAsset(
461-
instance.watchHost.tsbuildinfo,
462-
compilation,
463-
);
448+
outputFileToAsset(instance.watchHost.tsbuildinfo, compilation);
464449
}
465450

466451
instance.watchHost.outputFiles.clear();
@@ -477,10 +462,7 @@ function provideAssetsFromSolutionBuilderHost(
477462
) {
478463
if (instance.solutionBuilderHost) {
479464
// written files
480-
outputFilesToAsset(
481-
instance.solutionBuilderHost.writtenFiles,
482-
compilation,
483-
);
465+
outputFilesToAsset(instance.solutionBuilderHost.writtenFiles, compilation);
484466
instance.solutionBuilderHost.writtenFiles.length = 0;
485467
}
486468
}

src/instances.ts

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -149,18 +149,20 @@ function successfulTypeScriptInstance(
149149

150150
const { configFilePath, configFile } = configFileAndPath;
151151

152-
if (configFilePath && isWebpack5) {
153-
loader.addBuildDependency(configFilePath);
154-
}
152+
if (configFilePath) {
153+
if (isWebpack5) {
154+
loader.addBuildDependency(configFilePath);
155+
}
155156

156-
const filePathKeyMapper = createFilePathKeyMapper(compiler, loaderOptions);
157-
if (configFilePath && loaderOptions.projectReferences) {
158-
const configFileKey = filePathKeyMapper(configFilePath);
159-
const existing = getExistingSolutionBuilderHost(configFileKey);
160-
if (existing) {
161-
// Reuse the instance if config file for project references is shared.
162-
setTSInstanceInCache(loader._compiler, loaderOptions.instance, existing);
163-
return { instance: existing };
157+
if (loaderOptions.projectReferences) {
158+
const filePathKeyMapper = createFilePathKeyMapper(compiler, loaderOptions);
159+
const configFileKey = filePathKeyMapper(configFilePath);
160+
const existing = getExistingSolutionBuilderHost(configFileKey);
161+
if (existing) {
162+
// Reuse the instance if config file for project references is shared.
163+
setTSInstanceInCache(loader._compiler, loaderOptions.instance, existing);
164+
return { instance: existing };
165+
}
164166
}
165167
}
166168

0 commit comments

Comments
 (0)