798790622 fix(@angular-devkit/build-angular): allow new i18n options to work with VE

Author: Angular Builds

package.json

@@ -1,20 +1,20 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "0.900.0-next.19+106.08f0067",
+  "version": "0.900.0-next.19+107.7987906",
   "description": "Angular Webpack Build Facade",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#08f006714",
-    "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#08f006714",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#08f006714",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#08f006714",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#798790622",
+    "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#798790622",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#798790622",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#798790622",
     "@babel/core": "7.7.2",
     "@babel/generator": "7.7.2",
     "@babel/preset-env": "7.7.1",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#08f006714",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#798790622",
     "ajv": "6.10.2",
     "autoprefixer": "9.7.1",
     "babel-loader": "8.0.6",

src/utils/i18n-options.d.ts

@@ -20,6 +20,7 @@ export interface I18nOptions {
     }>;
     flatOutput?: boolean;
     readonly shouldInline: boolean;
+    veCompatLocale?: string;
 }
 export declare function createI18nOptions(metadata: json.JsonObject, inline?: boolean | string[]): I18nOptions;
 export declare function configureI18nBuild<T extends BrowserBuilderSchema | ServerBuilderSchema>(context: BuilderContext, options: T): Promise<{

src/utils/i18n-options.js

@@ -71,8 +71,22 @@ async function configureI18nBuild(context, options) {
         mergeDeprecatedI18nOptions(i18n, buildOptions.i18nLocale, buildOptions.i18nFile);
     }
     else if (buildOptions.localize !== undefined && !usingIvy) {
-        buildOptions.localize = undefined;
-        context.logger.warn(`Option 'localize' is not supported with View Engine.`);
+        if (buildOptions.localize === true ||
+            (Array.isArray(buildOptions.localize) && buildOptions.localize.length > 1)) {
+            throw new Error(`Localization with multiple locales in one build is not supported with View Engine.`);
+        }
+        for (const deprecatedOption of ['i18nLocale', 'i18nFormat', 'i18nFile']) {
+            // tslint:disable-next-line: no-any
+            if (typeof buildOptions[deprecatedOption] !== 'undefined') {
+                context.logger.warn(`Option 'localize' and deprecated '${deprecatedOption}' found.  Using 'localize'.`);
+            }
+        }
+        if (buildOptions.localize === false ||
+            (Array.isArray(buildOptions.localize) && buildOptions.localize.length === 0)) {
+            buildOptions.i18nFile = undefined;
+            buildOptions.i18nLocale = undefined;
+            buildOptions.i18nFormat = undefined;
+        }
     }
     // Clear deprecated options when using Ivy to prevent unintended behavior
     if (usingIvy) {
@@ -120,6 +134,17 @@ async function configureI18nBuild(context, options) {
         if (usedFormats.size > 0) {
             buildOptions.i18nFormat = [...usedFormats][0];
         }
+        // Provide support for using the Ivy i18n options with VE
+        if (!usingIvy) {
+            i18n.veCompatLocale = buildOptions.i18nLocale = [...i18n.inlineLocales][0];
+            if (buildOptions.i18nLocale !== i18n.sourceLocale) {
+                buildOptions.i18nFile = i18n.locales[buildOptions.i18nLocale].file;
+            }
+            // Clear inline locales to prevent any new i18n related processing
+            i18n.inlineLocales.clear();
+            // Update the output path to include the locale to mimic Ivy localize behavior
+            buildOptions.outputPath = path.join(buildOptions.outputPath, buildOptions.i18nLocale);
+        }
     }
     // If inlining store the output in a temporary location to facilitate post-processing
     if (i18n.shouldInline) {

src/utils/output-paths.d.ts

@@ -1,9 +1,2 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
 import { I18nOptions } from './i18n-options';
 export declare function ensureOutputPaths(baseOutputPath: string, i18n: I18nOptions): string[];

src/utils/output-paths.js

@@ -1,18 +1,18 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * @license
  * Copyright Google Inc. All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = require("fs");
 const path_1 = require("path");
 function ensureOutputPaths(baseOutputPath, i18n) {
     const outputPaths = i18n.shouldInline && !i18n.flatOutput
         ? [...i18n.inlineLocales].map(l => path_1.join(baseOutputPath, l))
-        : [baseOutputPath];
+        : [i18n.veCompatLocale ? path_1.join(baseOutputPath, i18n.veCompatLocale) : baseOutputPath];
     for (const outputPath of outputPaths) {
         if (!fs_1.existsSync(outputPath)) {
             fs_1.mkdirSync(outputPath, { recursive: true });

uniqueId

@@ -1 +1 @@
-Mon Nov 18 2019 19:07:09 GMT+0000 (Coordinated Universal Time)
+Mon Nov 18 2019 19:27:45 GMT+0000 (Coordinated Universal Time)