chore: clean-up code used for Node.js 4 and 5

.vscode/launch.json

@@ -15,7 +15,7 @@
 			"program": "${workspaceRoot}/lib/nativescript-cli.js",
 
 			// example commands
-			"args": [ "create", "cliapp"]
+			"args": [ "create", "cliapp", "--path", "${workspaceRoot}/scratch"]
 			// "args": [ "test", "android", "--justlaunch"]
 			// "args": [ "platform", "add", "[email protected]", "--path", "cliapp"]
 			// "args": [ "platform", "remove", "android", "--path", "cliapp"]
@@ -39,53 +39,13 @@
 			"sourceMaps": true
 		},
 
-		{
-			"type": "node",
-			"runtimeArgs": [
-				"--harmony"
-			],
-			"request": "launch",
-			"name": "Launch CLI (Node 4, Node 5)",
-			"program": "${workspaceRoot}/lib/nativescript-cli.js",
-			"cwd": "${workspaceRoot}",
-			"sourceMaps": true,
-			// define the arguments that you would like to pass to CLI, for example
-			// "args": [ "build", "android", "--justlaunch" ]
-			"args": [
-
-			]
-		},
-
-		{
-			// in case you want to debug a single test, modify it's code to be `it.only(...` instead of `it(...`
-			"type": "node",
-			"runtimeArgs": [
-				"--harmony"
-			],
-			"request": "launch",
-			"name": "Launch Tests (Node 4, Node 5)",
-			"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
-			"cwd": "${workspaceRoot}",
-			"sourceMaps": true
-		},
-
 		{
 			"type": "node",
 			"request": "attach",
 			"name": "Attach to Broker Process",
 			// In case you want to debug Analytics Broker process, add `--debug-brk=9897` (or --inspect-brk=9897) when spawning analytics-broker-process.
 			"port": 9897,
 			"sourceMaps": true
-		},
-
-		{
-			"type": "node",
-			"request": "attach",
-			"name": "Attach to Eqatec Process",
-			// In case you want to debug Eqatec Analytics process, add `--debug-brk=9855` (or --inspect-brk=9855) when spawning eqatec-analytics-process.
-			// NOTE: Ensure you set it only for one of the analytics processes.
-			"port": 9855,
-			"sourceMaps": true
 		}
 
 	]

bin/tns

@@ -2,35 +2,11 @@
 
 "use strict";
 var path = require("path"),
-	node = require("../package.json").engines.node,
 	pathToLib = path.join(__dirname, "..", "lib"),
 	pathToCommon = path.join(pathToLib, "common");
 
 require(path.join(pathToCommon, "verify-node-version")).verifyNodeVersion();
 
 var pathToCliExecutable = path.join(pathToLib, "nativescript-cli.js");
 
-var nodeArgs = require(path.join(pathToCommon, "scripts", "node-args")).getNodeArgs();
-
-if (nodeArgs.length) {
-	// We need custom args for Node process, so pass them here.
-	var childProcess = require("child_process");
-	var args = process.argv;
-
-	// Remove `node` and `nativescript` from the arguments.
-	args.shift();
-	args.shift();
-
-	args.unshift(pathToCliExecutable);
-
-	args = nodeArgs.concat(args);
-
-	var nodeProcess = childProcess.spawn(process.execPath, args, { stdio: "inherit" });
-
-	nodeProcess.on("close", function (code) {
-		// We need this handler so if command fails, we'll exit with same exit code as CLI.
-		process.exit(code);
-	});
-} else {
-	require(pathToCliExecutable);
-}
+require(pathToCliExecutable);

package.json

@@ -11,12 +11,12 @@
   "main": "./lib/nativescript-cli-lib.js",
   "scripts": {
     "setup": "npm i --ignore-scripts && ./node_modules/.bin/grunt",
-    "test": "node test-scripts/istanbul.js",
+    "test": "istanbul cover ./node_modules/mocha/bin/_mocha",
     "postinstall": "node postinstall.js",
     "preuninstall": "node preuninstall.js",
     "prepack": "grunt prepare",
     "postpack": "grunt set_dev_ga_id",
-    "mocha": "node test-scripts/mocha.js",
+    "mocha": "mocha",
     "tsc": "tsc",
     "tslint": "tslint -p tsconfig.json --type-check",
     "test-watch": "node ./dev/tsc-to-mocha-watch.js",

postinstall.js

@@ -4,8 +4,7 @@ var child_process = require("child_process");
 var path = require("path");
 var constants = require(path.join(__dirname, "lib", "constants"));
 var commandArgs = [path.join(__dirname, "bin", "tns"), constants.POST_INSTALL_COMMAND_NAME];
-var nodeArgs = require(path.join(__dirname, "lib", "common", "scripts", "node-args")).getNodeArgs();
 var helpers = require(path.join(__dirname, "lib", "common", "helpers"));
 if (helpers.isInstallingNativeScriptGlobally()) {
-	child_process.spawn(process.argv[0], nodeArgs.concat(commandArgs), { stdio: "inherit" });
+	child_process.spawn(process.argv[0], commandArgs, { stdio: "inherit" });
 }

preuninstall.js

@@ -2,10 +2,8 @@
 
 var child_process = require("child_process");
 var commandArgs = ["bin/tns", "dev-preuninstall"];
-var path = require("path");
-var nodeArgs = require(path.join(__dirname, "lib", "common", "scripts", "node-args")).getNodeArgs();
 
-var child = child_process.exec("node " + nodeArgs.concat(commandArgs).join(" "), function (error) {
+var child = child_process.exec("node " + commandArgs.join(" "), function (error) {
 	if (error) {
 		// Some npm versions (3.0, 3.5.1, 3.7.3) remove the NativeScript node_modules before the preuninstall script is executed and the script can't find them (the preuninstall script is like postinstall script).
 		// The issue is described in the npm repository https://github.com/npm/npm/issues/8806 and it is not fixed in version 3.1.1 as commented in the conversation.

test/nativescript-cli-lib.ts

@@ -2,7 +2,6 @@ import { assert } from "chai";
 import * as fs from "fs";
 import * as path from "path";
 import * as childProcess from "child_process";
-const nodeArgs = require(path.join(__dirname, "..", "lib", "common", "scripts", "node-args")).getNodeArgs();
 
 describe("nativescript-cli-lib", () => {
 	it("is main entry of the package", () => {
@@ -67,7 +66,7 @@ describe("nativescript-cli-lib", () => {
 			// For example $injector.register("errors", Errors) will add the errors module with its resolver (Errors) to $injector's cache.
 			// Calling $injector.require("errors", <path to errors file>), that's executed in our bootstrap, will fail, as the module errors is already in the cache.
 			// In order to workaround this problem, start new process and assert there. This way all files will not be required in it and $injector.require(...) will work correctly.
-			let testMethod = `"${process.execPath}" ${nodeArgs.join(" ")} -e "` +
+			let testMethod = `"${process.execPath}" -e "` +
 				"var assert = require('chai').assert;" +
 				`var result = require('${pathToEntryPoint}');` +
 				`assert.ok(result.${moduleName});`;