Merge branch 'master' into sidebar-layout-improvements

lerna.json

@@ -4,7 +4,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "6.4.0-beta.12",
+  "version": "6.4.0-beta.13",
   "npmClient": "yarn",
   "npmClientArgs": [
     "--network-timeout=100000"

package.json

@@ -18,11 +18,12 @@
     "test:unit": "lerna run --stream test:unit",
     "test:integration": "lerna run --stream test:integration",
     "bump-version": "lerna version --no-git-tag-version --no-push",
-    "create-release-pr": "node packages/release-tool",
+    "create-release-pr": "create-release-pr",
     "postinstall": "lerna bootstrap --ignore open-lens && lerna bootstrap --scope open-lens --include-dependencies"
   },
   "devDependencies": {
     "@k8slens/semver": "./packages/semver",
+    "@k8slens/release-tool": "./packages/release-tool",
     "adr": "^1.4.3",
     "cross-env": "^7.0.3",
     "lerna": "^6.4.1",

packages/core/package.json

@@ -3,7 +3,7 @@
   "productName": "",
   "description": "Lens Desktop Core",
   "homepage": "https://github.com/lensapp/lens",
-  "version": "6.4.0-beta.12",
+  "version": "6.4.0-beta.13",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lensapp/lens.git"
@@ -127,7 +127,7 @@
     "@astronautlabs/jsonpath": "^1.1.0",
     "@hapi/call": "^9.0.0",
     "@hapi/subtext": "^7.0.4",
-    "@k8slens/node-fetch": "^6.4.0-beta.12",
+    "@k8slens/node-fetch": "^6.4.0-beta.13",
     "@kubernetes/client-node": "^0.18.1",
     "@material-ui/styles": "^4.11.5",
     "@ogre-tools/fp": "^12.0.1",
@@ -201,8 +201,8 @@
     "@material-ui/icons": "^4.11.2",
     "@material-ui/lab": "^4.0.0-alpha.60",
     "@sentry/types": "^6.19.7",
-    "@swc/cli": "^0.1.60",
+    "@swc/cli": "^0.1.61",
-    "@swc/core": "^1.3.31",
+    "@swc/core": "^1.3.32",
     "@swc/jest": "^0.2.24",
     "@testing-library/dom": "^7.31.2",
     "@testing-library/jest-dom": "^5.16.5",

packages/core/src/common/library.ts

@@ -7,5 +7,3 @@
 export { applicationInformationToken } from "./vars/application-information-token";
 export type { ApplicationInformation } from "./vars/application-information-token";
 export { bundledExtensionInjectionToken } from "../extensions/extension-discovery/bundled-extension-token";
-
-export * as extensionApi from "../extensions/common-api";

packages/core/src/main/library.ts

@@ -10,5 +10,6 @@ export { beforeElectronIsReadyInjectionToken } from "./start-main-application/ru
 export { onLoadOfApplicationInjectionToken } from "./start-main-application/runnable-tokens/on-load-of-application-injection-token";
 export { createApp } from "./create-app";
 export * as Mobx from "mobx";
-export * as extensionApi from "../extensions/main-api";
+export * as mainExtensionApi from "../extensions/main-api";
+export * as commonExtensionApi from "../extensions/common-api";
 export * as Pty from "node-pty";

packages/core/src/renderer/library.ts

@@ -12,5 +12,6 @@ export * as Mobx from "mobx";
 export * as MobxReact from "mobx-react";
 export * as ReactRouter from "react-router";
 export * as ReactRouterDom from "react-router-dom";
-export * as extensionApi from "../extensions/renderer-api";
+export * as rendererExtensionApi from "../extensions/renderer-api";
+export * as commonExtensionApi from "../extensions/common-api";
 export { createApp } from "./create-app";

packages/ensure-binaries/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k8slens/ensure-binaries",
-  "version": "6.4.0-beta.12",
+  "version": "6.4.0-beta.13",
   "description": "CLI for downloading configured versions of the bundled versions of CLIs",
   "main": "dist/index.js",
   "license": "MIT",
@@ -31,8 +31,8 @@
     "zod": "^3.20.2"
   },
   "devDependencies": {
-    "@swc/cli": "^0.1.60",
+    "@swc/cli": "^0.1.61",
-    "@swc/core": "^1.3.31",
+    "@swc/core": "^1.3.32",
     "@types/cli-progress": "^3.11.0",
     "@types/gunzip-maybe": "^1.4.0",
     "@types/node": "^16.18.11",

packages/extension-api/package.json

@@ -2,7 +2,7 @@
   "name": "@k8slens/extensions",
   "productName": "OpenLens extensions",
   "description": "OpenLens - Open Source Kubernetes IDE: extensions",
-  "version": "6.4.0-beta.12",
+  "version": "6.4.0-beta.13",
   "copyright": "© 2022 OpenLens Authors",
   "license": "MIT",
   "main": "dist/extension-api.js",
@@ -26,7 +26,7 @@
     "prepare:dev": "yarn run build"
   },
   "dependencies": {
-    "@k8slens/core": "^6.4.0-beta.12"
+    "@k8slens/core": "^6.4.0-beta.13"
   },
   "devDependencies": {
     "@types/node": "^16.18.6",

packages/extension-api/src/extension-api.ts

@@ -3,6 +3,5 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-export { extensionApi as Main } from "@k8slens/core/main";
+export { mainExtensionApi as Main, commonExtensionApi as Common } from "@k8slens/core/main";
-export { extensionApi as Renderer } from "@k8slens/core/renderer";
+export { rendererExtensionApi as Renderer } from "@k8slens/core/renderer";
-export { extensionApi as Common } from "@k8slens/core/common";

packages/generate-tray-icons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k8slens/generate-tray-icons",
-  "version": "6.4.0-beta.12",
+  "version": "6.4.0-beta.13",
   "description": "CLI generating tray icons for building a lens-like application",
   "license": "MIT",
   "scripts": {
@@ -22,8 +22,8 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@swc/cli": "^0.1.59",
+    "@swc/cli": "^0.1.61",
-    "@swc/core": "^1.3.30",
+    "@swc/core": "^1.3.32",
     "@types/jsdom": "^20.0.1",
     "@types/node": "^18.11.18",
     "@types/sharp": "^0.31.1",

packages/node-fetch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k8slens/node-fetch",
-  "version": "6.4.0-beta.12",
+  "version": "6.4.0-beta.13",
   "description": "Node fetch for Lens",
   "license": "MIT",
   "private": false,

packages/open-lens/package.json

@@ -4,7 +4,7 @@
   "productName": "OpenLens",
   "description": "OpenLens - Open Source IDE for Kubernetes",
   "homepage": "https://github.com/lensapp/lens",
-  "version": "6.4.0-beta.12",
+  "version": "6.4.0-beta.13",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lensapp/lens.git"
@@ -192,9 +192,9 @@
     }
   },
   "dependencies": {
-    "@k8slens/core": "^6.4.0-beta.12",
+    "@k8slens/core": "^6.4.0-beta.13",
-    "@k8slens/ensure-binaries": "^6.4.0-beta.12",
+    "@k8slens/ensure-binaries": "^6.4.0-beta.13",
-    "@k8slens/generate-tray-icons": "^6.4.0-beta.12",
+    "@k8slens/generate-tray-icons": "^6.4.0-beta.13",
     "@ogre-tools/fp": "^12.0.1",
     "@ogre-tools/injectable": "^12.0.1",
     "@ogre-tools/injectable-extension-for-auto-registration": "^12.0.1",
@@ -204,10 +204,10 @@
     "rimraf": "^4.1.2"
   },
   "devDependencies": {
-    "@k8slens/node-fetch": "^6.4.0-beta.12",
+    "@k8slens/node-fetch": "^6.4.0-beta.13",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
-    "@swc/cli": "^0.1.59",
+    "@swc/cli": "^0.1.61",
-    "@swc/core": "^1.3.31",
+    "@swc/core": "^1.3.32",
     "@swc/jest": "^0.2.24",
     "@types/byline": "^4.2.33",
     "@types/chart.js": "^2.9.36",
@@ -233,6 +233,7 @@
     "autoprefixer": "^10.4.13",
     "circular-dependency-plugin": "^5.2.2",
     "concurrently": "^7.6.0",
+    "copy-webpack-plugin": "^11.0.0",
     "cross-env": "^7.0.3",
     "css-loader": "^6.7.2",
     "electron": "^19.1.9",

packages/open-lens/src/main/index.ts

@@ -1,8 +1,7 @@
 import { createContainer } from "@ogre-tools/injectable";
 import { autoRegister } from "@ogre-tools/injectable-extension-for-auto-registration";
 import { runInAction } from "mobx";
-import { createApp, extensionApi as Main } from "@k8slens/core/main";
+import { createApp, mainExtensionApi as Main, commonExtensionApi as Common } from "@k8slens/core/main";
-import { extensionApi as Common } from "@k8slens/core/common";
 
 const di = createContainer("main");
 const app = createApp({

packages/open-lens/src/renderer/index.ts

@@ -1,8 +1,7 @@
 import "@k8slens/core/styles";
 import { createContainer } from "@ogre-tools/injectable";
 import { runInAction } from "mobx";
-import { createApp, extensionApi as Renderer } from "@k8slens/core/renderer";
+import { createApp, rendererExtensionApi as Renderer, commonExtensionApi as Common } from "@k8slens/core/renderer";
-import { extensionApi as Common } from "@k8slens/core/common";
 import { autoRegister } from "@ogre-tools/injectable-extension-for-auto-registration";
 
 const di = createContainer("renderer");

packages/open-lens/webpack/renderer.ts

@@ -11,6 +11,7 @@
  import MonacoWebpackPlugin from "monaco-editor-webpack-plugin";
  import CircularDependencyPlugin from "circular-dependency-plugin";
  import ReactRefreshWebpackPlugin from "@pmmmwh/react-refresh-webpack-plugin";
+ import CopyPlugin from "copy-webpack-plugin";
  import type { WebpackPluginInstance } from "webpack";
  import { DefinePlugin } from "webpack";
  import { assetsFolderName, isDevelopment, rendererDir, buildDir, htmlTemplate, publicPath, sassCommonVars } from "./vars";
@@ -113,6 +114,15 @@
       filename: "[name].css",
     }),
 
+    new CopyPlugin({
+      patterns: [
+        {
+          from: "node_modules/@k8slens/core/static/build/library/*.ttf",
+          to: "[name][ext]",
+        },
+      ],
+    }),
+
     ...(
       isDevelopment
         ? [new ReactRefreshWebpackPlugin()]

packages/release-tool/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k8slens/release-tool",
-  "version": "6.4.0-beta.12",
+  "version": "6.4.0-beta.13",
   "description": "Release tool for lens monorepo",
   "main": "dist/index.mjs",
   "license": "MIT",
@@ -14,8 +14,8 @@
   },
   "type": "module",
   "devDependencies": {
-    "@swc/cli": "^0.1.60",
+    "@swc/cli": "^0.1.61",
-    "@swc/core": "^1.3.31",
+    "@swc/core": "^1.3.32",
     "@types/command-line-args": "^5.2.0",
     "@types/fs-extra": "^11.0.1",
     "@types/node": "^16.18.11",

packages/semver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k8slens/semver",
-  "version": "6.4.0-beta.12",
+  "version": "6.4.0-beta.13",
   "description": "CLI over semver package for picking parts of a version",
   "license": "MIT",
   "private": true,
@@ -15,8 +15,8 @@
     "semver": "^7.3.8"
   },
   "devDependencies": {
-    "@swc/cli": "^0.1.60",
+    "@swc/cli": "^0.1.61",
-    "@swc/core": "^1.3.31",
+    "@swc/core": "^1.3.32",
     "@types/command-line-args": "^5.2.0",
     "@types/node": "^16.18.11",
     "@types/semver": "^7.3.13",

yarn.lock

@@ -38,8 +38,13 @@
   resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b"
   integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==
 
+"@k8slens/release-tool@./packages/release-tool":
+  version "6.4.0-beta.13"
+  dependencies:
+    rimraf "^4.1.2"
+
 "@k8slens/semver@./packages/semver":
-  version "6.4.0-beta.11"
+  version "6.4.0-beta.13"
   dependencies:
     command-line-args "^5.2.1"
     semver "^7.3.8"
@@ -2566,9 +2571,9 @@ hosted-git-info@^5.0.0:
     lru-cache "^7.5.1"
 
 http-cache-semantics@^4.1.0:
-  version "4.1.0"
+  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
-  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
 
 http-proxy-agent@^5.0.0:
   version "5.0.0"