merge fixes

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

extensions/support-page/Makefile

@@ -0,0 +1,5 @@
+install-deps:
+	npm install
+
+build: install-deps
+	npm run build

extensions/support-page/tsconfig.json

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

src/extensions/core-api/index.ts

@@ -10,11 +10,13 @@ import * as Store from "./stores"
 import * as Util from "./utils"
 import * as Registry from "../registries"
 import * as CommonVars from "../../common/vars";
+import * as ClusterFeature from "./cluster-feature"
 
 export let windowManager: WindowManager;
 
 export {
   EventBus,
+  ClusterFeature,
   Store,
   Util,
   Registry,

src/extensions/core-api/stores.ts

@@ -1,2 +1,2 @@
 export { ExtensionStore } from "../extension-store"
-export { Cluster } from "../../main/cluster"
+export type { Cluster } from "../../main/cluster"