refactor(@angular-devkit/build-angular): unify webpack configurations

With this change we unify most of the webpack configuration into the common configuration. A number of lengthy functions and code portions have been moved into a seperate file to make the configuration easier to follow.

Author: alan-agius4

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

@@ -46,9 +46,7 @@ import {
 } from '../../utils/webpack-browser-config';
 import {
   getAnalyticsConfig,
-  getBrowserConfig,
   getCommonConfig,
-  getStatsConfig,
   getStylesConfig,
   getTypeScriptConfig,
   getWorkerConfig,
@@ -96,9 +94,7 @@ async function initialize(
   const { config, projectRoot, projectSourceRoot, i18n, target } =
     await generateI18nBrowserWebpackConfigFromContext(adjustedOptions, context, (wco) => [
       getCommonConfig(wco),
-      getBrowserConfig(wco),
       getStylesConfig(wco),
-      getStatsConfig(wco),
       getAnalyticsConfig(wco, context),
       getTypeScriptConfig(wco),
       wco.buildOptions.webWorkerTsConfig ? getWorkerConfig(wco) : {},

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

@@ -35,10 +35,8 @@ import {
 } from '../../utils/webpack-browser-config';
 import {
   getAnalyticsConfig,
-  getBrowserConfig,
   getCommonConfig,
   getDevServerConfig,
-  getStatsConfig,
   getStylesConfig,
   getTypeScriptConfig,
   getWorkerConfig,
@@ -167,9 +165,7 @@ export function serveWebpackBrowser(
       (wco) => [
         getDevServerConfig(wco),
         getCommonConfig(wco),
-        getBrowserConfig(wco),
         getStylesConfig(wco),
-        getStatsConfig(wco),
         getAnalyticsConfig(wco, context),
         getTypeScriptConfig(wco),
         browserOptions.webWorkerTsConfig ? getWorkerConfig(wco) : {},

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

@@ -19,13 +19,7 @@ import { createI18nOptions } from '../../utils/i18n-options';
 import { loadEsmModule } from '../../utils/load-esm';
 import { assertCompatibleAngularVersion } from '../../utils/version';
 import { generateBrowserWebpackConfigFromContext } from '../../utils/webpack-browser-config';
-import {
-  getBrowserConfig,
-  getCommonConfig,
-  getStatsConfig,
-  getTypeScriptConfig,
-  getWorkerConfig,
-} from '../../webpack/configs';
+import { getCommonConfig, getTypeScriptConfig, getWorkerConfig } from '../../webpack/configs';
 import { createWebpackLoggingCallback } from '../../webpack/utils/stats';
 import { Schema as BrowserBuilderOptions, OutputHashing } from '../browser/schema';
 import { Format, Schema } from './schema';
@@ -192,6 +186,7 @@ export async function execute(
     subresourceIntegrity: false,
     outputHashing: OutputHashing.None,
     namedChunks: true,
+    allowedCommonJsDependencies: undefined,
   };
   const { config, projectRoot } = await generateBrowserWebpackConfigFromContext(
     builderOptions,
@@ -203,10 +198,8 @@ export async function execute(
       const partials = [
         { plugins: [new NoEmitPlugin()] },
         getCommonConfig(wco),
-        getBrowserConfig(wco),
         getTypeScriptConfig(wco),
         getWorkerConfig(wco),
-        getStatsConfig(wco),
       ];
 
       // Add Ivy application file extractor support

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

@@ -19,7 +19,6 @@ import { generateBrowserWebpackConfigFromContext } from '../../utils/webpack-bro
 import {
   getCommonConfig,
   getStylesConfig,
-  getTestConfig,
   getTypeScriptConfig,
   getWorkerConfig,
 } from '../../webpack/configs';
@@ -64,7 +63,6 @@ async function initialize(
       getCommonConfig(wco),
       getStylesConfig(wco),
       getTypeScriptConfig(wco),
-      getTestConfig(wco),
       getWorkerConfig(wco),
     ],
   );

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

@@ -21,13 +21,7 @@ import { I18nOptions } from '../../utils/i18n-options';
 import { ensureOutputPaths } from '../../utils/output-paths';
 import { assertCompatibleAngularVersion } from '../../utils/version';
 import { generateI18nBrowserWebpackConfigFromContext } from '../../utils/webpack-browser-config';
-import {
-  getCommonConfig,
-  getServerConfig,
-  getStatsConfig,
-  getStylesConfig,
-  getTypeScriptConfig,
-} from '../../webpack/configs';
+import { getCommonConfig, getStylesConfig, getTypeScriptConfig } from '../../webpack/configs';
 import { webpackStatsLogger } from '../../webpack/utils/stats';
 import { Schema as ServerBuilderOptions } from './schema';
 
@@ -161,13 +155,7 @@ async function initialize(
       platform: 'server',
     } as NormalizedBrowserBuilderSchema,
     context,
-    (wco) => [
-      getCommonConfig(wco),
-      getServerConfig(wco),
-      getStylesConfig(wco),
-      getStatsConfig(wco),
-      getTypeScriptConfig(wco),
-    ],
+    (wco) => [getCommonConfig(wco), getStylesConfig(wco), getTypeScriptConfig(wco)],
   );
 
   let transformedConfig;

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

@@ -69,9 +69,6 @@ export interface BuildOptions {
   inlineStyleLanguage?: InlineStyleLanguage;
   allowedCommonJsDependencies?: string[];
   cache: NormalizedCachedOptions;
-}
-
-export interface WebpackTestOptions extends BuildOptions {
   codeCoverage?: boolean;
   codeCoverageExclude?: string[];
 }