fix(@angular-devkit/build-angular): insert locale data when localizing

Author: clydin

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

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { BuilderContext } from '@angular-devkit/architect';
-import { json, virtualFs } from '@angular-devkit/core';
+import { json } from '@angular-devkit/core';
 import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
@@ -19,7 +19,10 @@ import { createTranslationLoader } from './load-translations';
 export interface I18nOptions {
   inlineLocales: Set<string>;
   sourceLocale: string;
-  locales: Record<string, { file: string; format?: string; translation?: unknown }>;
+  locales: Record<
+    string,
+    { file: string; format?: string; translation?: unknown; localeDataPath?: string }
+  >;
   flatOutput?: boolean;
   readonly shouldInline: boolean;
 }
@@ -127,6 +130,13 @@ export async function configureI18nBuild<T extends BrowserBuilderSchema | Server
   }
 
   if (i18n.inlineLocales.size > 0) {
+    const localeDataBasePath = findLocaleBaseDataPath();
+    if (!localeDataBasePath) {
+      throw new Error(
+        `Unable to find locale data within '@angular/common'. Please ensure '@angular/common' is installed.`,
+      );
+    }
+
     // Load locales
     const loader = await createTranslationLoader();
     const projectRoot = path.join(context.workspaceRoot, (metadata.root as string) || '');
@@ -145,6 +155,15 @@ export async function configureI18nBuild<T extends BrowserBuilderSchema | Server
 
         desc.format = result.format;
         desc.translation = result.translation;
+
+        const localeDataPath = findLocaleDataPath(locale, localeDataBasePath);
+        if (!localeDataPath) {
+          context.logger.warn(
+            `Locale data for '${locale}' cannot be found.  No locale data will be included for this locale.`,
+          );
+        } else {
+          desc.localeDataPath = localeDataPath;
+        }
       }
     }
 
@@ -197,3 +216,28 @@ function mergeDeprecatedI18nOptions(
 
   return i18n;
 }
+
+function findLocaleBaseDataPath(): string | null {
+  try {
+    const commonPath = path.dirname(require.resolve('@angular/common/package.json'));
+    const localesPath = path.join(commonPath, 'locales/global');
+
+    if (!fs.existsSync(localesPath)) {
+      return null;
+    }
+
+    return localesPath;
+  } catch {
+    return null;
+  }
+}
+
+function findLocaleDataPath(locale: string, basePath: string): string | null {
+  const localeDataPath = path.join(basePath, locale);
+
+  if (!fs.existsSync(localeDataPath)) {
+    return null;
+  }
+
+  return localeDataPath;
+}

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

@@ -540,6 +540,14 @@ export async function inlineLocales(options: InlineOptions) {
       const setLocaleText = `var $localize=Object.assign(void 0===$localize?{}:$localize,{locale:"${locale}"});`;
       contentClone = content.clone();
       content.prepend(setLocaleText);
+
+      // If locale data is provided, load it and prepend to file
+      const localeDataPath = i18n.locales[locale] && i18n.locales[locale].localeDataPath;
+      if (localeDataPath) {
+        const localDataContent = loadLocaleData(localeDataPath, true);
+        // The semicolon ensures that there is no syntax error between statements
+        content.prepend(localDataContent + ';');
+      }
     }
 
     const output = content.toString();
@@ -667,3 +675,19 @@ function findLocalizePositions(
 
   return positions;
 }
+
+function loadLocaleData(path: string, optimize: boolean): string {
+  // The path is validated during option processing before the build starts
+  const content = fs.readFileSync(path, 'utf8');
+
+  if (optimize) {
+    const result = terserMangle(content, {
+      compress: true,
+      ecma: 5,
+    });
+
+    return result.code;
+  }
+
+  return content;
+}