feat(@angular-devkit/build-angular): support deprecated i18n options with new configuration

Author: clydin

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

@@ -51,7 +51,7 @@ import {
   normalizeSourceMaps,
 } from '../utils';
 import { copyAssets } from '../utils/copy-assets';
-import { I18nOptions, createI18nOptions } from '../utils/i18n-options';
+import { I18nOptions, createI18nOptions, mergeDeprecatedI18nOptions } from '../utils/i18n-options';
 import { createTranslationLoader } from '../utils/load-translations';
 import {
   InlineOptions,
@@ -163,9 +163,21 @@ async function initialize(
     throw new Error('The builder requires a target.');
   }
 
+  const tsConfig = readTsconfig(options.tsConfig, context.workspaceRoot);
+  const usingIvy = tsConfig.options.enableIvy !== false;
   const metadata = await context.getProjectMetadata(context.target);
   const i18n = createI18nOptions(metadata, options.localize);
 
+  // Until 11.0, support deprecated i18n options when not using new localize option
+  // i18nFormat is automatically calculated
+  if (options.localize === undefined && usingIvy) {
+    mergeDeprecatedI18nOptions(i18n, options.i18nLocale, options.i18nFile);
+  } else if (options.localize !== undefined && !usingIvy) {
+    options.localize = undefined;
+
+    context.logger.warn(`Option 'localize' is not supported with View Engine.`);
+  }
+
   if (i18n.inlineLocales.size > 0) {
     // Load locales
     const loader = await createTranslationLoader();
@@ -283,8 +295,14 @@ export function buildWebpackBrowser(
 
             return { success };
           } else if (success) {
-            if (!fs.existsSync(baseOutputPath)) {
-              fs.mkdirSync(baseOutputPath, { recursive: true });
+            const outputPaths =
+              i18n.shouldInline && !i18n.flatOutput
+                ? [...i18n.inlineLocales].map(l => path.join(baseOutputPath, l))
+                : [baseOutputPath];
+            for (const outputPath of outputPaths) {
+              if (!fs.existsSync(outputPath)) {
+                fs.mkdirSync(outputPath, { recursive: true });
+              }
             }
 
             let noModuleFiles: EmittedFiles[] | undefined;
@@ -475,13 +493,6 @@ export function buildWebpackBrowser(
 
                   let hasErrors = false;
                   try {
-                    for (const locale of i18n.inlineLocales) {
-                      const localeOutputPath = path.join(baseOutputPath, locale);
-                      if (!fs.existsSync(localeOutputPath)) {
-                        fs.mkdirSync(localeOutputPath, { recursive: true });
-                      }
-                    }
-
                     for await (const result of executor.inlineAll(inlineActions)) {
                       if (options.verbose) {
                         context.logger.info(
@@ -499,9 +510,6 @@ export function buildWebpackBrowser(
                     }
 
                     // Copy any non-processed files into the output locations
-                    const outputPaths = [...i18n.inlineLocales].map(l =>
-                      path.join(baseOutputPath, l),
-                    );
                     await copyAssets(
                       [
                         {
@@ -510,7 +518,7 @@ export function buildWebpackBrowser(
                           input: webpackStats.outputPath!,
                           output: '',
                           ignore: [...processedFiles].map(f =>
-                          // tslint:disable-next-line: no-non-null-assertion
+                            // tslint:disable-next-line: no-non-null-assertion
                             path.relative(webpackStats.outputPath!, f),
                           ),
                         },
@@ -546,9 +554,6 @@ export function buildWebpackBrowser(
 
               // Copy assets
               if (options.assets) {
-                const outputPaths = i18n.shouldInline
-                  ? [...i18n.inlineLocales].map(l => path.join(baseOutputPath, l))
-                  : [baseOutputPath];
                 try {
                   await copyAssets(
                     normalizeAssetPatterns(
@@ -640,10 +645,6 @@ export function buildWebpackBrowser(
             }
 
             if (options.index) {
-              const outputPaths = i18n.shouldInline
-                ? [...i18n.inlineLocales].map(l => path.join(baseOutputPath, l))
-                : [baseOutputPath];
-
               for (const outputPath of outputPaths) {
                 try {
                   await generateIndex(

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

@@ -11,6 +11,7 @@ export interface I18nOptions {
   inlineLocales: Set<string>;
   sourceLocale: string;
   locales: Record<string, { file: string; format?: string; translation?: unknown }>;
+  flatOutput?: boolean;
   readonly shouldInline: boolean;
 }
 
@@ -80,3 +81,21 @@ export function createI18nOptions(
 
   return i18n;
 }
+
+export function mergeDeprecatedI18nOptions(i18n: I18nOptions, i18nLocale: string | undefined, i18nFile: string | undefined): I18nOptions {
+  if (i18nFile !== undefined && i18nLocale === undefined) {
+    throw new Error(`Option 'i18nFile' cannot be used without the 'i18nLocale' option.`);
+  }
+
+  if (i18nLocale !== undefined) {
+    i18n.inlineLocales.clear();
+    i18n.inlineLocales.add(i18nLocale);
+
+    if (i18nFile !== undefined) {
+      i18n.locales[i18nLocale] = { file: i18nFile };
+      i18n.flatOutput = true;
+    }
+  }
+
+  return i18n;
+}

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

@@ -464,10 +464,16 @@ export async function inlineLocales(options: InlineOptions) {
   if (!i18n || i18n.inlineLocales.size === 0) {
     return { file: options.filename, diagnostics: [], count: 0 };
   }
+  if (i18n.flatOutput && i18n.inlineLocales.size > 1) {
+    throw new Error('Flat output is only supported when inlining one locale.');
+  }
 
   if (!options.code.includes(localizeName)) {
     for (const locale of i18n.inlineLocales) {
-      fs.writeFileSync(path.join(options.outputPath, locale, options.filename), options.code);
+      fs.writeFileSync(
+        path.join(options.outputPath, i18n.flatOutput ? '' : locale, options.filename),
+        options.code,
+      );
     }
 
     return { file: options.filename, diagnostics: [], count: 0 };
@@ -506,7 +512,10 @@ export async function inlineLocales(options: InlineOptions) {
     }
 
     const output = content.toString();
-    fs.writeFileSync(path.join(options.outputPath, locale, options.filename), output);
+    fs.writeFileSync(
+      path.join(options.outputPath, i18n.flatOutput ? '' : locale, options.filename),
+      output,
+    );
   }
 
   return { file: options.filename, diagnostics: diagnostics.messages, count: positions.length };