Merge branch 'master' into ensure-hashed-directory-fix

packages/core/.yarnrc

@@ -1,3 +0,0 @@
-disturl "https://electronjs.org/headers"
-target "19.0.4"
-runtime "electron"

packages/core/package.json

@@ -50,14 +50,14 @@
   "license": "MIT",
   "author": "OpenLens Authors <info@k8slens.dev>",
   "scripts": {
-    "build": "cross-env NODE_ENV=production yarn run webpack --config webpack/library-bundle.ts --progress",
+    "build": "cross-env NODE_ENV=production webpack --config webpack/library-bundle.ts --progress",
     "clean": "rimraf dist static/build",
-    "prepare:dev": "cross-env NODE_ENV=development yarn run webpack --config webpack/library-bundle.ts --progress",
-    "dev": "cross-env NODE_ENV=development yarn run webpack --config webpack/library-bundle.ts --watch",
+    "prepare:dev": "cross-env NODE_ENV=development webpack --config webpack/library-bundle.ts --progress",
+    "dev": "cross-env NODE_ENV=development webpack --config webpack/library-bundle.ts --watch",
     "test:unit": "jest --testPathIgnorePatterns integration",
     "test:watch": "func() { jest ${1} --watch --testPathIgnorePatterns integration; }; func",
-    "lint": "PROD=true yarn run eslint --ext js,ts,tsx --max-warnings=0 .",
-    "lint:fix": "yarn run lint --fix"
+    "lint": "PROD=true eslint --ext js,ts,tsx --max-warnings=0 .",
+    "lint:fix": "npm run lint --fix"
   },
   "config": {
     "k8sProxyVersion": "0.3.0",
@@ -192,7 +192,7 @@
     "win-ca": "^3.5.0",
     "winston": "^3.8.2",
     "winston-transport-browserconsole": "^1.0.5",
-    "ws": "^8.12.0",
+    "ws": "^8.12.1",
     "xterm-link-provider": "^1.3.1"
   },
   "devDependencies": {
@@ -242,7 +242,7 @@
     "@types/react-window": "^1.8.5",
     "@types/readable-stream": "^2.3.13",
     "@types/semver": "^7.3.13",
-    "@types/tar": "^6.1.3",
+    "@types/tar": "^6.1.4",
     "@types/tcp-port-used": "^1.0.1",
     "@types/tempy": "^0.3.0",
     "@types/triple-beam": "^1.3.2",
@@ -310,7 +310,7 @@
     "react-table": "^7.8.0",
     "react-window": "^1.8.8",
     "rimraf": "^4.1.2",
-    "sass": "^1.58.1",
+    "sass": "^1.58.2",
     "sass-loader": "^12.6.0",
     "style-loader": "^3.3.1",
     "tailwindcss": "^3.2.4",
@@ -318,7 +318,7 @@
     "ts-node": "^10.9.1",
     "type-fest": "^2.14.0",
     "typed-emitter": "^1.4.0",
-    "typedoc": "0.23.24",
+    "typedoc": "0.23.25",
     "typedoc-plugin-markdown": "^3.13.6",
     "typescript": "^4.9.5",
     "typescript-plugin-css-modules": "^3.4.0",
@@ -340,7 +340,7 @@
     "@types/react-router-dom": "^5.3.3",
     "@types/react-virtualized-auto-sizer": "^1.0.1",
     "@types/react-window": "^1.8.5",
-    "@types/tar": "^6.1.3",
+    "@types/tar": "^6.1.4",
     "@types/tcp-port-used": "^1.0.1",
     "@types/url-parse": "^1.4.8",
     "@types/uuid": "^8.3.4",

packages/core/src/renderer/bootstrap.tsx

@@ -29,17 +29,9 @@ export async function bootstrap(di: DiContainer) {
 
   assert(rootElem, "#app MUST exist");
 
-  const extensionLoader = di.inject(extensionLoaderInjectable);
-
-  extensionLoader.init();
-
-  const extensionDiscovery = di.inject(extensionDiscoveryInjectable);
-
-  extensionDiscovery.init();
-
-  const extensionInstallationStateStore = di.inject(extensionInstallationStateStoreInjectable);
-
-  extensionInstallationStateStore.bindIpcListeners();
+  await di.inject(extensionLoaderInjectable).init();
+  await di.inject(extensionDiscoveryInjectable).init();
+  di.inject(extensionInstallationStateStoreInjectable).bindIpcListeners();
 
   let App;
   let initializeApp;

packages/core/src/renderer/components/dock/logs/list.scss

@@ -7,10 +7,6 @@
   --overlay-bg: #8cc474b8;
   --overlay-active-bg: orange;
 
-  // fix for `this.logsElement.scrollTop = this.logsElement.scrollHeight`
-  // `overflow: overlay` don't allow scroll to the last line
-  overflow: auto;
-
   position: relative;
   color: var(--logsForeground);
   background: var(--logsBackground);
@@ -21,6 +17,7 @@
 
     .list {
       overflow-x: scroll!important;
+      overflow-y: auto!important;
 
       .LogRow {
         padding: 2px 16px;

packages/core/src/renderer/components/dock/logs/logs-view-model.injectable.ts

@@ -28,7 +28,7 @@ export interface InstantiateArgs {
 const logsViewModelInjectable = getInjectable({
   id: "logs-view-model",
 
-  instantiate: (di, { tabId }: InstantiateArgs) => new LogTabViewModel(tabId, {
+  instantiate: (di, tabId) => new LogTabViewModel(tabId, {
     getLogs: di.inject(getLogsInjectable),
     getLogsWithoutTimestamps: di.inject(getLogsWithoutTimestampsInjectable),
     getTimestampSplitLogs: di.inject(getTimestampSplitLogsInjectable),
@@ -45,7 +45,10 @@ const logsViewModelInjectable = getInjectable({
     downloadAllLogs: di.inject(downloadAllLogsInjectable),
     searchStore: di.inject(searchStoreInjectable),
   }),
-  lifecycle: lifecycleEnum.transient,
+
+  lifecycle: lifecycleEnum.keyedSingleton({
+    getInstanceKey: (di, tabId: TabId) => `log-tab-view-model-${tabId}}`,
+  }),
 });
 
 export default logsViewModelInjectable;

packages/core/src/renderer/components/dock/logs/view.tsx

@@ -101,9 +101,7 @@ const NonInjectedLogsDockTab = observer(({
 export const LogsDockTab = withInjectables<Dependencies, LogsDockTabProps>(NonInjectedLogsDockTab, {
   getProps: (di, props) => ({
     ...props,
-    model: di.inject(logsViewModelInjectable, {
-      tabId: props.tab.id,
-    }),
+    model: di.inject(logsViewModelInjectable, props.tab.id),
     subscribeStores: di.inject(subscribeStoresInjectable),
     podStore: di.inject(podStoreInjectable),
   }),

packages/core/webpack/main.ts

@@ -36,7 +36,7 @@ const webpackLensMain = (): webpack.Configuration => {
       extensions: [".json", ".js", ".ts"],
     },
     externals: [
-      nodeExternals(),
+      nodeExternals({ modulesFromFile: true }),
     ],
     module: {
       parser: {

packages/core/webpack/renderer.ts

@@ -46,7 +46,7 @@ export function webpackLensRenderer(): webpack.Configuration {
       ],
     },
     externals: [
-      nodeExternals(),
+      nodeExternals({ modulesFromFile: true }),
     ],
     optimization: {
       minimize: false,