Merge remote-tracking branch 'origin/extensions-api' into extension_support_page

# Conflicts:
#	extensions/telemetry/package.json
#	extensions/telemetry/renderer.tsx
#	extensions/telemetry/src/tracker.ts
#	src/extensions/core-api/registries.ts
#	src/extensions/extension-api.ts
#	src/extensions/extension-renderer-api.ts
#	src/extensions/lens-renderer-runtime.ts
#	src/extensions/renderer-api/registries.ts

extensions/example-extension/main.ts

@@ -1,4 +1,4 @@
-import { LensMainExtension } from "@lens/extensions";
+import { LensMainExtension } from "@k8slens/extensions";
 
 export default class ExampleExtensionMain extends LensMainExtension {
   onActivate() {

extensions/example-extension/page.tsx

@@ -1,13 +1,13 @@
-import { Component, LensRendererExtension } from "@lens/ui-extensions";
+import { LensRendererExtension, Component } from "@k8slens/extensions";
 import { CoffeeDoodle } from "react-open-doodles";
 import path from "path";
 import React from "react"
 
-export function ExtensionIcon(props: Component.IconProps) {
+export function ExampleIcon(props: Component.IconProps) {
   return <Component.Icon {...props} material="pages" tooltip={path.basename(__filename)}/>
 }
 
-export class ExtensionPage extends React.Component<{ extension: LensRendererExtension }> {
+export class ExamplePage extends React.Component<{ extension: LensRendererExtension }> {
   deactivate = () => {
     const { extension } = this.props;
     extension.disable();
@@ -27,7 +27,3 @@ export class ExtensionPage extends React.Component<{ extension: LensRendererExte
     )
   }
 }
-
-export function examplePage(ext: LensRendererExtension) {
-  return () => <ExtensionPage extension={ext} />
-}

extensions/example-extension/renderer.tsx

@@ -1,5 +1,6 @@
-import { Registry, LensRendererExtension } from "@lens/ui-extensions";
-import { examplePage, ExtensionIcon } from "./page"
+import { LensRendererExtension, Registry } from "@k8slens/extensions";
+import { ExamplePage, ExampleIcon } from "./page"
+import React from "react"
 
 export default class ExampleExtension extends LensRendererExtension {
   onActivate() {
@@ -13,8 +14,8 @@ export default class ExampleExtension extends LensRendererExtension {
         path: "/extension-example",
         title: "Example Extension",
         components: {
-          Page: examplePage(this),
-          MenuIcon: ExtensionIcon,
+          Page: () => <ExamplePage extension={this} />,
+          MenuIcon: ExampleIcon,
         }
       })
     )

extensions/example-extension/tsconfig.json

@@ -16,7 +16,7 @@
     "jsx": "react"
   },
   "include": [
-    "../../types",
+    "../../src/extensions/npm/**/*.d.ts",
     "./*.ts",
     "./*.tsx"
   ],

extensions/example-extension/webpack.config.js

@@ -17,8 +17,9 @@ module.exports = [
     },
     externals: [
       {
-        "@lens/extensions": "var global.LensExtensions",
+        "@k8slens/extensions": "var global.LensExtensions",
         "mobx": "var global.Mobx",
+        "react": "var global.React"
       }
     ],
     resolve: {
@@ -31,7 +32,7 @@ module.exports = [
     },
   },
   {
-    entry: './renderer.ts',
+    entry: './renderer.tsx',
     context: __dirname,
     target: "electron-renderer",
     mode: "production",
@@ -46,7 +47,7 @@ module.exports = [
     },
     externals: [
       {
-        "@lens/ui-extensions": "var global.LensExtensions",
+        "@k8slens/extensions": "var global.LensExtensions",
         "react": "var global.React",
         "mobx": "var global.Mobx"
       }

extensions/telemetry/main.ts

@@ -1,4 +1,4 @@
-import { LensMainExtension } from "@lens/extensions";
+import { LensMainExtension } from "@k8slens/extensions";
 import { telemetryPreferencesStore } from "./src/telemetry-preferences-store"
 import { tracker } from "./src/tracker";
 
@@ -7,7 +7,7 @@ export default class TelemetryMainExtension extends LensMainExtension {
   async onActivate() {
     console.log("telemetry main extension activated")
     tracker.start()
-    await telemetryPreferencesStore.load()
+    await telemetryPreferencesStore.loadExtension(this)
   }
 
   onDeactivate() {

extensions/telemetry/package.json

@@ -9,8 +9,8 @@
     "styles": []
   },
   "scripts": {
-    "build": "webpack -p",
-    "dev": "webpack --watch"
+    "build": "webpack --config webpack.config.js",
+    "dev": "npm run build --watch"
   },
   "dependencies": {},
   "devDependencies": {

extensions/telemetry/renderer.tsx

@@ -1,4 +1,4 @@
-import { Registry, LensRendererExtension } from "@lens/ui-extensions";
+import { LensRendererExtension, Registry } from "@k8slens/extensions";
 import { telemetryPreferencesStore } from "./src/telemetry-preferences-store"
 import { TelemetryPreferenceHint, TelemetryPreferenceInput } from "./src/telemetry-preference"
 import { tracker } from "./src/tracker"
@@ -8,7 +8,7 @@ export default class TelemetryRendererExtension extends LensRendererExtension {
   async onActivate() {
     console.log("telemetry extension activated")
     tracker.start()
-    await telemetryPreferencesStore.load()
+    await telemetryPreferencesStore.loadExtension(this)
   }
 
   registerAppPreferences(registry: Registry.AppPreferenceRegistry) {

extensions/telemetry/src/telemetry-preference.tsx

@@ -1,4 +1,4 @@
-import { Component } from "@lens/ui-extensions"
+import { Component } from "@k8slens/extensions"
 import React from "react"
 import { observer } from "mobx-react";
 import { TelemetryPreferencesStore } from "./telemetry-preferences-store"

extensions/telemetry/src/telemetry-preferences-store.ts

@@ -1,14 +1,14 @@
-import { Store } from "@lens/extensions";
+import { Store } from "@k8slens/extensions";
 import { toJS } from "mobx"
 
 export type TelemetryPreferencesModel = {
   enabled: boolean;
 }
 
-export class TelemetryPreferencesStore extends Store.BaseStore<TelemetryPreferencesModel> {
+export class TelemetryPreferencesStore extends Store.ExtensionStore<TelemetryPreferencesModel> {
   private constructor() {
     super({
-      configName: "telemetry-preferences-store",
+      configName: "preferences-store",
       defaults: {
         enabled: true
       }

extensions/telemetry/src/tracker.ts

@@ -1,4 +1,4 @@
-import { EventBus, Util } from "@lens/extensions"
+import { EventBus, Util } from "@k8slens/extensions"
 import ua from "universal-analytics"
 import { machineIdSync } from "node-machine-id"
 import { telemetryPreferencesStore } from "./telemetry-preferences-store"

extensions/telemetry/tsconfig.json

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

extensions/telemetry/webpack.config.js

@@ -17,7 +17,7 @@ module.exports = [
     },
     externals: [
       {
-        "@lens/extensions": "var global.LensExtensions",
+        "@k8slens/extensions": "var global.LensExtensions",
         "react": "var global.React",
         "mobx": "var global.Mobx"
       }
@@ -48,10 +48,10 @@ module.exports = [
     },
     externals: [
       {
-        "@lens/ui-extensions": "var global.LensExtensions",
-        "@lens/extensions": "var global.LensMainExtensions",
+        "@k8slens/extensions": "var global.LensExtensions",
         "react": "var global.React",
-        "mobx": "var global.Mobx"
+        "mobx": "var global.Mobx",
+        "mobx-react": "var global.MobxReact"
       }
     ],
     resolve: {