merge-conflicts fixes

Signed-off-by: Roman <ixrock@gmail.com>

README.md

@@ -40,9 +40,10 @@ brew cask install lens
 
 Allows for faster separate re-runs of some of the more involved processes:
 
-1. `yarn dev:main` compiles electron's main process part and start watching files 
-1. `yarn dev:renderer` compiles electron's renderer part and start watching files  
-1. `yarn dev-run` runs app in dev-mode and restarts when electron's main process file has changed
+1. `yarn dev:main` compiles electron's main process app part 
+1. `yarn dev:renderer` compiles electron's renderer app part  
+1. `yarn dev:extension-types` compile declaration types for `@k8slens/extensions`  
+1. `yarn dev-run` runs app in dev-mode and auto-restart when main process file has changed
 
 ## Developer's ~~RTFM~~ recommended list:
 

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>

package.json

@@ -16,12 +16,12 @@
     "dev-run": "nodemon --watch static/build/main.js --exec \"electron --inspect .\"",
     "dev:main": "yarn compile:main --watch",
     "dev:renderer": "yarn compile:renderer --watch",
-    "dev:extension-rollup": "yarn compile:extension-rollup --watch",
+    "dev:extension-types": "yarn compile:extension-types --watch",
     "compile": "env NODE_ENV=production concurrently yarn:compile:*",
     "compile:main": "webpack --config webpack.main.ts",
     "compile:renderer": "webpack --config webpack.renderer.ts",
     "compile:i18n": "lingui compile",
-    "compile:extension-rollup": "rollup --config src/extensions/rollup.config.js",
+    "compile:extension-types": "rollup --config src/extensions/rollup.config.js",
     "build:linux": "yarn compile && electron-builder --linux --dir -c.productName=Lens",
     "build:mac": "yarn compile && electron-builder --mac --dir -c.productName=Lens",
     "build:win": "yarn compile && electron-builder --win --dir -c.productName=Lens",
@@ -349,7 +349,6 @@
     "raw-loader": "^4.0.1",
     "react": "^16.14.0",
     "react-beautiful-dnd": "^13.0.0",
-    "react-beautiful-dnd": "^13.0.0",
     "react-dom": "^16.13.1",
     "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",

src/common/user-store.ts

@@ -66,7 +66,7 @@ export class UserStore extends BaseStore<UserStoreModel> {
     if (app) {
       // track telemetry availability
       reaction(() => this.preferences.allowTelemetry, allowed => {
-        tracker.event("telemetry", allowed ? "enabled" : "disabled");
+        appEventBus.emit({name: "telemetry", action: allowed ? "enabled" : "disabled"})
       });
 
       // open at system start-up

src/extensions/core-api/app.ts

@@ -1,5 +1,4 @@
-import { app } from "electron";
 import { getAppVersion } from "../../common/utils";
 
 export const version = getAppVersion()
-export { isSnap, isWindows, isMac, isLinux, appName } from "../../common/vars"
+export { isSnap, isWindows, isMac, isLinux, appName, slackUrl, issuesTrackerUrl } from "../../common/vars"

src/extensions/core-api/index.ts

@@ -10,7 +10,6 @@ import * as EventBus from "./event-bus"
 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;
@@ -22,5 +21,4 @@ export {
   Store,
   Util,
   Registry,
-  CommonVars,
 }

src/main/index.ts

@@ -27,6 +27,7 @@ const workingDir = path.join(app.getPath("appData"), appName);
 let proxyPort: number;
 let proxyServer: LensProxy;
 let clusterManager: ClusterManager;
+let windowManager: WindowManager;
 
 app.setName(appName);
 if (!process.env.CICD) {
@@ -75,14 +76,15 @@ app.on("ready", async () => {
     app.exit();
   }
 
-  LensExtensionsApi.windowManager = new WindowManager(proxyPort);
+  windowManager = new WindowManager(proxyPort);
 
+  LensExtensionsApi.windowManager = windowManager; // expose to extensions
   extensionLoader.loadOnMain()
   extensionLoader.extensions.replace(await extensionManager.load())
   extensionLoader.broadcastExtensions()
 
   setTimeout(() => {
-    appEventBus.emit({name: "app", action: "start"})
+    appEventBus.emit({ name: "app", action: "start" })
   }, 1000)
 });
 

src/main/menu.ts

@@ -215,7 +215,7 @@ export function buildMenu(windowManager: WindowManager) {
   // Modify menu from extensions-api
   menuRegistry.getItems().forEach(({ parentId, ...menuItem }) => {
     try {
-      const topMenu = appMenu[parentId].submenu as MenuItemConstructorOptions[];
+      const topMenu = appMenu[parentId as MenuTopId].submenu as MenuItemConstructorOptions[];
       topMenu.push(menuItem);
     } catch (err) {
       logger.error(`[MENU]: can't register menu item, parentId=${parentId}`, { menuItem })

src/main/window-manager.ts

@@ -3,10 +3,10 @@ import { clusterStore } from "../common/cluster-store";
 import { observable } from "mobx";
 import { app, BrowserWindow, dialog, ipcMain, shell, webContents } from "electron"
 import windowStateKeeper from "electron-window-state"
-import { initMenu } from "./menu";
-import { initTray } from "./tray";
 import { extensionLoader } from "../extensions/extension-loader";
 import { appEventBus } from "../common/event-bus"
+import { initMenu } from "./menu";
+import { initTray } from "./tray";
 
 export class WindowManager {
   protected mainWindow: BrowserWindow;

src/renderer/components/+cluster-settings/cluster-settings.tsx

@@ -2,6 +2,7 @@ import "./cluster-settings.scss";
 
 import React from "react";
 import { reaction } from "mobx";
+import { RouteComponentProps } from "react-router";
 import { observer, disposeOnUnmount } from "mobx-react";
 import { Features } from "./features";
 import { Removal } from "./removal";
@@ -12,6 +13,7 @@ import { ClusterIcon } from "../cluster-icon";
 import { IClusterSettingsRouteParams } from "./cluster-settings.route";
 import { clusterStore } from "../../../common/cluster-store";
 import { clusterIpc } from "../../../common/cluster-ipc";
+import { PageLayout } from "../layout/page-layout";
 
 interface Props extends RouteComponentProps<IClusterSettingsRouteParams> {
 }

src/renderer/components/cluster-manager/cluster-manager.tsx

@@ -1,4 +1,5 @@
 import "./cluster-manager.scss"
+
 import React from "react";
 import { Redirect, Route, Switch } from "react-router";
 import { comparer, reaction } from "mobx";
@@ -15,6 +16,7 @@ import { clusterViewRoute, clusterViewURL } from "./cluster-view.route";
 import { clusterStore } from "../../../common/cluster-store";
 import { hasLoadedView, initView, lensViews, refreshViews } from "./lens-views";
 import { globalPageRegistry } from "../../../extensions/registries/page-registry";
+import { getMatchedClusterId } from "../../navigation";
 
 @observer
 export class ClusterManager extends React.Component {

src/renderer/components/cluster-manager/clusters-menu.tsx

@@ -22,7 +22,6 @@ import { Tooltip } from "../tooltip";
 import { ConfirmDialog } from "../confirm-dialog";
 import { clusterIpc } from "../../../common/cluster-ipc";
 import { clusterViewURL } from "./cluster-view.route";
-import { DragDropContext, Draggable, DraggableProvided, Droppable, DroppableProvided, DropResult } from "react-beautiful-dnd";
 import { globalPageRegistry } from "../../../extensions/registries/page-registry";
 
 interface Props {

yarn.lock

@@ -4785,6 +4785,11 @@ detect-indent@~5.0.0:
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
   integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
 
+detect-libc@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
+
 detect-newline@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
@@ -9161,15 +9166,6 @@ no-case@^3.0.3:
     lower-case "^2.0.1"
     tslib "^1.10.0"
 
-node-fetch-npm@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz#6507d0e17a9ec0be3bec516958a497cec54bf5a4"
-  integrity sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==
-  dependencies:
-    encoding "^0.1.11"
-    json-parse-better-errors "^1.0.0"
-    safe-buffer "^5.1.1"
-
 node-abi@^2.7.0:
   version "2.19.1"
   resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.19.1.tgz#6aa32561d0a5e2fdb6810d8c25641b657a8cea85"
@@ -9182,6 +9178,15 @@ node-addon-api@^3.0.2:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.0.2.tgz#04bc7b83fd845ba785bb6eae25bc857e1ef75681"
   integrity sha512-+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg==
 
+node-fetch-npm@^2.0.2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz#6507d0e17a9ec0be3bec516958a497cec54bf5a4"
+  integrity sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==
+  dependencies:
+    encoding "^0.1.11"
+    json-parse-better-errors "^1.0.0"
+    safe-buffer "^5.1.1"
+
 node-forge@^0.7.5:
   version "0.7.6"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.6.tgz#fdf3b418aee1f94f0ef642cd63486c77ca9724ac"
@@ -10819,7 +10824,7 @@ raw-loader@^4.0.1:
     loader-utils "^2.0.0"
     schema-utils "^2.6.5"
 
-rc@^1.0.1, rc@^1.1.6, rc@^1.2.8:
+rc@^1.0.1, rc@^1.1.6, rc@^1.2.7, rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==