diff --git a/packages/compiler-cli/linker/src/file_linker/linker_environment.ts b/packages/compiler-cli/linker/src/file_linker/linker_environment.ts index 06c4a86d6e..505791f845 100644 --- a/packages/compiler-cli/linker/src/file_linker/linker_environment.ts +++ b/packages/compiler-cli/linker/src/file_linker/linker_environment.ts @@ -29,11 +29,6 @@ export class LinkerEnvironment { factory: AstFactory, options: Partial): LinkerEnvironment { return new LinkerEnvironment(fileSystem, logger, host, factory, { - enableI18nLegacyMessageIdFormat: options.enableI18nLegacyMessageIdFormat ?? - DEFAULT_LINKER_OPTIONS.enableI18nLegacyMessageIdFormat, - i18nNormalizeLineEndingsInICUs: options.i18nNormalizeLineEndingsInICUs ?? - DEFAULT_LINKER_OPTIONS.i18nNormalizeLineEndingsInICUs, - i18nUseExternalIds: options.i18nUseExternalIds ?? DEFAULT_LINKER_OPTIONS.i18nUseExternalIds, sourceMapping: options.sourceMapping ?? DEFAULT_LINKER_OPTIONS.sourceMapping, linkerJitMode: options.linkerJitMode ?? DEFAULT_LINKER_OPTIONS.linkerJitMode, }); diff --git a/packages/compiler-cli/linker/src/file_linker/linker_options.ts b/packages/compiler-cli/linker/src/file_linker/linker_options.ts index a11112291e..ebef3425bb 100644 --- a/packages/compiler-cli/linker/src/file_linker/linker_options.ts +++ b/packages/compiler-cli/linker/src/file_linker/linker_options.ts @@ -10,24 +10,6 @@ * Options to configure the linking behavior. */ export interface LinkerOptions { - /** - * Whether to generate legacy i18n message ids. - * The default is `true`. - */ - enableI18nLegacyMessageIdFormat: boolean; - /** - * Whether to convert all line-endings in ICU expressions to `\n` characters. - * The default is `false`. - */ - i18nNormalizeLineEndingsInICUs: boolean; - - /** - * Whether translation variable name should contain external message id - * (used by Closure Compiler's output of `goog.getMsg` for transition period) - * The default is `false`. - */ - i18nUseExternalIds: boolean; - /** * Whether to use source-mapping to compute the original source for external templates. * The default is `true`. @@ -47,9 +29,6 @@ export interface LinkerOptions { * The default linker options to use if properties are not provided. */ export const DEFAULT_LINKER_OPTIONS: LinkerOptions = { - enableI18nLegacyMessageIdFormat: true, - i18nNormalizeLineEndingsInICUs: false, - i18nUseExternalIds: false, sourceMapping: true, linkerJitMode: false, }; diff --git a/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_component_linker_1.ts b/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_component_linker_1.ts index f97b03c396..633099c4aa 100644 --- a/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_component_linker_1.ts +++ b/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_component_linker_1.ts @@ -14,7 +14,6 @@ import {Range} from '../../ast/ast_host'; import {AstObject, AstValue} from '../../ast/ast_value'; import {FatalLinkerError} from '../../fatal_linker_error'; import {GetSourceFileFn} from '../get_source_file'; -import {LinkerEnvironment} from '../linker_environment'; import {toR3DirectiveMeta} from './partial_directive_linker_1'; import {PartialLinker} from './partial_linker'; @@ -25,14 +24,7 @@ import {extractForwardRef} from './util'; */ export class PartialComponentLinkerVersion1 implements PartialLinker { - private readonly i18nNormalizeLineEndingsInICUs = - this.environment.options.i18nNormalizeLineEndingsInICUs; - private readonly enableI18nLegacyMessageIdFormat = - this.environment.options.enableI18nLegacyMessageIdFormat; - private readonly i18nUseExternalIds = this.environment.options.i18nUseExternalIds; - constructor( - private readonly environment: LinkerEnvironment, private readonly getSourceFile: GetSourceFileFn, private sourceUrl: AbsoluteFsPath, private code: string) {} @@ -54,17 +46,15 @@ export class PartialComponentLinkerVersion1 implements const isInline = metaObj.has('isInline') ? metaObj.getBoolean('isInline') : false; const templateInfo = this.getTemplateInfo(templateSource, isInline); - // We always normalize line endings if the template is inline. - const i18nNormalizeLineEndingsInICUs = isInline || this.i18nNormalizeLineEndingsInICUs; - const template = parseTemplate(templateInfo.code, templateInfo.sourceUrl, { escapedString: templateInfo.isEscaped, interpolationConfig: interpolation, range: templateInfo.range, - enableI18nLegacyMessageIdFormat: this.enableI18nLegacyMessageIdFormat, + enableI18nLegacyMessageIdFormat: false, preserveWhitespaces: metaObj.has('preserveWhitespaces') ? metaObj.getBoolean('preserveWhitespaces') : false, - i18nNormalizeLineEndingsInICUs, + // We normalize line endings if the template is was inline. + i18nNormalizeLineEndingsInICUs: isInline, isInline, }); if (template.errors !== null) { @@ -141,7 +131,7 @@ export class PartialComponentLinkerVersion1 implements ChangeDetectionStrategy.Default, animations: metaObj.has('animations') ? metaObj.getOpaque('animations') : null, relativeContextFilePath: this.sourceUrl, - i18nUseExternalIds: this.i18nUseExternalIds, + i18nUseExternalIds: false, pipes, directives, }; diff --git a/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_linker_selector.ts b/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_linker_selector.ts index fb9659fe8f..eee77d65f9 100644 --- a/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_linker_selector.ts +++ b/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_linker_selector.ts @@ -95,8 +95,7 @@ export class PartialLinkerSelector { const partialDirectiveLinkerVersion1 = new PartialDirectiveLinkerVersion1(sourceUrl, code); const partialClassMetadataLinkerVersion1 = new PartialClassMetadataLinkerVersion1(); const partialComponentLinkerVersion1 = new PartialComponentLinkerVersion1( - environment, createGetSourceFile(sourceUrl, code, environment.sourceFileLoader), sourceUrl, - code); + createGetSourceFile(sourceUrl, code, environment.sourceFileLoader), sourceUrl, code); const partialFactoryLinkerVersion1 = new PartialFactoryLinkerVersion1(); const partialInjectableLinkerVersion1 = new PartialInjectableLinkerVersion1(); const partialInjectorLinkerVersion1 = new PartialInjectorLinkerVersion1(); diff --git a/packages/compiler-cli/test/compliance/linked/linked_compile_spec.ts b/packages/compiler-cli/test/compliance/linked/linked_compile_spec.ts index 503d3fc8ba..d1e7475e80 100644 --- a/packages/compiler-cli/test/compliance/linked/linked_compile_spec.ts +++ b/packages/compiler-cli/test/compliance/linked/linked_compile_spec.ts @@ -32,8 +32,6 @@ function linkPartials(fileSystem: FileSystem, test: ComplianceTest): CompileResu const linkerPlugin = createEs2015LinkerPlugin({ fileSystem, logger, - // By default we don't render legacy message ids in compliance tests. - enableI18nLegacyMessageIdFormat: false, sourceMapping: test.compilerOptions?.sourceMap === true, ...test.angularCompilerOptions }); diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_i18n/line_ending_normalization/TEST_CASES.json b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_i18n/line_ending_normalization/TEST_CASES.json index bd6e3d7763..d91df4e2f6 100644 --- a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_i18n/line_ending_normalization/TEST_CASES.json +++ b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_i18n/line_ending_normalization/TEST_CASES.json @@ -106,6 +106,9 @@ "i18nNormalizeLineEndingsInICUs": true, "enableI18nLegacyMessageIdFormat": true }, + "compilationModeFilter": [ + "full compile" + ], "expectations": [ { "files": [ @@ -130,6 +133,9 @@ "i18nNormalizeLineEndingsInICUs": false, "enableI18nLegacyMessageIdFormat": true }, + "compilationModeFilter": [ + "full compile" + ], "expectations": [ { "files": [ @@ -154,6 +160,9 @@ "i18nNormalizeLineEndingsInICUs": true, "enableI18nLegacyMessageIdFormat": true }, + "compilationModeFilter": [ + "full compile" + ], "expectations": [ { "extraChecks": [ @@ -172,6 +181,9 @@ "i18nNormalizeLineEndingsInICUs": false, "enableI18nLegacyMessageIdFormat": true }, + "compilationModeFilter": [ + "full compile" + ], "expectations": [ { "extraChecks": [ diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_i18n/localize_legacy_message_ids/TEST_CASES.json b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_i18n/localize_legacy_message_ids/TEST_CASES.json index c5ff12e140..ce115a9574 100644 --- a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_i18n/localize_legacy_message_ids/TEST_CASES.json +++ b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_i18n/localize_legacy_message_ids/TEST_CASES.json @@ -9,6 +9,9 @@ "angularCompilerOptions": { "enableI18nLegacyMessageIdFormat": true }, + "compilationModeFilter": [ + "full compile" + ], "expectations": [ { "extraChecks": [