base branch merge fixes / clean up

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

extensions/support-page/main.ts

@@ -1,4 +1,4 @@
-import { LensMainExtension, Registry } from "@lens/extensions";
+import { LensMainExtension, Registry } from "@k8slens/extensions";
 import { supportPageURL } from "./src/support.route";
 
 export default class SupportPageMainExtension extends LensMainExtension {

extensions/support-page/renderer.tsx

@@ -1,4 +1,4 @@
-import { LensRendererExtension, Registry } from "@lens/ui-extensions";
+import { LensRendererExtension, Registry } from "@k8slens/extensions";
 import { Support } from "./src/support";
 import { supportPageRoute, supportPageURL } from "./src/support.route";
 

extensions/support-page/src/support.tsx

@@ -3,7 +3,7 @@
 
 import React from "react"
 import { observer } from "mobx-react"
-import { CommonVars, Component } from "@lens/ui-extensions";
+import { CommonVars, Component } from "@k8slens/extensions";
 
 @observer
 export class Support extends React.Component {

extensions/support-page/tsconfig.json

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

extensions/support-page/webpack.config.ts

@@ -3,6 +3,13 @@ import path from "path"
 const outputPath = path.resolve(__dirname, 'dist');
 
 // TODO: figure out how to share base TS and Webpack configs from Lens (npm, filesystem, etc?)
+const lensExternals = {
+  "@k8slens/extensions": "var global.LensExtensions",
+  "react": "var global.React",
+  "mobx": "var global.Mobx",
+  "mobx-react": "var global.MobxReact",
+};
+
 export default [
   {
     entry: './main.ts',
@@ -19,14 +26,10 @@ export default [
       ],
     },
     externals: [
-      {
-        "@lens/extensions": "var global.LensExtensions",
-        "react": "var global.React",
-        "mobx": "var global.Mobx"
-      }
+      lensExternals,
     ],
     resolve: {
-      extensions: [ '.tsx', '.ts', '.js' ],
+      extensions: ['.tsx', '.ts', '.js'],
     },
     output: {
       libraryTarget: "commonjs2",
@@ -50,15 +53,10 @@ export default [
       ],
     },
     externals: [
-      {
-        "@lens/ui-extensions": "var global.LensExtensions",
-        "@lens/extensions": "var global.LensMainExtensions",
-        "react": "var global.React",
-        "mobx": "var global.Mobx"
-      }
+      lensExternals,
     ],
     resolve: {
-      extensions: [ '.tsx', '.ts', '.js' ],
+      extensions: ['.tsx', '.ts', '.js'],
     },
     output: {
       libraryTarget: "commonjs2",