From ffc93e0946dc7c5a2a64a25a97dbae551b3ffbec Mon Sep 17 00:00:00 2001
From: Andrew Kushnir <akushnir@google.com>
Date: Mon, 8 Mar 2021 17:51:26 -0800
Subject: [PATCH] perf(forms): make `FormBuilder` class tree-shakable (#41126)

This commit makes the `FormBuilder` class tree-shakable by adding the `providedIn` property to its `@Injectable`
decorator. Now if the `FormBuilder` class is not referenced in application's code, it should not be included into
its production bundle.

PR Close #41126
---
 packages/forms/src/form_builder.ts   | 3 ++-
 packages/forms/src/form_providers.ts | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/forms/src/form_builder.ts b/packages/forms/src/form_builder.ts
index c64f4683b82..f6e18484f60 100644
--- a/packages/forms/src/form_builder.ts
+++ b/packages/forms/src/form_builder.ts
@@ -9,6 +9,7 @@
 import {Injectable} from '@angular/core';
 
 import {AsyncValidatorFn, ValidatorFn} from './directives/validators';
+import {ReactiveFormsModule} from './form_providers';
 import {AbstractControl, AbstractControlOptions, FormArray, FormControl, FormGroup, FormHooks} from './model';
 
 function isAbstractControlOptions(options: AbstractControlOptions|
@@ -30,7 +31,7 @@ function isAbstractControlOptions(options: AbstractControlOptions|
  *
  * @publicApi
  */
-@Injectable()
+@Injectable({providedIn: ReactiveFormsModule})
 export class FormBuilder {
   /**
    * @description
diff --git a/packages/forms/src/form_providers.ts b/packages/forms/src/form_providers.ts
index fce781493a5..7b077c5e3ee 100644
--- a/packages/forms/src/form_providers.ts
+++ b/packages/forms/src/form_providers.ts
@@ -10,7 +10,6 @@ import {ModuleWithProviders, NgModule} from '@angular/core';
 
 import {InternalFormsSharedModule, NG_MODEL_WITH_FORM_CONTROL_WARNING, REACTIVE_DRIVEN_DIRECTIVES, TEMPLATE_DRIVEN_DIRECTIVES} from './directives';
 import {RadioControlRegistry} from './directives/radio_control_value_accessor';
-import {FormBuilder} from './form_builder';
 
 /**
  * Exports the required providers and directives for template-driven forms,
@@ -40,7 +39,9 @@ export class FormsModule {
  */
 @NgModule({
   declarations: [REACTIVE_DRIVEN_DIRECTIVES],
-  providers: [FormBuilder, RadioControlRegistry],
+  // Note: FormBuilder is also provided in this module as a tree-shakable provider,
+  // see packages/forms/src/form_builder.ts.
+  providers: [RadioControlRegistry],
   exports: [InternalFormsSharedModule, REACTIVE_DRIVEN_DIRECTIVES]
 })
 export class ReactiveFormsModule {