Merge branch 'master' into extensions_register_feature_clean_up

# Conflicts:
#	extensions/support-page/main.ts

extensions/support-page/main.ts

@@ -7,10 +7,7 @@ export default class SupportPageMainExtension extends LensMainExtension {
       parentId: "help",
       label: "Support",
       click() {
-        windowManager.navigate({
-          channel: "menu:navigate", // fixme: use windowManager.ensureMainWindow from Tray's PR
-          url: supportPageURL(),
-        });
+        windowManager.navigate(supportPageURL());
       }
     }
   ]

extensions/support-page/package-lock.json

@@ -4,6 +4,10 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@k8slens/extensions": {
+      "version": "file:../../src/extensions/npm/extensions",
+      "dev": true
+    },
     "@types/anymatch": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz",

extensions/support-page/package.json

@@ -14,6 +14,7 @@
     "@types/react": "^16.9.53",
     "@types/react-router": "^5.1.8",
     "@types/webpack": "^4.41.17",
+    "@k8slens/extensions": "file:../../src/extensions/npm/extensions",
     "mobx": "^5.15.5",
     "react": "^16.13.1",
     "ts-loader": "^8.0.4",

extensions/support-page/src/support.tsx

@@ -3,13 +3,13 @@
 
 import React from "react"
 import { observer } from "mobx-react"
-import { CommonVars, Component } from "@k8slens/extensions";
+import { App, Component } from "@k8slens/extensions";
 
 @observer
 export class Support extends React.Component {
   render() {
     const { PageLayout } = Component;
-    const { slackUrl, issuesTrackerUrl } = CommonVars;
+    const { slackUrl, issuesTrackerUrl } = App;
     return (
       <PageLayout showOnTop className="Support" header={<h2>Support</h2>}>
         <h2>Community Slack Channel</h2>

extensions/support-page/tsconfig.json

@@ -24,7 +24,6 @@
   },
   "include": [
     "renderer.tsx",
-    "../../src/extensions/npm/**/*.d.ts",
     "src/**/*"
   ]
 }