fix(overmind-devtools-client): fix deps and padding

christianalfoni · christianalfoni · commit 6eaeee8fffc1 · 2019-06-18T20:55:11.000+02:00
diff --git a/packages/node_modules/overmind-devtools-client/src/index.tsx b/packages/node_modules/overmind-devtools-client/src/index.tsx
@@ -9,7 +9,8 @@ injectGlobal`
   ${css}
 
   html, body {
-    margin: 0;
+    margin: 0 !important;
+    padding: 0 !important;
     height: 100%;
   }
 
diff --git a/packages/node_modules/overmind-devtools-vscode/package.json b/packages/node_modules/overmind-devtools-vscode/package.json
@@ -40,7 +40,7 @@
     ]
   },
   "scripts": {
-    "vscode:prepublish": "yarn run compile",
+    "vscode:prepublish": "npm run compile",
     "compile": "tsc -p ./",
     "watch": "tsc -watch -p ./",
     "postinstall": "node ./node_modules/vscode/bin/install"
diff --git a/packages/node_modules/overmind-devtools-vscode/src/DevtoolsPanel.ts b/packages/node_modules/overmind-devtools-vscode/src/DevtoolsPanel.ts
@@ -1,62 +1,61 @@
-import * as vscode from "vscode";
-import * as path from "path";
-import { log } from "./utils/Logger";
+import * as vscode from 'vscode'
+import * as path from 'path'
+import { log } from './utils/Logger'
 
 export class DevtoolsPanel {
-  public static currentPanel: DevtoolsPanel | undefined;
+  public static currentPanel: DevtoolsPanel | undefined
 
-  public static viewType = "overmindDevtools";
+  public static viewType = 'overmindDevtools'
 
   // keeps track of location for overmind-devetools js bundle
-  public static scriptFile: any = null;
+  public static scriptFile: any = null
 
-  private readonly _panel: vscode.WebviewPanel;
+  private readonly _panel: vscode.WebviewPanel
 
-  private _disposables: vscode.Disposable[] = [];
+  private _disposables: vscode.Disposable[] = []
 
   private constructor(panel: vscode.WebviewPanel, extensionPath: string) {
-    this._panel = panel;
-    this.update();
+    this._panel = panel
+    this.update()
 
-    this._panel.onDidDispose(() => this.dispose(), null, this._disposables);
+    this._panel.onDidDispose(() => this.dispose(), null, this._disposables)
 
     this._panel.onDidChangeViewState(
-      e => {
+      (e) => {
         if (this._panel.visible) {
-          this.update();
+          this.update()
         }
       },
       null,
       this._disposables
-    );
+    )
 
     this._panel.webview.onDidReceiveMessage(
-      message => {
+      (message) => {
         switch (message.command) {
-          case "alert":
-            vscode.window.showErrorMessage(message.text);
-            
+          case 'alert':
+            vscode.window.showErrorMessage(message.text)
         }
       },
       null,
       this._disposables
-    );
+    )
   }
 
   dispose(): any {
-    DevtoolsPanel.currentPanel = undefined;
-    this._panel.dispose();
+    DevtoolsPanel.currentPanel = undefined
+    this._panel.dispose()
     while (this._disposables.length) {
-      const x = this._disposables.pop();
+      const x = this._disposables.pop()
       if (x) {
-        x.dispose();
+        x.dispose()
       }
     }
   }
 
   private update() {
-    log("Extension.update");
-    this._panel.webview.html = this.getHtmlForWevbiew();
+    log('Extension.update')
+    this._panel.webview.html = this.getHtmlForWevbiew()
   }
 
   private getHtmlForWevbiew(): string {
@@ -77,38 +76,38 @@ export class DevtoolsPanel {
         />
       </head>
       <body>
-      <script type="text/javascript" src="${DevtoolsPanel.scriptFile}"></script>
+      <script type="text/javascript" src="http://localhost:8080/bundle.js"></script>
       </body>
     </html>
-    `;
+    `
   }
 
   static createOrShow(extensionPath: string) {
     const column = vscode.window.activeTextEditor
       ? vscode.window.activeTextEditor.viewColumn
-      : undefined;
+      : undefined
 
     if (DevtoolsPanel.currentPanel) {
-      DevtoolsPanel.currentPanel._panel.reveal(column);
-      return;
+      DevtoolsPanel.currentPanel._panel.reveal(column)
+      return
     }
     const panel = vscode.window.createWebviewPanel(
       DevtoolsPanel.viewType,
-      "Overmind",
+      'Overmind',
       column || vscode.ViewColumn.One,
       {
         enableScripts: true,
         retainContextWhenHidden: true,
         localResourceRoots: [
-          vscode.Uri.file(path.join(extensionPath, "devtoolsDist"))
-        ]
+          vscode.Uri.file(path.join(extensionPath, 'devtoolsDist')),
+        ],
       }
-    );
+    )
 
-    DevtoolsPanel.currentPanel = new DevtoolsPanel(panel, extensionPath);
+    DevtoolsPanel.currentPanel = new DevtoolsPanel(panel, extensionPath)
   }
 
   static revive(webViewPanel: vscode.WebviewPanel, extensionPath: string) {
-    DevtoolsPanel.currentPanel = new DevtoolsPanel(webViewPanel, extensionPath);
+    DevtoolsPanel.currentPanel = new DevtoolsPanel(webViewPanel, extensionPath)
   }
 }

Original file line number	Diff line number	Diff line change
@@ -9,7 +9,8 @@ injectGlobal`
`9`	`9`	`${css}`
`10`	`10`
`11`	`11`	`html, body {`
`12`		`- margin: 0;`
	`12`	`+ margin: 0 !important;`
	`13`	`+ padding: 0 !important;`
`13`	`14`	`height: 100%;`
`14`	`15`	`}`
`15`	`16`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`]`
`41`	`41`	`},`
`42`	`42`	`"scripts": {`
`43`		`- "vscode:prepublish": "yarn run compile",`
	`43`	`+ "vscode:prepublish": "npm run compile",`
`44`	`44`	`"compile": "tsc -p ./",`
`45`	`45`	`"watch": "tsc -watch -p ./",`
`46`	`46`	`"postinstall": "node ./node_modules/vscode/bin/install"`