microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-22 22:55:36 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Make update bundle return invalidated project if it cant update the bundle

Browse Source
This commit is contained in:
Sheetal Nandi
2019-05-07 14:22:34 -07:00
parent 5270b7e9b0
commit e4fe4acc17
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/compiler/tsbuild.ts
View File

@@ -682,7 +682,7 @@ namespace ts {
interface UpdateBundleProject extends InvalidatedProjectBase {
readonly kind: InvalidatedProjectKind.UpdateBundle;
updateBundle(cancellationToken?: CancellationToken): BuildResultFlags;
updateBundle(): BuildResultFlags | BuildInvalidedProject;
}
type InvalidatedProject = UpdateOutputFileStampsProject | BuildInvalidedProject | UpdateBundleProject;
@@ -749,13 +749,21 @@ namespace ts {
projectPath,
updateBundle: update,
done: cancellationToken => {
if (updatePending) update(cancellationToken);
if (updatePending) {
const result = update();
if ((result as BuildInvalidedProject).project) {
return (result as BuildInvalidedProject).done(cancellationToken);
}
}
state.projectPendingBuild.delete(projectPath);
}
};
function update(cancellationToken?: CancellationToken) {
const buildResult = updateBundle(state, project, projectPath, config, cancellationToken);
function update() {
const buildResult = updateBundle(state, project, projectPath, config);
if (isString(buildResult)) {
return createBuildInvalidedProject(state, project, projectPath, projectIndex, config, buildOrder);
}
queueReferencingProjects(state, project, projectPath, projectIndex, config, buildOrder, buildResult);
updatePending = false;
return buildResult;
@@ -1068,9 +1076,8 @@ namespace ts {
state: SolutionBuilderState,
proj: ResolvedConfigFileName,
resolvedPath: ResolvedConfigFilePath,
config: ParsedCommandLine,
cancellationToken: CancellationToken | undefined
): BuildResultFlags {
config: ParsedCommandLine
): BuildResultFlags | string {
if (state.options.dry) {
reportStatus(state, Diagnostics.A_non_dry_build_would_update_output_of_project_0, proj);
return BuildResultFlags.Success;
@@ -1090,7 +1097,7 @@ namespace ts {
});
if (isString(outputFiles)) {
reportStatus(state, Diagnostics.Cannot_update_output_of_project_0_because_there_was_error_reading_file_1, proj, relName(state, outputFiles));
return buildSingleProject(state, proj, resolvedPath, config, cancellationToken);
return outputFiles;
}
// Actual Emit