refactor(@angular-devkit/build-angular): remove differential loading version 1.0

Author: alan-agius4

packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts

@@ -86,9 +86,6 @@ export interface BuildOptions {
   /* Append script target version to filename. */
   esVersionInFileName?: boolean;
 
-  /* When specified it will be used instead of the script target in the tsconfig.json. */
-  scriptTargetOverride?: ScriptTarget;
-
   experimentalRollupPass?: boolean;
 }
 
@@ -106,4 +103,5 @@ export interface WebpackConfigOptions<T = BuildOptions> {
   tsConfig: ParsedConfiguration;
   tsConfigPath: string;
   supportES2015: boolean;
+  differentialLoadingMode?: boolean;
 }

packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts

@@ -25,7 +25,7 @@ import {
 } from 'webpack';
 import { RawSource } from 'webpack-sources';
 import { AssetPatternClass, ExtraEntryPoint } from '../../../browser/schema';
-import { BuildBrowserFeatures, fullDifferential } from '../../../utils';
+import { BuildBrowserFeatures } from '../../../utils';
 import { manglingDisabled } from '../../../utils/mangle-options';
 import { BundleBudgetPlugin } from '../../plugins/bundle-budget';
 import { CleanCssWebpackPlugin } from '../../plugins/cleancss-webpack-plugin';
@@ -62,7 +62,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   const entryPoints: { [key: string]: string[] } = {};
 
   const targetInFileName = getEsVersionForFileName(
-    fullDifferential ? buildOptions.scriptTargetOverride : tsConfig.options.target,
+    tsConfig.options.target,
     buildOptions.esVersionInFileName,
   );
 
@@ -114,16 +114,14 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     }
   }
 
-  let differentialLoadingNeeded = false;
+  const differentialLoadingMode = !!wco.differentialLoadingMode;
   if (wco.buildOptions.platform !== 'server') {
-    const buildBrowserFeatures = new BuildBrowserFeatures(
-      projectRoot,
-      tsConfig.options.target || ScriptTarget.ES5,
-    );
-
-    differentialLoadingNeeded = buildBrowserFeatures.isDifferentialLoadingNeeded();
+    if (differentialLoadingMode || tsConfig.options.target === ScriptTarget.ES5) {
+      const buildBrowserFeatures = new BuildBrowserFeatures(
+        projectRoot,
+        tsConfig.options.target || ScriptTarget.ES5,
+      );
 
-    if ((buildOptions.scriptTargetOverride || tsConfig.options.target) === ScriptTarget.ES5) {
       if (
         buildOptions.es5BrowserSupport ||
         (buildOptions.es5BrowserSupport === undefined && buildBrowserFeatures.isEs5SupportNeeded())
@@ -141,26 +139,21 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
             : [noModuleScript];
         }
 
-        // For full build differential loading we don't need to generate a seperate polyfill file
-        // because they will be loaded exclusivly based on module and nomodule
-        const polyfillsChunkName =
-          fullDifferential && differentialLoadingNeeded ? 'polyfills' : 'polyfills-es5';
-
+        const polyfillsChunkName = 'polyfills-es5';
         entryPoints[polyfillsChunkName] = [path.join(__dirname, '..', 'es5-polyfills.js')];
-        if (!fullDifferential && differentialLoadingNeeded) {
+        if (differentialLoadingMode) {
           // Add zone.js legacy support to the es5 polyfills
           // This is a noop execution-wise if zone-evergreen is not used.
           entryPoints[polyfillsChunkName].push('zone.js/dist/zone-legacy');
         }
         if (!buildOptions.aot) {
-          // If not performing a full differential build the JIT polyfills need to be added to ES5
-          if (!fullDifferential && differentialLoadingNeeded) {
+          if (differentialLoadingMode) {
             entryPoints[polyfillsChunkName].push(path.join(__dirname, '..', 'jit-polyfills.js'));
           }
           entryPoints[polyfillsChunkName].push(path.join(__dirname, '..', 'es5-jit-polyfills.js'));
         }
         // If not performing a full differential build the polyfills need to be added to ES5 bundle
-        if (!fullDifferential && buildOptions.polyfills) {
+        if (buildOptions.polyfills) {
           entryPoints[polyfillsChunkName].push(path.resolve(root, buildOptions.polyfills));
         }
       }
@@ -411,7 +404,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
       mangle:
         !manglingDisabled &&
         buildOptions.platform !== 'server' &&
-        (!differentialLoadingNeeded || (differentialLoadingNeeded && fullDifferential)),
+        !differentialLoadingMode,
     };
 
     extraMinimizers.push(

packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts

@@ -15,7 +15,6 @@ import {
   NgToolsLoader,
   PLATFORM
 } from '@ngtools/webpack';
-import { fullDifferential } from '../../../utils';
 import { WebpackConfigOptions, BuildOptions } from '../build-options';
 
 function _pluginOptionsOverrides(
@@ -33,10 +32,6 @@ function _pluginOptionsOverrides(
     }
   }
 
-  if (fullDifferential && buildOptions.scriptTargetOverride) {
-    compilerOptions.target = buildOptions.scriptTargetOverride;
-  }
-
   if (buildOptions.preserveSymlinks) {
     compilerOptions.preserveSymlinks = true;
   }

packages/angular_devkit/build_angular/src/browser/index.ts

@@ -7,7 +7,6 @@
  */
 import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
 import {
-  BuildResult,
   EmittedFiles,
   WebpackLoggingCallback,
   runWebpack,
@@ -25,7 +24,7 @@ import * as findCacheDirectory from 'find-cache-dir';
 import * as fs from 'fs';
 import * as path from 'path';
 import { Observable, from, of } from 'rxjs';
-import { bufferCount, catchError, concatMap, map, mergeScan, switchMap } from 'rxjs/operators';
+import { catchError, concatMap, map, switchMap } from 'rxjs/operators';
 import { ScriptTarget } from 'typescript';
 import * as webpack from 'webpack';
 import { NgBuildAnalyticsPlugin } from '../../plugins/webpack/analytics';
@@ -57,7 +56,6 @@ import { ExecutionTransformer } from '../transforms';
 import {
   BuildBrowserFeatures,
   deleteOutputDir,
-  fullDifferential,
   normalizeAssetPatterns,
   normalizeOptimization,
   normalizeSourceMaps,
@@ -111,7 +109,7 @@ export async function buildBrowserWebpackConfigFromContext(
   options: BrowserBuilderSchema,
   context: BuilderContext,
   host: virtualFs.Host<fs.Stats> = new NodeJsSyncHost(),
-): Promise<{ config: webpack.Configuration[]; projectRoot: string; projectSourceRoot?: string }> {
+): Promise<{ config: webpack.Configuration; projectRoot: string; projectSourceRoot?: string }> {
   return generateBrowserWebpackConfigFromContext(
     options,
     context,
@@ -164,7 +162,7 @@ async function initialize(
   host: virtualFs.Host<fs.Stats>,
   webpackConfigurationTransform?: ExecutionTransformer<webpack.Configuration>,
 ): Promise<{
-  config: webpack.Configuration[];
+  config: webpack.Configuration;
   projectRoot: string;
   projectSourceRoot?: string;
   i18n: I18nOptions;
@@ -182,10 +180,7 @@ async function initialize(
 
   let transformedConfig;
   if (webpackConfigurationTransform) {
-    transformedConfig = [];
-    for (const c of config) {
-      transformedConfig.push(await webpackConfigurationTransform(c));
-    }
+    transformedConfig = await webpackConfigurationTransform(config);
   }
 
   if (options.deleteOutputPath) {
@@ -218,7 +213,7 @@ export function buildWebpackBrowser(
 
   return from(initialize(options, context, host, transforms.webpackConfiguration)).pipe(
     // tslint:disable-next-line: no-big-function
-    switchMap(({ config: configs, projectRoot, projectSourceRoot, i18n }) => {
+    switchMap(({ config, projectRoot, projectSourceRoot, i18n }) => {
       const tsConfig = readTsconfig(options.tsConfig, context.workspaceRoot);
       const target = tsConfig.options.target || ScriptTarget.ES5;
       const buildBrowserFeatures = new BuildBrowserFeatures(projectRoot, target);
@@ -233,40 +228,23 @@ export function buildWebpackBrowser(
         `);
       }
 
-      const useBundleDownleveling =
-        isDifferentialLoadingNeeded && !(fullDifferential || options.watch);
+      const useBundleDownleveling = isDifferentialLoadingNeeded && !options.watch;
       const startTime = Date.now();
 
-      return from(configs).pipe(
-        // the concurrency parameter (3rd parameter of mergeScan) is deliberately
-        // set to 1 to make sure the build steps are executed in sequence.
-        mergeScan(
-          (lastResult, config) => {
-            // Make sure to only run the 2nd build step, if 1st one succeeded
-            if (lastResult.success) {
-              return runWebpack(config, context, {
-                logging:
-                  transforms.logging ||
-                  (useBundleDownleveling
-                    ? () => {}
-                    : createBrowserLoggingCallback(!!options.verbose, context.logger)),
-              });
-            } else {
-              return of();
-            }
-          },
-          { success: true } as BuildResult,
-          1,
-        ),
-        bufferCount(configs.length),
+      return runWebpack(config, context, {
+        logging:
+          transforms.logging ||
+          (useBundleDownleveling
+            ? () => {}
+            : createBrowserLoggingCallback(!!options.verbose, context.logger)),
+      }).pipe(
         // tslint:disable-next-line: no-big-function
-        switchMap(async buildEvents => {
-          configs.length = 0;
-          const success = buildEvents.every(r => r.success);
+        concatMap(async buildEvent => {
+          const { webpackStats, success, emittedFiles = [] } = buildEvent;
+
           if (!success && useBundleDownleveling) {
             // If using bundle downleveling then there is only one build
             // If it fails show any diagnostic messages and bail
-            const webpackStats = buildEvents[0].webpackStats;
             if (webpackStats && webpackStats.warnings.length > 0) {
               context.logger.warn(statsWarningsToString(webpackStats, { colors: true }));
             }
@@ -285,18 +263,12 @@ export function buildWebpackBrowser(
               'scripts',
             ).map(x => x.bundleName);
 
-            const [firstBuild, secondBuild] = buildEvents;
-            if (isDifferentialLoadingNeeded && (fullDifferential || options.watch)) {
-              moduleFiles = firstBuild.emittedFiles || [];
+            if (isDifferentialLoadingNeeded && options.watch) {
+              moduleFiles = emittedFiles;
               files = moduleFiles.filter(
                 x => x.extension === '.css' || (x.name && scriptsEntryPointName.includes(x.name)),
               );
-
-              if (buildEvents.length === 2) {
-                noModuleFiles = secondBuild.emittedFiles;
-              }
-            } else if (isDifferentialLoadingNeeded && !fullDifferential) {
-              const { emittedFiles = [], webpackStats } = firstBuild;
+            } else if (isDifferentialLoadingNeeded) {
               moduleFiles = [];
               noModuleFiles = [];
 
@@ -526,7 +498,6 @@ export function buildWebpackBrowser(
                 context.logger.error(statsErrorsToString(webpackStats, { colors: true }));
               }
             } else {
-              const { emittedFiles = [] } = firstBuild;
               files = emittedFiles.filter(x => x.name !== 'polyfills-es5');
               noModuleFiles = emittedFiles.filter(x => x.name === 'polyfills-es5');
             }

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

@@ -126,7 +126,7 @@ export function serveWebpackBrowser(
     );
 
     // No differential loading for dev-server, hence there is just one config
-    let webpackConfig = webpackConfigResult.config[0];
+    let webpackConfig = webpackConfigResult.config;
 
     const port = await checkPort(options.port || 0, options.host || 'localhost', 4200);
     const webpackDevServerConfig = (webpackConfig.devServer = buildServerConfig(

packages/angular_devkit/build_angular/src/extract-i18n/index.ts

@@ -119,7 +119,7 @@ async function execute(options: ExtractI18nBuilderOptions, context: BuilderConte
     }
   };
 
-  return runWebpack(config[0], context, { logging }).toPromise();
+  return runWebpack(config, context, { logging }).toPromise();
 }
 
 export default createBuilder<JsonObject & ExtractI18nBuilderOptions>(execute);

packages/angular_devkit/build_angular/src/karma/index.ts

@@ -61,7 +61,7 @@ async function initialize(
 
   return [
     karma,
-    webpackConfigurationTransformer ? await webpackConfigurationTransformer(config[0]) : config[0],
+    webpackConfigurationTransformer ? await webpackConfigurationTransformer(config) : config,
   ];
 }
 

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

@@ -106,5 +106,5 @@ async function buildServerWebpackConfig(
     ],
   );
 
-  return config[0];
+  return config;
 }

packages/angular_devkit/build_angular/src/utils/build-browser-features.ts

@@ -10,12 +10,6 @@ import * as browserslist from 'browserslist';
 import { feature, features } from 'caniuse-lite';
 import * as ts from 'typescript';
 
-const fullDifferentialEnv = process.env['NG_BUILD_DIFFERENTIAL_FULL'];
-export const fullDifferential =
-  fullDifferentialEnv !== undefined &&
-  fullDifferentialEnv !== '0' &&
-  fullDifferentialEnv.toLowerCase() !== 'false';
-
 export class BuildBrowserFeatures {
   private readonly _supportedBrowsers: string[];
   private readonly _es6TargetOrLater: boolean;