From 89c4c4f684baa102a2a21be1a58bedff428a9906 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 21 Feb 2019 17:52:15 -0800 Subject: [PATCH] Update the message to not just mean javascript since we might need to regenerate .d.ts as well --- src/compiler/diagnosticMessages.json | 8 +++--- src/compiler/tsbuild.ts | 8 +++--- src/testRunner/unittests/tsbuild/outFile.ts | 30 ++++++++++----------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 14f7e4fc1c..bd971b1542 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -3996,11 +3996,11 @@ "category": "Message", "code": 6371 }, - "Project '{0}' is out of date because output javascript and source map (if specified) of its dependency '{1}' has changed": { + "Project '{0}' is out of date because output of its dependency '{1}' has changed": { "category": "Message", "code": 6372 }, - "Updating output javascript and javascript source map (if specified) of project '{0}'...": { + "Updating output of project '{0}'...": { "category": "Message", "code": 6373 }, @@ -4008,11 +4008,11 @@ "category": "Message", "code": 6374 }, - "A non-dry build would update output javascript and javascript source map (if specified) of project '{0}'": { + "A non-dry build would update output of project '{0}'": { "category": "Message", "code": 6375 }, - "Cannot update output javascript and javascript source map (if specified) of project '{0}' because there was error reading file '{1}'": { + "Cannot update output of project '{0}' because there was error reading file '{1}'": { "category": "Message", "code": 6376 }, diff --git a/src/compiler/tsbuild.ts b/src/compiler/tsbuild.ts index fd643410d8..5d169c1e95 100644 --- a/src/compiler/tsbuild.ts +++ b/src/compiler/tsbuild.ts @@ -1227,11 +1227,11 @@ namespace ts { function updateBundle(proj: ResolvedConfigFileName): BuildResultFlags { if (options.dry) { - reportStatus(Diagnostics.A_non_dry_build_would_update_output_javascript_and_javascript_source_map_if_specified_of_project_0, proj); + reportStatus(Diagnostics.A_non_dry_build_would_update_output_of_project_0, proj); return BuildResultFlags.Success; } - if (options.verbose) reportStatus(Diagnostics.Updating_output_javascript_and_javascript_source_map_if_specified_of_project_0, proj); + if (options.verbose) reportStatus(Diagnostics.Updating_output_of_project_0, proj); // Update js, and source map const config = Debug.assertDefined(parseConfigFile(proj)); @@ -1241,7 +1241,7 @@ namespace ts { compilerHost, ref => parseConfigFile(resolveProjectName(ref.path))); if (isString(outputFiles)) { - reportStatus(Diagnostics.Cannot_update_output_javascript_and_javascript_source_map_if_specified_of_project_0_because_there_was_error_reading_file_1, proj, relName(outputFiles)); + reportStatus(Diagnostics.Cannot_update_output_of_project_0_because_there_was_error_reading_file_1, proj, relName(outputFiles)); return buildSingleProject(proj); } @@ -1535,7 +1535,7 @@ namespace ts { // Don't report anything for "up to date because it was already built" -- too verbose break; case UpToDateStatusType.OutOfDateWithPrepend: - return formatMessage(Diagnostics.Project_0_is_out_of_date_because_output_javascript_and_source_map_if_specified_of_its_dependency_1_has_changed, + return formatMessage(Diagnostics.Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed, relName(configFileName), relName(status.newerProjectName)); case UpToDateStatusType.UpToDateWithUpstreamTypes: diff --git a/src/testRunner/unittests/tsbuild/outFile.ts b/src/testRunner/unittests/tsbuild/outFile.ts index 5875f686e6..787928d383 100644 --- a/src/testRunner/unittests/tsbuild/outFile.ts +++ b/src/testRunner/unittests/tsbuild/outFile.ts @@ -156,8 +156,8 @@ namespace ts { [Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relSources[project.first][source.config], relOutputFiles[project.first][ext.js], relSources[project.first][source.ts][part.one]], [Diagnostics.Building_project_0, sources[project.first][source.config]], [Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2, relSources[project.second][source.config], relSources[project.second][source.ts][part.one], relOutputFiles[project.second][ext.js]], - [Diagnostics.Project_0_is_out_of_date_because_output_javascript_and_source_map_if_specified_of_its_dependency_1_has_changed, relSources[project.third][source.config], "src/first"], - [Diagnostics.Updating_output_javascript_and_javascript_source_map_if_specified_of_project_0, sources[project.third][source.config]], + [Diagnostics.Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed, relSources[project.third][source.config], "src/first"], + [Diagnostics.Updating_output_of_project_0, sources[project.third][source.config]], [Diagnostics.Updating_unchanged_output_timestamps_of_project_0, sources[project.third][source.config]], ]; let incrementalDtsUnchangedWithBuildInfoExpectedReadFiles: ReadonlyMap = getReadFilesMap( @@ -183,11 +183,11 @@ namespace ts { getExpectedDiagnosticForProjectsInBuild(relSources[project.first][source.config], relSources[project.second][source.config], relSources[project.third][source.config]), [Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relSources[project.first][source.config], relOutputFiles[project.first][ext.js], relSources[project.first][source.ts][part.one]], [Diagnostics.Building_project_0, sources[project.first][source.config]], - [Diagnostics.Project_0_is_out_of_date_because_output_javascript_and_source_map_if_specified_of_its_dependency_1_has_changed, relSources[project.second][source.config], "src/first"], - [Diagnostics.Updating_output_javascript_and_javascript_source_map_if_specified_of_project_0, sources[project.second][source.config]], + [Diagnostics.Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed, relSources[project.second][source.config], "src/first"], + [Diagnostics.Updating_output_of_project_0, sources[project.second][source.config]], [Diagnostics.Updating_unchanged_output_timestamps_of_project_0, sources[project.second][source.config]], - [Diagnostics.Project_0_is_out_of_date_because_output_javascript_and_source_map_if_specified_of_its_dependency_1_has_changed, relSources[project.third][source.config], "src/second"], - [Diagnostics.Updating_output_javascript_and_javascript_source_map_if_specified_of_project_0, sources[project.third][source.config]], + [Diagnostics.Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed, relSources[project.third][source.config], "src/second"], + [Diagnostics.Updating_output_of_project_0, sources[project.third][source.config]], [Diagnostics.Updating_unchanged_output_timestamps_of_project_0, sources[project.third][source.config]], ]; let incrementalDtsUnchangedWithBuildInfoExpectedReadFilesDependOrdered: ReadonlyMap = getIncrementalDtsUnchangedWithBuildInfoExpectedReadFilesDependOrdered(); @@ -197,9 +197,9 @@ namespace ts { [Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relSources[project.first][source.config], relOutputFiles[project.first][ext.js], relSources[project.first][source.ts][part.one]], [Diagnostics.Building_project_0, sources[project.first][source.config]], [Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2, relSources[project.second][source.config], relSources[project.second][source.ts][part.one], relOutputFiles[project.second][ext.js]], - [Diagnostics.Project_0_is_out_of_date_because_output_javascript_and_source_map_if_specified_of_its_dependency_1_has_changed, relSources[project.third][source.config], "src/first"], - [Diagnostics.Updating_output_javascript_and_javascript_source_map_if_specified_of_project_0, sources[project.third][source.config]], - [Diagnostics.Cannot_update_output_javascript_and_javascript_source_map_if_specified_of_project_0_because_there_was_error_reading_file_1, sources[project.third][source.config], relOutputFiles[project.third][ext.buildinfo]], + [Diagnostics.Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed, relSources[project.third][source.config], "src/first"], + [Diagnostics.Updating_output_of_project_0, sources[project.third][source.config]], + [Diagnostics.Cannot_update_output_of_project_0_because_there_was_error_reading_file_1, sources[project.third][source.config], relOutputFiles[project.third][ext.buildinfo]], [Diagnostics.Building_project_0, sources[project.third][source.config]] ]; let incrementalDtsUnchangedWithoutBuildInfoExpectedReadFiles: ReadonlyMap = getReadFilesMap( @@ -228,13 +228,13 @@ namespace ts { getExpectedDiagnosticForProjectsInBuild(relSources[project.first][source.config], relSources[project.second][source.config], relSources[project.third][source.config]), [Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relSources[project.first][source.config], relOutputFiles[project.first][ext.js], relSources[project.first][source.ts][part.one]], [Diagnostics.Building_project_0, sources[project.first][source.config]], - [Diagnostics.Project_0_is_out_of_date_because_output_javascript_and_source_map_if_specified_of_its_dependency_1_has_changed, relSources[project.second][source.config], "src/first"], - [Diagnostics.Updating_output_javascript_and_javascript_source_map_if_specified_of_project_0, sources[project.second][source.config]], - [Diagnostics.Cannot_update_output_javascript_and_javascript_source_map_if_specified_of_project_0_because_there_was_error_reading_file_1, sources[project.second][source.config], relOutputFiles[project.second][ext.buildinfo]], + [Diagnostics.Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed, relSources[project.second][source.config], "src/first"], + [Diagnostics.Updating_output_of_project_0, sources[project.second][source.config]], + [Diagnostics.Cannot_update_output_of_project_0_because_there_was_error_reading_file_1, sources[project.second][source.config], relOutputFiles[project.second][ext.buildinfo]], [Diagnostics.Building_project_0, sources[project.second][source.config]], - [Diagnostics.Project_0_is_out_of_date_because_output_javascript_and_source_map_if_specified_of_its_dependency_1_has_changed, relSources[project.third][source.config], "src/second"], - [Diagnostics.Updating_output_javascript_and_javascript_source_map_if_specified_of_project_0, sources[project.third][source.config]], - [Diagnostics.Cannot_update_output_javascript_and_javascript_source_map_if_specified_of_project_0_because_there_was_error_reading_file_1, sources[project.third][source.config], relOutputFiles[project.third][ext.buildinfo]], + [Diagnostics.Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed, relSources[project.third][source.config], "src/second"], + [Diagnostics.Updating_output_of_project_0, sources[project.third][source.config]], + [Diagnostics.Cannot_update_output_of_project_0_because_there_was_error_reading_file_1, sources[project.third][source.config], relOutputFiles[project.third][ext.buildinfo]], [Diagnostics.Building_project_0, sources[project.third][source.config]] ]; let incrementalDtsUnchangedWithoutBuildInfoExpectedReadFilesDependOrdered: ReadonlyMap = getIncrementalDtsUnchangedWithoutBuildInfoExpectedReadFilesDependOrdered();