@@ -60,11 +60,9 @@ export function runOneBuild(args: string[], inputs?: {[path: string]: string}):
6060 // `angularCompilerOptions` will be considered. As this code is going to be
6161 // removed with Ivy, the added complication of handling recursive extends
6262 // is likely not needed.
63- let userConfigFile =
64- resolveNormalizedPath ( path . dirname ( project ) , config [ 'extends' ] ) ;
63+ let userConfigFile = resolveNormalizedPath ( path . dirname ( project ) , config [ 'extends' ] ) ;
6564 if ( ! userConfigFile . endsWith ( '.json' ) ) userConfigFile += '.json' ;
66- const { config : userConfig , error} =
67- ts . readConfigFile ( userConfigFile , ts . sys . readFile ) ;
65+ const { config : userConfig , error} = ts . readConfigFile ( userConfigFile , ts . sys . readFile ) ;
6866 if ( error ) {
6967 console . error ( ng . formatDiagnostics ( [ error ] ) ) ;
7068 return false ;
@@ -73,37 +71,40 @@ export function runOneBuild(args: string[], inputs?: {[path: string]: string}):
7371 // All user angularCompilerOptions values that a user has control
7472 // over should be collected here
7573 if ( userConfig . angularCompilerOptions ) {
76- angularCompilerOptions . diagnostics = angularCompilerOptions . diagnostics ||
77- userConfig . angularCompilerOptions . diagnostics ;
78- angularCompilerOptions . trace = angularCompilerOptions . trace ||
79- userConfig . angularCompilerOptions . trace ;
80-
81- angularCompilerOptions . disableExpressionLowering = angularCompilerOptions . disableExpressionLowering ||
82- userConfig . angularCompilerOptions . disableExpressionLowering ;
83- angularCompilerOptions . disableTypeScriptVersionCheck = angularCompilerOptions . disableTypeScriptVersionCheck ||
84- userConfig . angularCompilerOptions . disableTypeScriptVersionCheck ;
85-
86- angularCompilerOptions . i18nOutLocale = angularCompilerOptions . i18nOutLocale ||
87- userConfig . angularCompilerOptions . i18nOutLocale ;
88- angularCompilerOptions . i18nOutFormat = angularCompilerOptions . i18nOutFormat ||
89- userConfig . angularCompilerOptions . i18nOutFormat ;
90- angularCompilerOptions . i18nOutFile = angularCompilerOptions . i18nOutFile ||
91- userConfig . angularCompilerOptions . i18nOutFile ;
92-
93- angularCompilerOptions . i18nInFormat = angularCompilerOptions . i18nInFormat ||
94- userConfig . angularCompilerOptions . i18nInFormat ;
95- angularCompilerOptions . i18nInLocale = angularCompilerOptions . i18nInLocale ||
96- userConfig . angularCompilerOptions . i18nInLocale ;
97- angularCompilerOptions . i18nInFile = angularCompilerOptions . i18nInFile ||
98- userConfig . angularCompilerOptions . i18nInFile ;
99-
100- angularCompilerOptions . i18nInMissingTranslations = angularCompilerOptions . i18nInMissingTranslations ||
101- userConfig . angularCompilerOptions . i18nInMissingTranslations ;
102- angularCompilerOptions . i18nUseExternalIds = angularCompilerOptions . i18nUseExternalIds ||
103- userConfig . angularCompilerOptions . i18nUseExternalIds ;
104-
105- angularCompilerOptions . preserveWhitespaces = angularCompilerOptions . preserveWhitespaces ||
106- userConfig . angularCompilerOptions . preserveWhitespaces ;
74+ angularCompilerOptions . diagnostics =
75+ angularCompilerOptions . diagnostics || userConfig . angularCompilerOptions . diagnostics ;
76+ angularCompilerOptions . trace =
77+ angularCompilerOptions . trace || userConfig . angularCompilerOptions . trace ;
78+
79+ angularCompilerOptions . disableExpressionLowering =
80+ angularCompilerOptions . disableExpressionLowering ||
81+ userConfig . angularCompilerOptions . disableExpressionLowering ;
82+ angularCompilerOptions . disableTypeScriptVersionCheck =
83+ angularCompilerOptions . disableTypeScriptVersionCheck ||
84+ userConfig . angularCompilerOptions . disableTypeScriptVersionCheck ;
85+
86+ angularCompilerOptions . i18nOutLocale =
87+ angularCompilerOptions . i18nOutLocale || userConfig . angularCompilerOptions . i18nOutLocale ;
88+ angularCompilerOptions . i18nOutFormat =
89+ angularCompilerOptions . i18nOutFormat || userConfig . angularCompilerOptions . i18nOutFormat ;
90+ angularCompilerOptions . i18nOutFile =
91+ angularCompilerOptions . i18nOutFile || userConfig . angularCompilerOptions . i18nOutFile ;
92+
93+ angularCompilerOptions . i18nInFormat =
94+ angularCompilerOptions . i18nInFormat || userConfig . angularCompilerOptions . i18nInFormat ;
95+ angularCompilerOptions . i18nInLocale =
96+ angularCompilerOptions . i18nInLocale || userConfig . angularCompilerOptions . i18nInLocale ;
97+ angularCompilerOptions . i18nInFile =
98+ angularCompilerOptions . i18nInFile || userConfig . angularCompilerOptions . i18nInFile ;
99+
100+ angularCompilerOptions . i18nInMissingTranslations =
101+ angularCompilerOptions . i18nInMissingTranslations ||
102+ userConfig . angularCompilerOptions . i18nInMissingTranslations ;
103+ angularCompilerOptions . i18nUseExternalIds = angularCompilerOptions . i18nUseExternalIds ||
104+ userConfig . angularCompilerOptions . i18nUseExternalIds ;
105+
106+ angularCompilerOptions . preserveWhitespaces = angularCompilerOptions . preserveWhitespaces ||
107+ userConfig . angularCompilerOptions . preserveWhitespaces ;
107108 }
108109 }
109110
0 commit comments