refactor: clean up webpack 4 code

Author: alan-agius4

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

@@ -17,9 +17,9 @@ import {
   Compiler,
   Configuration,
   ContextReplacementPlugin,
+  ProgressPlugin,
   RuleSetRule,
   debug,
-  sources,
 } from 'webpack';
 import { AssetPatternClass } from '../../browser/schema';
 import { BuildBrowserFeatures, maxWorkers } from '../../utils';
@@ -226,7 +226,6 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   }
 
   if (buildOptions.progress) {
-    const ProgressPlugin = require('webpack/lib/ProgressPlugin');
     const spinner = new Spinner();
 
     extraPlugins.push(new ProgressPlugin({

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

@@ -6,10 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { Compiler } from 'webpack';
-import { isWebpackFiveOrHigher } from '../../utils/webpack-version';
 import { HashFormat } from '../utils/helpers';
 
-
 export interface RemoveHashPluginOptions {
   chunkNames: string[];
   hashFormat: HashFormat;
@@ -35,14 +33,7 @@ export class RemoveHashPlugin {
         return path;
       };
 
-      if (isWebpackFiveOrHigher()) {
-        compilation.hooks.assetPath.tap('remove-hash-plugin', assetPath);
-      } else {
-        const mainTemplate = compilation.mainTemplate as typeof compilation.mainTemplate & {
-          hooks: typeof compilation['hooks'];
-        };
-        mainTemplate.hooks.assetPath.tap('remove-hash-plugin', assetPath);
-      }
+      compilation.hooks.assetPath.tap('remove-hash-plugin', assetPath);
     });
   }
 }

packages/angular_devkit/build_angular/src/webpack/plugins/remove-hash-plugin.ts

@@ -8,12 +8,10 @@
 
 import { interpolateName } from 'loader-utils';
 import * as path from 'path';
-import { Compilation, Compiler } from 'webpack';
+import { Chunk, Compilation, Compiler } from 'webpack';
 import { CachedSource, ConcatSource, OriginalSource, RawSource, Source } from 'webpack-sources';
 
-const Chunk = require('webpack/lib/Chunk');
-const EntryPoint = require('webpack/lib/Entrypoint');
-
+const Entrypoint = require('webpack/lib/Entrypoint');
 export interface ScriptsWebpackPluginOptions {
   name: string;
   sourceMap?: boolean;
@@ -76,7 +74,7 @@ export class ScriptsWebpackPlugin {
     chunk.ids = [chunk.id];
     chunk.files.add(filename);
 
-    const entrypoint = new EntryPoint(this.options.name);
+    const entrypoint = new Entrypoint(this.options.name);
     entrypoint.pushChunk(chunk);
     chunk.addGroup(entrypoint);
     compilation.entrypoints.set(this.options.name, entrypoint);

packages/angular_devkit/build_angular/src/webpack/plugins/scripts-webpack-plugin.ts

@@ -16,7 +16,7 @@
     "webpack": "5.32.0"
   },
   "peerDependencies": {
-    "webpack": "^4.6.0 || ^5.30.0",
+    "webpack": "^5.30.0",
     "webpack-dev-server": "^3.1.4"
   }
 }

packages/angular_devkit/build_webpack/package.json

@@ -27,7 +27,7 @@
   "peerDependencies": {
     "@angular/compiler-cli": "^12.0.0-next",
     "typescript": "~4.2.3",
-    "webpack": "^4.0.0 || ^5.30.0"
+    "webpack": "^5.30.0"
   },
   "devDependencies": {
     "@angular-devkit/core": "0.0.0",

packages/ngtools/webpack/package.json

@@ -9,12 +9,11 @@ import { CompilerHost, CompilerOptions, readConfiguration } from '@angular/compi
 import { NgtscProgram } from '@angular/compiler-cli/src/ngtsc/program';
 import { createHash } from 'crypto';
 import * as ts from 'typescript';
-import { Compilation, Compiler, Module, NormalModuleReplacementPlugin } from 'webpack';
+import { Compilation, Compiler, Module, NormalModuleReplacementPlugin, util } from 'webpack';
 import { NgccProcessor } from '../ngcc_processor';
 import { TypeScriptPathsPlugin } from '../paths-plugin';
 import { WebpackResourceLoader } from '../resource_loader';
 import { addError, addWarning } from '../webpack-diagnostics';
-import { isWebpackFiveOrHigher, mergeResolverMainFields } from '../webpack-version';
 import { SourceFileCache } from './cache';
 import { DiagnosticsReporter, createDiagnosticsReporter } from './diagnostics';
 import {
@@ -144,7 +143,9 @@ export class AngularWebpackPlugin {
           }
           resolveOptions.plugins.push(pathsPlugin);
 
-          return mergeResolverMainFields(resolveOptions, originalMainFields, ivyMainFields);
+          // https://github.com/webpack/webpack/issues/11635#issuecomment-707016779
+          return util.cleverMerge(resolveOptions, { mainFields: [...ivyMainFields, '...'] });
+
         });
     });
 
@@ -256,15 +257,9 @@ export class AngularWebpackPlugin {
         .filter((sourceFile) => !internalFiles?.has(sourceFile));
 
       // Ensure all program files are considered part of the compilation and will be watched
-      if (isWebpackFiveOrHigher()) {
-        allProgramFiles.forEach((sourceFile) =>
-          compilation.fileDependencies.add(sourceFile.fileName),
-        );
-      } else {
-        allProgramFiles.forEach((sourceFile) =>
-          compilation.compilationDependencies.add(sourceFile.fileName),
-        );
-      }
+      allProgramFiles.forEach((sourceFile) =>
+        compilation.fileDependencies.add(sourceFile.fileName),
+      );
 
       compilation.hooks.finishModules.tapPromise(PLUGIN_NAME, async (modules) => {
         // Rebuild any remaining AOT required modules