feat(overmind): vscode extension uses port from config, passes it along

eirikhm · eirikhm · commit 87336460cdfd · 2019-06-19T20:04:25.000+02:00
diff --git a/packages/node_modules/overmind-devtools-vscode/src/extension.ts b/packages/node_modules/overmind-devtools-vscode/src/extension.ts
@@ -3,7 +3,7 @@ import { DevtoolsPanel } from './DevtoolsPanel'
 import { log } from './utils/Logger'
 import * as path from 'path'
 
-function getMarkup(scriptSource: vscode.Uri | string): string {
+function getMarkup(scriptSource: vscode.Uri | string, port: number): string {
   return `<!DOCTYPE html>
 <html lang="en">
   <head>
@@ -19,6 +19,9 @@ function getMarkup(scriptSource: vscode.Uri | string): string {
       href="https://fonts.googleapis.com/css?family=Nunito:400,700"
       rel="stylesheet"
     />
+    <script type="text/javascript">
+      window['__OVERMIND_DEVTOOLS_BACKEND_PORT__'] = "${port}";
+    </script>
   </head>
   <body>
   <script type="text/javascript" src="${scriptSource}"></script>
@@ -51,17 +54,19 @@ export function activate(context: vscode.ExtensionContext) {
     },
   }
 
-  const DevtoolBackend = require('overmind-devtools-client/DevtoolBackend')
-  DevtoolBackend.create({
-    port: 3031,
-    onRelaunch() {
-      console.log('relaunch')
-    },
-    storage,
-  })
-
   context.subscriptions.push(
     vscode.commands.registerCommand('overmind-devtools.start', () => {
+      const port: number =
+        vscode.workspace.getConfiguration().get('overmind-devtools.port') || 3301
+      const DevtoolBackend = require('overmind-devtools-client/DevtoolBackend')
+      DevtoolBackend.create({
+        port: port,
+        onRelaunch() {
+          console.log('relaunch')
+        },
+        storage,
+      })
+
       let scriptFile: vscode.Uri | string
 
       // TODO consider https://github.com/microsoft/vscode/commit/fbcdb4c6a736ff38e60a7e9d0a3f1be5ccbaf3af ?
@@ -74,7 +79,7 @@ export function activate(context: vscode.ExtensionContext) {
         scriptFile = onDiskPath.with({ scheme: 'vscode-resource' })
       }
 
-      DevtoolsPanel.markup = getMarkup(scriptFile)
+      DevtoolsPanel.markup = getMarkup(scriptFile, port)
       DevtoolsPanel.createOrShow(context.extensionPath) // refactor to keep local reference to panel
     })
   )
