From 571694bb8e461326a26fe0a54b6f3ec6c68ffe0d Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Sun, 25 Oct 2020 10:28:43 +0200
Subject: [PATCH] merge fixes

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 extensions/support-page/Makefile      | 5 +++++
 extensions/support-page/tsconfig.json | 2 +-
 src/extensions/core-api/index.ts      | 2 ++
 src/extensions/core-api/stores.ts     | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 extensions/support-page/Makefile

diff --git a/extensions/support-page/Makefile b/extensions/support-page/Makefile
new file mode 100644
index 0000000000..d73e8524cb
--- /dev/null
+++ b/extensions/support-page/Makefile
@@ -0,0 +1,5 @@
+install-deps:
+	npm install
+
+build: install-deps
+	npm run build
diff --git a/extensions/support-page/tsconfig.json b/extensions/support-page/tsconfig.json
index c32d3f0b74..966b29e183 100644
--- a/extensions/support-page/tsconfig.json
+++ b/extensions/support-page/tsconfig.json
@@ -23,7 +23,7 @@
     }
   },
   "include": [
-    "renderer.ts",
+    "renderer.tsx",
     "../../src/extensions/npm/**/*.d.ts",
     "src/**/*"
   ]
diff --git a/src/extensions/core-api/index.ts b/src/extensions/core-api/index.ts
index 79d6c98151..c98266a2c5 100644
--- a/src/extensions/core-api/index.ts
+++ b/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,
diff --git a/src/extensions/core-api/stores.ts b/src/extensions/core-api/stores.ts
index b36e7a786f..9ff2c66763 100644
--- a/src/extensions/core-api/stores.ts
+++ b/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"