Merge branch 'vscode' of https://github.com/cerebral/overmind into vscode

Author: christianalfoni

packages/node_modules/overmind-devtools-vscode/package.json

@@ -20,13 +20,23 @@
       "title": "Overmind Devtools",
       "type": "object",
       "properties": {
-        "overmind-devtools.port": {
+        "overmind.port": {
           "default": 3031,
           "description": "Port for devtools backend server",
           "type": "number"
         },
-        "overmind-devtools.verbose": {
-          "default": "",
+        "overmind.devmode.url": {
+          "default": "http://localhost:8080/bundle.js",
+          "description": "Where to look for overmind-devtools-client in devmode",
+          "type": "string"
+        },
+        "overmind.devmode.enabled": {
+          "default": false,
+          "description": "Enable devmode. Will serve client from specified url",
+          "type": "boolean"
+        },
+        "overmind.logging.verbose": {
+          "default": false,
           "description": "Toggles verbose logging",
           "type": "boolean"
         }

packages/node_modules/overmind-devtools-vscode/src/extension.ts

@@ -56,16 +56,16 @@ export function activate(context: vscode.ExtensionContext) {
 
   function startDevtools() {
     const port: number =
-      vscode.workspace.getConfiguration().get('overmind-devtools.port') || 3031
+      vscode.workspace.getConfiguration().get('overmind.port') || 3031
 
     devtoolBackend
       .connect(port)
       .then(() => {
         let scriptFile: vscode.Uri | string
 
         // TODO consider https://github.com/microsoft/vscode/commit/fbcdb4c6a736ff38e60a7e9d0a3f1be5ccbaf3af ?
-        if (process.env.VSCODE_DEBUG_MODE) {
-          scriptFile = 'http://localhost:8080/bundle.js'
+        if (process.env.VSCODE_DEBUG_MODE || vscode.workspace.getConfiguration().get('overmind.devmode.enabled')) {
+          scriptFile = <string>vscode.workspace.getConfiguration().get('overmind.devmode.url')
         } else {
           const onDiskPath = vscode.Uri.file(
             path.join(context.extensionPath, 'devtoolsDist', 'bundle.js')