More pre-build hacks to run handle Angular imports

hdeshev · hdeshev · commit aa354c9b1ca6 · 2015-10-13T14:46:56.000+03:00
diff --git a/ng-sample/gruntfile.js b/ng-sample/gruntfile.js
@@ -1,5 +1,6 @@
 var path = require("path");
 var fs = require("fs");
+var shelljs = require("shelljs");
 
 module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-ts');
@@ -18,10 +19,19 @@ module.exports = function(grunt) {
             build: {
                 src: [
                     'src/**/*.ts',
+                    // This one refers to the Angular package structure from npm
+                    // and doesn't compile against the dev source.
+                    '!src/nativescript-angular/application.d.ts',
                 ],
                 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,
@@ -47,23 +57,41 @@ module.exports = function(grunt) {
                 expand: true,
                 cwd: '../src',
                 src: [
+                    'css/**/*',
                     'nativescript-angular/**/*',
                 ],
                 dest: 'src'
             },
-            tnsifyAngularAndroid: {
+            tnsifyAngular: {
                 expand: true,
                 cwd: 'app/',
                 src: [
                     "angular2/**/*",
+                    "css/**/*",
                     "nativescript-angular/**/*",
                 ],
+                dest: 'node_modules',
+            },
+            tnsifyCssStub: {
+                expand: true,
+                cwd: 'app/',
+                src: [
+                    "css/**/*",
+                ],
+                dest: 'node_modules/tns-core-modules',
+            },
+            tnsifyRxJsAngular: {
+                expand: true,
+                cwd: 'node_modules/',
+                src: [
+                    "@reactivex/**/*",
+                ],
                 dest: 'platforms/android/src/main/assets/app/tns_modules',
             },
         },
         shell: {
             updateAngular: {
-                command: "grunt copy:angularSource --angularDest ng-sample/src",
+                command: "grunt prepareAngular --angularDest ng-sample/src",
                 options: {
                     execOptions: {
                         cwd: '..',
@@ -81,6 +109,7 @@ module.exports = function(grunt) {
                 src: [
                     'angular2',
                     'nativescript-angular',
+                    'css',
                     '**/*.js.map',
                 ]
             },
@@ -140,8 +169,16 @@ module.exports = function(grunt) {
         "prepareQuerystringPackage",
     ]);
 
+    grunt.registerTask("fixAngularPackageJson", function() {
+        //remove lines containing invalid chars
+        shelljs.sed('-i', /.*<%.*\n/g, '', 'node_modules/angular2/package.json');
+    });
+
     grunt.registerTask("preDeploy", [
-        "copy:tnsifyAngularAndroid",
+        "copy:tnsifyAngular",
+        "fixAngularPackageJson",
+        "copy:tnsifyCssStub",
+        "copy:tnsifyRxJsAngular",
         "clean:appBeforeDeploy",
     ]);
 
diff --git a/ng-sample/package.json b/ng-sample/package.json
@@ -23,10 +23,9 @@
 	},
 	"homepage": "https://github.com/NativeScript/template-hello-world",
 	"dependencies": {
-		"reflect-metadata": "0.1.0",
-		"rtts_assert": "2.0.0-alpha.26",
-		"zone.js": "0.5.0",
-		"rx": "2.5.3",
+		"@reactivex/rxjs": "0.0.0-prealpha.3",
+		"reflect-metadata": "0.1.1",
+		"zone.js": "0.5.7",
 		"parse5": "1.4.2",
 		"punycode": "1.3.2",
 		"querystring": "0.2.0",
@@ -38,7 +37,8 @@
 		"grunt-contrib-copy": "0.8.0",
 		"grunt-contrib-clean": "0.6.0",
 		"grunt-shell": "1.1.2",
-		"typescript": "1.5.3"
+		"shelljs": "^0.5.3",
+		"typescript": "1.6.2"
 	},
 	"nativescript": {
 		"id": "org.nativescript.ngsample",
diff --git a/package.json b/package.json
@@ -15,14 +15,13 @@
   "scripts": {},
   "dependencies": {
       "angular2": "2.0.0-alpha.36",
+      "@reactivex/rxjs": "0.0.0-prealpha.3",
       "parse5": "1.4.2",
       "punycode": "1.3.2",
       "querystring": "0.2.0",
       "url": "0.10.3",
-      "reflect-metadata": "0.1.0",
-      "rtts_assert": "2.0.0-alpha.36",
-      "rx": "2.5.3",
-      "zone.js": "0.5.3"
+      "reflect-metadata": "0.1.1",
+      "zone.js": "0.5.7"
   },
   "devDependencies": {
     "grunt": "0.4.5",
diff --git a/src/nativescript-angular/application.d.ts b/src/nativescript-angular/application.d.ts
@@ -1,6 +1,6 @@
 declare module "nativescript-angular/application" {
     import { Type, ApplicationRef, Binding } from 'angular2/angular2';
 
-    export type BindingList = List<Type | Binding | List<any>>;
-    export function nativeScriptBootstrap(appComponentType: any, componentInjectableBindings?: BindingList): Promise<ApplicationRef>;
+    export type BindingArray = Array<Type | Binding | Array<any>>;
+    export function nativeScriptBootstrap(appComponentType: any, componentInjectableBindings?: BindingArray): Promise<ApplicationRef>;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`declare module "nativescript-angular/application" {`
`2`	`2`	`import { Type, ApplicationRef, Binding } from 'angular2/angular2';`
`3`	`3`
`4`		`- export type BindingList = List<Type \| Binding \| List<any>>;`
`5`		`- export function nativeScriptBootstrap(appComponentType: any, componentInjectableBindings?: BindingList): Promise<ApplicationRef>;`
	`4`	`+ export type BindingArray = Array<Type \| Binding \| Array<any>>;`
	`5`	`+ export function nativeScriptBootstrap(appComponentType: any, componentInjectableBindings?: BindingArray): Promise<ApplicationRef>;`
`6`	`6`	`}`