From 05a98c02924f656be3257d5f459ae88c1ae29fba Mon Sep 17 00:00:00 2001
From: Alan Agius <alanagius@google.com>
Date: Mon, 26 Sep 2022 10:41:08 +0000
Subject: [PATCH] feat(@angular-devkit/build-angular): karma builder `main`
 option is now optional

The Karma builder `main` option is now optional. The default test bootstrapping is injected automatically in the bundle.
---
 .../angular_devkit/build_angular/index.md     |  2 +-
 .../build_angular/src/builders/karma/index.ts | 31 +++++++++++++++++++
 .../src/builders/karma/schema.json            |  2 +-
 .../src/builders/karma/tests/setup.ts         |  1 -
 .../src/webpack/configs/common.ts             |  2 +-
 .../test/hello-world-app/angular.json         |  1 -
 .../test/hello-world-app/src/test.ts          | 22 -------------
 .../hello-world-app/src/tsconfig.spec.json    |  1 -
 .../hello-world-lib/projects/lib/src/test.ts  | 23 --------------
 .../projects/lib/tsconfig.lib.json            |  1 -
 .../projects/lib/tsconfig.spec.json           |  3 --
 11 files changed, 34 insertions(+), 55 deletions(-)
 delete mode 100644 packages/angular_devkit/build_angular/test/hello-world-app/src/test.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/test.ts

diff --git a/goldens/public-api/angular_devkit/build_angular/index.md b/goldens/public-api/angular_devkit/build_angular/index.md
index e7a6a890e1a1..5a7c1a144a75 100644
--- a/goldens/public-api/angular_devkit/build_angular/index.md
+++ b/goldens/public-api/angular_devkit/build_angular/index.md
@@ -178,7 +178,7 @@ export interface KarmaBuilderOptions {
     include?: string[];
     inlineStyleLanguage?: InlineStyleLanguage_2;
     karmaConfig: string;
-    main: string;
+    main?: string;
     poll?: number;
     polyfills?: Polyfills_2;
     preserveSymlinks?: boolean;
diff --git a/packages/angular_devkit/build_angular/src/builders/karma/index.ts b/packages/angular_devkit/build_angular/src/builders/karma/index.ts
index d8ca058507d8..f406fa769047 100644
--- a/packages/angular_devkit/build_angular/src/builders/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/builders/karma/index.ts
@@ -111,6 +111,17 @@ export function execute(
         throw new Error('The builder requires a target.');
       }
 
+      if (!options.main) {
+        webpackConfig.entry ??= {};
+        if (typeof webpackConfig.entry === 'object' && !Array.isArray(webpackConfig.entry)) {
+          if (Array.isArray(webpackConfig.entry['main'])) {
+            webpackConfig.entry['main'].push(getBuiltInMainFile());
+          } else {
+            webpackConfig.entry['main'] = [getBuiltInMainFile()];
+          }
+        }
+      }
+
       const projectMetadata = await context.getProjectMetadata(projectName);
       const sourceRoot = (projectMetadata.sourceRoot ?? projectMetadata.root ?? '') as string;
 
@@ -169,3 +180,23 @@ export function execute(
 
 export { KarmaBuilderOptions };
 export default createBuilder<Record<string, string> & KarmaBuilderOptions>(execute);
+
+function getBuiltInMainFile(): string {
+  const content = Buffer.from(
+    `
+  import { getTestBed } from '@angular/core/testing';
+  import {
+    BrowserDynamicTestingModule,
+    platformBrowserDynamicTesting,
+   } from '@angular/platform-browser-dynamic/testing';
+
+  // Initialize the Angular testing environment.
+  getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
+    errorOnUnknownElements: true,
+    errorOnUnknownProperties: true
+  });
+`,
+  ).toString('base64');
+
+  return `ng-virtual-main.js!=!data:text/javascript;base64,${content}`;
+}
diff --git a/packages/angular_devkit/build_angular/src/builders/karma/schema.json b/packages/angular_devkit/build_angular/src/builders/karma/schema.json
index 35a9de5054ee..1d55ee6434c9 100644
--- a/packages/angular_devkit/build_angular/src/builders/karma/schema.json
+++ b/packages/angular_devkit/build_angular/src/builders/karma/schema.json
@@ -255,7 +255,7 @@
     }
   },
   "additionalProperties": false,
-  "required": ["main", "tsConfig", "karmaConfig"],
+  "required": ["tsConfig", "karmaConfig"],
   "definitions": {
     "assetPattern": {
       "oneOf": [
diff --git a/packages/angular_devkit/build_angular/src/builders/karma/tests/setup.ts b/packages/angular_devkit/build_angular/src/builders/karma/tests/setup.ts
index 03693ac3e9b3..3197a12e8aba 100644
--- a/packages/angular_devkit/build_angular/src/builders/karma/tests/setup.ts
+++ b/packages/angular_devkit/build_angular/src/builders/karma/tests/setup.ts
@@ -20,7 +20,6 @@ export const KARMA_BUILDER_INFO = Object.freeze({
  * Also disables progress reporting to minimize logging output.
  */
 export const BASE_OPTIONS = Object.freeze<Schema>({
-  main: 'src/test.ts',
   polyfills: 'src/polyfills.ts',
   tsConfig: 'src/tsconfig.spec.json',
   karmaConfig: 'karma.conf.js',
diff --git a/packages/angular_devkit/build_angular/src/webpack/configs/common.ts b/packages/angular_devkit/build_angular/src/webpack/configs/common.ts
index 98f5dd550c50..2b585b8e71e5 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/common.ts
@@ -130,7 +130,7 @@ export async function getCommonConfig(wco: WebpackConfigOptions): Promise<Config
       if (Array.isArray(entryPoints['main'])) {
         entryPoints['main'].unshift(zoneTestingEntryPoint);
       } else {
-        entryPoints['main'] = [zoneTestingEntryPoint, entryPoints['main'] as string];
+        entryPoints['main'] = [zoneTestingEntryPoint];
       }
     }
   }
diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/angular.json b/packages/angular_devkit/build_angular/test/hello-world-app/angular.json
index 0200444814cc..adae68d5f1d0 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-app/angular.json
+++ b/packages/angular_devkit/build_angular/test/hello-world-app/angular.json
@@ -117,7 +117,6 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "src/tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/src/test.ts b/packages/angular_devkit/build_angular/test/hello-world-app/src/test.ts
deleted file mode 100644
index a1358960f3e7..000000000000
--- a/packages/angular_devkit/build_angular/test/hello-world-app/src/test.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-// This file is required by karma.conf.js and loads recursively all the .spec and framework files
-
-import 'zone.js/testing';
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing';
-
-// First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
-  errorOnUnknownElements: true,
-  errorOnUnknownProperties: true
-});
diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/src/tsconfig.spec.json b/packages/angular_devkit/build_angular/test/hello-world-app/src/tsconfig.spec.json
index dba226c49414..7ece4f757a0d 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-app/src/tsconfig.spec.json
+++ b/packages/angular_devkit/build_angular/test/hello-world-app/src/tsconfig.spec.json
@@ -7,7 +7,6 @@
     ]
   },
   "files": [
-    "test.ts",
     "polyfills.ts"
   ],
   "include": [
diff --git a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/test.ts b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/test.ts
deleted file mode 100644
index 88ee02586b8d..000000000000
--- a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/test.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-// This file is required by karma.conf.js and loads recursively all the .spec and framework files
-
-import 'zone.js';
-import 'zone.js/testing';
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting
-} from '@angular/platform-browser-dynamic/testing';
-
-// First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
-  errorOnUnknownElements: true,
-  errorOnUnknownProperties: true
-});
diff --git a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/tsconfig.lib.json b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/tsconfig.lib.json
index 953df1b95597..fe12470400e2 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/tsconfig.lib.json
+++ b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/tsconfig.lib.json
@@ -7,7 +7,6 @@
     "types": []
   },
   "exclude": [
-    "src/test.ts",
     "**/*.spec.ts"
   ]
 }
diff --git a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/tsconfig.spec.json b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/tsconfig.spec.json
index f1c08bf277d3..eae9b9ae9c29 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/tsconfig.spec.json
+++ b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/tsconfig.spec.json
@@ -6,9 +6,6 @@
       "jasmine"
     ]
   },
-  "files": [
-    "src/test.ts"
-  ],
   "include": [
     "**/*.spec.ts",
     "**/*.d.ts"