fix(@angular-devkit/build-angular): support global locale data with development server

Author: clydin

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

@@ -65,25 +65,27 @@ async function createI18nPlugins(
 
   const diagnostics = new localizeDiag.Diagnostics();
 
-  if (translation) {
-    const es2015 = await import(
-      // tslint:disable-next-line: trailing-comma no-implicit-dependencies
-      '@angular/localize/src/tools/src/translate/source_files/es2015_translate_plugin'
-    );
-    plugins.push(
-      // tslint:disable-next-line: no-any
-      es2015.makeEs2015TranslatePlugin(diagnostics, translation as any, { missingTranslation }),
-    );
+  const es2015 = await import(
+    // tslint:disable-next-line: trailing-comma no-implicit-dependencies
+    '@angular/localize/src/tools/src/translate/source_files/es2015_translate_plugin'
+  );
+  plugins.push(
+    // tslint:disable-next-line: no-any
+    es2015.makeEs2015TranslatePlugin(diagnostics, (translation || {}) as any, {
+      missingTranslation: translation === undefined ? 'ignore' : missingTranslation,
+    }),
+  );
 
-    const es5 = await import(
-      // tslint:disable-next-line: trailing-comma no-implicit-dependencies
-      '@angular/localize/src/tools/src/translate/source_files/es5_translate_plugin'
-    );
-    plugins.push(
-      // tslint:disable-next-line: no-any
-      es5.makeEs5TranslatePlugin(diagnostics, translation as any, { missingTranslation }),
-    );
-  }
+  const es5 = await import(
+    // tslint:disable-next-line: trailing-comma no-implicit-dependencies
+    '@angular/localize/src/tools/src/translate/source_files/es5_translate_plugin'
+  );
+  plugins.push(
+    // tslint:disable-next-line: no-any
+    es5.makeEs5TranslatePlugin(diagnostics, (translation || {}) as any, {
+      missingTranslation: translation === undefined ? 'ignore' : missingTranslation,
+    }),
+  );
 
   const inlineLocale = await import(
     // tslint:disable-next-line: trailing-comma no-implicit-dependencies
@@ -173,14 +175,29 @@ export function serveWebpackBrowser(
       }
 
       const locale = [...i18n.inlineLocales][0];
-      const translation = i18n.locales[locale] && i18n.locales[locale].translation;
+      const localeDescription = i18n.locales[locale] && i18n.locales[locale];
 
       const { plugins, diagnostics } = await createI18nPlugins(
         locale,
-        translation,
+        localeDescription && localeDescription.translation,
         browserOptions.i18nMissingTranslation,
       );
 
+      // Modify main entrypoint to include locale data
+      if (
+        localeDescription &&
+        localeDescription.dataPath &&
+        typeof config.entry === 'object' &&
+        !Array.isArray(config.entry) &&
+        config.entry['main']
+      ) {
+        if (Array.isArray(config.entry['main'])) {
+          config.entry['main'].unshift(localeDescription.dataPath);
+        } else {
+          config.entry['main'] = [localeDescription.dataPath, config.entry['main']];
+        }
+      }
+
       // Get the insertion point for the i18n babel loader rule
       // This is currently dependent on the rule order/construction in common.ts
       // A future refactor of the webpack configuration definition will improve this situation
@@ -212,7 +229,6 @@ export function serveWebpackBrowser(
       // Add a plugin to inject the i18n diagnostics
       // tslint:disable-next-line: no-non-null-assertion
       webpackConfig.plugins!.push({
-        // tslint:disable-next-line:no-any
         apply: (compiler: webpack.Compiler) => {
           compiler.hooks.thisCompilation.tap('build-angular', compilation => {
             compilation.hooks.finishModules.tap('build-angular', () => {

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

@@ -121,6 +121,13 @@ export async function configureI18nBuild<T extends BrowserBuilderSchema | Server
     context.logger.warn(`Option 'localize' is not supported with View Engine.`);
   }
 
+  // Clear deprecated options when using Ivy to prevent unintended behavior
+  if (usingIvy) {
+    buildOptions.i18nFile = undefined;
+    buildOptions.i18nFormat = undefined;
+    buildOptions.i18nLocale = undefined;
+  }
+
   if (i18n.inlineLocales.size > 0) {
     const projectRoot = path.join(context.workspaceRoot, (metadata.root as string) || '');
     const localeDataBasePath = findLocaleDataBasePath(projectRoot);