Merge pull request #744 from NativeScript/vladimirov/unify-proton-and-master

Modify test infrastructure and grunt tasks

Author: rosen-vladimirov

Gruntfile.js

@@ -1,5 +1,3 @@
-var util = require("util");
-
 var now = new Date().toISOString();
 
 function shallowCopy(obj) {
@@ -14,6 +12,13 @@ var travis = process.env["TRAVIS"];
 var buildNumber = process.env["TRAVIS_BUILD_NUMBER"] || process.env["BUILD_NUMBER"] || "non-ci";
 
 module.exports = function(grunt) {
+	var path = require("path");
+	var commonLibNodeModules = path.join("lib", "common", "node_modules");
+	if(require("fs").existsSync(commonLibNodeModules)) {
+		grunt.file.delete(commonLibNodeModules);
+	}
+	grunt.file.write(path.join("lib", "common", ".d.ts"), "");
+
 	grunt.initConfig({
 		copyPackageTo: process.env["CopyPackageTo"] || ".",
 
@@ -22,29 +27,29 @@ module.exports = function(grunt) {
 		dateString: now.substr(0, now.indexOf("T")),
 
 		pkg: grunt.file.readJSON("package.json"),
-
 		ts: {
 			options: {
 				target: 'es5',
 				module: 'commonjs',
 				sourceMap: true,
 				declaration: false,
 				removeComments: false,
-				noImplicitAny: true
+				noImplicitAny: true,
+				experimentalDecorators: true
 			},
 
 			devlib: {
-				src: ["lib/**/*.ts"],
+				src: ["lib/**/*.ts", "!lib/common/node_modules/**/*.ts"],
 				reference: "lib/.d.ts"
 			},
 
 			devall: {
-				src: ["lib/**/*.ts", "test/**/*.ts"],
+				src: ["lib/**/*.ts", "test/**/*.ts", "!lib/common/node_modules/**/*.ts", "lib/common/test/unit-tests/**/*.ts", "definitions/**/*.ts", "!lib/common/test/.d.ts"],
 				reference: "lib/.d.ts"
 			},
 
 			release_build: {
-				src: ["lib/**/*.ts", "test/**/*.ts"],
+				src: ["lib/**/*.ts", "test/**/*.ts", "!lib/common/node_modules/**/*.ts"],
 				reference: "lib/.d.ts",
 				options: {
 					sourceMap: false,
@@ -55,7 +60,7 @@ module.exports = function(grunt) {
 
 		watch: {
 			devall: {
-				files: ["lib/**/*.ts", 'test/**/*.ts'],
+				files: ["lib/**/*.ts", 'test/**/*.ts', "!lib/common/node_modules/**/*.ts"],
 				tasks: [
 					'ts:devall',
 					'shell:npm_test'
@@ -105,7 +110,7 @@ module.exports = function(grunt) {
 		},
 
 		clean: {
-			src: ["test/**/*.js*", "lib/**/*.js*", "!lib/common/vendor/*.js", "*.tgz"]
+			src: ["test/**/*.js*", "lib/**/*.js*", "!lib/common/vendor/*.js", "!lib/common/**/*.json", "!lib/common/Gruntfile.js", "!lib/common/node_modules/**/*", "!lib/common/hooks/**/*.js", "!lib/common/bin/*.js", "*.tgz"]
 		}
 	});
 

lib/common

@@ -10,7 +10,7 @@
   },
   "main": "./lib/nativescript-cli.js",
   "scripts": {
-    "test": "node_modules\\.bin\\_mocha --ui mocha-fibers --recursive --reporter spec --require test/test-bootstrap.js --timeout 60000 test/",
+    "test": "node_modules\\.bin\\_mocha --ui mocha-fibers --recursive --reporter spec --require test/test-bootstrap.js --timeout 60000 test/ lib/common/test/unit-tests",
     "postinstall": "node postinstall.js",
     "preuninstall": "node preuninstall.js"
   },
@@ -24,6 +24,7 @@
     "mobile"
   ],
   "dependencies": {
+    "bluebird": "2.9.34",
     "bplist-parser": "0.1.0",
     "broccoli": "0.16.4",
     "broccoli-funnel": "0.2.3",
@@ -81,12 +82,12 @@
   "devDependencies": {
     "chai": "1.8.x",
     "grunt": "0.4.5",
-    "grunt-contrib-clean": "0.5.0",
-    "grunt-contrib-copy": "0.5.0",
-    "grunt-contrib-watch": "0.5.3",
-    "grunt-shell": "0.6.4",
+    "grunt-contrib-clean": "0.6.0",
+    "grunt-contrib-copy": "0.8.0",
+    "grunt-contrib-watch": "0.6.1",
+    "grunt-shell": "1.1.2",
     "grunt-ts": "4.2.0",
-    "mocha": "1.21.4",
+    "mocha": "2.2.5",
     "mocha-fibers": "https://github.com/Icenium/mocha-fibers/tarball/master",
     "should": "7.0.2",
     "typescript": "1.5.3"

package.json

@@ -1,4 +1,2 @@
 /// <reference path="../lib/.d.ts" />
-/// <reference path="./definitions/mocha.d.ts" />
 /// <reference path="./definitions/should.d.ts" />
-