Merge branch 'master' into kddimitrov/bump-version-084

Author: rosen-vladimirov

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (c) 2015-2018 Telerik EAD
+   Copyright (c) 2015-2018 Progress Software Corporation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

package.json

@@ -36,6 +36,7 @@
     "@types/lodash": "^4.14.109",
     "@types/mocha": "^5.2.1",
     "@types/node": "6.0.46",
+    "@types/semver": "^5.5.0",
     "@types/universal-analytics": "0.4.1",
     "cpx": "^1.5.0",
     "mocha": "^5.2.0",
@@ -140,10 +141,7 @@
             "platform": "ios",
             "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
-            "watch": true,
-            "sourceMapPathOverrides": {
-               "webpack:///*": "${workspaceRoot}/src/*"
-            }
+            "watch": true
           },
           {
             "name": "Attach on iOS",
@@ -152,10 +150,7 @@
             "platform": "ios",
             "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
-            "watch": false,
-            "sourceMapPathOverrides": {
-               "webpack:///*": "${workspaceRoot}/src/*"
-            }
+            "watch": false
           },
           {
             "name": "Launch on Android",
@@ -164,10 +159,7 @@
             "platform": "android",
             "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
-            "watch": true,
-            "sourceMapPathOverrides": {
-               "webpack:///*": "${workspaceRoot}/src/*"
-            }
+            "watch": true
           },
           {
             "name": "Attach on Android",
@@ -176,10 +168,7 @@
             "platform": "android",
             "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
-            "watch": false,
-            "sourceMapPathOverrides": {
-               "webpack:///*": "${workspaceRoot}/src/*"
-            }
+            "watch": false
           }
         ],
         "configurationSnippets": [
@@ -193,10 +182,7 @@
               "platform": "ios",
               "appRoot": "^\"\\${workspaceRoot}\"",
               "sourceMaps": true,
-              "watch": true,
-              "sourceMapPathOverrides": {
-                 "webpack:///*": "${workspaceRoot}/src/*"
-              }
+              "watch": true
             }
           },
           {
@@ -209,10 +195,7 @@
               "platform": "android",
               "appRoot": "^\"\\${workspaceRoot}\"",
               "sourceMaps": true,
-              "watch": true,
-              "sourceMapPathOverrides": {
-                 "webpack:///*": "${workspaceRoot}/src/*"
-              }
+              "watch": true
             }
           },
           {
@@ -225,10 +208,7 @@
               "platform": "ios",
               "appRoot": "^\"\\${workspaceRoot}\"",
               "sourceMaps": true,
-              "watch": false,
-              "sourceMapPathOverrides": {
-                 "webpack:///*": "${workspaceRoot}/src/*"
-              }
+              "watch": false
             }
           },
           {
@@ -241,10 +221,7 @@
               "platform": "android",
               "appRoot": "^\"\\${workspaceRoot}\"",
               "sourceMaps": true,
-              "watch": false,
-              "sourceMapPathOverrides": {
-                 "webpack:///*": "${workspaceRoot}/src/*"
-              }
+              "watch": false
             }
           }
         ],

src/debug-adapter/nativeScriptDebugAdapter.ts

@@ -144,6 +144,17 @@ export class NativeScriptDebugAdapter extends ChromeDebugAdapter {
             args.webRoot = args.appRoot;
         }
 
+        if (!args.sourceMapPathOverrides) {
+            args.sourceMapPathOverrides = { };
+        }
+
+        if (!args.sourceMapPathOverrides['webpack:///*']) {
+            const appDirPath = this.getAppDirPath(args.webRoot) || 'app';
+            const fullAppDirPath = join(args.webRoot, appDirPath);
+
+            args.sourceMapPathOverrides['webpack:///*'] = `${fullAppDirPath}/*`;
+        }
+
         return args;
     }
 

src/project/androidProject.ts

@@ -1,14 +1,17 @@
 import { ChildProcess } from 'child_process';
 import { EventEmitter } from 'events';
+import * as semver from 'semver';
 import * as stream from 'stream';
 import { NativeScriptCli } from './nativeScriptCli';
 import { IDebugResult, Project } from './project';
 import * as scanner from './streamScanner';
 
 export class AndroidProject extends Project {
+    private cliVersion: string;
 
     constructor(appRoot: string, cli: NativeScriptCli) {
         super(appRoot, cli);
+        this.cliVersion = cli.executeGetVersion();
     }
 
     public platformName(): string {
@@ -23,7 +26,7 @@ export class AndroidProject extends Project {
         const debugProcess: ChildProcess = super.executeDebugCommand(args);
         const tnsOutputEventEmitter = new EventEmitter();
 
-        this.configureReadyEvent(debugProcess.stdout, tnsOutputEventEmitter, true);
+        this.configureReadyEvent(debugProcess.stdout, tnsOutputEventEmitter, false);
 
         return { tnsProcess: debugProcess, tnsOutputEventEmitter };
     }
@@ -37,26 +40,26 @@ export class AndroidProject extends Project {
 
         const debugProcess: ChildProcess = super.executeDebugCommand(args);
         const tnsOutputEventEmitter: EventEmitter = new EventEmitter();
+        const shouldWaitAfterRestartMessage = semver.lt(semver.coerce(this.cliVersion), '5.1.0');
+        const waitForRestartMessage = shouldWaitAfterRestartMessage || args.indexOf('--debug-brk') > -1;
 
-        this.configureReadyEvent(debugProcess.stdout, tnsOutputEventEmitter, false);
+        this.configureReadyEvent(debugProcess.stdout, tnsOutputEventEmitter, waitForRestartMessage);
 
         return { tnsProcess: debugProcess, tnsOutputEventEmitter };
     }
 
-    protected configureReadyEvent(readableStream: stream.Readable, eventEmitter: EventEmitter, attach?: boolean): void {
+    protected configureReadyEvent(readableStream: stream.Readable, eventEmitter: EventEmitter, waitForRestartMessage?: boolean): void {
         super.configureReadyEvent(readableStream, eventEmitter);
-
         let debugPort = null;
 
         new scanner.StringMatchingScanner(readableStream).onEveryMatch(new RegExp('device: .* debug port: [0-9]+'), (match: scanner.IMatchFound) => {
             // device: {device-name} debug port: {debug-port}
             debugPort = parseInt((match.matches[0] as string).match('(?:debug port: )([\\d]{5})')[1], 10);
-            if (attach) {
-                // wait a little before trying to connect, this gives a chance for adb to be able to connect to the debug socket
+            if (!waitForRestartMessage) {
                 setTimeout(() => { eventEmitter.emit('readyForConnection', debugPort); }, 1000);
             }
         });
-        if (!attach) {
+        if (waitForRestartMessage) {
             new scanner.StringMatchingScanner(readableStream).onEveryMatch('# NativeScript Debugger started #', (match: scanner.IMatchFound) => {
                 // wait a little before trying to connect, this gives a chance for adb to be able to connect to the debug socket
                 setTimeout(() => { eventEmitter.emit('readyForConnection', debugPort); }, 1000);