@angular-devkit/build-angular 0.800.3 → 0.800.4

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "0.800.3",
+  "version": "0.800.4",
   "description": "Angular Webpack Build Facade",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@angular-devkit/architect": "0.800.3",
-    "@angular-devkit/build-optimizer": "0.800.3",
-    "@angular-devkit/build-webpack": "0.800.3",
-    "@angular-devkit/core": "8.0.3",
-    "@ngtools/webpack": "8.0.3",
+    "@angular-devkit/architect": "0.800.4",
+    "@angular-devkit/build-optimizer": "0.800.4",
+    "@angular-devkit/build-webpack": "0.800.4",
+    "@angular-devkit/core": "8.0.4",
+    "@ngtools/webpack": "8.0.4",
     "ajv": "6.10.0",
     "autoprefixer": "9.5.1",
     "browserslist": "4.5.5",
@@ -58,6 +58,7 @@
     "worker-plugin": "3.1.0"
   },
   "peerDependencies": {
+    "@angular/compiler-cli": ">=8.0.0-beta.0 < 9.0.0",
     "typescript": ">=3.1 < 3.5"
   },
   "keywords": [

package/src/angular-cli-files/models/build-options.d.ts

@@ -6,7 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { logging } from '@angular-devkit/core';
-import { ParsedCommandLine, ScriptTarget } from 'typescript';
+import { ParsedConfiguration } from '@angular/compiler-cli';
+import { ScriptTarget } from 'typescript';
 import { AssetPatternClass, Budget, ExtraEntryPoint, OptimizationClass, SourceMapClass } from '../../browser/schema';
 import { NormalizedFileReplacement } from '../../utils/normalize-file-replacements';
 export interface BuildOptions {
@@ -78,7 +79,7 @@ export interface WebpackConfigOptions<T = BuildOptions> {
     projectRoot: string;
     sourceRoot?: string;
     buildOptions: T;
-    tsConfig: ParsedCommandLine;
+    tsConfig: ParsedConfiguration;
     tsConfigPath: string;
     supportES2015: boolean;
 }

package/src/angular-cli-files/plugins/karma.js

@@ -60,15 +60,14 @@ const init = (config, emitter, customFileHandlers) => {
     const logger = config.buildWebpack.logger || node_1.createConsoleLogger();
     successCb = config.buildWebpack.successCb;
     failureCb = config.buildWebpack.failureCb;
-    config.reporters.unshift('@angular-devkit/build-angular--event-reporter');
     // When using code-coverage, auto-add coverage-istanbul.
     config.reporters = config.reporters || [];
     if (options.codeCoverage && config.reporters.indexOf('coverage-istanbul') === -1) {
-        config.reporters.unshift('coverage-istanbul');
+        config.reporters.push('coverage-istanbul');
     }
     // Add a reporter that fixes sourcemap urls.
     if (index_1.normalizeSourceMaps(options.sourceMap).scripts) {
-        config.reporters.unshift('@angular-devkit/build-angular--sourcemap-reporter');
+        config.reporters.push('@angular-devkit/build-angular--sourcemap-reporter');
         // Code taken from https://github.com/tschaub/karma-source-map-support.
         // We can't use it directly because we need to add it conditionally in this file, and karma
         // frameworks cannot be added dynamically.
@@ -79,6 +78,7 @@ const init = (config, emitter, customFileHandlers) => {
             { pattern: path.join(ksmsPath, 'client.js'), watched: false }
         ], true);
     }
+    config.reporters.push('@angular-devkit/build-angular--event-reporter');
     // Add webpack config.
     const webpackConfig = config.buildWebpack.webpackConfig;
     const webpackMiddlewareConfig = {

package/src/angular-cli-files/utilities/index-file/write-index-html.js

@@ -21,7 +21,7 @@ function writeIndexHtml({ host, outputPath, indexPath, ES5BuildFiles, ES2015Buil
         deployUrl,
         sri,
         entrypoints: package_chunk_sort_1.generateEntryPoints({ scripts, styles }),
-        files: filterAndMapBuildFiles(ES5BuildFiles, '.css'),
+        files: filterAndMapBuildFiles(ES2015BuildFiles, '.css'),
         noModuleFiles: filterAndMapBuildFiles(ES5BuildFiles, '.js'),
         moduleFiles: filterAndMapBuildFiles(ES2015BuildFiles, '.js'),
         loadOutputFile: async (filePath) => {

package/src/angular-cli-files/utilities/read-tsconfig.d.ts

@@ -5,5 +5,12 @@
  * 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 * as ts from 'typescript';
-export declare function readTsconfig(tsconfigPath: string): ts.ParsedCommandLine;
+import { ParsedConfiguration } from '@angular/compiler-cli';
+/**
+ * Reads and parses a given TsConfig file.
+ *
+ * @param tsconfigPath - An absolute or relative path from 'workspaceRoot' of the tsconfig file.
+ * @param workspaceRoot - workspaceRoot root location when provided
+ * it will resolve 'tsconfigPath' from this path.
+ */
+export declare function readTsconfig(tsconfigPath: string, workspaceRoot?: string): ParsedConfiguration;

package/src/angular-cli-files/utilities/read-tsconfig.js

@@ -1,14 +1,31 @@
 "use strict";
+/**
+ * @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 path = require("path");
-const require_project_module_1 = require("../utilities/require-project-module");
-function readTsconfig(tsconfigPath) {
-    const projectTs = require_project_module_1.requireProjectModule(path.dirname(tsconfigPath), 'typescript');
-    const configResult = projectTs.readConfigFile(tsconfigPath, projectTs.sys.readFile);
-    const tsConfig = projectTs.parseJsonConfigFileContent(configResult.config, projectTs.sys, path.dirname(tsconfigPath), undefined, tsconfigPath);
-    if (tsConfig.errors.length > 0) {
-        throw new Error(`Errors found while reading ${tsconfigPath}:\n  ${tsConfig.errors.map(e => e.messageText).join('\n  ')}`);
+/**
+ * Reads and parses a given TsConfig file.
+ *
+ * @param tsconfigPath - An absolute or relative path from 'workspaceRoot' of the tsconfig file.
+ * @param workspaceRoot - workspaceRoot root location when provided
+ * it will resolve 'tsconfigPath' from this path.
+ */
+function readTsconfig(tsconfigPath, workspaceRoot) {
+    const tsConfigFullPath = workspaceRoot
+        ? path.resolve(workspaceRoot, tsconfigPath)
+        : tsconfigPath;
+    // We use 'ng' instead of 'ts' here because 'ts' is not aware of 'angularCompilerOptions'
+    // and will not merged them if they are at un upper level tsconfig file when using `extends`.
+    const ng = require('@angular/compiler-cli');
+    const configResult = ng.readConfiguration(tsConfigFullPath);
+    if (configResult.errors && configResult.errors.length) {
+        throw new Error(ng.formatDiagnostics(configResult.errors));
     }
-    return tsConfig;
+    return configResult;
 }
 exports.readTsconfig = readTsconfig;

package/src/angular-cli-files/utilities/service-worker/index.js

@@ -68,7 +68,7 @@ async function augmentAppWithServiceWorker(host, projectRoot, appRoot, outputPat
     if (!configExists) {
         throw new Error(core_1.tags.oneLine `
       Error: Expected to find an ngsw-config.json configuration
-      file in the ${appRoot} folder. Either provide one or disable Service Worker
+      file in the ${core_1.getSystemPath(appRoot)} folder. Either provide one or disable Service Worker
       in your angular.json configuration file.
     `);
     }

package/src/browser/index.js

@@ -106,8 +106,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
             throw new Error('Must either have a target from the context or a default project.');
         }
         const projectRoot = core_1.resolve(workspace.root, core_1.normalize(workspace.getProject(projectName).root));
-        const tsConfigPath = path.resolve(core_1.getSystemPath(workspace.root), options.tsConfig);
-        const tsConfig = read_tsconfig_1.readTsconfig(tsConfigPath);
+        const tsConfig = read_tsconfig_1.readTsconfig(options.tsConfig, context.workspaceRoot);
         const target = tsConfig.options.target || typescript_1.ScriptTarget.ES5;
         const buildBrowserFeatures = new utils_1.BuildBrowserFeatures(core_1.getSystemPath(projectRoot), target);
         if (target > typescript_1.ScriptTarget.ES2015 && buildBrowserFeatures.isDifferentialLoadingNeeded()) {
@@ -145,14 +144,14 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                     scripts: options.scripts,
                     styles: options.styles,
                 })
-                    .pipe(operators_1.map(() => ({ success: true })), operators_1.catchError(() => rxjs_1.of({ success: false })));
+                    .pipe(operators_1.map(() => ({ success: true })), operators_1.catchError(error => rxjs_1.of({ success: false, error: mapErrorToMessage(error) })));
             }
             else {
                 return rxjs_1.of({ success });
             }
         }), operators_1.concatMap(buildEvent => {
             if (buildEvent.success && !options.watch && options.serviceWorker) {
-                return rxjs_1.from(service_worker_1.augmentAppWithServiceWorker(host, root, projectRoot, core_1.resolve(root, core_1.normalize(options.outputPath)), options.baseHref || '/', options.ngswConfigPath).then(() => ({ success: true }), () => ({ success: false })));
+                return rxjs_1.from(service_worker_1.augmentAppWithServiceWorker(host, root, projectRoot, core_1.resolve(root, core_1.normalize(options.outputPath)), options.baseHref || '/', options.ngswConfigPath).then(() => ({ success: true }), error => ({ success: false, error: mapErrorToMessage(error) })));
             }
             else {
                 return rxjs_1.of(buildEvent);
@@ -165,4 +164,13 @@ function buildWebpackBrowser(options, context, transforms = {}) {
     }));
 }
 exports.buildWebpackBrowser = buildWebpackBrowser;
+function mapErrorToMessage(error) {
+    if (error instanceof Error) {
+        return error.message;
+    }
+    if (typeof error === 'string') {
+        return error;
+    }
+    return undefined;
+}
 exports.default = architect_1.createBuilder(buildWebpackBrowser);

package/src/extract-i18n/index.js

@@ -12,6 +12,7 @@ const build_webpack_1 = require("@angular-devkit/build-webpack");
 const path = require("path");
 const webpack = require("webpack");
 const webpack_configs_1 = require("../angular-cli-files/models/webpack-configs");
+const read_tsconfig_1 = require("../angular-cli-files/utilities/read-tsconfig");
 const stats_1 = require("../angular-cli-files/utilities/stats");
 const version_1 = require("../utils/version");
 const webpack_browser_config_1 = require("../utils/webpack-browser-config");
@@ -40,6 +41,13 @@ async function execute(options, context) {
     version_1.Version.assertCompatibleAngularVersion(context.workspaceRoot);
     const browserTarget = architect_1.targetFromTargetString(options.browserTarget);
     const browserOptions = await context.validateOptions(await context.getTargetOptions(browserTarget), await context.getBuilderNameForTarget(browserTarget));
+    // FIXME: i18n is not yet implemented in Ivy
+    // We should display a warning and exit gracefully.
+    const { options: compilerOptions } = read_tsconfig_1.readTsconfig(browserOptions.tsConfig, context.workspaceRoot);
+    if (compilerOptions.enableIvy) {
+        context.logger.warn('We are sorry but i18n is not yet implemented in Ivy.');
+        return { success: true };
+    }
     // We need to determine the outFile name so that AngularCompiler can retrieve it.
     let outFile = options.outFile || getI18nOutfile(options.i18nFormat);
     if (options.outputPath) {

package/src/karma/index.js

@@ -81,7 +81,7 @@ function execute(options, context, transforms = {}) {
                 return karmaStart.then(() => karmaServerWithStop.stop());
             }
         };
-    })));
+    })), operators_1.defaultIfEmpty({ success: false }));
 }
 exports.execute = execute;
 exports.default = architect_1.createBuilder(execute);

package/src/utils/webpack-browser-config.js

@@ -32,18 +32,26 @@ async function generateWebpackConfig(context, workspaceRoot, projectRoot, source
     // For differential loading, we can have several targets
     return scriptTargets.map(scriptTarget => {
         let buildOptions = { ...options };
+        const supportES2015 = scriptTarget !== ts.ScriptTarget.ES3 && scriptTarget !== ts.ScriptTarget.ES5;
         if (differentialLoading) {
-            // For differential loading, the builder needs to created the index.html by itself
-            // without using a webpack plugin.
             buildOptions = {
                 ...options,
+                ...(
+                // FIXME: we do create better webpack config composition to achieve the below
+                // When DL is enabled and supportES2015 is true it means that we are on the second build
+                // This also means that we don't need to include styles and assets multiple times
+                supportES2015
+                    ? {}
+                    : {
+                        styles: options.extractCss ? [] : options.styles,
+                        assets: [],
+                    }),
                 es5BrowserSupport: undefined,
                 index: '',
                 esVersionInFileName: true,
                 scriptTargetOverride: scriptTarget,
             };
         }
-        const supportES2015 = scriptTarget !== ts.ScriptTarget.ES3 && scriptTarget !== ts.ScriptTarget.ES5;
         const wco = {
             root: workspaceRoot,
             logger: logger.createChild('webpackConfigOptions'),