Merge branch 'master' into parker

1 files changed, 82 insertions, 106 deletions

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 9692c79d9..ce9f50f67 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -4,110 +4,86 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
-      {
-        "type": "chrome",
-        "request": "launch",
-        "name": "Launch Chrome against localhost",
-        "sourceMaps": true,
-        "breakOnLoad": true,
-        "url": "http://localhost:1050/login",
-        "webRoot": "${workspaceFolder}",
-        "runtimeArgs": [
-          "--experimental-modules"
-        ]
-      },
-      {
-        "type": "chrome",
-        "request": "launch",
-        "name": "Launch Chromium against localhost",
-        "sourceMaps": true,
-        "breakOnLoad": true,
-        "url": "http://localhost:1050/login",
-        "webRoot": "${workspaceFolder}",
-        "runtimeExecutable": "/usr/bin/chromium",
-        "runtimeArgs": [
-          "--experimental-modules"
-        ]
-      },
-      {
-        "type": "firefox",
-        "request": "launch",
-        "name": "Launch Firefox against localhost",
-        "reAttach": true,
-        "url": "http://localhost:1050/login",
-        "webRoot": "${workspaceFolder}",
-        "pathMappings": [
-          {
-            "url": "webpack://dash/src",
-            "path": "${workspaceFolder}/src"
-          }
-        ]
-      },
-      {
-        "type": "chrome",
-        "request": "launch",
-        "name": "Launch Chrome against Dash server",
-        "sourceMaps": true,
-        "breakOnLoad": true,
-        "url": "https://browndash.com/login",
-        "webRoot": "${workspaceFolder}"
-      },
-      {
-        "type": "node",
-        "request": "attach",
-        "name": "Typescript Server",
-        "protocol": "inspector",
-        "port": 9229,
-        "localRoot": "${workspaceFolder}",
-        "remoteRoot": "${workspaceFolder}"
-      },
-      {
-        "type": "node",
-        "request": "launch",
-        "name": "Current TS File",
-        "runtimeExecutable": "npx",
-        "runtimeArgs": [
-          "ts-node-dev",
-          "--nolazy",
-          "--inspect",
-          "--",
-          "${relativeFile}"
-        ],
-        "port": 9229
-      },
-      {
-        "type": "node",
-        "request": "launch",
-        "name": "Mocha Tests",
-        "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
-        "args": [
-          "-r",
-          "ts-node/register",
-          "--timeout",
-          "999999",
-          "--colors",
-          "${workspaceFolder}/test/**/*.ts"
-        ],
-        "console": "integratedTerminal",
-        "internalConsoleOptions": "openOnSessionStart",
-        "protocol": "inspector"
-      },
-      {
-        "type": "node",
-        "request": "launch",
-        "name": "Mocha Current File",
-        "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
-        "args": [
-          "-r",
-          "ts-node/register",
-          "--timeout",
-          "999999",
-          "--colors",
-          "${file}"
-        ],
-        "console": "integratedTerminal",
-        "internalConsoleOptions": "openOnSessionStart",
-        "protocol": "inspector"
-      }
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Launch Chrome against localhost",
+            "sourceMaps": true,
+            "breakOnLoad": true,
+            "url": "http://localhost:1050/login",
+            "webRoot": "${workspaceFolder}",
+            "runtimeArgs": ["--experimental-modules"]
+        },
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Launch Chromium against localhost",
+            "sourceMaps": true,
+            "breakOnLoad": true,
+            "url": "http://localhost:1050/login",
+            "webRoot": "${workspaceFolder}",
+            "runtimeExecutable": "/usr/bin/chromium",
+            "runtimeArgs": ["--experimental-modules"]
+        },
+        {
+            "type": "firefox",
+            "request": "launch",
+            "name": "Launch Firefox against localhost",
+            "reAttach": true,
+            "url": "http://localhost:1050/login",
+            "webRoot": "${workspaceFolder}",
+            "pathMappings": [
+                {
+                    "url": "webpack://dash/src",
+                    "path": "${workspaceFolder}/src"
+                }
+            ]
+        },
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Launch Chrome against Dash server",
+            "sourceMaps": true,
+            "breakOnLoad": true,
+            "url": "https://browndash.com/login",
+            "webRoot": "${workspaceFolder}"
+        },
+        {
+            "type": "node",
+            "request": "attach",
+            "name": "Typescript Server",
+            "protocol": "inspector",
+            "port": 9229,
+            "localRoot": "${workspaceFolder}",
+            "remoteRoot": "${workspaceFolder}"
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Current TS File",
+            "runtimeExecutable": "npx",
+            "runtimeArgs": ["ts-node-dev", "--nolazy", "--inspect", "--", "${relativeFile}"],
+            "port": 9229
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Mocha Tests",
+            "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+            "args": ["-r", "ts-node/register", "--timeout", "999999", "--colors", "${workspaceFolder}/test/**/*.ts"],
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "openOnSessionStart",
+            "protocol": "inspector"
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Mocha Current File",
+            "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+            "args": ["-r", "ts-node/register", "--timeout", "999999", "--colors", "${file}"],
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "openOnSessionStart",
+            "protocol": "inspector"
+        }
     ]
-}
\ No newline at end of file
+}