refactor(@angular-devkit/build-angular): remove webpack 4 checks

These are no longer needed as we don't support Webpack 4 any longer

Author: alan-agius4

package.json

@@ -183,7 +183,6 @@
     "parse5-html-rewriting-stream": "6.0.1",
     "pidtree": "^0.5.0",
     "pidusage": "^2.0.17",
-    "pnp-webpack-plugin": "1.6.4",
     "popper.js": "^1.14.1",
     "postcss": "8.2.10",
     "postcss-import": "14.0.1",
@@ -226,7 +225,7 @@
     "typescript": "4.2.4",
     "verdaccio": "4.12.0",
     "verdaccio-auth-memory": "^10.0.0",
-    "webpack": "5.30.0",
+    "webpack": "5.31.0",
     "webpack-dev-middleware": "4.1.0",
     "webpack-dev-server": "3.11.2",
     "webpack-merge": "5.7.3",

packages/angular_devkit/build_angular/BUILD.bazel

@@ -166,7 +166,6 @@ ts_library(
         "@npm//open",
         "@npm//ora",
         "@npm//parse5-html-rewriting-stream",
-        "@npm//pnp-webpack-plugin",
         "@npm//postcss",
         "@npm//postcss-import",
         "@npm//postcss-loader",

packages/angular_devkit/build_angular/package.json

@@ -47,7 +47,6 @@
     "open": "8.0.5",
     "ora": "5.4.0",
     "parse5-html-rewriting-stream": "6.0.1",
-    "pnp-webpack-plugin": "1.6.4",
     "postcss": "8.2.10",
     "postcss-import": "14.0.1",
     "postcss-loader": "5.2.0",
@@ -70,7 +69,7 @@
     "terser-webpack-plugin": "4.2.3",
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
-    "webpack": "5.30.0",
+    "webpack": "5.31.0",
     "webpack-dev-middleware": "4.1.0",
     "webpack-dev-server": "3.11.2",
     "webpack-merge": "5.7.3",

packages/angular_devkit/build_angular/src/utils/process-bundle.ts

@@ -35,8 +35,6 @@ import { I18nOptions } from './i18n-options';
 
 type LocalizeUtilities = typeof import('@angular/localize/src/tools/src/source_file_utils');
 
-const deserialize = ((v8 as unknown) as { deserialize(buffer: Buffer): unknown }).deserialize;
-
 // If code size is larger than 500KB, consider lower fidelity but faster sourcemap merge
 const FAST_SOURCEMAP_THRESHOLD = 500 * 1024;
 
@@ -88,7 +86,7 @@ let i18n: I18nOptions | undefined;
 
 export function setup(data: number[] | { cachePath: string; i18n: I18nOptions }): void {
   const options = Array.isArray(data)
-    ? (deserialize(Buffer.from(data)) as { cachePath: string; i18n: I18nOptions })
+    ? (v8.deserialize(Buffer.from(data)) as { cachePath: string; i18n: I18nOptions })
     : data;
   cachePath = options.cachePath;
   i18n = options.i18n;

packages/angular_devkit/build_angular/src/utils/webpack-diagnostics.ts

@@ -6,26 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as webpack from 'webpack';
-import { isWebpackFiveOrHigher } from './webpack-version';
 
 const WebpackError = require('webpack/lib/WebpackError');
 
 export function addWarning(compilation: webpack.compilation.Compilation, message: string): void {
-  if (isWebpackFiveOrHigher()) {
-    compilation.warnings.push(new WebpackError(message));
-  } else {
-    // Allows building with either Webpack 4 or 5+ types
-    // tslint:disable-next-line: no-any
-    compilation.warnings.push(message as any);
-  }
+  compilation.warnings.push(new WebpackError(message));
+
 }
 
 export function addError(compilation: webpack.compilation.Compilation, message: string): void {
-  if (isWebpackFiveOrHigher()) {
-    compilation.errors.push(new WebpackError(message));
-  } else {
-    // Allows building with either Webpack 4 or 5+ types
-    // tslint:disable-next-line: no-any
-    compilation.errors.push(new Error(message) as any);
-  }
+  compilation.errors.push(new WebpackError(message));
+
 }

packages/angular_devkit/build_angular/src/utils/webpack-version.ts

@@ -21,8 +21,3 @@ export function isWebpackFiveOrHigher(): boolean {
 
   return cachedIsWebpackFiveOrHigher;
 }
-
-// tslint:disable-next-line: no-any
-export function withWebpackFourOrFive<T, R>(webpackFourValue: T, webpackFiveValue: R): any {
-  return isWebpackFiveOrHigher() ? webpackFiveValue : webpackFourValue;
-}

packages/angular_devkit/build_angular/src/webpack.d.ts

@@ -10,29 +10,6 @@ import { loader as webpack4Loader } from '@types/webpack';
 
 // Webpack 5 transition support types
 declare module 'webpack' {
-  export interface Configuration extends webpack.Configuration {
-    devServer?: import('webpack-dev-server').Configuration;
-  }
-
-  export namespace sources {
-    export class RawSource extends webpack.sources.RawSource {
-      constructor(source: string);
-    }
-    export class SourceMapSource extends webpack.sources.SourceMapSource {
-      constructor(
-        source: string,
-        name: string,
-        sourceMap: string,
-        originalSource: string,
-        innerSourceMap: string,
-      );
-    }
-  }
-
-  export namespace compilation {
-    export type Compilation = webpack.Compilation;
-    export type Module = webpack.Module;
-  }
 
   export namespace loader {
     export type LoaderContext = webpack4Loader.LoaderContext;

packages/angular_devkit/build_angular/src/webpack/configs/common.ts

@@ -35,18 +35,15 @@ import {
 import { findAllNodeModules } from '../../utils/find-up';
 import { Spinner } from '../../utils/spinner';
 import { addError } from '../../utils/webpack-diagnostics';
-import { isWebpackFiveOrHigher, withWebpackFourOrFive } from '../../utils/webpack-version';
 import {
   DedupeModuleResolvePlugin,
-  NamedLazyChunksPlugin,
   OptimizeCssWebpackPlugin,
   ScriptsWebpackPlugin,
 } from '../plugins';
 import { getEsVersionForFileName, getOutputHashFormat, getWatchOptions, normalizeExtraEntryPoints } from '../utils/helpers';
 import { IGNORE_WARNINGS } from '../utils/stats';
 
 const TerserPlugin = require('terser-webpack-plugin');
-const PnpWebpackPlugin = require('pnp-webpack-plugin');
 
 // tslint:disable-next-line:no-big-function
 export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
@@ -288,18 +285,6 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     );
   }
 
-  if (buildOptions.namedChunks && !isWebpackFiveOrHigher()) {
-    extraPlugins.push(new NamedLazyChunksPlugin());
-
-    // Provide full names for lazy routes that use the deprecated string format
-    extraPlugins.push(
-      new ContextReplacementPlugin(
-        /\@angular[\\\/]core[\\\/]/,
-        (data: { chunkName?: string }) => (data.chunkName = '[request]'),
-      ),
-    );
-  }
-
   if ((scriptsSourceMap || stylesSourceMap)) {
     extraRules.push({
       test: /\.m?js$/,
@@ -422,7 +407,6 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
       extensions: ['.ts', '.tsx', '.mjs', '.js'],
       symlinks: !buildOptions.preserveSymlinks,
       modules: [wco.tsConfig.options.baseUrl || projectRoot, 'node_modules'],
-      plugins: isWebpackFiveOrHigher() ? [] : [PnpWebpackPlugin],
     },
     resolveLoader: {
       symlinks: !buildOptions.preserveSymlinks,
@@ -433,12 +417,10 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
         'node_modules',
         ...findAllNodeModules(__dirname, projectRoot),
       ],
-      plugins: isWebpackFiveOrHigher() ? [] : [PnpWebpackPlugin.moduleLoader(module)],
     },
     context: root,
     entry: entryPoints,
     output: {
-      ...withWebpackFourOrFive({ futureEmitAssets: true }, {}),
       path: path.resolve(root, buildOptions.outputPath),
       publicPath: buildOptions.deployUrl,
       filename: ({ chunk }) => {
@@ -455,7 +437,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     performance: {
       hints: false,
     },
-    ...withWebpackFourOrFive({}, { ignoreWarnings: IGNORE_WARNINGS }),
+    ignoreWarnings: IGNORE_WARNINGS,
     module: {
       // Show an error for missing exports instead of a warning.
       strictExportPresence: true,
@@ -494,9 +476,9 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     cache: !!buildOptions.watch && !cachingDisabled,
     optimization: {
       minimizer: extraMinimizers,
-      moduleIds: withWebpackFourOrFive('hashed', 'deterministic'),
+      moduleIds: 'deterministic',
       chunkIds: buildOptions.namedChunks ? 'named' : 'deterministic',
-      ...withWebpackFourOrFive({ noEmitOnErrors: true }, { emitOnErrors: false }),
+      emitOnErrors: false,
     },
     plugins: [
       // Always replace the context for the System.import in angular/core to prevent warnings.

packages/angular_devkit/build_angular/src/webpack/configs/stats.ts

@@ -7,7 +7,6 @@
  */
 
 import { WebpackConfigOptions } from '../../utils/build-options';
-import { isWebpackFiveOrHigher } from '../../utils/webpack-version';
 
 const webpackOutputOptions = {
   all: false, // Fallback value for stats options when an option is not defined. It has precedence over local webpack defaults.
@@ -43,11 +42,7 @@ const verboseWebpackOutputOptions:  Record<string, boolean | string | number> =
   logging: 'verbose',
 };
 
-if (isWebpackFiveOrHigher()) {
-  verboseWebpackOutputOptions['modulesSpace'] = Infinity;
-} else {
-  verboseWebpackOutputOptions['maxModules'] = Infinity;
-}
+verboseWebpackOutputOptions['modulesSpace'] = Infinity;
 
 export function getWebpackStatsConfig(verbose = false) {
   return verbose

packages/angular_devkit/build_angular/src/webpack/plugins/analytics.ts

@@ -7,10 +7,10 @@
  */
 import { analytics } from '@angular-devkit/core';
 import {
+  Compilation,
   Compiler,
   Module,
   Stats,
-  compilation,
 } from 'webpack';
 import { OriginalSource } from 'webpack-sources';
 
@@ -182,7 +182,7 @@ export class NgBuildAnalyticsPlugin {
     }
   }
 
-  protected _collectBundleStats(compilation: compilation.Compilation) {
+  protected _collectBundleStats(compilation: Compilation) {
     const chunkAssets = new Set<string>();
     for (const chunk of compilation.chunks) {
       if (!chunk.rendered) {
@@ -231,7 +231,7 @@ export class NgBuildAnalyticsPlugin {
    * Reports a succeed module.
    * @private
    */
-  protected _succeedModule(mod: compilation.Module) {
+  protected _succeedModule(mod: Module) {
     // Only report NormalModule instances.
     if (mod.constructor !== NormalModule) {
       return;
@@ -253,7 +253,7 @@ export class NgBuildAnalyticsPlugin {
     }
   }
 
-  protected _compilation(compiler: Compiler, compilation: compilation.Compilation) {
+  protected _compilation(compiler: Compiler, compilation: Compilation) {
     this._reset();
     compilation.hooks.succeedModule.tap('NgBuildAnalyticsPlugin', this._succeedModule.bind(this));
   }