Merge remote-tracking branch 'origin/release'

Author: ivanbuhov

.vscodeignore

@@ -1,5 +1,6 @@
 **/*.ts
 **/*.map
+.vscode/**
 node_modules/.bin/**
 src/**
 out/tests/**

package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
-  "version": "0.2.1",
-  "minNativescriptCliVersion": "1.6",
+  "version": "0.3.0",
+  "minNativescriptCliVersion": "2.1",
   "icon": "images/icon.png",
   "displayName": "NativeScript",
   "description": "NativeScript support for Visual Studio Code",
@@ -46,7 +46,7 @@
     "clean": "git clean -fdx",
     "build": "tsc -p ./src && cp ./src/services/analytics/EqatecMonitor.min.js ./out/services/analytics/EqatecMonitor.min.js",
     "package": "vsce package",
-    "launch-as-server": "node --nolazy ./out/webkit/webKitDebug.js --server=4712",
+    "launch-as-server": "node --nolazy ./out/debug-adapter/webKitDebug.js --server=4712",
     "test-mac": "mocha --opts ./src/tests/config/mocha.opts --config ../../src/tests/config/mac.json ./out/tests",
     "test-win": "mocha --opts ./src/tests/config/mocha.opts --config ../../src/tests/config/win.json ./out/tests",
     "test-custom": "mocha --opts ./src/tests/config/mocha.opts --config ../../src/tests/config/custom.json ./out/tests"
@@ -170,7 +170,7 @@
             "platform": "android",
             "request": "attach",
             "appRoot": "${workspaceRoot}",
-            "sourceMaps": false,
+            "sourceMaps": true,
             "diagnosticLogging": false,
             "emulator": false
           },
@@ -180,7 +180,7 @@
             "platform": "android",
             "request": "attach",
             "appRoot": "${workspaceRoot}",
-            "sourceMaps": false,
+            "sourceMaps": true,
             "diagnosticLogging": false,
             "emulator": true
           }

src/services/NsCliService.ts

@@ -92,7 +92,8 @@ export abstract class NSProject extends EventEmitter {
     public abstract debug(args: IAttachRequestArgs | ILaunchRequestArgs): Promise<any>;
 
     protected spawnProcess(commandPath: string, commandArgs: string[], tnsOutput?: string): ChildProcess {
-        let child: ChildProcess = spawn(commandPath, commandArgs, { cwd: this.getProjectPath() });
+        let options = { cwd: this.getProjectPath(), shell: true };
+        let child: ChildProcess = spawn(commandPath, commandArgs, options);
         child.stdout.setEncoding('utf8');
         child.stderr.setEncoding('utf8');
         return child;

src/services/ipc/ExtensionClient.ts

@@ -1,4 +1,6 @@
 import * as path from 'path';
+import * as os from 'os';
+import * as crypto from 'crypto';
 import * as extProtocol from './ExtensionProtocol';
 let ipc = require('node-ipc');
 
@@ -22,6 +24,11 @@ export class ExtensionClient {
         return this._appRoot;
     }
 
+    public static getTempFilePathForDirectory(directoryPath: string) {
+        let fileName: string = 'vsc-ns-ext-' + crypto.createHash('md5').update(directoryPath).digest("hex") + '.sock';
+        return path.join(os.tmpdir(), fileName);
+    }
+
     public static setAppRoot(appRoot: string) {
         this._appRoot = appRoot;
     }
@@ -40,7 +47,7 @@ export class ExtensionClient {
         this._ipcClientInitialized = new Promise((res, rej) => {
             ipc.connectTo(
                 'extHost',
-                path.join(ExtensionClient.getAppRoot(), 'temp-nativescript-vscode-extension-pipe-handle'),
+                ExtensionClient.getTempFilePathForDirectory(ExtensionClient.getAppRoot()),
                 () => {
                     ipc.of.extHost.on('connect', () => {
                         res();

src/services/ipc/ExtensionServer.ts

@@ -1,4 +1,6 @@
 import * as path from 'path';
+import * as os from 'os';
+import * as crypto from 'crypto';
 import * as fs from 'fs';
 import * as vscode from 'vscode';
 import * as extProtocol from './ExtensionProtocol';
@@ -17,13 +19,18 @@ export class ExtensionServer {
         return this._instance;
     }
 
+    public static getTempFilePathForDirectory(directoryPath: string) {
+        let fileName: string = 'vsc-ns-ext-' + crypto.createHash('md5').update(directoryPath).digest("hex") + '.sock';
+        return path.join(os.tmpdir(), fileName);
+    }
+
     constructor() {
         this._isRunning = false;
     }
 
     public getPipeHandlePath(): string {
         return vscode.workspace.rootPath ?
-            path.join(vscode.workspace.rootPath, 'temp-nativescript-vscode-extension-pipe-handle') :
+            ExtensionServer.getTempFilePathForDirectory(vscode.workspace.rootPath) :
             null;
     }
 

src/tests/testdata/DebuggerStatement/package.json

@@ -1,14 +1,20 @@
 {
-	"nativescript": {
-		"id": "org.nativescript.DebuggerStatement",
-		"tns-ios": {
-			"version": "1.7.0"
-		},
-		"tns-android": {
-			"version": "1.7.1"
-		}
-	},
-	"dependencies": {
-		"tns-core-modules": "1.7.1"
-	}
+  "nativescript": {
+    "id": "org.nativescript.DebuggerStatement",
+    "tns-ios": {
+      "version": "2.1.0"
+    },
+    "tns-android": {
+      "version": "2.1.1"
+    }
+  },
+  "dependencies": {
+    "tns-core-modules": "1.7.1"
+  },
+  "devDependencies": {
+    "babel-traverse": "6.10.4",
+    "babel-types": "6.11.1",
+    "babylon": "6.8.2",
+    "lazy": "1.0.11"
+  }
 }

src/tests/testdata/TestApp1/package.json

@@ -1,14 +1,20 @@
 {
-	"nativescript": {
-		"id": "org.nativescript.TestApp1",
-		"tns-ios": {
-			"version": "1.7.0"
-		},
-		"tns-android": {
-			"version": "1.7.1"
-		}
-	},
-	"dependencies": {
-		"tns-core-modules": "1.7.1"
-	}
+  "nativescript": {
+    "id": "org.nativescript.TestApp1",
+    "tns-ios": {
+      "version": "2.1.0"
+    },
+    "tns-android": {
+      "version": "2.1.1"
+    }
+  },
+  "dependencies": {
+    "tns-core-modules": "1.7.1"
+  },
+  "devDependencies": {
+    "babel-traverse": "6.10.4",
+    "babel-types": "6.11.1",
+    "babylon": "6.8.2",
+    "lazy": "1.0.11"
+  }
 }

src/tests/testdata/TestApp2/package.json

@@ -1,14 +1,20 @@
 {
-	"nativescript": {
-		"id": "org.nativescript.TestApp2",
-		"tns-ios": {
-			"version": "1.7.0"
-		},
-		"tns-android": {
-			"version": "1.7.1"
-		}
-	},
-	"dependencies": {
-		"tns-core-modules": "1.7.1"
-	}
+  "nativescript": {
+    "id": "org.nativescript.TestApp2",
+    "tns-ios": {
+      "version": "2.1.0"
+    },
+    "tns-android": {
+      "version": "2.1.1"
+    }
+  },
+  "dependencies": {
+    "tns-core-modules": "1.7.1"
+  },
+  "devDependencies": {
+    "babel-traverse": "6.10.4",
+    "babel-types": "6.11.1",
+    "babylon": "6.8.2",
+    "lazy": "1.0.11"
+  }
 }