refactor(core): drop all .ngfactory and .ngsummary imports (angular#44957)

AndrewKushnir · dylhunn · commit 64acbc424275 · 2022-02-07T15:31:49.000-08:00
This commit updates various places in the repo (mostly tests/examples) to drop all `.ngfactory` and `.ngsummary` imports as they are no longer needed in Ivy. PR Close angular#44957
diff --git a/aio/content/examples/upgrade-phonecat-2-hybrid/app/main-aot.ts b/aio/content/examples/upgrade-phonecat-2-hybrid/app/main-aot.ts
@@ -1,6 +1,6 @@
 // #docregion
 import { platformBrowser } from '@angular/platform-browser';
 
-import { AppModuleNgFactory } from './app.module.ngfactory';
+import { AppModule } from './app.module';
 
-platformBrowser().bootstrapModuleFactory(AppModuleNgFactory);
+platformBrowser().bootstrapModule(AppModule);
diff --git a/integration/bazel_workspace_tests/bazel_ngtsc_plugin/src/hello-world/hello-world.component.spec.ts b/integration/bazel_workspace_tests/bazel_ngtsc_plugin/src/hello-world/hello-world.component.spec.ts
@@ -1,9 +1,7 @@
-import {DebugElement} from '@angular/core';
 import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
 
 import {HelloWorldComponent} from './hello-world.component';
-import {HelloWorldModuleNgSummary} from './hello-world.module.ngsummary';
 
 describe('BannerComponent (inline template)', () => {
   let comp: HelloWorldComponent;
@@ -13,7 +11,6 @@ describe('BannerComponent (inline template)', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [HelloWorldComponent],  // declare the test component
-      aotSummaries: HelloWorldModuleNgSummary,
     });
     TestBed.compileComponents();
   }));
diff --git a/modules/benchmarks/src/change_detection/transplanted_views/index_aot.ts b/modules/benchmarks/src/change_detection/transplanted_views/index_aot.ts
@@ -10,7 +10,7 @@ import {enableProdMode} from '@angular/core';
 import {platformBrowser} from '@angular/platform-browser';
 
 import {init} from './init';
-import {TransplantedViewsModuleNgFactory} from './transplanted_views.ngfactory';
+import {TransplantedViewsModule} from './transplanted_views';
 
 enableProdMode();
-platformBrowser().bootstrapModuleFactory(TransplantedViewsModuleNgFactory).then(init);
+platformBrowser().bootstrapModule(TransplantedViewsModule).then(init);
diff --git a/modules/benchmarks/src/expanding_rows/index_aot.ts b/modules/benchmarks/src/expanding_rows/index_aot.ts
@@ -7,16 +7,11 @@
  */
 // This benchmark uses i18n in its `ExpandingRowSummary` component so `$localize` must be loaded.
 import '@angular/localize/init';
+
 import {enableProdMode} from '@angular/core';
 import {platformBrowser} from '@angular/platform-browser';
 
 import {ExpandingRowBenchmarkModule} from './benchmark';
-import {ExpandingRowBenchmarkModuleNgFactory} from './benchmark.ngfactory';
 
-setMode(ExpandingRowBenchmarkModule.hasOwnProperty('ɵmod') ? 'Ivy' : 'ViewEngine');
 enableProdMode();
-platformBrowser().bootstrapModuleFactory(ExpandingRowBenchmarkModuleNgFactory);
-
-function setMode(name: string): void {
-  document.querySelector('#rendererMode')!.textContent = `Render Mode: ${name}`;
-}
+platformBrowser().bootstrapModule(ExpandingRowBenchmarkModule);
diff --git a/modules/benchmarks/src/js-web-frameworks/ng2/index_aot.ts b/modules/benchmarks/src/js-web-frameworks/ng2/index_aot.ts
@@ -10,7 +10,7 @@ import {enableProdMode} from '@angular/core';
 import {platformBrowser} from '@angular/platform-browser';
 
 import {init} from './init';
-import {JsWebFrameworksModuleNgFactory} from './rows.ngfactory';
+import {JsWebFrameworksModule} from './rows';
 
 enableProdMode();
-platformBrowser().bootstrapModuleFactory(JsWebFrameworksModuleNgFactory).then(init);
+platformBrowser().bootstrapModule(JsWebFrameworksModule).then(init);
diff --git a/modules/benchmarks/src/largeform/ng2/index_aot.ts b/modules/benchmarks/src/largeform/ng2/index_aot.ts
@@ -9,8 +9,8 @@
 import {enableProdMode} from '@angular/core';
 import {platformBrowser} from '@angular/platform-browser';
 
-import {AppModuleNgFactory} from './app.ngfactory';
+import {AppModule} from './app';
 import {init} from './init';
 
 enableProdMode();
-platformBrowser().bootstrapModuleFactory(AppModuleNgFactory).then(init);
+platformBrowser().bootstrapModule(AppModule).then(init);
diff --git a/modules/benchmarks/src/largetable/ng2/index_aot.ts b/modules/benchmarks/src/largetable/ng2/index_aot.ts
@@ -10,7 +10,7 @@ import {enableProdMode} from '@angular/core';
 import {platformBrowser} from '@angular/platform-browser';
 
 import {init} from './init';
-import {AppModuleNgFactory} from './table.ngfactory';
+import {AppModule} from './table';
 
 enableProdMode();
-platformBrowser().bootstrapModuleFactory(AppModuleNgFactory).then(init);
+platformBrowser().bootstrapModule(AppModule).then(init);
diff --git a/modules/benchmarks/src/largetable/ng2_switch/index_aot.ts b/modules/benchmarks/src/largetable/ng2_switch/index_aot.ts
@@ -10,7 +10,7 @@ import {enableProdMode} from '@angular/core';
 import {platformBrowser} from '@angular/platform-browser';
 
 import {init} from './init';
-import {AppModuleNgFactory} from './table.ngfactory';
+import {AppModule} from './table';
 
 enableProdMode();
-platformBrowser().bootstrapModuleFactory(AppModuleNgFactory).then(init);
+platformBrowser().bootstrapModule(AppModule).then(init);
diff --git a/modules/benchmarks/src/styling/ng2/index_aot.ts b/modules/benchmarks/src/styling/ng2/index_aot.ts
@@ -10,7 +10,7 @@ import {enableProdMode} from '@angular/core';
 import {platformBrowser} from '@angular/platform-browser';
 
 import {init} from './init';
-import {StylingModuleNgFactory} from './styling.ngfactory';
+import {StylingModule} from './styling';
 
 enableProdMode();
-platformBrowser().bootstrapModuleFactory(StylingModuleNgFactory).then(init);
+platformBrowser().bootstrapModule(StylingModule).then(init);
diff --git a/modules/benchmarks/src/tree/ng2/index_aot.ts b/modules/benchmarks/src/tree/ng2/index_aot.ts
@@ -10,7 +10,7 @@ import {enableProdMode} from '@angular/core';
 import {platformBrowser} from '@angular/platform-browser';
 
 import {init} from './init';
-import {AppModuleNgFactory} from './tree.ngfactory';
+import {AppModule} from './tree';
 
 enableProdMode();
-platformBrowser().bootstrapModuleFactory(AppModuleNgFactory).then(init);
+platformBrowser().bootstrapModule(AppModule).then(init);
diff --git a/modules/benchmarks/src/tree/ng2_switch/index_aot.ts b/modules/benchmarks/src/tree/ng2_switch/index_aot.ts
@@ -10,7 +10,7 @@ import {enableProdMode} from '@angular/core';
 import {platformBrowser} from '@angular/platform-browser';
 
 import {init} from './init';
-import {AppModuleNgFactory} from './tree.ngfactory';
+import {AppModule} from './tree';
 
 enableProdMode();
-platformBrowser().bootstrapModuleFactory(AppModuleNgFactory).then(init);
+platformBrowser().bootstrapModule(AppModule).then(init);
diff --git a/modules/benchmarks/src/views/index.ts b/modules/benchmarks/src/views/index.ts
@@ -8,7 +8,7 @@
 import {enableProdMode} from '@angular/core';
 import {platformBrowser} from '@angular/platform-browser';
 
-import {ViewsBenchmarkModuleNgFactory} from './views-benchmark.ngfactory';
+import {ViewsBenchmarkModule} from './views-benchmark';
 
 enableProdMode();
-platformBrowser().bootstrapModuleFactory(ViewsBenchmarkModuleNgFactory);
+platformBrowser().bootstrapModule(ViewsBenchmarkModule);
diff --git a/packages/compiler-cli/integrationtest/bazel/injectable_def/app/src/root.ts b/packages/compiler-cli/integrationtest/bazel/injectable_def/app/src/root.ts
@@ -6,12 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, Injectable, NgModule, Optional, Self} from '@angular/core';
+import {Component, NgModule} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
 import {ServerModule} from '@angular/platform-server';
 import {RouterModule} from '@angular/router';
 
-import {LazyModuleNgFactory} from './root_lazy.ngfactory';
+import {LazyModule} from './root_lazy';
 
 @Component({
   selector: 'root-app',
@@ -21,8 +21,8 @@ export class AppComponent {
 }
 
 export function children(): any {
-  console.error('children', LazyModuleNgFactory);
-  return LazyModuleNgFactory;
+  console.error('children', LazyModule);
+  return LazyModule;
 }
 
 
diff --git a/packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/app_spec.ts b/packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/app_spec.ts
@@ -8,18 +8,18 @@
 
 import {Component, Injectable, INJECTOR, NgModule} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
-import {renderModuleFactory} from '@angular/platform-server';
-import {BasicAppModuleNgFactory} from 'app_built/src/basic.ngfactory';
-import {DepAppModuleNgFactory} from 'app_built/src/dep.ngfactory';
-import {HierarchyAppModuleNgFactory} from 'app_built/src/hierarchy.ngfactory';
-import {RootAppModuleNgFactory} from 'app_built/src/root.ngfactory';
-import {SelfAppModuleNgFactory} from 'app_built/src/self.ngfactory';
-import {StringAppModuleNgFactory} from 'app_built/src/string.ngfactory';
-import {TokenAppModuleNgFactory} from 'app_built/src/token.ngfactory';
+import {renderModule} from '@angular/platform-server';
+import {BasicAppModule} from 'app_built/src/basic';
+import {DepAppModule} from 'app_built/src/dep';
+import {HierarchyAppModule} from 'app_built/src/hierarchy';
+import {RootAppModule} from 'app_built/src/root';
+import {SelfAppModule} from 'app_built/src/self';
+import {StringAppModule} from 'app_built/src/string';
+import {TokenAppModule} from 'app_built/src/token';
 
 describe('ngInjectableDef Bazel Integration', () => {
   it('works in AOT', done => {
-    renderModuleFactory(BasicAppModuleNgFactory, {
+    renderModule(BasicAppModule, {
       document: '<id-app></id-app>',
       url: '/',
     }).then(html => {
@@ -29,7 +29,7 @@ describe('ngInjectableDef Bazel Integration', () => {
   });
 
   it('@Self() works in component hierarchies', done => {
-    renderModuleFactory(HierarchyAppModuleNgFactory, {
+    renderModule(HierarchyAppModule, {
       document: '<hierarchy-app></hierarchy-app>',
       url: '/',
     }).then(html => {
@@ -39,7 +39,7 @@ describe('ngInjectableDef Bazel Integration', () => {
   });
 
   it('@Optional() Self() resolves to @Injectable() scoped service', done => {
-    renderModuleFactory(SelfAppModuleNgFactory, {
+    renderModule(SelfAppModule, {
       document: '<self-app></self-app>',
       url: '/',
     }).then(html => {
@@ -49,7 +49,7 @@ describe('ngInjectableDef Bazel Integration', () => {
   });
 
   it('InjectionToken ngInjectableDef works', done => {
-    renderModuleFactory(TokenAppModuleNgFactory, {
+    renderModule(TokenAppModule, {
       document: '<token-app></token-app>',
       url: '/',
     }).then(html => {
@@ -59,7 +59,7 @@ describe('ngInjectableDef Bazel Integration', () => {
   });
 
   it('APP_ROOT_SCOPE works', done => {
-    renderModuleFactory(RootAppModuleNgFactory, {
+    renderModule(RootAppModule, {
       document: '<root-app></root-app>',
       url: '/',
     }).then(html => {
@@ -69,7 +69,7 @@ describe('ngInjectableDef Bazel Integration', () => {
   });
 
   it('can inject dependencies', done => {
-    renderModuleFactory(DepAppModuleNgFactory, {
+    renderModule(DepAppModule, {
       document: '<dep-app></dep-app>',
       url: '/',
     }).then(html => {
@@ -79,7 +79,7 @@ describe('ngInjectableDef Bazel Integration', () => {
   });
 
   it('string tokens work', done => {
-    renderModuleFactory(StringAppModuleNgFactory, {
+    renderModule(StringAppModule, {
       document: '<string-app></string-app>',
       url: '/',
     }).then(html => {
diff --git a/packages/compiler-cli/integrationtest/src/bootstrap.ts b/packages/compiler-cli/integrationtest/src/bootstrap.ts
@@ -6,7 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {createNgModuleRef} from '@angular/core';
+
 import {BasicComp} from './basic';
-import {MainModuleNgFactory} from './module.ngfactory';
+import {MainModule} from './module';
 
-MainModuleNgFactory.create(null).instance.appRef.bootstrap(BasicComp);
+const ngModuleRef = createNgModuleRef(MainModule);
+ngModuleRef.instance.appRef.bootstrap(BasicComp);
diff --git a/packages/core/src/application_ref.ts b/packages/core/src/application_ref.ts
@@ -291,26 +291,7 @@ export class PlatformRef {
   constructor(private _injector: Injector) {}
 
   /**
-   * Creates an instance of an `@NgModule` for the given platform for offline compilation.
-   *
-   * @usageNotes
-   *
-   * The following example creates the NgModule for a browser platform.
-   *
-   * ```typescript
-   * my_module.ts:
-   *
-   * @NgModule({
-   *   imports: [BrowserModule]
-   * })
-   * class MyModule {}
-   *
-   * main.ts:
-   * import {MyModuleNgFactory} from './my_module.ngfactory';
-   * import {platformBrowser} from '@angular/platform-browser';
-   *
-   * let moduleRef = platformBrowser().bootstrapModuleFactory(MyModuleNgFactory);
-   * ```
+   * Creates an instance of an `@NgModule` for the given platform.
    *
    * @deprecated Passing NgModule factories as the `PlatformRef.bootstrapModuleFactory` function
    *     argument is deprecated. Use the `PlatformRef.bootstrapModule` API instead.
@@ -367,7 +348,7 @@ export class PlatformRef {
   }
 
   /**
-   * Creates an instance of an `@NgModule` for a given platform using the given runtime compiler.
+   * Creates an instance of an `@NgModule` for a given platform.
    *
    * @usageNotes
    * ### Simple Example
diff --git a/packages/examples/common/main.ts b/packages/examples/common/main.ts
@@ -7,6 +7,7 @@
  */
 
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import {TestsAppModuleNgFactory} from './test_module.ngfactory';
 
-platformBrowserDynamic().bootstrapModuleFactory(TestsAppModuleNgFactory);
+import {TestsAppModule} from './test_module';
+
+platformBrowserDynamic().bootstrapModule(TestsAppModule);
diff --git a/packages/examples/core/main.ts b/packages/examples/core/main.ts
@@ -7,6 +7,7 @@
  */
 
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import {TestsAppModuleNgFactory} from './test_module.ngfactory';
 
-platformBrowserDynamic().bootstrapModuleFactory(TestsAppModuleNgFactory);
+import {TestsAppModule} from './test_module';
+
+platformBrowserDynamic().bootstrapModule(TestsAppModule);
diff --git a/packages/examples/forms/main.ts b/packages/examples/forms/main.ts
@@ -7,6 +7,7 @@
  */
 
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import {TestsAppModuleNgFactory} from './test_module.ngfactory';
 
-platformBrowserDynamic().bootstrapModuleFactory(TestsAppModuleNgFactory);
+import {TestsAppModule} from './test_module';
+
+platformBrowserDynamic().bootstrapModule(TestsAppModule);
diff --git a/packages/examples/router/activated-route/main.ts b/packages/examples/router/activated-route/main.ts
@@ -7,6 +7,7 @@
  */
 
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import {AppModuleNgFactory} from './module.ngfactory';
 
-platformBrowserDynamic().bootstrapModuleFactory(AppModuleNgFactory);
+import {AppModule} from './module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/packages/examples/service-worker/push/main.ts b/packages/examples/service-worker/push/main.ts
@@ -7,6 +7,7 @@
  */
 
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import {AppModuleNgFactory} from './module.ngfactory';
 
-platformBrowserDynamic().bootstrapModuleFactory(AppModuleNgFactory);
+import {AppModule} from './module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/packages/examples/service-worker/registration-options/main.ts b/packages/examples/service-worker/registration-options/main.ts
@@ -7,6 +7,7 @@
  */
 
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import {AppModuleNgFactory} from './module.ngfactory';
 
-platformBrowserDynamic().bootstrapModuleFactory(AppModuleNgFactory);
+import {AppModule} from './module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/packages/examples/upgrade/static/ts/lite/module.ts b/packages/examples/upgrade/static/ts/lite/module.ts
@@ -10,15 +10,13 @@
 import {Component, Directive, ElementRef, EventEmitter, Inject, Injectable, Injector, Input, NgModule, Output, StaticProvider} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
 // #docregion basic-how-to
-// Alternatively, we could import and use an `NgModuleFactory` instead:
-// import {MyLazyAngularModuleNgFactory} from './my-lazy-angular-module.ngfactory';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 // #enddocregion
 /* tslint:disable: no-duplicate-imports */
-import {UpgradeComponent} from '@angular/upgrade/static';
-import {downgradeComponent} from '@angular/upgrade/static';
 // #docregion basic-how-to
-import {downgradeModule} from '@angular/upgrade/static';
+import {downgradeComponent, downgradeModule, UpgradeComponent} from '@angular/upgrade/static';
+
+
 // #enddocregion
 /* tslint:enable: no-duplicate-imports */
 
diff --git a/packages/router/test/aot_ngsummary_test/BUILD.bazel b/packages/router/test/aot_ngsummary_test/BUILD.bazel
diff --git a/packages/router/test/aot_ngsummary_test/aot_router_bootstrap.spec.ts b/packages/router/test/aot_ngsummary_test/aot_router_bootstrap.spec.ts
diff --git a/packages/router/test/aot_ngsummary_test/aot_router_module.ts b/packages/router/test/aot_ngsummary_test/aot_router_module.ts
