Skip to content

Commit

Permalink
refactor(core): drop all .ngfactory and .ngsummary imports (#44957)
Browse files Browse the repository at this point in the history
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 #44957
  • Loading branch information
AndrewKushnir authored and dylhunn committed Feb 7, 2022
1 parent 1368f58 commit d40ac20
Show file tree
Hide file tree
Showing 26 changed files with 69 additions and 195 deletions.
@@ -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);
@@ -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;
Expand All @@ -13,7 +11,6 @@ describe('BannerComponent (inline template)', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [HelloWorldComponent], // declare the test component
aotSummaries: HelloWorldModuleNgSummary,
});
TestBed.compileComponents();
}));
Expand Down
Expand Up @@ -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);
9 changes: 2 additions & 7 deletions modules/benchmarks/src/expanding_rows/index_aot.ts
Expand Up @@ -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);
4 changes: 2 additions & 2 deletions modules/benchmarks/src/js-web-frameworks/ng2/index_aot.ts
Expand Up @@ -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);
4 changes: 2 additions & 2 deletions modules/benchmarks/src/largeform/ng2/index_aot.ts
Expand Up @@ -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);
4 changes: 2 additions & 2 deletions modules/benchmarks/src/largetable/ng2/index_aot.ts
Expand Up @@ -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);
4 changes: 2 additions & 2 deletions modules/benchmarks/src/largetable/ng2_switch/index_aot.ts
Expand Up @@ -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);
4 changes: 2 additions & 2 deletions modules/benchmarks/src/styling/ng2/index_aot.ts
Expand Up @@ -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);
4 changes: 2 additions & 2 deletions modules/benchmarks/src/tree/ng2/index_aot.ts
Expand Up @@ -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);
4 changes: 2 additions & 2 deletions modules/benchmarks/src/tree/ng2_switch/index_aot.ts
Expand Up @@ -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);
4 changes: 2 additions & 2 deletions modules/benchmarks/src/views/index.ts
Expand Up @@ -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);
Expand Up @@ -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',
Expand All @@ -21,8 +21,8 @@ export class AppComponent {
}

export function children(): any {
console.error('children', LazyModuleNgFactory);
return LazyModuleNgFactory;
console.error('children', LazyModule);
return LazyModule;
}


Expand Down
Expand Up @@ -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 => {
Expand All @@ -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 => {
Expand All @@ -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 => {
Expand All @@ -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 => {
Expand All @@ -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 => {
Expand All @@ -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 => {
Expand All @@ -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 => {
Expand Down
7 changes: 5 additions & 2 deletions packages/compiler-cli/integrationtest/src/bootstrap.ts
Expand Up @@ -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);
23 changes: 2 additions & 21 deletions packages/core/src/application_ref.ts
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions packages/examples/common/main.ts
Expand Up @@ -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);
5 changes: 3 additions & 2 deletions packages/examples/core/main.ts
Expand Up @@ -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);
5 changes: 3 additions & 2 deletions packages/examples/forms/main.ts
Expand Up @@ -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);
5 changes: 3 additions & 2 deletions packages/examples/router/activated-route/main.ts
Expand Up @@ -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);
5 changes: 3 additions & 2 deletions packages/examples/service-worker/push/main.ts
Expand Up @@ -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);
5 changes: 3 additions & 2 deletions packages/examples/service-worker/registration-options/main.ts
Expand Up @@ -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);
8 changes: 3 additions & 5 deletions packages/examples/upgrade/static/ts/lite/module.ts
Expand Up @@ -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 */

Expand Down

0 comments on commit d40ac20

Please sign in to comment.