Precompilation and upgrade fixes WIP

hdeshev · hdeshev · commit 52fcf96ed3db · 2015-10-07T16:23:34.000+03:00
diff --git a/gruntfile.js b/gruntfile.js
@@ -74,7 +74,7 @@ module.exports = function(grunt) {
                     '!angular2/docs/**/*',
                     '!angular2/test*',
                     '!angular2/src/test_lib/**/*',
-                    '!angular2/typings/tsd.d.ts',
+                    //'!angular2/typings/tsd.d.ts',
                     '!angular2/typings/angular-protractor/**/*',
                     '!angular2/typings/node/**/*',
                     //'!angular2/typings/es6-promise/**/*',
diff --git a/src/nativescript-angular/application.ts b/src/nativescript-angular/application.ts
@@ -1,27 +1,27 @@
 import 'reflect-metadata';
 import 'nativescript-angular/polyfills/array';
 import 'nativescript-angular/zone';
-import {Type} from 'angular2/src/facade/lang';
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
-import {ApplicationRef} from 'angular2/src/core/application';
-import {bind, Binding} from 'angular2/di';
-import {DOM} from 'angular2/src/dom/dom_adapter';
+import {Type} from 'angular2/src/core/facade/lang';
+import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
+import {ComponentRef} from 'angular2/src/core/linker/dynamic_component_loader';
+import {bind, Binding} from 'angular2/src/core/di';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
-import {Renderer} from 'angular2/src/render/api';
+import {Renderer} from 'angular2/src/core/render/api';
 import {NativeScriptRenderer} from 'nativescript-angular/renderer';
 import {NativeScriptDomAdapter} from 'nativescript-angular/dom_adapter';
-import {Parse5DomAdapter} from 'angular2/src/dom/parse5_adapter';
+import {Parse5DomAdapter} from 'angular2/src/core/dom/parse5_adapter';
 
 import {bootstrap as angularBootstrap} from 'angular2/src/core/application';
 
 
-export type BindingList = List<Type | Binding | List<any>>;
+export type BindingArray = Array<Type | Binding | any[]>;
 
 export function nativeScriptBootstrap(appComponentType: any,
-                          componentInjectableBindings: BindingList = null): Promise<ApplicationRef> {
+                          componentInjectableBindings: BindingArray = null): Promise<ComponentRef> {
   NativeScriptDomAdapter.makeCurrent();
 
-  let nativeScriptBindings: BindingList = [
+  let nativeScriptBindings: BindingArray = [
       NativeScriptRenderer,
       bind(Renderer).toAlias(NativeScriptRenderer)
   ];
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/dom/parse5_adapter';
-import {setRootDomAdapter} from 'angular2/src/dom/dom_adapter';
+import {Parse5DomAdapter} from 'angular2/src/core/dom/parse5_adapter';
+import {setRootDomAdapter} from 'angular2/src/core/dom/dom_adapter';
 
 export class NativeScriptDomAdapter extends Parse5DomAdapter {
   static makeCurrent() { setRootDomAdapter(new NativeScriptDomAdapter()); }
diff --git a/src/nativescript-angular/renderer.ts b/src/nativescript-angular/renderer.ts
@@ -1,5 +1,5 @@
 import {Injectable} from 'angular2/angular2';
-import {MapWrapper} from 'angular2/src/facade/collection';
+import {MapWrapper} from 'angular2/src/core/facade/collection';
 import {DomProtoView, resolveInternalDomProtoView} from 'angular2/src/render/dom/view/proto_view';
 import {
     Renderer,
@@ -9,10 +9,10 @@ import {
     RenderViewRef,
     RenderFragmentRef,
     RenderViewWithFragments
-} from 'angular2/src/render/api';
-import {TemplateCloner} from 'angular2/src/render/dom/template_cloner';
-import {NG_BINDING_CLASS, cloneAndQueryProtoView} from 'angular2/src/render/dom/util';
-import {DOM} from 'angular2/src/dom/dom_adapter';
+} from 'angular2/src/core/render/api';
+import {DefaultProtoViewRef} from 'angular2/src/core/render/view';
+import {NG_BINDING_CLASS, cloneAndQueryProtoView} from 'angular2/src/core/render/dom/util';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
 import {ViewNode, DummyViewNode} from 'nativescript-angular/view_node';
 
@@ -54,7 +54,7 @@ export class NativeScriptFragmentRef extends RenderFragmentRef {
 
 @Injectable()
 export class NativeScriptRenderer extends Renderer {
-    constructor(private _templateCloner: TemplateCloner) {
+    constructor() {
         super();
         console.log('NativeScriptRenderer created');
     }
@@ -170,7 +170,7 @@ export class NativeScriptRenderer extends Renderer {
     /**
     * Calls a method on an element.
     */
-    invokeElementMethod(location: RenderElementRef, methodName: string, args: List<any>) {
+    invokeElementMethod(location: RenderElementRef, methodName: string, args: Array<any>) {
         console.log("NativeScriptRenderer.invokeElementMethod " + methodName + " " + args);
     }
 
diff --git a/src/nativescript-angular/view_node.ts b/src/nativescript-angular/view_node.ts
@@ -13,7 +13,7 @@ import {Switch} from 'ui/switch';
 import {LayoutBase} from 'ui/layouts/layout-base';
 import gestures = require("ui/gestures");
 import {NativeScriptView} from 'nativescript-angular/renderer';
-import {AST} from 'angular2/src/change_detection/parser/ast';
+import {AST} from 'angular2/src/core/change_detection/parser/ast';
 import {ViewClass, getViewClass, isKnownView} from 'nativescript-angular/element-registry';
 
 type EventHandler = (args: EventData) => void;
