Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(compiler): do not autoinclude components declared as entry points #10898

Merged
merged 1 commit into from Aug 19, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 2 additions & 5 deletions modules/@angular/compiler/src/metadata_resolver.ts
Expand Up @@ -383,11 +383,8 @@ export class CompileMetadataResolver {
});
moduleMeta.entryComponents.forEach((entryComponentType) => {
if (!moduleMeta.transitiveModule.directivesSet.has(entryComponentType.runtime)) {
this._addDirectiveToModule(
this.getDirectiveMetadata(entryComponentType.runtime), moduleMeta.type.runtime,
moduleMeta.transitiveModule, moduleMeta.declaredDirectives);
this._console.warn(
`NgModule ${stringify(moduleMeta.type.runtime)} uses ${stringify(entryComponentType.runtime)} via "entryComponents" but it was neither declared nor imported! This warning will become an error after final.`);
throw new BaseException(
`NgModule ${stringify(moduleMeta.type.runtime)} uses ${stringify(entryComponentType.runtime)} via "entryComponents" but it was neither declared nor imported! If ${stringify(entryComponentType.runtime)} is declared in an imported module, make sure it is exported.`);
}
});
// Collect @Component.directives/pipes/entryComponents into our declared
Expand Down
30 changes: 11 additions & 19 deletions modules/@angular/core/test/linker/ng_module_integration_spec.ts
Expand Up @@ -263,27 +263,19 @@ function declareTests({useJit}: {useJit: boolean}) {
.toBe(SomeComp);
});

it('should warn and auto declare when using an entryComponent that was neither declared nor imported',
() => {
@Component({template: '', entryComponents: [SomeComp]})
class SomeCompWithEntryComponents {
}

@NgModule({entryComponents: [SomeCompWithEntryComponents]})
class SomeModule {
}
it('should throw when using an entryComponent that was neither declared nor imported', () => {
@Component({template: '', entryComponents: [SomeComp]})
class SomeCompWithEntryComponents {
}

const ngModule = createModule(SomeModule);
expect(ngModule.componentFactoryResolver
.resolveComponentFactory(SomeCompWithEntryComponents)
.componentType)
.toBe(SomeCompWithEntryComponents);
@NgModule({entryComponents: [SomeCompWithEntryComponents]})
class SomeModule {
}

expect(console.warnings).toEqual([
`NgModule ${stringify(SomeModule)} uses ${stringify(SomeCompWithEntryComponents)} via "entryComponents" but it was neither declared nor imported! This warning will become an error after final.`,
`Component ${stringify(SomeCompWithEntryComponents)} in NgModule ${stringify(SomeModule)} uses ${stringify(SomeComp)} via "entryComponents" but it was neither declared nor imported into the module! This warning will become an error after final.`
]);
});
expect(() => createModule(SomeModule))
.toThrowError(
`NgModule ${stringify(SomeModule)} uses ${stringify(SomeCompWithEntryComponents)} via "entryComponents" but it was neither declared nor imported! If ${stringify(SomeCompWithEntryComponents)} is declared in an imported module, make sure it is exported.`);
});

it('should create ComponentFactories via ANALYZE_FOR_ENTRY_COMPONENTS', () => {
@NgModule({
Expand Down
2 changes: 1 addition & 1 deletion modules/@angular/platform-server/test/integration_spec.ts
Expand Up @@ -24,7 +24,7 @@ function writeBody(html: string): any {
class MyServerApp {
}

@NgModule({imports: [ServerModule], bootstrap: [MyServerApp]})
@NgModule({imports: [ServerModule], declarations: [MyServerApp], bootstrap: [MyServerApp]})
class ExampleModule {
}

Expand Down
2 changes: 1 addition & 1 deletion modules/playground/src/animate/index.ts
Expand Up @@ -11,7 +11,7 @@ import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';

import {AnimateApp} from './app/animate-app';

@NgModule({bootstrap: [AnimateApp], imports: [BrowserModule]})
@NgModule({declarations: [AnimateApp], bootstrap: [AnimateApp], imports: [BrowserModule]})
class ExampleModule {
}

Expand Down
3 changes: 2 additions & 1 deletion modules/playground/src/async/index.ts
Expand Up @@ -98,7 +98,8 @@ class AsyncApplication {
};
}

@NgModule({bootstrap: [AsyncApplication], imports: [BrowserModule]})
@NgModule(
{declarations: [AsyncApplication], bootstrap: [AsyncApplication], imports: [BrowserModule]})
class ExampleModule {
}

Expand Down
2 changes: 1 addition & 1 deletion modules/playground/src/gestures/index.ts
Expand Up @@ -25,7 +25,7 @@ class GesturesCmp {
onRotate(event: any /** TODO #9100 */): void { this.rotateAngle = event.rotation; }
}

@NgModule({bootstrap: [GesturesCmp], imports: [BrowserModule]})
@NgModule({declarations: [GesturesCmp], bootstrap: [GesturesCmp], imports: [BrowserModule]})
class ExampleModule {
}

Expand Down
2 changes: 1 addition & 1 deletion modules/playground/src/hello_world/index.ts
Expand Up @@ -57,6 +57,6 @@ export class HelloCmp {
changeGreeting(): void { this.greeting = 'howdy'; }
}

@NgModule({bootstrap: [HelloCmp], declarations: [RedDec], imports: [BrowserModule]})
@NgModule({bootstrap: [HelloCmp], declarations: [HelloCmp, RedDec], imports: [BrowserModule]})
class ExampleModule {
}
2 changes: 1 addition & 1 deletion modules/playground/src/http/index.ts
Expand Up @@ -13,7 +13,7 @@ import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';

import {HttpCmp} from './app/http_comp';

@NgModule({bootstrap: [HttpCmp], imports: [BrowserModule, HttpModule]})
@NgModule({declarations: [HttpCmp], bootstrap: [HttpCmp], imports: [BrowserModule, HttpModule]})
class ExampleModule {
}

Expand Down
2 changes: 1 addition & 1 deletion modules/playground/src/key_events/index.ts
Expand Up @@ -41,7 +41,7 @@ class KeyEventsApp {
resetShiftEnter(): void { this.shiftEnter = false; }
}

@NgModule({bootstrap: [KeyEventsApp], imports: [BrowserModule]})
@NgModule({declarations: [KeyEventsApp], bootstrap: [KeyEventsApp], imports: [BrowserModule]})
class ExampleModule {
}

Expand Down
2 changes: 1 addition & 1 deletion modules/playground/src/model_driven_forms/index.ts
Expand Up @@ -158,7 +158,7 @@ class ReactiveForms {

@NgModule({
bootstrap: [ReactiveForms],
declarations: [ShowError],
declarations: [ReactiveForms, ShowError],
imports: [BrowserModule, ReactiveFormsModule]
})
class ExampleModule {
Expand Down
3 changes: 2 additions & 1 deletion modules/playground/src/order_management/index.ts
Expand Up @@ -197,7 +197,8 @@ class OrderManagementApplication {

@NgModule({
bootstrap: [OrderManagementApplication],
declarations: [OrderListComponent, OrderDetailsComponent, OrderItemComponent],
declarations:
[OrderManagementApplication, OrderListComponent, OrderDetailsComponent, OrderItemComponent],
imports: [BrowserModule, FormsModule]
})
class ExampleModule {
Expand Down
3 changes: 2 additions & 1 deletion modules/playground/src/person_management/index.ts
Expand Up @@ -198,7 +198,8 @@ class PersonManagementApplication {

@NgModule({
bootstrap: [PersonManagementApplication],
declarations: [FullNameComponent, PersonsComponent, PersonsDetailComponent],
declarations:
[PersonManagementApplication, FullNameComponent, PersonsComponent, PersonsDetailComponent],
imports: [BrowserModule, FormsModule]
})
class ExampleModule {
Expand Down
2 changes: 1 addition & 1 deletion modules/playground/src/relative_assets/index.ts
Expand Up @@ -24,6 +24,6 @@ export function main() {
export class RelativeApp {
}

@NgModule({bootstrap: [RelativeApp], imports: [BrowserModule]})
@NgModule({declarations: [RelativeApp], bootstrap: [RelativeApp], imports: [BrowserModule]})
class ExampleModule {
}
2 changes: 1 addition & 1 deletion modules/playground/src/sourcemap/index.ts
Expand Up @@ -20,7 +20,7 @@ export class ErrorComponent {
createError(): void { throw new BaseException('Sourcemap test'); }
}

@NgModule({bootstrap: [ErrorComponent], imports: [BrowserModule]})
@NgModule({declarations: [ErrorComponent], bootstrap: [ErrorComponent], imports: [BrowserModule]})
class ExampleModule {
}

Expand Down
2 changes: 1 addition & 1 deletion modules/playground/src/svg/index.ts
Expand Up @@ -23,7 +23,7 @@ class SvgGroup {
class SvgApp {
}

@NgModule({bootstrap: [SvgApp], declarations: [SvgGroup], imports: [BrowserModule]})
@NgModule({bootstrap: [SvgApp], declarations: [SvgApp, SvgGroup], imports: [BrowserModule]})
class ExampleModule {
}

Expand Down
6 changes: 5 additions & 1 deletion modules/playground/src/template_driven_forms/index.ts
Expand Up @@ -169,7 +169,11 @@ class TemplateDrivenForms {
print(this.model);
}
}
@NgModule({bootstrap: [TemplateDrivenForms], imports: [BrowserModule]})
@NgModule({
declarations: [TemplateDrivenForms],
bootstrap: [TemplateDrivenForms],
imports: [BrowserModule]
})
class ExampleModule {
}

Expand Down
2 changes: 1 addition & 1 deletion modules/playground/src/todo/index.ts
Expand Up @@ -51,7 +51,7 @@ class TodoApp {
clearCompleted(): void { this.todoStore.removeBy((todo: Todo) => todo.completed); }
}

@NgModule({bootstrap: [TodoApp], imports: [BrowserModule]})
@NgModule({declarations: [TodoApp], bootstrap: [TodoApp], imports: [BrowserModule]})
class ExampleModule {
}

Expand Down
Expand Up @@ -12,7 +12,7 @@ import {platformWorkerAppDynamic} from '@angular/platform-browser-dynamic';

import {ImageDemo} from './index_common';

@NgModule({imports: [WorkerAppModule], bootstrap: [ImageDemo]})
@NgModule({imports: [WorkerAppModule], bootstrap: [ImageDemo], declarations: [ImageDemo]})
class ExampleModule {
}

Expand Down
Expand Up @@ -12,7 +12,7 @@ import {platformWorkerAppDynamic} from '@angular/platform-browser-dynamic';

import {InputCmp} from './index_common';

@NgModule({imports: [WorkerAppModule], bootstrap: [InputCmp]})
@NgModule({imports: [WorkerAppModule], bootstrap: [InputCmp], declarations: [InputCmp]})
class ExampleModule {
}

Expand Down
Expand Up @@ -12,7 +12,7 @@ import {platformWorkerAppDynamic} from '@angular/platform-browser-dynamic';

import {HelloCmp} from './index_common';

@NgModule({imports: [WorkerAppModule], bootstrap: [HelloCmp]})
@NgModule({imports: [WorkerAppModule], bootstrap: [HelloCmp], declarations: [HelloCmp]})
class ExampleModule {
}

Expand Down
Expand Up @@ -12,7 +12,7 @@ import {platformWorkerAppDynamic} from '@angular/platform-browser-dynamic';

import {App} from './index_common';

@NgModule({imports: [WorkerAppModule], bootstrap: [App]})
@NgModule({imports: [WorkerAppModule], bootstrap: [App], declarations: [App]})
class ExampleModule {
}

Expand Down
Expand Up @@ -12,7 +12,7 @@ import {platformWorkerAppDynamic} from '@angular/platform-browser-dynamic';

import {TodoApp} from './index_common';

@NgModule({imports: [WorkerAppModule], bootstrap: [TodoApp]})
@NgModule({imports: [WorkerAppModule], bootstrap: [TodoApp], declarations: [TodoApp]})
class ExampleModule {
}

Expand Down
2 changes: 1 addition & 1 deletion modules/playground/src/zippy_component/index.ts
Expand Up @@ -30,7 +30,7 @@ class ZippyApp {
pushLog(log: string) { this.logs.push(log); }
}

@NgModule({bootstrap: [ZippyApp], imports: [BrowserModule]})
@NgModule({declarations: [ZippyApp], bootstrap: [ZippyApp], imports: [BrowserModule]})
class ExampleModule {
}

Expand Down
1 change: 1 addition & 0 deletions modules/rollup-test/hello_world.ts
Expand Up @@ -15,6 +15,7 @@ class HelloWorldComponent {
}

@NgModule({
declarations: [HelloWorldComponent],
bootstrap: [HelloWorldComponent],
imports: [BrowserModule]
})
Expand Down