Update renderer to run against beta 0.

hdeshev · hdeshev · commit 11ea763948dc · 2015-12-16T23:39:34.000+02:00
diff --git a/package.json b/package.json
@@ -14,14 +14,14 @@
   },
   "scripts": {},
   "dependencies": {
-      "angular2": "2.0.0-alpha.46",
-      "@reactivex/rxjs": "5.0.0-alpha.7",
+      "angular2": "2.0.0-beta.0",
       "parse5": "1.4.2",
       "punycode": "1.3.2",
       "querystring": "0.2.0",
       "url": "0.10.3",
       "reflect-metadata": "0.1.2",
-      "zone.js": "0.5.8"
+      "rxjs": "5.0.0-beta.0",
+      "zone.js": "0.5.10"
   },
   "devDependencies": {
     "grunt": "0.4.5",
diff --git a/src/nativescript-angular/application.d.ts b/src/nativescript-angular/application.d.ts
@@ -1,4 +1,4 @@
-import { Type, ApplicationRef, Provider } from 'angular2/angular2';
+import { Type, ApplicationRef, Provider } from 'angular2/core';
 
 export type BindingArray = Array<Type | Provider | Array<any>>;
 export function nativeScriptBootstrap(appComponentType: any, componentInjectableBindings?: BindingArray): Promise<ApplicationRef>;
diff --git a/src/nativescript-angular/application.ts b/src/nativescript-angular/application.ts
@@ -3,36 +3,49 @@ import './polyfills/array';
 import './zone';
 import {isPresent, Type} from 'angular2/src/facade/lang';
 import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
-import {ComponentRef} from 'angular2/src/core/linker/dynamic_component_loader';
+import {platform, ComponentRef, PLATFORM_DIRECTIVES, PLATFORM_PIPES} from 'angular2/core';
 import {bind, provide, Provider} from 'angular2/src/core/di';
-import {DOM} from 'angular2/src/core/dom/dom_adapter';
+import {DOM} from 'angular2/src/platform/dom/dom_adapter';
 
 import {Renderer} from 'angular2/src/core/render/api';
 import {NativeScriptRenderer} from './renderer';
 import {NativeScriptDomAdapter} from './dom_adapter';
 import {XHR} from 'angular2/src/compiler/xhr';
 import {FileSystemXHR} from './xhr';
-import {Parse5DomAdapter} from 'angular2/src/core/dom/parse5_adapter';
+import {Parse5DomAdapter} from 'angular2/src/platform/server/parse5_adapter';
+import {ExceptionHandler} from 'angular2/src/facade/exception_handler';
+import {APPLICATION_COMMON_PROVIDERS} from 'angular2/src/core/application_common_providers';
+import {COMPILER_PROVIDERS} from 'angular2/src/compiler/compiler';
+import {PLATFORM_COMMON_PROVIDERS} from 'angular2/src/core/platform_common_providers';
+import {COMMON_DIRECTIVES, COMMON_PIPES, FORM_PROVIDERS} from "angular2/common";
 
-import {bootstrap as angularBootstrap} from 'angular2/src/core/application';
-import {commonBootstrap} from 'angular2/src/core/application_common';
+import {bootstrap as angularBootstrap} from 'angular2/bootstrap';
 
-
-export type BindingArray = Array<Type | Provider | any[]>;
+export type ProviderArray = Array<Type | Provider | any[]>;
 
 export function nativeScriptBootstrap(appComponentType: any,
-                          componentInjectableBindings: BindingArray = null): Promise<ComponentRef> {
+                          customProviders: ProviderArray = null): Promise<ComponentRef> {
   NativeScriptDomAdapter.makeCurrent();
 
-  let nativeScriptBindings: BindingArray = [
+  let nativeScriptProviders: ProviderArray = [
       NativeScriptRenderer,
       provide(Renderer, {useClass: NativeScriptRenderer}),
       provide(XHR, {useClass: FileSystemXHR}),
+      provide(ExceptionHandler, {useFactory: () => new ExceptionHandler(DOM, true), deps: []}),
+
+      provide(PLATFORM_PIPES, {useValue: COMMON_PIPES, multi: true}),
+      provide(PLATFORM_DIRECTIVES, {useValue: COMMON_DIRECTIVES, multi: true}),
+
+      APPLICATION_COMMON_PROVIDERS,
+      COMPILER_PROVIDERS,
+      PLATFORM_COMMON_PROVIDERS,
+      FORM_PROVIDERS,
   ];
-  var bindings = [nativeScriptBindings];
-  if (isPresent(componentInjectableBindings)) {
-      bindings.push(componentInjectableBindings);
+
+  var appProviders = [];
+  if (isPresent(customProviders)) {
+      appProviders.push(customProviders);
   }
 
-  return angularBootstrap(appComponentType, bindings)
+  return platform(nativeScriptProviders).application(appProviders).bootstrap(appComponentType);
 }
diff --git a/src/nativescript-angular/dom_adapter.ts b/src/nativescript-angular/dom_adapter.ts
@@ -1,5 +1,5 @@
-import {Parse5DomAdapter} from 'angular2/src/core/dom/parse5_adapter';
-import {setRootDomAdapter} from 'angular2/src/core/dom/dom_adapter';
+import {Parse5DomAdapter} from 'angular2/src/platform/server/parse5_adapter';
+import {setRootDomAdapter} from 'angular2/src/platform/dom/dom_adapter';
 import {Type} from 'angular2/src/facade/lang';
 
 export class NativeScriptDomAdapter extends Parse5DomAdapter {
diff --git a/src/nativescript-angular/renderer.ts b/src/nativescript-angular/renderer.ts
@@ -1,6 +1,5 @@
 import {Inject, Injectable} from 'angular2/src/core/di';
 import {RenderComponentTemplate} from 'angular2/src/core/render/api';
-import {DOCUMENT} from 'angular2/src/core/render/dom/dom_tokens';
 import {createRenderView, NodeFactory} from 'angular2/src/core/render/view_factory';
 import {
     Renderer,
@@ -18,19 +17,16 @@ import {
     DefaultRenderView,
     DefaultRenderFragmentRef
 } from 'angular2/src/core/render/view';
-import {DOM} from 'angular2/src/core/dom/dom_adapter';
+import {DOM} from 'angular2/src/platform/dom/dom_adapter';
 import {ViewNode, DummyViewNode} from './view_node';
 
 //var console = {log: function(msg) {}}
 
 @Injectable()
 export class NativeScriptRenderer extends Renderer implements NodeFactory<ViewNode> {
-    private _document;
-
-    constructor(@Inject(DOCUMENT) document) {
+    constructor() {
         super();
         console.log('NativeScriptRenderer created');
-        this._document = document;
     }
 
     public createProtoView(componentTemplateId: string, cmds: RenderTemplateCmd[]): RenderProtoViewRef {
@@ -153,6 +149,16 @@ export class NativeScriptRenderer extends Renderer implements NodeFactory<ViewNo
         node.setStyleProperty(styleName, styleValue);
     }
 
+    /**
+    * Used only in debug mode to serialize property changes to comment nodes,
+    * such as <template> placeholders.
+    */
+    setBindingDebugInfo(location: RenderElementRef, propertyName: string, propertyValue: string): void {
+        let node = resolveBoundNode(location);
+        console.log('NativeScriptRenderer.setBindingDebugInfo: ' + node.viewName + ', ' + propertyName + ' = ' + propertyValue);
+    }
+
+
     getNativeElementSync(location: RenderElementRef): any {
         console.log("NativeScriptRenderer.getNativeElementSync");
 
diff --git a/src/nativescript-angular/zone.ts b/src/nativescript-angular/zone.ts
@@ -4,7 +4,7 @@ import NativeScriptPatch from "./zone_patch"
 
 var core = require('zone.js/lib/core.js');
 
-var zone = global.zone = new core.Zone()
-console.log('Created zone.');
+global.Zone = core.Zone;
+global.zone = new core.Zone();
 
 NativeScriptPatch.apply();
