Skip to content
This repository was archived by the owner on Jan 19, 2023. It is now read-only.

Commit 64acbc4

Browse files
AndrewKushnirdylhunn
authored andcommitted
refactor(core): drop all .ngfactory and .ngsummary imports (angular#44957)
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
1 parent d4da832 commit 64acbc4

File tree

26 files changed

+69
-195
lines changed

26 files changed

+69
-195
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// #docregion
22
import { platformBrowser } from '@angular/platform-browser';
33

4-
import { AppModuleNgFactory } from './app.module.ngfactory';
4+
import { AppModule } from './app.module';
55

6-
platformBrowser().bootstrapModuleFactory(AppModuleNgFactory);
6+
platformBrowser().bootstrapModule(AppModule);

integration/bazel_workspace_tests/bazel_ngtsc_plugin/src/hello-world/hello-world.component.spec.ts

-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import {DebugElement} from '@angular/core';
21
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
32
import {By} from '@angular/platform-browser';
43

54
import {HelloWorldComponent} from './hello-world.component';
6-
import {HelloWorldModuleNgSummary} from './hello-world.module.ngsummary';
75

86
describe('BannerComponent (inline template)', () => {
97
let comp: HelloWorldComponent;
@@ -13,7 +11,6 @@ describe('BannerComponent (inline template)', () => {
1311
beforeEach(async(() => {
1412
TestBed.configureTestingModule({
1513
declarations: [HelloWorldComponent], // declare the test component
16-
aotSummaries: HelloWorldModuleNgSummary,
1714
});
1815
TestBed.compileComponents();
1916
}));

modules/benchmarks/src/change_detection/transplanted_views/index_aot.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {enableProdMode} from '@angular/core';
1010
import {platformBrowser} from '@angular/platform-browser';
1111

1212
import {init} from './init';
13-
import {TransplantedViewsModuleNgFactory} from './transplanted_views.ngfactory';
13+
import {TransplantedViewsModule} from './transplanted_views';
1414

1515
enableProdMode();
16-
platformBrowser().bootstrapModuleFactory(TransplantedViewsModuleNgFactory).then(init);
16+
platformBrowser().bootstrapModule(TransplantedViewsModule).then(init);

modules/benchmarks/src/expanding_rows/index_aot.ts

+2-7
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,11 @@
77
*/
88
// This benchmark uses i18n in its `ExpandingRowSummary` component so `$localize` must be loaded.
99
import '@angular/localize/init';
10+
1011
import {enableProdMode} from '@angular/core';
1112
import {platformBrowser} from '@angular/platform-browser';
1213

1314
import {ExpandingRowBenchmarkModule} from './benchmark';
14-
import {ExpandingRowBenchmarkModuleNgFactory} from './benchmark.ngfactory';
1515

16-
setMode(ExpandingRowBenchmarkModule.hasOwnProperty('ɵmod') ? 'Ivy' : 'ViewEngine');
1716
enableProdMode();
18-
platformBrowser().bootstrapModuleFactory(ExpandingRowBenchmarkModuleNgFactory);
19-
20-
function setMode(name: string): void {
21-
document.querySelector('#rendererMode')!.textContent = `Render Mode: ${name}`;
22-
}
17+
platformBrowser().bootstrapModule(ExpandingRowBenchmarkModule);

modules/benchmarks/src/js-web-frameworks/ng2/index_aot.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {enableProdMode} from '@angular/core';
1010
import {platformBrowser} from '@angular/platform-browser';
1111

1212
import {init} from './init';
13-
import {JsWebFrameworksModuleNgFactory} from './rows.ngfactory';
13+
import {JsWebFrameworksModule} from './rows';
1414

1515
enableProdMode();
16-
platformBrowser().bootstrapModuleFactory(JsWebFrameworksModuleNgFactory).then(init);
16+
platformBrowser().bootstrapModule(JsWebFrameworksModule).then(init);

modules/benchmarks/src/largeform/ng2/index_aot.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import {enableProdMode} from '@angular/core';
1010
import {platformBrowser} from '@angular/platform-browser';
1111

12-
import {AppModuleNgFactory} from './app.ngfactory';
12+
import {AppModule} from './app';
1313
import {init} from './init';
1414

1515
enableProdMode();
16-
platformBrowser().bootstrapModuleFactory(AppModuleNgFactory).then(init);
16+
platformBrowser().bootstrapModule(AppModule).then(init);

modules/benchmarks/src/largetable/ng2/index_aot.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {enableProdMode} from '@angular/core';
1010
import {platformBrowser} from '@angular/platform-browser';
1111

1212
import {init} from './init';
13-
import {AppModuleNgFactory} from './table.ngfactory';
13+
import {AppModule} from './table';
1414

1515
enableProdMode();
16-
platformBrowser().bootstrapModuleFactory(AppModuleNgFactory).then(init);
16+
platformBrowser().bootstrapModule(AppModule).then(init);

modules/benchmarks/src/largetable/ng2_switch/index_aot.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {enableProdMode} from '@angular/core';
1010
import {platformBrowser} from '@angular/platform-browser';
1111

1212
import {init} from './init';
13-
import {AppModuleNgFactory} from './table.ngfactory';
13+
import {AppModule} from './table';
1414

1515
enableProdMode();
16-
platformBrowser().bootstrapModuleFactory(AppModuleNgFactory).then(init);
16+
platformBrowser().bootstrapModule(AppModule).then(init);

modules/benchmarks/src/styling/ng2/index_aot.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {enableProdMode} from '@angular/core';
1010
import {platformBrowser} from '@angular/platform-browser';
1111

1212
import {init} from './init';
13-
import {StylingModuleNgFactory} from './styling.ngfactory';
13+
import {StylingModule} from './styling';
1414

1515
enableProdMode();
16-
platformBrowser().bootstrapModuleFactory(StylingModuleNgFactory).then(init);
16+
platformBrowser().bootstrapModule(StylingModule).then(init);

modules/benchmarks/src/tree/ng2/index_aot.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {enableProdMode} from '@angular/core';
1010
import {platformBrowser} from '@angular/platform-browser';
1111

1212
import {init} from './init';
13-
import {AppModuleNgFactory} from './tree.ngfactory';
13+
import {AppModule} from './tree';
1414

1515
enableProdMode();
16-
platformBrowser().bootstrapModuleFactory(AppModuleNgFactory).then(init);
16+
platformBrowser().bootstrapModule(AppModule).then(init);

modules/benchmarks/src/tree/ng2_switch/index_aot.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {enableProdMode} from '@angular/core';
1010
import {platformBrowser} from '@angular/platform-browser';
1111

1212
import {init} from './init';
13-
import {AppModuleNgFactory} from './tree.ngfactory';
13+
import {AppModule} from './tree';
1414

1515
enableProdMode();
16-
platformBrowser().bootstrapModuleFactory(AppModuleNgFactory).then(init);
16+
platformBrowser().bootstrapModule(AppModule).then(init);

modules/benchmarks/src/views/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import {enableProdMode} from '@angular/core';
99
import {platformBrowser} from '@angular/platform-browser';
1010

11-
import {ViewsBenchmarkModuleNgFactory} from './views-benchmark.ngfactory';
11+
import {ViewsBenchmarkModule} from './views-benchmark';
1212

1313
enableProdMode();
14-
platformBrowser().bootstrapModuleFactory(ViewsBenchmarkModuleNgFactory);
14+
platformBrowser().bootstrapModule(ViewsBenchmarkModule);

packages/compiler-cli/integrationtest/bazel/injectable_def/app/src/root.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {Component, Injectable, NgModule, Optional, Self} from '@angular/core';
9+
import {Component, NgModule} from '@angular/core';
1010
import {BrowserModule} from '@angular/platform-browser';
1111
import {ServerModule} from '@angular/platform-server';
1212
import {RouterModule} from '@angular/router';
1313

14-
import {LazyModuleNgFactory} from './root_lazy.ngfactory';
14+
import {LazyModule} from './root_lazy';
1515

1616
@Component({
1717
selector: 'root-app',
@@ -21,8 +21,8 @@ export class AppComponent {
2121
}
2222

2323
export function children(): any {
24-
console.error('children', LazyModuleNgFactory);
25-
return LazyModuleNgFactory;
24+
console.error('children', LazyModule);
25+
return LazyModule;
2626
}
2727

2828

packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/app_spec.ts

+15-15
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88

99
import {Component, Injectable, INJECTOR, NgModule} from '@angular/core';
1010
import {TestBed} from '@angular/core/testing';
11-
import {renderModuleFactory} from '@angular/platform-server';
12-
import {BasicAppModuleNgFactory} from 'app_built/src/basic.ngfactory';
13-
import {DepAppModuleNgFactory} from 'app_built/src/dep.ngfactory';
14-
import {HierarchyAppModuleNgFactory} from 'app_built/src/hierarchy.ngfactory';
15-
import {RootAppModuleNgFactory} from 'app_built/src/root.ngfactory';
16-
import {SelfAppModuleNgFactory} from 'app_built/src/self.ngfactory';
17-
import {StringAppModuleNgFactory} from 'app_built/src/string.ngfactory';
18-
import {TokenAppModuleNgFactory} from 'app_built/src/token.ngfactory';
11+
import {renderModule} from '@angular/platform-server';
12+
import {BasicAppModule} from 'app_built/src/basic';
13+
import {DepAppModule} from 'app_built/src/dep';
14+
import {HierarchyAppModule} from 'app_built/src/hierarchy';
15+
import {RootAppModule} from 'app_built/src/root';
16+
import {SelfAppModule} from 'app_built/src/self';
17+
import {StringAppModule} from 'app_built/src/string';
18+
import {TokenAppModule} from 'app_built/src/token';
1919

2020
describe('ngInjectableDef Bazel Integration', () => {
2121
it('works in AOT', done => {
22-
renderModuleFactory(BasicAppModuleNgFactory, {
22+
renderModule(BasicAppModule, {
2323
document: '<id-app></id-app>',
2424
url: '/',
2525
}).then(html => {
@@ -29,7 +29,7 @@ describe('ngInjectableDef Bazel Integration', () => {
2929
});
3030

3131
it('@Self() works in component hierarchies', done => {
32-
renderModuleFactory(HierarchyAppModuleNgFactory, {
32+
renderModule(HierarchyAppModule, {
3333
document: '<hierarchy-app></hierarchy-app>',
3434
url: '/',
3535
}).then(html => {
@@ -39,7 +39,7 @@ describe('ngInjectableDef Bazel Integration', () => {
3939
});
4040

4141
it('@Optional() Self() resolves to @Injectable() scoped service', done => {
42-
renderModuleFactory(SelfAppModuleNgFactory, {
42+
renderModule(SelfAppModule, {
4343
document: '<self-app></self-app>',
4444
url: '/',
4545
}).then(html => {
@@ -49,7 +49,7 @@ describe('ngInjectableDef Bazel Integration', () => {
4949
});
5050

5151
it('InjectionToken ngInjectableDef works', done => {
52-
renderModuleFactory(TokenAppModuleNgFactory, {
52+
renderModule(TokenAppModule, {
5353
document: '<token-app></token-app>',
5454
url: '/',
5555
}).then(html => {
@@ -59,7 +59,7 @@ describe('ngInjectableDef Bazel Integration', () => {
5959
});
6060

6161
it('APP_ROOT_SCOPE works', done => {
62-
renderModuleFactory(RootAppModuleNgFactory, {
62+
renderModule(RootAppModule, {
6363
document: '<root-app></root-app>',
6464
url: '/',
6565
}).then(html => {
@@ -69,7 +69,7 @@ describe('ngInjectableDef Bazel Integration', () => {
6969
});
7070

7171
it('can inject dependencies', done => {
72-
renderModuleFactory(DepAppModuleNgFactory, {
72+
renderModule(DepAppModule, {
7373
document: '<dep-app></dep-app>',
7474
url: '/',
7575
}).then(html => {
@@ -79,7 +79,7 @@ describe('ngInjectableDef Bazel Integration', () => {
7979
});
8080

8181
it('string tokens work', done => {
82-
renderModuleFactory(StringAppModuleNgFactory, {
82+
renderModule(StringAppModule, {
8383
document: '<string-app></string-app>',
8484
url: '/',
8585
}).then(html => {

packages/compiler-cli/integrationtest/src/bootstrap.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9+
import {createNgModuleRef} from '@angular/core';
10+
911
import {BasicComp} from './basic';
10-
import {MainModuleNgFactory} from './module.ngfactory';
12+
import {MainModule} from './module';
1113

12-
MainModuleNgFactory.create(null).instance.appRef.bootstrap(BasicComp);
14+
const ngModuleRef = createNgModuleRef(MainModule);
15+
ngModuleRef.instance.appRef.bootstrap(BasicComp);

packages/core/src/application_ref.ts

+2-21
Original file line numberDiff line numberDiff line change
@@ -291,26 +291,7 @@ export class PlatformRef {
291291
constructor(private _injector: Injector) {}
292292

293293
/**
294-
* Creates an instance of an `@NgModule` for the given platform for offline compilation.
295-
*
296-
* @usageNotes
297-
*
298-
* The following example creates the NgModule for a browser platform.
299-
*
300-
* ```typescript
301-
* my_module.ts:
302-
*
303-
* @NgModule({
304-
* imports: [BrowserModule]
305-
* })
306-
* class MyModule {}
307-
*
308-
* main.ts:
309-
* import {MyModuleNgFactory} from './my_module.ngfactory';
310-
* import {platformBrowser} from '@angular/platform-browser';
311-
*
312-
* let moduleRef = platformBrowser().bootstrapModuleFactory(MyModuleNgFactory);
313-
* ```
294+
* Creates an instance of an `@NgModule` for the given platform.
314295
*
315296
* @deprecated Passing NgModule factories as the `PlatformRef.bootstrapModuleFactory` function
316297
* argument is deprecated. Use the `PlatformRef.bootstrapModule` API instead.
@@ -367,7 +348,7 @@ export class PlatformRef {
367348
}
368349

369350
/**
370-
* Creates an instance of an `@NgModule` for a given platform using the given runtime compiler.
351+
* Creates an instance of an `@NgModule` for a given platform.
371352
*
372353
* @usageNotes
373354
* ### Simple Example

packages/examples/common/main.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*/
88

99
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
10-
import {TestsAppModuleNgFactory} from './test_module.ngfactory';
1110

12-
platformBrowserDynamic().bootstrapModuleFactory(TestsAppModuleNgFactory);
11+
import {TestsAppModule} from './test_module';
12+
13+
platformBrowserDynamic().bootstrapModule(TestsAppModule);

packages/examples/core/main.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*/
88

99
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
10-
import {TestsAppModuleNgFactory} from './test_module.ngfactory';
1110

12-
platformBrowserDynamic().bootstrapModuleFactory(TestsAppModuleNgFactory);
11+
import {TestsAppModule} from './test_module';
12+
13+
platformBrowserDynamic().bootstrapModule(TestsAppModule);

packages/examples/forms/main.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*/
88

99
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
10-
import {TestsAppModuleNgFactory} from './test_module.ngfactory';
1110

12-
platformBrowserDynamic().bootstrapModuleFactory(TestsAppModuleNgFactory);
11+
import {TestsAppModule} from './test_module';
12+
13+
platformBrowserDynamic().bootstrapModule(TestsAppModule);

packages/examples/router/activated-route/main.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*/
88

99
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
10-
import {AppModuleNgFactory} from './module.ngfactory';
1110

12-
platformBrowserDynamic().bootstrapModuleFactory(AppModuleNgFactory);
11+
import {AppModule} from './module';
12+
13+
platformBrowserDynamic().bootstrapModule(AppModule);

packages/examples/service-worker/push/main.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*/
88

99
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
10-
import {AppModuleNgFactory} from './module.ngfactory';
1110

12-
platformBrowserDynamic().bootstrapModuleFactory(AppModuleNgFactory);
11+
import {AppModule} from './module';
12+
13+
platformBrowserDynamic().bootstrapModule(AppModule);

packages/examples/service-worker/registration-options/main.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*/
88

99
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
10-
import {AppModuleNgFactory} from './module.ngfactory';
1110

12-
platformBrowserDynamic().bootstrapModuleFactory(AppModuleNgFactory);
11+
import {AppModule} from './module';
12+
13+
platformBrowserDynamic().bootstrapModule(AppModule);

packages/examples/upgrade/static/ts/lite/module.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@
1010
import {Component, Directive, ElementRef, EventEmitter, Inject, Injectable, Injector, Input, NgModule, Output, StaticProvider} from '@angular/core';
1111
import {BrowserModule} from '@angular/platform-browser';
1212
// #docregion basic-how-to
13-
// Alternatively, we could import and use an `NgModuleFactory` instead:
14-
// import {MyLazyAngularModuleNgFactory} from './my-lazy-angular-module.ngfactory';
1513
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
1614
// #enddocregion
1715
/* tslint:disable: no-duplicate-imports */
18-
import {UpgradeComponent} from '@angular/upgrade/static';
19-
import {downgradeComponent} from '@angular/upgrade/static';
2016
// #docregion basic-how-to
21-
import {downgradeModule} from '@angular/upgrade/static';
17+
import {downgradeComponent, downgradeModule, UpgradeComponent} from '@angular/upgrade/static';
18+
19+
2220
// #enddocregion
2321
/* tslint:enable: no-duplicate-imports */
2422

0 commit comments

Comments
 (0)