Update ng-sample app for alpha 46

hdeshev · hdeshev · commit 7574f7dd7614 · 2015-11-23T11:09:59.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@ ng-sample/lib
 ng-sample/node_modules
 ng-sample/src/tns_modules
 ng-sample/src/typings
+ng-sample/src/global.d.ts
 ng-sample/src/angular2
 ng-sample/src/nativescript-angular
 
diff --git a/ng-sample/gruntfile.js b/ng-sample/gruntfile.js
@@ -9,6 +9,7 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-shell');
 
     var nsDistPath = process.env.NSDIST || '../deps/NativeScript/bin/dist';
+    var angularDistPath = process.env.ANGULARDIST || '../';
 
     var modulesPath = grunt.option("modulesPath", path.join(nsDistPath, 'modules'));
 
@@ -26,12 +27,6 @@ module.exports = function(grunt) {
                 dest: 'app',
                 options: {
                     fast: "never",
-
-                    // Resolve non-relative modules like "ui/styling/style"
-                    // based on the project root (not on node_modules which
-                    // is the typescript 1.6+ default)
-                    additionalFlags: '--moduleResolution classic',
-
                     module: "commonjs",
                     target: "es5",
                     sourceMap: true,
@@ -57,32 +52,15 @@ module.exports = function(grunt) {
                 expand: true,
                 cwd: '../src',
                 src: [
-                    'css/**/*',
                     'nativescript-angular/**/*',
                     'global.d.ts',
                 ],
                 dest: 'src'
             },
-            tnsifyAngular: {
-                expand: true,
-                cwd: 'app/',
-                src: [
-                    "angular2/**/*",
-                    "css/**/*",
-                    "nativescript-angular/**/*",
-                ],
-                //dest: 'platforms/android/src/main/assets/app/tns_modules',
-                dest: 'app/tns_modules',
-            },
         },
         shell: {
-            updateAngular: {
-                command: "grunt prepareAngular --angularDest ng-sample/src",
-                options: {
-                    execOptions: {
-                        cwd: '..',
-                    }
-                }
+            localInstallAngular: {
+                command: "npm install \"<%= angularPackagePath %>\""
             },
             localInstallModules: {
                 command: "npm install \"<%= nsPackagePath %>\""
@@ -134,11 +112,26 @@ module.exports = function(grunt) {
         grunt.config('nsPackagePath', nsPackagePath);
     });
 
+    grunt.registerTask("getAngularPackage", function() {
+        var packageFiles = grunt.file.expand({
+            cwd: angularDistPath
+        },[
+            'angular2-*.tgz'
+        ]);
+        var angularPackagePath = path.join(angularDistPath, packageFiles[0]);
+        grunt.config('angularPackagePath', angularPackagePath);
+    });
+
     grunt.registerTask("updateModules", [
         "getNSPackage",
         "shell:localInstallModules",
     ]);
 
+    grunt.registerTask("updateAngular", [
+        "getAngularPackage",
+        "shell:localInstallAngular",
+    ]);
+
     grunt.registerTask("prepareQuerystringPackage", function() {
         //The {N} require doesn't look for index.js automatically
         //so we need to declare it as main
@@ -151,12 +144,11 @@ module.exports = function(grunt) {
 
     grunt.registerTask("prepare", [
         "updateModules",
-        "shell:updateAngular",
+        "updateAngular",
         "prepareQuerystringPackage",
     ]);
 
     grunt.registerTask("preDeploy", [
-        "copy:tnsifyAngular",
     ]);
 
     grunt.registerTask("full-clean", [
diff --git a/ng-sample/package.json b/ng-sample/package.json
@@ -23,12 +23,12 @@
 	},
 	"homepage": "https://github.com/NativeScript/template-hello-world",
 	"dependencies": {
-		"@reactivex/rxjs": "5.0.0-alpha.4",
+		"@reactivex/rxjs": "5.0.0-alpha.7",
 		"parse5": "1.4.2",
 		"punycode": "1.3.2",
 		"querystring": "0.2.0",
 		"url": "0.10.3",
-		"reflect-metadata": "0.1.1",
+		"reflect-metadata": "0.1.2",
 		"zone.js": "0.5.8"
 	},
 	"devDependencies": {
diff --git a/ng-sample/src/benchmark.ts b/ng-sample/src/benchmark.ts
@@ -3,7 +3,6 @@ import {Button} from 'ui/button';
 import {Label} from 'ui/label';
 import {Inject, Component, View, NgIf, NgFor} from 'angular2/angular2';
 import {ApplicationRef} from 'angular2/src/core/application_ref';
-import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle';
 import * as profiling from './profiling';
 
 @Component({selector: 'tree', inputs: ['data']})
@@ -48,7 +47,7 @@ export class Benchmark {
     public initDataNg = new TreeNode('', null, null);
     public initDataBaseline = new TreeNode('', null, null);
 
-    constructor(private appRef: ApplicationRef, private lifeCycle: LifeCycle) {
+    constructor(private appRef: ApplicationRef) {
     }
 
     public baselineTest(container: StackLayout) {
@@ -63,7 +62,7 @@ export class Benchmark {
 
     public componentTest() {
         this.initDataNg = new TreeNode('', null, null);
-        this.lifeCycle.tick();
+        this.appRef.tick();
 
         profiling.start('angular');
         this.createNgDom();
@@ -91,14 +90,14 @@ export class Benchmark {
         var values = this.count++ % 2 == 0 ? ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '*'] :
         ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', '-'];
         this.initDataBaseline = buildTree(this.maxDepth, values, 0);
-        this.lifeCycle.tick();
+        this.appRef.tick();
     }
 
     private createNgDom() {
         var values = this.count++ % 2 == 0 ? ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '*'] :
         ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', '-'];
         this.initDataNg = buildTree(this.maxDepth, values, 0);
-        this.lifeCycle.tick();
+        this.appRef.tick();
     }
 }
 
diff --git a/ng-sample/src/global.d.ts b/ng-sample/src/global.d.ts
diff --git a/ng-sample/src/main-page.ts b/ng-sample/src/main-page.ts
@@ -2,7 +2,7 @@ import * as profiling from "./profiling";
 import {topmost} from 'ui/frame';
 import {TextView} from 'ui/text-view';
 
-import {nativeScriptBootstrap} from 'nativescript-angular/application';
+import {nativeScriptBootstrap} from './nativescript-angular/application';
 import {RendererTest} from './renderer-test';
 import {Benchmark} from './benchmark';
 
@@ -16,7 +16,8 @@ export function pageLoaded(args) {
 
     profiling.start('ng-bootstrap');
     console.log('BOOTSTRAPPING...');
-    nativeScriptBootstrap(Benchmark, []).then((appRef) => {
+    //nativeScriptBootstrap(Benchmark, []).then((appRef) => {
+    nativeScriptBootstrap(RendererTest, []).then((appRef) => {
         profiling.stop('ng-bootstrap');
         console.log('ANGULAR BOOTSTRAP DONE.');
     }, (err) =>{
diff --git a/src/global.d.ts b/src/global.d.ts
@@ -1,30 +1,15 @@
 declare var assert: any;
 
-interface BrowserNodeGlobal {
-  Object: typeof Object;
-  Array: typeof Array;
-  Map: typeof Map;
-  Set: typeof Set;
-  Date: typeof Date;
-  RegExp: typeof RegExp;
-  JSON: typeof JSON;
-  Math: typeof Math;
-  assert(condition: any): void;
-  Reflect: any;
-  zone: Zone;
-  getAngularTestability: Function;
-  getAllAngularTestabilities: Function;
-  setTimeout: Function;
-  clearTimeout: Function;
-  setInterval: Function;
-  clearInterval: Function;
-}
+declare type BrowserNodeGlobal = any;
 
 interface Map<K, V> {
     keys(): Array<K>;
     values(): Array<V>;
 }
 
+declare type MapConstructor = typeof Map;
+declare type SetConstructor = typeof Set;
+
 interface NumberConstructor {
     isInteger(number: number): boolean;
 }
