Merge remote-tracking branch 'origin/master' into feature/tray

# Conflicts:
#	package.json

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/tsconfig.json

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