refactor(@ngtools/webpack): remove ESM workarounds

Author: alan-agius4

packages/ngtools/webpack/src/ivy/plugin.ts

@@ -734,24 +734,7 @@ export class AngularWebpackPlugin {
     // this, a Function constructor is used to prevent TypeScript from changing the dynamic import.
     // Once TypeScript provides support for keeping the dynamic import this workaround can
     // be dropped.
-    const compilerCliModule = await new Function(`return import('@angular/compiler-cli');`)();
-    let compilerNgccModule;
-    try {
-      compilerNgccModule = await new Function(`return import('@angular/compiler-cli/ngcc');`)();
-    } catch {
-      // If the `exports` field entry is not present then try the file directly.
-      // TODO_ESM: This try/catch can be removed once the `exports` field is present in `@angular/compiler-cli`
-      compilerNgccModule = await new Function(
-        `return import('@angular/compiler-cli/ngcc/index.js');`,
-      )();
-    }
-    // If it is not ESM then the functions needed will be stored in the `default` property.
-    // TODO_ESM: This conditional can be removed when `@angular/compiler-cli` is ESM only.
-    this.compilerCliModule = compilerCliModule.readConfiguration
-      ? compilerCliModule
-      : compilerCliModule.default;
-    this.compilerNgccModule = compilerNgccModule.process
-      ? compilerNgccModule
-      : compilerNgccModule.default;
+    this.compilerCliModule = await new Function(`return import('@angular/compiler-cli');`)();
+    this.compilerNgccModule = await new Function(`return import('@angular/compiler-cli/ngcc');`)();
   }
 }

packages/ngtools/webpack/src/ngcc_processor.ts

@@ -120,14 +120,6 @@ export class NgccProcessor {
     const timeLabel = 'NgccProcessor.process';
     time(timeLabel);
 
-    // Temporary workaround during transition to ESM-only @angular/compiler-cli
-    // TODO_ESM: This workaround should be removed prior to the final release of v13
-    //       and replaced with only `this.compilerNgcc.ngccMainFilePath`.
-    const ngccExecutablePath =
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (this.compilerNgcc as any).ngccMainFilePath ??
-      require.resolve('@angular/compiler-cli/ngcc/main-ngcc.js');
-
     // We spawn instead of using the API because:
     // - NGCC Async uses clustering which is problematic when used via the API which means
     // that we cannot setup multiple cluster masters with different options.
@@ -136,7 +128,7 @@ export class NgccProcessor {
     const { status, error } = spawnSync(
       process.execPath,
       [
-        ngccExecutablePath,
+        this.compilerNgcc.ngccMainFilePath,
         '--source' /** basePath */,
         this._nodeModulesDirectory,
         '--properties' /** propertiesToConsider */,