feat(@angular-devkit/build-angular): expose i18nDuplicateTranslation option of browser and server builders

Part of #22201

Author: minijus

goldens/public-api/angular_devkit/build_angular/src/index.md

@@ -43,7 +43,8 @@ export interface BrowserBuilderOptions {
     deployUrl?: string;
     extractLicenses?: boolean;
     fileReplacements?: FileReplacement[];
-    i18nMissingTranslation?: I18NMissingTranslation;
+    i18nDuplicateTranslation?: I18NTranslation;
+    i18nMissingTranslation?: I18NTranslation;
     index: IndexUnion;
     inlineStyleLanguage?: InlineStyleLanguage;
     localize?: Localize;
@@ -259,7 +260,8 @@ export interface ServerBuilderOptions {
     externalDependencies?: string[];
     extractLicenses?: boolean;
     fileReplacements?: FileReplacement_3[];
-    i18nMissingTranslation?: I18NMissingTranslation_2;
+    i18nDuplicateTranslation?: I18NTranslation_2;
+    i18nMissingTranslation?: I18NTranslation_2;
     inlineStyleLanguage?: InlineStyleLanguage_3;
     localize?: Localize_2;
     main: string;

packages/angular_devkit/build_angular/src/babel/presets/application.ts

@@ -35,6 +35,7 @@ export interface ApplicationPresetOptions {
   i18n?: {
     locale: string;
     missingTranslationBehavior?: 'error' | 'warning' | 'ignore';
+    duplicateTranslationBehavior?: 'error' | 'warning' | 'ignore';
     translation?: unknown;
     pluginCreators?: I18nPluginCreators;
   };
@@ -108,6 +109,7 @@ function createI18nPlugins(
   locale: string,
   translation: unknown | undefined,
   missingTranslationBehavior: 'error' | 'warning' | 'ignore',
+  duplicateTranslationBehavior: 'error' | 'warning' | 'ignore',
   diagnosticReporter: DiagnosticReporter | undefined,
   // TODO_ESM: Make `pluginCreators` required once `@angular/localize` is published with the `tools` entry point
   pluginCreators: I18nPluginCreators | undefined,
@@ -125,6 +127,7 @@ function createI18nPlugins(
     plugins.push(
       makeEs2015TranslatePlugin(diagnostics, translation, {
         missingTranslation: missingTranslationBehavior,
+        duplicateTranslation: duplicateTranslationBehavior,
       }),
     );
 
@@ -137,6 +140,7 @@ function createI18nPlugins(
     plugins.push(
       makeEs5TranslatePlugin(diagnostics, translation, {
         missingTranslation: missingTranslationBehavior,
+        duplicateTranslation: duplicateTranslationBehavior,
       }),
     );
   }
@@ -208,11 +212,18 @@ export default function (api: unknown, options: ApplicationPresetOptions) {
   }
 
   if (options.i18n) {
-    const { locale, missingTranslationBehavior, pluginCreators, translation } = options.i18n;
+    const {
+      locale,
+      missingTranslationBehavior,
+      duplicateTranslationBehavior,
+      pluginCreators,
+      translation,
+    } = options.i18n;
     const i18nPlugins = createI18nPlugins(
       locale,
       translation,
       missingTranslationBehavior || 'ignore',
+      duplicateTranslationBehavior || 'ignore',
       options.diagnosticReporter,
       pluginCreators,
     );

packages/angular_devkit/build_angular/src/builders/browser/index.ts

@@ -226,6 +226,7 @@ export function buildWebpackBrowser(
                   webpackOutputPath,
                   target <= ScriptTarget.ES5,
                   options.i18nMissingTranslation,
+                  options.i18nDuplicateTranslation,
                 );
                 if (!success) {
                   return { success: false };

packages/angular_devkit/build_angular/src/builders/browser/schema.json

@@ -220,6 +220,12 @@
       "enum": ["warning", "error", "ignore"],
       "default": "warning"
     },
+    "i18nDuplicateTranslation": {
+      "type": "string",
+      "description": "How to handle duplicate translations for i18n.",
+      "enum": ["warning", "error", "ignore"],
+      "default": "warning"
+    },
     "localize": {
       "description": "Translate the bundles in one or more locales.",
       "oneOf": [

packages/angular_devkit/build_angular/src/builders/dev-server/index.ts

@@ -309,16 +309,19 @@ async function setupLocalize(
   }
 
   let missingTranslationBehavior = browserOptions.i18nMissingTranslation || 'ignore';
+  let duplicateTranslationBehavior = browserOptions.i18nMissingTranslation || 'ignore';
   let translation = localeDescription?.translation || {};
 
   if (locale === i18n.sourceLocale) {
     missingTranslationBehavior = 'ignore';
+    duplicateTranslationBehavior = 'ignore';
     translation = {};
   }
 
   const i18nLoaderOptions = {
     locale,
     missingTranslationBehavior,
+    duplicateTranslationBehavior,
     translation: i18n.shouldInline ? translation : undefined,
   };
 

packages/angular_devkit/build_angular/src/builders/server/index.ts

@@ -111,6 +111,7 @@ export function execute(
               outputPath,
               target <= ScriptTarget.ES5,
               options.i18nMissingTranslation,
+              options.i18nDuplicateTranslation,
             );
           }
 

packages/angular_devkit/build_angular/src/builders/server/schema.json

@@ -133,6 +133,12 @@
       "enum": ["warning", "error", "ignore"],
       "default": "warning"
     },
+    "i18nDuplicateTranslation": {
+      "type": "string",
+      "description": "How to handle duplicate translations for i18n.",
+      "enum": ["warning", "error", "ignore"],
+      "default": "warning"
+    },
     "localize": {
       "description": "Translate the bundles in one or more locales.",
       "oneOf": [

packages/angular_devkit/build_angular/src/utils/build-options.ts

@@ -13,7 +13,7 @@ import {
   Budget,
   CrossOrigin,
   ExtraEntryPoint,
-  I18NMissingTranslation,
+  I18NTranslation,
   IndexUnion,
   InlineStyleLanguage,
   Localize,
@@ -38,7 +38,8 @@ export interface BuildOptions {
   verbose?: boolean;
   progress?: boolean;
   localize?: Localize;
-  i18nMissingTranslation?: I18NMissingTranslation;
+  i18nMissingTranslation?: I18NTranslation;
+  i18nDuplicateTranslation?: I18NTranslation;
   bundleDependencies?: boolean;
   externalDependencies?: string[];
   watch?: boolean;

packages/angular_devkit/build_angular/src/utils/i18n-inlining.ts

@@ -23,6 +23,7 @@ function emittedFilesToInlineOptions(
   outputPath: string,
   es5: boolean,
   missingTranslation: 'error' | 'warning' | 'ignore' | undefined,
+  duplicateTranslation: 'error' | 'warning' | 'ignore' | undefined,
   context: BuilderContext,
 ): { options: InlineOptions[]; originalFiles: string[] } {
   const options: InlineOptions[] = [];
@@ -43,6 +44,7 @@ function emittedFilesToInlineOptions(
       es5,
       outputPath,
       missingTranslation,
+      duplicateTranslation,
       setLocale: emittedFile.name === 'main' || emittedFile.name === 'vendor',
     };
     originalFiles.push(originalPath);
@@ -93,6 +95,7 @@ export async function i18nInlineEmittedFiles(
   emittedPath: string,
   es5: boolean,
   missingTranslation: 'error' | 'warning' | 'ignore' | undefined,
+  duplicateTranslation: 'error' | 'warning' | 'ignore' | undefined,
 ): Promise<boolean> {
   const executor = new BundleActionExecutor({ i18n });
   let hasErrors = false;
@@ -107,6 +110,7 @@ export async function i18nInlineEmittedFiles(
       baseOutputPath,
       es5,
       missingTranslation,
+      duplicateTranslation,
       context,
     );
 

packages/angular_devkit/build_angular/src/utils/process-bundle.ts

@@ -115,6 +115,7 @@ export interface InlineOptions {
   es5: boolean;
   outputPath: string;
   missingTranslation?: 'warning' | 'error' | 'ignore';
+  duplicateTranslation?: 'warning' | 'error' | 'ignore';
   setLocale?: boolean;
 }