Additional cleanup & readme updates & build fixes

Author: vakrilov

Diff for: .gitignore

@@ -10,6 +10,7 @@ nativescript-angular/**/*.d.ts
 nativescript-angular/**/*.js
 !nativescript-angular/postinstall.js
 !nativescript-angular/hooks/**/*.js
+!nativescript-angular/gulpfile.js
 
 .tscache
 .nvm

Diff for: .travis.yml

@@ -25,16 +25,17 @@ install:
     - npm install -g nativescript --ignore-scripts
     - tns usage-reporting disable
     - tns error-reporting disable
+    - cd nativescript-angular
+    - npm install
+    - cd ../tests
+    - npm install
+    - npm install ../nativescript-angular
 
 before_script:
     - echo no | android create avd --force -n test -t android-19 -b armeabi-v7a
     - emulator -avd test -no-audio -no-window &
     - android-wait-for-emulator
 
 script:
-    - npm install
-    - cd ./tests
-    - npm install
-    - npm install ../nativescript-angular
     - tns platform add android
     - tns test android --emulator --justlaunch

Diff for: DEVELOPERS.md

@@ -4,7 +4,7 @@ Integrating NativeScript with Angular 2.
 
 # Running locally
 
-# Prerequisites
+## Prerequisites
 
 Install your native toolchain and NativeScript as described in the docs:
 
@@ -14,31 +14,26 @@ https://docs.nativescript.org/setup/quick-setup
 ## Install dependencies
 
 ```
-$ npm install -g grunt-cli gulp
+$ npm install -g gulp
 ```
 
 Then install the needed NPM packages:
 
 ```
+$ cd nativescript-angular
 $ npm install
 ```
 
-## Compile and prepare NativeScript and Angular
-
-```
-$ grunt
-```
-
-## Initialize the test NativeScript app (ng-sample)
+## Run the sample application (ng-sample)
 
+Intall NPM packages (use the local copy of `nativescript-angular`):
 ```
 $ cd ng-sample
 $ npm install
+$ npm install ../nativescript-angular
 ```
 
-The latter installs the `angular2` and `tns-core-modules` packages that you just built by running `grunt prepare` step in the project root.
-
-## Run the ng-sample app
+Start the app:
 
 ```
 $ tns run android
@@ -61,19 +56,37 @@ $ env WEBPACK_BUILD=1 tns run android
 
 # Running the tests
 
+Intall NPM packages (use the local copy of `nativescript-angular`):
 ```
 $ cd tests
 $ npm install
+$ npm install ../nativescript-angular
+```
+
+Start test run:
+
+```
 $ tns test ios --emulator
+$ tns test android --emulator
 ```
 
 # Developer workflow:
 
-1. Make changes to `src/nativescript-angular`, and rebuild with `grunt build`. If succesful, you should get a npm package in the project root.
-2. Navigate to the ng-sample subdir: `$ cd ng-sample`. Make some changes to the app or `../src/nativescript-angular`.
-3. Run with `$ tns run android` or `$ tns run ios`
+## Setup:
+Use `npm link` to link `nativescript-angular` in `tests` and `ng-sample` progects:
+
+```
+cd nativescript-angular
+npm link
+cd ../ng-sample
+npm link nativescript-angular
+cd ../tests
+npm link nativescript-angular
+```
 
-Note that you should never change files in `ng-sample/src/nativescript-angular/` as they are overwritten with the reference sources in `src/nativescript-angular` on every `grunt app` run.
+## Work
+1. Make changes to the `test`, `ng-sample` projects or in `nativescript-angular` folder.
+2. Run the `tests` or `ng-sample` using as shown above.
 
 # Watch the video explaining Angular 2 and NativeScript
 [NativeScript session on AngularConnect conference](https://www.youtube.com/watch?v=4SbiiyRSIwo)

Diff for: README.md

@@ -3,6 +3,9 @@
 *.ts
 !*.d.ts
 
+*.js.map
+
 tsconfig.json
 global.d.ts
 .npmignore
+gulpfile.js

Diff for: gruntfile.js

@@ -1 +1 @@
-/// <reference path="../node_modules/tns-core-modules/tns-core-modules.d.ts" />
+/// <reference path="./node_modules/tns-core-modules/tns-core-modules.d.ts" />

Diff for: nativescript-angular/.npmignore

@@ -0,0 +1,15 @@
+var gulp = require('gulp');
+var del = require('del');
+var glob = require('glob');
+
+gulp.task('clean-defs', function() {
+    var files = [...glob.sync("*.ts"), ...glob.sync("!(node_modules)/*.ts")]
+        .map(function(file) {
+            return file.replace(/.ts$/, '.d.ts');
+        });
+    
+    return del(files).then(paths => {
+        console.log('Definition files cleaned:')
+        console.log(paths.join('\n'));
+    });   
+});

Diff for: nativescript-angular/global.d.ts

@@ -14,7 +14,8 @@
   },
   "scripts": {
     "postinstall": "node postinstall.js",
-    "prepublish": "tsc"
+    "prepublish": "tsc",
+    "postpublish": "gulp clean-defs"
   },
   "dependencies": {
     "nativescript-intl": "^0.0.2",
@@ -31,21 +32,18 @@
     "parse5": "1.4.2",
     "punycode": "1.3.2",
     "querystring": "0.2.0",
-    "url": "0.10.3"
+    "url": "0.10.3",
+    "shelljs": "^0.7.0"
   },
   "devDependencies": {
-    "grunt": "0.4.5",
-    "grunt-contrib-copy": "0.8.0",
-    "grunt-contrib-clean": "0.6.0",
-    "grunt-shell": "1.1.2",
-    "grunt-file": "1.0.2",
-    "grunt-env": "0.4.4",
-    "grunt-ts": "5.0.0-beta.5",
-    "shelljs": "^0.5.3",
+    "del": "^2.2.0",
+    "glob": "^7.0.3",
+    "gulp": "^3.9.1",
+    "tns-core-modules": ">=2.0.0 || >=2.1.0-2016 || >=2.0.0-angular-7",
     "typescript": "^1.8.10"
   },
   "peerDependencies": {
     "tns-core-modules": ">=2.0.0 || >=2.1.0-2016 || >=2.0.0-angular-7"
   },
   "nativescript": {}
-}
+}