refactor(core): change module semantics
This contains major changes to the compiler, bootstrap of the platforms and test environment initialization. Main part of #10043 Closes #10164 BREAKING CHANGE: - Semantics and name of `@AppModule` (now `@NgModule`) changed quite a bit. This is actually not breaking as `@AppModules` were not part of rc.4. We will have detailed docs on `@NgModule` separately. - `coreLoadAndBootstrap` and `coreBootstrap` can't be used any more (without migration support). Use `bootstrapModule` / `bootstrapModuleFactory` instead. - All Components listed in routes have to be part of the `declarations` of an NgModule. Either directly on the bootstrap module / lazy loaded module, or in an NgModule imported by them.
This commit is contained in:
@ -6,7 +6,7 @@
|
||||
* found in the LICENSE file at https://angular.io/license
|
||||
*/
|
||||
|
||||
import {Type} from '@angular/core';
|
||||
import {NgModule, Type} from '@angular/core';
|
||||
|
||||
import {CheckboxControlValueAccessor} from './directives/checkbox_value_accessor';
|
||||
import {DefaultValueAccessor} from './directives/default_value_accessor';
|
||||
@ -83,3 +83,10 @@ export const FORM_DIRECTIVES: Type[][] =
|
||||
|
||||
export const REACTIVE_FORM_DIRECTIVES: Type[][] =
|
||||
/*@ts2dart_const*/[REACTIVE_DRIVEN_DIRECTIVES, SHARED_FORM_DIRECTIVES];
|
||||
|
||||
/**
|
||||
* Internal module used for sharing directives between FormsModule and ReactiveFormsModule
|
||||
*/
|
||||
@NgModule({declarations: SHARED_FORM_DIRECTIVES, exports: SHARED_FORM_DIRECTIVES})
|
||||
export class InternalFormsSharedModule {
|
||||
}
|
||||
|
@ -6,9 +6,9 @@
|
||||
* found in the LICENSE file at https://angular.io/license
|
||||
*/
|
||||
|
||||
import {AppModule, PLATFORM_DIRECTIVES, Type} from '@angular/core';
|
||||
import {NgModule, PLATFORM_DIRECTIVES, Type} from '@angular/core';
|
||||
|
||||
import {FORM_DIRECTIVES, REACTIVE_FORM_DIRECTIVES} from './directives';
|
||||
import {FORM_DIRECTIVES, InternalFormsSharedModule, REACTIVE_DRIVEN_DIRECTIVES, REACTIVE_FORM_DIRECTIVES, SHARED_FORM_DIRECTIVES, TEMPLATE_DRIVEN_DIRECTIVES} from './directives';
|
||||
import {RadioControlRegistry} from './directives/radio_control_value_accessor';
|
||||
import {FormBuilder} from './form_builder';
|
||||
|
||||
@ -28,18 +28,26 @@ export const REACTIVE_FORM_PROVIDERS: Type[] =
|
||||
/*@ts2dart_const*/[FormBuilder, RadioControlRegistry];
|
||||
|
||||
/**
|
||||
* The app module for forms.
|
||||
* The ng module for forms.
|
||||
* @experimental
|
||||
*/
|
||||
@AppModule({providers: [FORM_PROVIDERS], directives: FORM_DIRECTIVES, pipes: []})
|
||||
@NgModule({
|
||||
declarations: TEMPLATE_DRIVEN_DIRECTIVES,
|
||||
providers: [FORM_PROVIDERS],
|
||||
exports: [InternalFormsSharedModule, TEMPLATE_DRIVEN_DIRECTIVES]
|
||||
})
|
||||
export class FormsModule {
|
||||
}
|
||||
|
||||
/**
|
||||
* The app module for reactive forms.
|
||||
* The ng module for reactive forms.
|
||||
* @experimental
|
||||
*/
|
||||
@AppModule({providers: [REACTIVE_FORM_PROVIDERS], directives: REACTIVE_FORM_DIRECTIVES, pipes: []})
|
||||
@NgModule({
|
||||
declarations: [REACTIVE_DRIVEN_DIRECTIVES],
|
||||
providers: [REACTIVE_FORM_PROVIDERS],
|
||||
exports: [InternalFormsSharedModule, REACTIVE_DRIVEN_DIRECTIVES]
|
||||
})
|
||||
export class ReactiveFormsModule {
|
||||
}
|
||||
|
||||
@ -57,4 +65,4 @@ export function provideForms(): any[] {
|
||||
return [
|
||||
{provide: PLATFORM_DIRECTIVES, useValue: FORM_DIRECTIVES, multi: true}, REACTIVE_FORM_PROVIDERS
|
||||
];
|
||||
}
|
||||
}
|
||||
|
@ -22,7 +22,7 @@ import {PromiseWrapper} from '../src/facade/promise';
|
||||
export function main() {
|
||||
describe('reactive forms integration tests', () => {
|
||||
|
||||
beforeEach(() => { configureModule({modules: [FormsModule, ReactiveFormsModule]}); });
|
||||
beforeEach(() => { configureModule({imports: [FormsModule, ReactiveFormsModule]}); });
|
||||
|
||||
it('should initialize DOM elements with the given form object',
|
||||
inject(
|
||||
|
@ -20,7 +20,7 @@ import {ListWrapper} from '../src/facade/collection';
|
||||
export function main() {
|
||||
describe('template-driven forms integration tests', () => {
|
||||
|
||||
beforeEach(() => { configureModule({modules: [FormsModule]}); });
|
||||
beforeEach(() => { configureModule({imports: [FormsModule]}); });
|
||||
|
||||
it('should support ngModel for single fields',
|
||||
fakeAsync(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
|
||||
|
Reference in New Issue
Block a user