feat(overmind): support running in dev and prod

eirikhm · christianalfoni · commit e60bc7aeb543 · 2019-06-18T20:56:54.000+02:00
diff --git a/packages/node_modules/overmind-devtools-vscode/.vscode/launch.json b/packages/node_modules/overmind-devtools-vscode/.vscode/launch.json
@@ -12,7 +12,10 @@
       "runtimeExecutable": "${execPath}",
       "args": ["--extensionDevelopmentPath=${workspaceFolder}"],
       "outFiles": ["${workspaceFolder}/out/**/*.js"],
-      "preLaunchTask": "npm: watch"
+      "preLaunchTask": "npm: watch",
+      "env": {
+        "VSCODE_DEBUG_MODE": "true"
+      }
     },
     {
       "name": "Extension Tests",
diff --git a/packages/node_modules/overmind-devtools-vscode/src/DevtoolsPanel.ts b/packages/node_modules/overmind-devtools-vscode/src/DevtoolsPanel.ts
@@ -1,5 +1,6 @@
 import * as vscode from 'vscode'
 import { log } from './utils/Logger'
+import * as path from 'path'
 
 export class DevtoolsPanel {
   public static currentPanel: DevtoolsPanel | undefined
@@ -10,6 +11,8 @@ export class DevtoolsPanel {
 
   private _disposables: vscode.Disposable[] = []
 
+  public static markup: string = ''
+
   private constructor(panel: vscode.WebviewPanel, extensionPath: string) {
     this._panel = panel
     this.update()
@@ -55,27 +58,7 @@ export class DevtoolsPanel {
   }
 
   private getHtmlForWevbiew(): string {
-    return `<!DOCTYPE html>
-    <html lang="en">
-      <head>
-        <meta charset="UTF-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta http-equiv="X-UA-Compatible" content="ie=edge" />
-        <title>Document</title>
-        <link
-          href="https://fonts.googleapis.com/css?family=Source+Code+Pro"
-          rel="stylesheet"
-        />
-        <link
-          href="https://fonts.googleapis.com/css?family=Nunito:400,700"
-          rel="stylesheet"
-        />
-      </head>
-      <body>
-      <script type="text/javascript" src="http://localhost:8080/bundle.js"></script>
-      </body>
-    </html>
-    `
+    return DevtoolsPanel.markup
   }
 
   static createOrShow(extensionPath: string) {
@@ -94,7 +77,9 @@ export class DevtoolsPanel {
       {
         enableScripts: true,
         retainContextWhenHidden: true,
-        localResourceRoots: [],
+        localResourceRoots: [
+          vscode.Uri.file(path.join(extensionPath, 'devtoolsDist')),
+        ],
       }
     )
 
diff --git a/packages/node_modules/overmind-devtools-vscode/src/extension.ts b/packages/node_modules/overmind-devtools-vscode/src/extension.ts
@@ -1,6 +1,31 @@
 import * as vscode from 'vscode'
 import { DevtoolsPanel } from './DevtoolsPanel'
 import { log } from './utils/Logger'
+import * as path from 'path'
+
+function getMarkup(scriptSource: vscode.Uri | string): string {
+  return `<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta http-equiv="X-UA-Compatible" content="ie=edge" />
+    <title>Document</title>
+    <link
+      href="https://fonts.googleapis.com/css?family=Source+Code+Pro"
+      rel="stylesheet"
+    />
+    <link
+      href="https://fonts.googleapis.com/css?family=Nunito:400,700"
+      rel="stylesheet"
+    />
+  </head>
+  <body>
+  <script type="text/javascript" src="${scriptSource}"></script>
+  </body>
+</html>
+`
+}
 
 // this method is called when your extension is activated
 // your extension is activated the very first time the command is executed
@@ -37,6 +62,19 @@ export function activate(context: vscode.ExtensionContext) {
 
   context.subscriptions.push(
     vscode.commands.registerCommand('overmind-devtools.start', () => {
+      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'
+      } else {
+        const onDiskPath = vscode.Uri.file(
+          path.join(context.extensionPath, 'devtoolsDist', 'bundle.js')
+        )
+        scriptFile = onDiskPath.with({ scheme: 'vscode-resource' })
+      }
+
+      DevtoolsPanel.markup = getMarkup(scriptFile)
       DevtoolsPanel.createOrShow(context.extensionPath) // refactor to keep local reference to panel
     })
   )
