a491b09 fix(@ngtools/webpack): import factory from original declaration file

Angular Builds · Angular Builds · commit 6d21be3694e0 · 2019-05-15T21:41:15.000Z
diff --git a/package.json b/package.json
@@ -1,17 +1,17 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "0.800.0-beta.18+93.3bf929f",
+  "version": "0.800.0-beta.18+99.a491b09",
   "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#3bf929f",
-    "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#3bf929f",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#3bf929f",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#3bf929f",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#3bf929f",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#a491b09",
+    "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#a491b09",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#a491b09",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#a491b09",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#a491b09",
     "ajv": "6.10.0",
     "autoprefixer": "9.5.1",
     "browserslist": "4.6.0",
diff --git a/src/angular-cli-files/models/webpack-configs/browser.js b/src/angular-cli-files/models/webpack-configs/browser.js
@@ -8,13 +8,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * found in the LICENSE file at https://angular.io/license
  */
 const license_webpack_plugin_1 = require("license-webpack-plugin");
-const path = require("path");
-const index_html_webpack_plugin_1 = require("../../plugins/index-html-webpack-plugin");
-const package_chunk_sort_1 = require("../../utilities/package-chunk-sort");
 const utils_1 = require("./utils");
 const SubresourceIntegrityPlugin = require('webpack-subresource-integrity');
 function getBrowserConfig(wco) {
-    const { root, buildOptions } = wco;
+    const { buildOptions } = wco;
     const extraPlugins = [];
     let isEval = false;
     const { styles: stylesOptimization, scripts: scriptsOptimization } = buildOptions.optimization;
@@ -27,17 +24,6 @@ function getBrowserConfig(wco) {
         // Produce eval sourcemaps for development with serve, which are faster.
         isEval = true;
     }
-    if (buildOptions.index) {
-        extraPlugins.push(new index_html_webpack_plugin_1.IndexHtmlWebpackPlugin({
-            input: path.resolve(root, buildOptions.index),
-            output: path.basename(buildOptions.index),
-            baseHref: buildOptions.baseHref,
-            entrypoints: package_chunk_sort_1.generateEntryPoints(buildOptions),
-            deployUrl: buildOptions.deployUrl,
-            sri: buildOptions.subresourceIntegrity,
-            noModuleEntrypoints: ['polyfills-es5'],
-        }));
-    }
     if (buildOptions.subresourceIntegrity) {
         extraPlugins.push(new SubresourceIntegrityPlugin({
             hashFuncNames: ['sha384'],
diff --git a/src/angular-cli-files/plugins/index-html-webpack-plugin.d.ts b/src/angular-cli-files/plugins/index-html-webpack-plugin.d.ts
@@ -1,4 +1,5 @@
 import { Compiler } from 'webpack';
+import { IndexHtmlTransform } from '../utilities/index-file/write-index-html';
 export interface IndexHtmlWebpackPluginOptions {
     input: string;
     output: string;
@@ -7,6 +8,7 @@ export interface IndexHtmlWebpackPluginOptions {
     deployUrl?: string;
     sri: boolean;
     noModuleEntrypoints: string[];
+    postTransform?: IndexHtmlTransform;
 }
 export declare class IndexHtmlWebpackPlugin {
     private _options;
diff --git a/src/angular-cli-files/plugins/index-html-webpack-plugin.js b/src/angular-cli-files/plugins/index-html-webpack-plugin.js
@@ -8,27 +8,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * found in the LICENSE file at https://angular.io/license
  */
 const path = require("path");
+const webpack_sources_1 = require("webpack-sources");
 const augment_index_html_1 = require("../utilities/index-file/augment-index-html");
+const strip_bom_1 = require("../utilities/strip-bom");
 function readFile(filename, compilation) {
     return new Promise((resolve, reject) => {
         compilation.inputFileSystem.readFile(filename, (err, data) => {
             if (err) {
                 reject(err);
                 return;
             }
-            let content;
-            if (data.length >= 3 && data[0] === 0xEF && data[1] === 0xBB && data[2] === 0xBF) {
-                // Strip UTF-8 BOM
-                content = data.toString('utf8', 3);
-            }
-            else if (data.length >= 2 && data[0] === 0xFF && data[1] === 0xFE) {
-                // Strip UTF-16 LE BOM
-                content = data.toString('utf16le', 2);
-            }
-            else {
-                content = data.toString();
-            }
-            resolve(content);
+            resolve(strip_bom_1.stripBom(data.toString()));
         });
     });
 }
@@ -67,7 +57,7 @@ class IndexHtmlWebpackPlugin {
                 }
             }
             const loadOutputFile = (name) => compilation.assets[name].source();
-            const indexSource = await augment_index_html_1.augmentIndexHtml({
+            let indexSource = await augment_index_html_1.augmentIndexHtml({
                 input: this._options.input,
                 inputContent,
                 baseHref: this._options.baseHref,
@@ -78,8 +68,11 @@ class IndexHtmlWebpackPlugin {
                 loadOutputFile,
                 entrypoints: this._options.entrypoints,
             });
+            if (this._options.postTransform) {
+                indexSource = await this._options.postTransform(indexSource);
+            }
             // Add to compilation assets
-            compilation.assets[this._options.output] = indexSource;
+            compilation.assets[this._options.output] = new webpack_sources_1.RawSource(indexSource);
         });
     }
 }
diff --git a/src/angular-cli-files/utilities/index-file/augment-index-html.d.ts b/src/angular-cli-files/utilities/index-file/augment-index-html.d.ts
@@ -5,7 +5,6 @@
  * 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 { Source } from 'webpack-sources';
 export declare type LoadOutputFileFunctionType = (file: string) => Promise<string>;
 export interface AugmentIndexHtmlOptions {
     input: string;
@@ -27,4 +26,4 @@ export interface FileInfo {
     name: string;
     extension: string;
 }
-export declare function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise<Source>;
+export declare function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise<string>;
diff --git a/src/angular-cli-files/utilities/index-file/augment-index-html.js b/src/angular-cli-files/utilities/index-file/augment-index-html.js
@@ -156,7 +156,7 @@ async function augmentIndexHtml(params) {
         treeAdapter.appendChild(styleElements, element);
     }
     indexSource.insert(styleInsertionPoint, parse5.serialize(styleElements, { treeAdapter }));
-    return indexSource;
+    return indexSource.source();
 }
 exports.augmentIndexHtml = augmentIndexHtml;
 function _generateSriAttributes(content) {
diff --git a/src/angular-cli-files/utilities/index-file/write-index-html.d.ts b/src/angular-cli-files/utilities/index-file/write-index-html.d.ts
@@ -13,12 +13,15 @@ export interface WriteIndexHtmlOptions {
     host: virtualFs.Host;
     outputPath: Path;
     indexPath: Path;
-    ES5BuildFiles: EmittedFiles[];
-    ES2015BuildFiles: EmittedFiles[];
+    files?: EmittedFiles[];
+    noModuleFiles?: EmittedFiles[];
+    moduleFiles?: EmittedFiles[];
     baseHref?: string;
     deployUrl?: string;
     sri?: boolean;
     scripts?: ExtraEntryPoint[];
     styles?: ExtraEntryPoint[];
+    postTransform?: IndexHtmlTransform;
 }
-export declare function writeIndexHtml({ host, outputPath, indexPath, ES5BuildFiles, ES2015BuildFiles, baseHref, deployUrl, sri, scripts, styles, }: WriteIndexHtmlOptions): Observable<void>;
+export declare type IndexHtmlTransform = (content: string) => Promise<string>;
+export declare function writeIndexHtml({ host, outputPath, indexPath, files, noModuleFiles, moduleFiles, baseHref, deployUrl, sri, scripts, styles, postTransform, }: WriteIndexHtmlOptions): Observable<void>;
diff --git a/src/angular-cli-files/utilities/index-file/write-index-html.js b/src/angular-cli-files/utilities/index-file/write-index-html.js
@@ -8,11 +8,12 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@angular-devkit/core");
+const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const package_chunk_sort_1 = require("../package-chunk-sort");
 const strip_bom_1 = require("../strip-bom");
 const augment_index_html_1 = require("./augment-index-html");
-function writeIndexHtml({ host, outputPath, indexPath, ES5BuildFiles, ES2015BuildFiles, baseHref, deployUrl, sri = false, scripts = [], styles = [], }) {
+function writeIndexHtml({ host, outputPath, indexPath, files = [], noModuleFiles = [], moduleFiles = [], baseHref, deployUrl, sri = false, scripts = [], styles = [], postTransform, }) {
     return host.read(indexPath)
         .pipe(operators_1.map(content => strip_bom_1.stripBom(core_1.virtualFs.fileBufferToString(content))), operators_1.switchMap(content => augment_index_html_1.augmentIndexHtml({
         input: core_1.getSystemPath(outputPath),
@@ -21,21 +22,24 @@ function writeIndexHtml({ host, outputPath, indexPath, ES5BuildFiles, ES2015Buil
         deployUrl,
         sri,
         entrypoints: package_chunk_sort_1.generateEntryPoints({ scripts, styles }),
-        files: filterAndMapBuildFiles(ES5BuildFiles, '.css'),
-        noModuleFiles: filterAndMapBuildFiles(ES5BuildFiles, '.js'),
-        moduleFiles: filterAndMapBuildFiles(ES2015BuildFiles, '.js'),
+        files: filterAndMapBuildFiles(files, ['.js', '.css']),
+        noModuleFiles: filterAndMapBuildFiles(noModuleFiles, '.js'),
+        moduleFiles: filterAndMapBuildFiles(moduleFiles, '.js'),
         loadOutputFile: async (filePath) => {
             return host.read(core_1.join(outputPath, filePath))
                 .pipe(operators_1.map(data => core_1.virtualFs.fileBufferToString(data)))
                 .toPromise();
         },
-    })), operators_1.map(content => core_1.virtualFs.stringToFileBuffer(content.source())), operators_1.switchMap(content => host.write(core_1.join(outputPath, core_1.basename(indexPath)), content)));
+    })), operators_1.switchMap(content => postTransform ? postTransform(content) : rxjs_1.of(content)), operators_1.map(content => core_1.virtualFs.stringToFileBuffer(content)), operators_1.switchMap(content => host.write(core_1.join(outputPath, core_1.basename(indexPath)), content)));
 }
 exports.writeIndexHtml = writeIndexHtml;
 function filterAndMapBuildFiles(files, extensionFilter) {
     const filteredFiles = [];
+    const validExtensions = Array.isArray(extensionFilter)
+        ? extensionFilter
+        : [extensionFilter];
     for (const { file, name, extension, initial } of files) {
-        if (name && initial && extension === extensionFilter) {
+        if (name && initial && validExtensions.includes(extension)) {
             filteredFiles.push({ file, extension, name });
         }
     }
diff --git a/src/browser/index.d.ts b/src/browser/index.d.ts
@@ -11,6 +11,7 @@ import { WebpackLoggingCallback } from '@angular-devkit/build-webpack';
 import { experimental, json, logging, virtualFs } from '@angular-devkit/core';
 import * as fs from 'fs';
 import * as webpack from 'webpack';
+import { IndexHtmlTransform } from '../angular-cli-files/utilities/index-file/write-index-html';
 import { ExecutionTransformer } from '../transforms';
 import { Schema as BrowserBuilderSchema } from './schema';
 export declare type BrowserBuilderOutput = json.JsonObject & BuilderOutput & {
@@ -24,6 +25,7 @@ export declare function buildBrowserWebpackConfigFromContext(options: BrowserBui
 export declare function buildWebpackBrowser(options: BrowserBuilderSchema, context: BuilderContext, transforms?: {
     webpackConfiguration?: ExecutionTransformer<webpack.Configuration>;
     logging?: WebpackLoggingCallback;
+    indexHtml?: IndexHtmlTransform;
 }): import("rxjs").Observable<BrowserBuilderOutput>;
 declare const _default: import("@angular-devkit/architect/src/internal").Builder<json.JsonObject & BrowserBuilderSchema>;
 export default _default;
diff --git a/src/browser/index.js b/src/browser/index.js
@@ -130,20 +130,34 @@ function buildWebpackBrowser(options, context, transforms = {}) {
             }
         }, { success: true }, 1), operators_1.bufferCount(configs.length), operators_1.switchMap(buildEvents => {
             const success = buildEvents.every(r => r.success);
-            if (success && buildEvents.length === 2 && options.index) {
-                const { emittedFiles: ES5BuildFiles = [] } = buildEvents[0];
-                const { emittedFiles: ES2015BuildFiles = [] } = buildEvents[1];
+            if (success && options.index) {
+                let noModuleFiles;
+                let moduleFiles;
+                let files;
+                const [ES5Result, ES2015Result] = buildEvents;
+                if (buildEvents.length === 2) {
+                    noModuleFiles = ES5Result.emittedFiles;
+                    moduleFiles = ES2015Result.emittedFiles || [];
+                    files = moduleFiles.filter(x => x.extension === '.css');
+                }
+                else {
+                    const { emittedFiles = [] } = ES5Result;
+                    files = emittedFiles.filter(x => x.name !== 'polyfills-es5');
+                    noModuleFiles = emittedFiles.filter(x => x.name === 'polyfills-es5');
+                }
                 return write_index_html_1.writeIndexHtml({
                     host,
                     outputPath: core_1.join(root, options.outputPath),
                     indexPath: core_1.join(root, options.index),
-                    ES5BuildFiles,
-                    ES2015BuildFiles,
+                    files,
+                    noModuleFiles,
+                    moduleFiles,
                     baseHref: options.baseHref,
                     deployUrl: options.deployUrl,
                     sri: options.subresourceIntegrity,
                     scripts: options.scripts,
                     styles: options.styles,
+                    postTransform: transforms.indexHtml,
                 })
                     .pipe(operators_1.map(() => ({ success: true })), operators_1.catchError(() => rxjs_1.of({ success: false })));
             }
diff --git a/src/dev-server/index.d.ts b/src/dev-server/index.d.ts
@@ -11,6 +11,7 @@ import { json, logging } from '@angular-devkit/core';
 import { Observable } from 'rxjs';
 import * as webpack from 'webpack';
 import * as WebpackDevServer from 'webpack-dev-server';
+import { IndexHtmlTransform } from '../angular-cli-files/utilities/index-file/write-index-html';
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import { ExecutionTransformer } from '../transforms';
 import { Schema } from './schema';
@@ -29,6 +30,7 @@ export declare type DevServerBuilderOutput = DevServerBuildOutput & {
 export declare function serveWebpackBrowser(options: DevServerBuilderOptions, context: BuilderContext, transforms?: {
     webpackConfiguration?: ExecutionTransformer<webpack.Configuration>;
     logging?: WebpackLoggingCallback;
+    indexHtml?: IndexHtmlTransform;
 }): Observable<DevServerBuilderOutput>;
 /**
  * Create a webpack configuration for the dev server.
diff --git a/src/dev-server/index.js b/src/dev-server/index.js
@@ -17,7 +17,9 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const url = require("url");
 const webpack = require("webpack");
+const index_html_webpack_plugin_1 = require("../angular-cli-files/plugins/index-html-webpack-plugin");
 const check_port_1 = require("../angular-cli-files/utilities/check-port");
+const package_chunk_sort_1 = require("../angular-cli-files/utilities/package-chunk-sort");
 const browser_1 = require("../browser");
 const utils_1 = require("../utils");
 const version_1 = require("../utils/version");
@@ -96,17 +98,31 @@ function serveWebpackBrowser(options, context, transforms = {}) {
         else if (options.hmr) {
             context.logger.warn('Live reload is disabled. HMR option ignored.');
         }
+        webpackConfig.plugins = [...(webpackConfig.plugins || [])];
         if (!options.watch) {
             // There's no option to turn off file watching in webpack-dev-server, but
             // we can override the file watcher instead.
-            webpackConfig.plugins = [...(webpackConfig.plugins || []), {
-                    // tslint:disable-next-line:no-any
-                    apply: (compiler) => {
-                        compiler.hooks.afterEnvironment.tap('angular-cli', () => {
-                            compiler.watchFileSystem = { watch: () => { } };
-                        });
-                    },
-                }];
+            webpackConfig.plugins.push({
+                // tslint:disable-next-line:no-any
+                apply: (compiler) => {
+                    compiler.hooks.afterEnvironment.tap('angular-cli', () => {
+                        compiler.watchFileSystem = { watch: () => { } };
+                    });
+                },
+            });
+        }
+        if (browserOptions.index) {
+            const { scripts = [], styles = [], index, baseHref } = browserOptions;
+            webpackConfig.plugins.push(new index_html_webpack_plugin_1.IndexHtmlWebpackPlugin({
+                input: path.resolve(root, index),
+                output: path.basename(index),
+                baseHref,
+                entrypoints: package_chunk_sort_1.generateEntryPoints({ scripts, styles }),
+                deployUrl: browserOptions.deployUrl,
+                sri: browserOptions.subresourceIntegrity,
+                noModuleEntrypoints: ['polyfills-es5'],
+                postTransform: transforms.indexHtml,
+            }));
         }
         const normalizedOptimization = utils_1.normalizeOptimization(browserOptions.optimization);
         if (normalizedOptimization.scripts || normalizedOptimization.styles) {
diff --git a/src/server/index.js b/src/server/index.js
@@ -51,7 +51,6 @@ function getCompilerConfig(wco) {
 async function buildServerWebpackConfig(options, context) {
     const { config } = await webpack_browser_config_1.generateBrowserWebpackConfigFromContext({
         ...options,
-        index: '',
         buildOptimizer: false,
         aot: true,
         platform: 'server',
diff --git a/src/utils/webpack-browser-config.js b/src/utils/webpack-browser-config.js
@@ -36,7 +36,6 @@ async function generateWebpackConfig(context, workspaceRoot, projectRoot, source
             buildOptions = {
                 ...options,
                 es5BrowserSupport: undefined,
-                index: '',
                 esVersionInFileName: true,
                 scriptTargetOverride: scriptTarget,
             };
diff --git a/uniqueId b/uniqueId
@@ -1 +1 @@
-Tue May 14 2019 18:20:45 GMT+0000 (Coordinated Universal Time)
+Wed May 15 2019 21:41:15 GMT+0000 (Coordinated Universal Time)

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ async function augmentIndexHtml(params) {`
`156`	`156`	`treeAdapter.appendChild(styleElements, element);`
`157`	`157`	`}`
`158`	`158`	`indexSource.insert(styleInsertionPoint, parse5.serialize(styleElements, { treeAdapter }));`
`159`		`- return indexSource;`
	`159`	`+ return indexSource.source();`
`160`	`160`	`}`
`161`	`161`	`exports.augmentIndexHtml = augmentIndexHtml;`
`162`	`162`	`function _generateSriAttributes(content) {`