Transpile to ES6

.gitignore

@@ -29,12 +29,9 @@ results
 scratch/
 .idea/
 .settings/
-.vscode/**
-!.vscode/launch.json
+.vscode/
 test-reports.xml
 
 npm-debug.log
 node_modules
-docs/html
-
-!test-scripts/*.js
+docs/html

.npmignore

@@ -21,12 +21,11 @@ lib/**/*.ts
 lib/**/*.js.map
 
 test/
-test-scripts/
 .vscode
 lib/common/test/
 coverage/
 scratch/
 *.suo
 .travis.yml
 docs/html/
-dev/
+dev/

Gruntfile.js

@@ -28,7 +28,15 @@ module.exports = function(grunt) {
 
 		pkg: grunt.file.readJSON("package.json"),
 		ts: {
-			options: grunt.file.readJSON("tsconfig.json").compilerOptions,
+			options: {
+				target: 'es5',
+				module: 'commonjs',
+				sourceMap: true,
+				declaration: false,
+				removeComments: false,
+				noImplicitAny: true,
+				experimentalDecorators: true
+			},
 
 			devlib: {
 				src: ["lib/**/*.ts", "!lib/common/node_modules/**/*.ts"],
@@ -123,17 +131,7 @@ module.exports = function(grunt) {
 		},
 
 		clean: {
-			src: ["test/**/*.js*",
-				"lib/**/*.js*",
-				"!test-scripts/**/*",
-				"!lib/common/vendor/*.js",
-				"!lib/common/**/*.json",
-				"!lib/common/Gruntfile.js",
-				"!lib/common/node_modules/**/*",
-				"!lib/common/hooks/**/*.js",
-				"!lib/common/bin/*.js",
-				"!lib/common/test-scripts/**/*",
-				"*.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"]
 		}
 	});
 

bin/nativescript

@@ -1,19 +1,4 @@
 #!/bin/sh
 
 AB_DIR="`dirname \"$0\"`"
-NODE_VERSION=`node --version`
-NODE4_VERSION_PREFIX="v4."
-NODE5_VERSION_PREFIX="v5."
-
-# check if Node.js version is 4.x.x or 5.x.x - both of them do not support some of required features
-# so we have to pass --harmony flag for them in order to enable spread opearator usage
-# Use POSIX substring parameter expansion, so the code will work on all shells.
-
-if [ "${NODE_VERSION#$NODE4_VERSION_PREFIX*}" != "$NODE_VERSION" -o "${NODE_VERSION#$NODE5_VERSION_PREFIX*}" != "$NODE_VERSION" ]
-then
-	# Node is 4.x.x or 5.x.x
-	node --harmony "$AB_DIR/nativescript.js" "$@"
-else
-	# Node is NOT 4.x.x or 5.x.x
-	node "$AB_DIR/nativescript.js" "$@"
-fi
+node "$AB_DIR/nativescript.js" "$@"

bin/nativescript.cmd

@@ -1,18 +1 @@
-@for /F "delims=" %%i IN ('@node --version') DO @set node_ver=%%i
-
-@echo %node_ver% | @findstr /b /c:"v4."
-@set is_node_4=%errorlevel%
-
-@echo %node_ver% | @findstr /b /c:"v5."
-@set is_node_5=%errorlevel%
-
-@set use_harmony_flag=0
-
-@if %is_node_4% == 0 @set use_harmony_flag=1
-@if %is_node_5% == 0 @set use_harmony_flag=1
-
-@if %use_harmony_flag% == 1 (
-	return @node --harmony %~dp0\nativescript.js %*
-) else (
-	@node %~dp0\nativescript.js %*
-)
+@node %~dp0\nativescript.js %*

bin/tns

@@ -1,19 +1,4 @@
 #!/bin/sh
 
 AB_DIR="`dirname \"$0\"`"
-NODE_VERSION=`node --version`
-NODE4_VERSION_PREFIX="v4."
-NODE5_VERSION_PREFIX="v5."
-
-# check if Node.js version is 4.x.x or 5.x.x - both of them do not support some of required features
-# so we have to pass --harmony flag for them in order to enable spread opearator usage
-# Use POSIX substring parameter expansion, so the code will work on all shells.
-
-if [ "${NODE_VERSION#$NODE4_VERSION_PREFIX*}" != "$NODE_VERSION" -o "${NODE_VERSION#$NODE5_VERSION_PREFIX*}" != "$NODE_VERSION" ]
-then
-	# Node is 4.x.x or 5.x.x
-	node --harmony "$AB_DIR/nativescript.js" "$@"
-else
-	# Node is NOT 4.x.x or 5.x.x
-	node "$AB_DIR/nativescript.js" "$@"
-fi
+node "$AB_DIR/nativescript.js" "$@"

bin/tns.cmd

@@ -1,18 +1 @@
-@for /F "delims=" %%i IN ('@node --version') DO @set node_ver=%%i
-
-@echo %node_ver% | @findstr /b /c:"v4."
-@set is_node_4=%errorlevel%
-
-@echo %node_ver% | @findstr /b /c:"v5."
-@set is_node_5=%errorlevel%
-
-@set use_harmony_flag=0
-
-@if %is_node_4% == 0 @set use_harmony_flag=1
-@if %is_node_5% == 0 @set use_harmony_flag=1
-
-@if %use_harmony_flag% == 1 (
-	return @node --harmony %~dp0\nativescript.js %*
-) else (
-	@node %~dp0\nativescript.js %*
-)
+@node %~dp0\nativescript.js %*

lib/declarations.ts

@@ -95,6 +95,7 @@ interface IOptions extends ICommonOptions {
 	rebuild: boolean;
 	syncAllFiles: boolean;
 	liveEdit: boolean;
+	chrome: boolean;
 }
 
 interface IInitService {
@@ -225,7 +226,8 @@ interface IAndroidToolsInfoData {
 }
 
 interface ISocketProxyFactory {
-	createSocketProxy(factory: () => any): IFuture<any>;
+	createTCPSocketProxy(factory: () => any): any;
+	createWebSocketProxy(factory: () => any): any;
 }
 
 interface IiOSNotification {

lib/definitions/project.d.ts

@@ -112,4 +112,12 @@ interface ICocoaPodsService {
 	 * @return {string} The footer which needs to be placed at the end of a Podfile.
 	 */
 	getPodfileFooter(): string;
+
+	/**
+	 * Merges the content of hooks with the provided name if there are more than one hooks with this name in the Podfile.
+	 * @param {string} hookName The name of the hook.
+	 * @param {string} pathToPodfile The path to the Podfile.
+	 * @return {IFuture<void>}
+	 */
+	mergePodfileHookContent(sectionName: string, pathToPodfile: string): IFuture<void>
 }