Simplify basic debug scenarios

doc/debugging.md

@@ -51,9 +51,7 @@ For UWP apps use `windows` target platform in `launch.json` configuration, e.g.:
     "program": "${workspaceRoot}/.vscode/launchReactNative.js",
     "type": "reactnative",
     "request": "launch",
-    "platform": "windows",
-    "sourceMaps": true,
-    "outDir": "${workspaceRoot}/.vscode/.react"
+    "platform": "windows"
 }
 ```
 
@@ -65,8 +63,6 @@ For WPF apps use `wpf`, e.g.(WPF debugging available only for react-native-windo
     "program": "${workspaceRoot}/.vscode/launchReactNative.js",
     "type": "reactnative",
     "request": "launch",
-    "platform": "wpf",
-    "sourceMaps": true,
-    "outDir": "${workspaceRoot}/.vscode/.react"
+    "platform": "wpf"
 }
 ```

package.json

@@ -129,9 +129,7 @@
 							"program": "^\"\\${workspaceRoot}/.vscode/launchReactNative.js\"",
 							"type": "reactnative",
 							"request": "launch",
-							"platform": "android",
-							"sourceMaps": true,
-							"outDir": "^\"\\${workspaceRoot}/.vscode/.react\""
+							"platform": "android"
 						}
 					},
 					{
@@ -142,9 +140,7 @@
 							"program": "^\"\\${workspaceRoot}/.vscode/launchReactNative.js\"",
 							"type": "reactnative",
 							"request": "launch",
-							"platform": "ios",
-							"sourceMaps": true,
-							"outDir": "^\"\\${workspaceRoot}/.vscode/.react\""
+							"platform": "ios"
 						}
 					},
 					{
@@ -154,9 +150,7 @@
 							"name": "Attach to packager",
 							"program": "^\"\\${workspaceRoot}/.vscode/launchReactNative.js\"",
 							"type": "reactnative",
-							"request": "attach",
-							"sourceMaps": true,
-							"outDir": "^\"\\${workspaceRoot}/.vscode/.react\""
+							"request": "attach"
 						}
 					},
 					{
@@ -167,9 +161,7 @@
 							"program": "^\"\\${workspaceRoot}/.vscode/launchReactNative.js\"",
 							"type": "reactnative",
 							"request": "launch",
-							"platform": "exponent",
-							"sourceMaps": true,
-							"outDir": "^\"\\${workspaceRoot}/.vscode/.react\""
+							"platform": "exponent"
 						}
 					}
 				],
@@ -188,11 +180,6 @@
 								"description": "%reactNative.attach.sourceMaps.description%",
 								"default": false
 							},
-							"outDir": {
-								"type": "string",
-								"description": "%reactNative.attach.outDir.description%",
-								"default": null
-							},
 							"sourceMapPathOverrides": {
 								"type": "object",
 								"description": "%reactNative.attach.sourceMapsPathOverrides.description%"
@@ -295,11 +282,6 @@
 									"ReactNativeJS:V"
 								]
 							},
-							"outDir": {
-								"type": "string",
-								"description": "%reactNative.launch.outDir.description%",
-								"default": null
-							},
 							"runArguments": {
 								"type": "array",
 								"description": "%reactNative.launch.runArguments.description%"

package.nls.json

@@ -19,7 +19,6 @@
     "reactNative.snippets.debugExpo.description":"A new configuration for launching Expo app",
     "reactNative.attach.program.description":"The path to launchReactNative.js in the vscode folder",
     "reactNative.attach.sourceMaps.description":"Whether to use JavaScript source maps to map the generated bundled code back to its original sources",
-    "reactNative.attach.outDir.description":"The location of the generated JavaScript code (the bundle file). Normally this should be \"${workspaceRoot}/.vscode/.react\"",
     "reactNative.attach.sourceMapsPathOverrides.description":"A set of mappings for rewriting the locations of source files from what the source map says, to their locations on disk. See https://github.com/Microsoft/vscode-react-native/blob/master/doc/debugging.md#debugging-with-typescript-and-haul for details",
     "reactNative.attach.trace.description":"Setup logging level in debugger.",
     "reactNative.attach.address.description":"TCP/IP address of debug port. Default is 'localhost'.",

src/debugger/nodeDebugWrapper.ts

@@ -150,6 +150,9 @@ export function makeSession(
                 logger.setup(Logger.LogLevel.Log, chromeDebugCoreLogs || false);
             }
 
+            if (!args.sourceMaps) {
+                args.sourceMaps = true;
+            }
             const projectRootPath = getProjectRoot(args);
             return ReactNativeProjectHelper.isReactNativeProject(projectRootPath)
                 .then((result) => {

src/extension/debugConfigurationProvider.ts

@@ -15,34 +15,26 @@ export class ReactNativeDebugConfigProvider implements vscode.DebugConfiguration
             "type": "reactnative",
             "request": "launch",
             "platform": "android",
-            "sourceMaps": true,
-            "outDir": "${workspaceRoot}/.vscode/.react",
         },
         "Debug iOS": {
             "name": "Debug iOS",
             "program": "${workspaceRoot}/.vscode/launchReactNative.js",
             "type": "reactnative",
             "request": "launch",
             "platform": "ios",
-            "sourceMaps": true,
-            "outDir": "${workspaceRoot}/.vscode/.react",
         },
         "Attach to packager": {
             "name": "Attach to packager",
             "program": "${workspaceRoot}/.vscode/launchReactNative.js",
             "type": "reactnative",
             "request": "attach",
-            "sourceMaps": true,
-            "outDir": "${workspaceRoot}/.vscode/.react",
         },
         "Debug in Exponent": {
             "name": "Debug in Exponent",
             "program": "${workspaceRoot}/.vscode/launchReactNative.js",
             "type": "reactnative",
             "request": "launch",
             "platform": "exponent",
-            "sourceMaps": true,
-            "outDir": "${workspaceRoot}/.vscode/.react",
         },
     };
 

src/extension/rn-extension.ts

@@ -67,11 +67,8 @@ export function activate(context: vscode.ExtensionContext): Q.Promise<void> {
         context.subscriptions.push(vscode.workspace.onDidChangeConfiguration((event) => onChangeConfiguration(context)));
 
         debugConfigProvider = vscode.debug.registerDebugConfigurationProvider("reactnative", configProvider);
-
         let activateExtensionEvent = TelemetryHelper.createTelemetryEvent("activate");
         Telemetry.send(activateExtensionEvent);
-
-
         let promises: any = [];
         if (workspaceFolders) {
             outputChannelLogger.debug(`Projects found: ${workspaceFolders.length}`);

test/smoke/resources/launch.json

@@ -6,35 +6,27 @@
             "program": "${workspaceRoot}/.vscode/launchReactNative.js",
             "type": "reactnative",
             "request": "launch",
-            "platform": "android",
-            "sourceMaps": true,
-            "outDir": "${workspaceRoot}/.vscode/.react"
+            "platform": "android"
         },
         {
             "name": "Debug iOS",
             "program": "${workspaceRoot}/.vscode/launchReactNative.js",
             "type": "reactnative",
             "request": "launch",
-            "platform": "ios",
-            "sourceMaps": true,
-            "outDir": "${workspaceRoot}/.vscode/.react"
+            "platform": "ios"
         },
         {
             "name": "Attach to packager",
             "program": "${workspaceRoot}/.vscode/launchReactNative.js",
             "type": "reactnative",
-            "request": "attach",
-            "sourceMaps": true,
-            "outDir": "${workspaceRoot}/.vscode/.react"
+            "request": "attach"
         },
         {
             "name": "Debug in Exponent",
             "program": "${workspaceRoot}/.vscode/launchReactNative.js",
             "type": "reactnative",
             "request": "launch",
-            "platform": "exponent",
-            "sourceMaps": true,
-            "outDir": "${workspaceRoot}/.vscode/.react"
+            "platform": "exponent"
         }
     ]
-}
+}