cleanup: removes the render and lifecycle_hooks modules

vsavkin · vsavkin · commit 125fa3885ec7 · 2015-11-20T19:16:38.000Z
BREAKING CHANGE Before import {Renderer} from 'angular2/render'; After import {Renderer} form 'angular2/core'; Closes angular#5367
diff --git a/modules/angular2/angular2.dart b/modules/angular2/angular2.dart
@@ -9,7 +9,6 @@ export 'package:angular2/core.dart'
     hide forwardRef, resolveForwardRef, ForwardRefFn;
 export 'package:angular2/common.dart';
 export 'package:angular2/profile.dart';
-export 'package:angular2/lifecycle_hooks.dart';
 export 'package:angular2/src/core/application_tokens.dart'
     hide APP_COMPONENT_REF_PROMISE, APP_ID_RANDOM_PROVIDER;
 export 'package:angular2/src/platform/dom/dom_tokens.dart';
diff --git a/modules/angular2/angular2.ts b/modules/angular2/angular2.ts
@@ -1,7 +1,6 @@
 export * from './common';
 export * from './core';
 export * from './profile';
-export * from './lifecycle_hooks';
 export * from './platform/browser';
 export * from './src/platform/dom/dom_adapter';
 export * from './upgrade';
diff --git a/modules/angular2/lifecycle_hooks.ts b/modules/angular2/lifecycle_hooks.ts
diff --git a/modules/angular2/render.ts b/modules/angular2/render.ts
diff --git a/modules/angular2/src/platform/browser_common.ts b/modules/angular2/src/platform/browser_common.ts
@@ -2,20 +2,20 @@ import {CONST_EXPR} from 'angular2/src/facade/lang';
 import {provide, Provider, Injector, OpaqueToken} from 'angular2/src/core/di';
 
 import {
+  PLATFORM_INITIALIZER,
   PLATFORM_DIRECTIVES,
   PLATFORM_PIPES,
   ComponentRef,
   platform,
   ExceptionHandler,
   Reflector,
+  Renderer,
   reflector,
   APPLICATION_COMMON_PROVIDERS,
   PLATFORM_COMMON_PROVIDERS,
-  EVENT_MANAGER_PLUGINS,
-  PLATFORM_INITIALIZER
+  EVENT_MANAGER_PLUGINS
 } from "angular2/core";
 import {COMMON_DIRECTIVES, COMMON_PIPES, FORM_PROVIDERS} from "angular2/common";
-import {Renderer} from 'angular2/render';
 import {Testability} from 'angular2/src/core/testability/testability';
 import {DOM} from 'angular2/src/platform/dom/dom_adapter';
 import {DomEventsPlugin} from 'angular2/src/platform/dom/events/dom_events';
diff --git a/modules/angular2/test/core/directive_lifecycle_integration_spec.ts b/modules/angular2/test/core/directive_lifecycle_integration_spec.ts
@@ -21,7 +21,7 @@ import {
   AfterContentChecked,
   AfterViewInit,
   AfterViewChecked
-} from 'angular2/lifecycle_hooks';
+} from 'angular2/core';
 import {Directive, Component, View, ViewMetadata} from 'angular2/src/core/metadata';
 
 export function main() {
diff --git a/modules/angular2/test/core/linker/dynamic_component_loader_spec.ts b/modules/angular2/test/core/linker/dynamic_component_loader_spec.ts
@@ -16,7 +16,7 @@ import {
   ComponentFixture
 } from 'angular2/testing_internal';
 
-import {OnDestroy} from 'angular2/lifecycle_hooks';
+import {OnDestroy} from 'angular2/core';
 import {Injector, inspectElement} from 'angular2/core';
 import {NgIf} from 'angular2/common';
 import {By} from 'angular2/platform/browser';
diff --git a/modules/angular2/test/core/linker/element_injector_spec.ts b/modules/angular2/test/core/linker/element_injector_spec.ts
@@ -37,7 +37,7 @@ import {
   ComponentMetadata,
   DirectiveMetadata
 } from 'angular2/src/core/metadata';
-import {OnDestroy} from 'angular2/lifecycle_hooks';
+import {OnDestroy} from 'angular2/core';
 import {provide, Injector, Provider, Optional, Inject, Injectable, Self, SkipSelf, InjectMetadata, Host, HostMetadata, SkipSelfMetadata} from 'angular2/core';
 import {ViewContainerRef, ViewContainerRef_} from 'angular2/src/core/linker/view_container_ref';
 import {TemplateRef, TemplateRef_} from 'angular2/src/core/linker/template_ref';
diff --git a/modules/angular2/test/core/linker/view_manager_utils_spec.ts b/modules/angular2/test/core/linker/view_manager_utils_spec.ts
@@ -42,7 +42,7 @@ import {
 import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver';
 import {Component} from 'angular2/src/core/metadata';
 import {AppViewManagerUtils} from 'angular2/src/core/linker/view_manager_utils';
-import {RenderViewWithFragments} from 'angular2/render';
+import {RenderViewWithFragments} from 'angular2/core';
 
 export function main() {
   // TODO(tbosch): add more tests here!
diff --git a/modules/angular2/web_worker/worker.ts b/modules/angular2/web_worker/worker.ts
@@ -1,4 +1,4 @@
-export * from '../lifecycle_hooks';
+export * from '../src/core/linker/interfaces';
 export * from '../src/core/metadata';
 export * from '../src/core/util';
 export * from '../src/core/di';
diff --git a/modules/playground/src/hello_world/index.ts b/modules/playground/src/hello_world/index.ts
@@ -1,6 +1,5 @@
 import {bootstrap} from 'angular2/bootstrap';
-import {ElementRef, Component, Directive, Injectable} from 'angular2/core';
-import {Renderer} from 'angular2/render';
+import {Renderer, ElementRef, Component, Directive, Injectable} from 'angular2/core';
 
 export function main() {
   // Bootstrapping only requires specifying a root component.
diff --git a/modules/playground/src/web_workers/kitchen_sink/index_common.ts b/modules/playground/src/web_workers/kitchen_sink/index_common.ts
@@ -1,5 +1,4 @@
-import {ElementRef, Component, Directive, View, Injectable} from 'angular2/core';
-import {Renderer} from 'angular2/render';
+import {Renderer, ElementRef, Component, Directive, View, Injectable} from 'angular2/core';
 import {StringWrapper} from 'angular2/src/facade/lang';
 
 // A service available to the Injector, used by the HelloCmp component.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-export * from '../lifecycle_hooks';`
	`1`	`+export * from '../src/core/linker/interfaces';`
`2`	`2`	`export * from '../src/core/metadata';`
`3`	`3`	`export * from '../src/core/util';`
`4`	`4`	`export * from '../src/core/di';`