mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Merge branch 'master' into cluster-icon-settings-injectables
This commit is contained in:
Alex Andreev
commit
da8c11fdb6
45
.github/workflows/bump-master-version.yaml
vendored
45
.github/workflows/bump-master-version.yaml
vendored
@ -1,45 +0,0 @@
|
||||
name: Bump Version on master
|
||||
on:
|
||||
pull_request:
|
||||
types:
|
||||
- closed
|
||||
branches:
|
||||
- master
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
release:
|
||||
name: Release
|
||||
runs-on: ubuntu-latest
|
||||
if: ${{ github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'release') }}
|
||||
steps:
|
||||
- name: Checkout Release from lens
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
yarn install --frozen-lockfile
|
||||
- name: Bump version to first alpha of next minor version
|
||||
id: bump
|
||||
run: |
|
||||
CURRENT_VERSION=$(cat lerna.json | jq .version --raw-output)
|
||||
|
||||
if ! [[ "${CURRENT_VERSION}" =~ ^\d+\.\d+\.0$ ]]; then
|
||||
echo "Not a minor release"
|
||||
echo "status=skip" >> $GITHUB_OUTPUT
|
||||
exit 0
|
||||
fi
|
||||
|
||||
yarn bump-version preminor
|
||||
|
||||
echo "status=create" >> $GITHUB_OUTPUT
|
||||
- uses: peter-evans/create-pull-request@v4
|
||||
if: ${{ steps.bump.outputs.status == 'create' }}
|
||||
with:
|
||||
add-paths: lerna.json,packages/*/package.json
|
||||
commit-message: Update package.json version to next preminor because of recent release
|
||||
signoff: true
|
||||
delete-branch: true
|
||||
title: Update version to next preminor
|
||||
labels: skip-changelog
|
||||
2
.github/workflows/daily-alpha.yml
vendored
2
.github/workflows/daily-alpha.yml
vendored
@ -29,7 +29,7 @@ jobs:
|
||||
- name: Bump version
|
||||
id: version
|
||||
run: |
|
||||
node packages/bump-version-for-cron/dist/index.js --path lerna.json
|
||||
node packages/bump-version-for-cron/dist/index.js --path packages/core/package.json
|
||||
- name: Check if branch already exists
|
||||
id: check-branch
|
||||
run: git ls-remote --exit-code --tags origin v${{ steps.version.outputs.VERSION }}
|
||||
|
||||
2
.github/workflows/publish-release-npm.yml
vendored
2
.github/workflows/publish-release-npm.yml
vendored
@ -38,7 +38,7 @@ jobs:
|
||||
- name: Publish NPM packages
|
||||
run: |
|
||||
npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
|
||||
VERSION=$(cat lerna.json | jq '.version' --raw-output)
|
||||
VERSION=$(cat packages/core/package.json | jq '.version' --raw-output)
|
||||
echo ${VERSION}
|
||||
DIST_TAG=$(node packages/semver/dist/index.js --prerelease 0 ${VERSION})
|
||||
npx lerna \
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
|
||||
"useWorkspaces": true,
|
||||
"version": "6.5.0-alpha.0",
|
||||
"version": "independent",
|
||||
"npmClient": "npm",
|
||||
"npmClientArgs": [
|
||||
"--network-timeout=100000"
|
||||
|
||||
1767
package-lock.json
generated
1767
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@k8slens/bump-version-for-cron",
|
||||
"version": "6.5.0-alpha.0",
|
||||
"version": "6.5.0-alpha.1",
|
||||
"description": "CLI to bump the version to during a cron daily alpha release",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
"productName": "",
|
||||
"description": "Lens Desktop Core",
|
||||
"homepage": "https://github.com/lensapp/lens",
|
||||
"version": "6.5.0-alpha.0",
|
||||
"version": "6.5.0-alpha.2",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/lensapp/lens.git"
|
||||
@ -127,7 +127,7 @@
|
||||
"@astronautlabs/jsonpath": "^1.1.0",
|
||||
"@hapi/call": "^9.0.1",
|
||||
"@hapi/subtext": "^7.1.0",
|
||||
"@k8slens/node-fetch": "^6.5.0-alpha.0",
|
||||
"@k8slens/node-fetch": "^6.5.0-alpha.1",
|
||||
"@kubernetes/client-node": "^0.18.1",
|
||||
"@material-ui/styles": "^4.11.5",
|
||||
"@ogre-tools/fp": "^15.1.2",
|
||||
@ -331,9 +331,9 @@
|
||||
"peerDependencies": {
|
||||
"@k8slens/application": "^6.5.0-alpha.0",
|
||||
"@k8slens/application-for-electron-main": "^6.5.0-alpha.0",
|
||||
"@k8slens/run-many": "^1.0.0",
|
||||
"@k8slens/test-utils": "^1.0.0",
|
||||
"@k8slens/utilities": "^1.0.0",
|
||||
"@k8slens/run-many": "^1.0.0-alpha.1",
|
||||
"@k8slens/test-utils": "^1.0.0-alpha.1",
|
||||
"@k8slens/utilities": "^1.0.0-alpha.1",
|
||||
"@types/byline": "^4.2.33",
|
||||
"@types/chart.js": "^2.9.36",
|
||||
"@types/color": "^3.0.3",
|
||||
|
||||
@ -118,7 +118,7 @@ class ClusterConnection {
|
||||
this.bindEvents();
|
||||
}
|
||||
|
||||
if (this.cluster.disconnected || !this.cluster.accessible.get()) {
|
||||
if (this.cluster.disconnected.get() || !this.cluster.accessible.get()) {
|
||||
try {
|
||||
this.dependencies.broadcastConnectionUpdate({
|
||||
level: "info",
|
||||
@ -184,7 +184,7 @@ class ClusterConnection {
|
||||
}
|
||||
|
||||
disconnect() {
|
||||
if (this.cluster.disconnected) {
|
||||
if (this.cluster.disconnected.get()) {
|
||||
return this.dependencies.logger.debug("[CLUSTER]: already disconnected", { id: this.cluster.id });
|
||||
}
|
||||
|
||||
|
||||
@ -53,6 +53,7 @@
|
||||
&.hidden {
|
||||
opacity: 0;
|
||||
pointer-events: none;
|
||||
visibility: hidden;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
.HotbarIcon {
|
||||
--corner: 0px 0px 0px 1px var(--clusterMenuBackground);
|
||||
--iconActiveShadow: var(--corner), var(--corner), 0 0 0px 3px var(--clusterMenuBackground), 0 0 0px 6px var(--textColorAccent);
|
||||
--iconHoverShadow: 0 0 0px 3px var(--clusterMenuBackground), 0 0 0px 6px #ffffff50;
|
||||
--iconHoverShadow: 0 0 0px 3px var(--clusterMenuBackground), 0 0 0px 6px var(--clusterMenuCellOutline);
|
||||
|
||||
display: flex;
|
||||
cursor: pointer;
|
||||
|
||||
@ -16,7 +16,7 @@ exports[`<Tooltip /> renders to DOM when forced to by visibile prop 1`] = `
|
||||
<body>
|
||||
<div>
|
||||
<div
|
||||
class="Tooltip visible"
|
||||
class="Tooltip right visible"
|
||||
role="tooltip"
|
||||
style="left: 10px; top: 0px;"
|
||||
>
|
||||
@ -35,7 +35,7 @@ exports[`<Tooltip /> renders to DOM when hovering over target 1`] = `
|
||||
<body>
|
||||
<div>
|
||||
<div
|
||||
class="Tooltip visible"
|
||||
class="Tooltip right visible"
|
||||
role="tooltip"
|
||||
style="left: 10px; top: 0px;"
|
||||
>
|
||||
|
||||
@ -97,6 +97,7 @@ const lensDarkThemeInjectable = getInjectable({
|
||||
clusterMenuBackground: "#252729",
|
||||
clusterMenuBorderColor: "#252729",
|
||||
clusterMenuCellBackground: "#2e3136",
|
||||
clusterMenuCellOutline: "#ffffff66",
|
||||
clusterSettingsBackground: "#1e2124",
|
||||
addClusterIconColor: "#252729",
|
||||
boxShadow: "#0000003a",
|
||||
|
||||
@ -94,9 +94,10 @@ const lensLightThemeInjectable = getInjectable({
|
||||
drawerSubtitleBackground: "#f1f1f1",
|
||||
drawerItemNameColor: "#727272",
|
||||
drawerItemValueColor: "#555555",
|
||||
clusterMenuBackground: "#d7d8da",
|
||||
clusterMenuBackground: "#e2e2e2",
|
||||
clusterMenuBorderColor: "#c9cfd3",
|
||||
clusterMenuCellBackground: "#bbbbbb",
|
||||
clusterMenuCellBackground: "#d2d2d2",
|
||||
clusterMenuCellOutline: "#22222266",
|
||||
clusterSettingsBackground: "#ffffff",
|
||||
addClusterIconColor: "#8d8d8d",
|
||||
boxShadow: "#0000003a",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@k8slens/ensure-binaries",
|
||||
"version": "6.5.0-alpha.0",
|
||||
"version": "6.5.0-alpha.1",
|
||||
"description": "CLI for downloading configured versions of the bundled versions of CLIs",
|
||||
"main": "dist/index.js",
|
||||
"license": "MIT",
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
"name": "@k8slens/extensions",
|
||||
"productName": "OpenLens extensions",
|
||||
"description": "OpenLens - Open Source Kubernetes IDE: extensions",
|
||||
"version": "6.5.0-alpha.0",
|
||||
"version": "6.5.0-alpha.2",
|
||||
"copyright": "© 2022 OpenLens Authors",
|
||||
"license": "MIT",
|
||||
"main": "dist/extension-api.js",
|
||||
@ -26,7 +26,7 @@
|
||||
"prepare:dev": "npm run build"
|
||||
},
|
||||
"dependencies": {
|
||||
"@k8slens/core": "^6.5.0-alpha.0"
|
||||
"@k8slens/core": "^6.5.0-alpha.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "^16.18.6",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@k8slens/generate-tray-icons",
|
||||
"version": "6.5.0-alpha.0",
|
||||
"version": "6.5.0-alpha.1",
|
||||
"description": "CLI generating tray icons for building a lens-like application",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@k8slens/eslint-config",
|
||||
"version": "^6.5.0-alpha.0",
|
||||
"version": "6.5.0-alpha.1",
|
||||
"description": "Lens eslint and prettier configurations",
|
||||
"author": {
|
||||
"name": "OpenLens Authors",
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@k8slens/jest",
|
||||
"private": false,
|
||||
"version": "6.5.0-alpha.0",
|
||||
"version": "6.5.0-alpha.1",
|
||||
"description": "Jest configuration and scripts for Lens packages.",
|
||||
"type": "commonjs",
|
||||
"publishConfig": {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@k8slens/typescript",
|
||||
"private": false,
|
||||
"version": "6.5.0-alpha.0",
|
||||
"version": "6.5.0-alpha.1",
|
||||
"description": "Typescript configuration for Lens packages.",
|
||||
"type": "commonjs",
|
||||
"publishConfig": {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@k8slens/webpack",
|
||||
"private": false,
|
||||
"version": "6.5.0-alpha.0",
|
||||
"version": "6.5.0-alpha.1",
|
||||
"description": "Webpack configurations and scripts for Lens packages.",
|
||||
"type": "commonjs",
|
||||
"publishConfig": {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@k8slens/node-fetch",
|
||||
"version": "6.5.0-alpha.0",
|
||||
"version": "6.5.0-alpha.1",
|
||||
"description": "Node fetch for Lens",
|
||||
"license": "MIT",
|
||||
"private": false,
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
"productName": "OpenLens",
|
||||
"description": "OpenLens - Open Source IDE for Kubernetes",
|
||||
"homepage": "https://github.com/lensapp/lens",
|
||||
"version": "6.5.0-alpha.0",
|
||||
"version": "6.5.0-alpha.2",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/lensapp/lens.git"
|
||||
@ -195,15 +195,15 @@
|
||||
}
|
||||
},
|
||||
"dependencies": {
|
||||
"@k8slens/application": "^6.5.0-alpha.0",
|
||||
"@k8slens/feature-core": "^6.5.0-alpha.0",
|
||||
"@k8slens/application-for-electron-main": "^6.5.0-alpha.0",
|
||||
"@k8slens/core": "^6.5.0-alpha.0",
|
||||
"@k8slens/ensure-binaries": "^6.5.0-alpha.0",
|
||||
"@k8slens/generate-tray-icons": "^6.5.0-alpha.0",
|
||||
"@k8slens/run-many": "^1.0.0",
|
||||
"@k8slens/test-utils": "^1.0.0",
|
||||
"@k8slens/utilities": "^1.0.0",
|
||||
"@k8slens/application": "^6.5.0-alpha.1",
|
||||
"@k8slens/application-for-electron-main": "^6.5.0-alpha.1",
|
||||
"@k8slens/core": "^6.5.0-alpha.2",
|
||||
"@k8slens/ensure-binaries": "^6.5.0-alpha.1",
|
||||
"@k8slens/feature-core": "^6.5.0-alpha.1",
|
||||
"@k8slens/generate-tray-icons": "^6.5.0-alpha.1",
|
||||
"@k8slens/run-many": "^1.0.0-alpha.1",
|
||||
"@k8slens/test-utils": "^1.0.0-alpha.1",
|
||||
"@k8slens/utilities": "^1.0.0-alpha.1",
|
||||
"@ogre-tools/fp": "^15.1.2",
|
||||
"@ogre-tools/injectable": "^15.1.2",
|
||||
"@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2",
|
||||
@ -214,7 +214,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@electron/rebuild": "^3.2.10",
|
||||
"@k8slens/node-fetch": "^6.5.0-alpha.0",
|
||||
"@k8slens/node-fetch": "^6.5.0-alpha.1",
|
||||
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
|
||||
"@swc/cli": "^0.1.61",
|
||||
"@swc/core": "^1.3.37",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@k8slens/release-tool",
|
||||
"version": "6.5.0-alpha.0",
|
||||
"version": "6.5.0-alpha.2",
|
||||
"description": "Release tool for lens monorepo",
|
||||
"main": "dist/index.mjs",
|
||||
"license": "MIT",
|
||||
|
||||
@ -158,7 +158,7 @@ async function createReleaseBranchAndCommit(prBase: string, version: SemVer, prB
|
||||
const prBranch = `release/v${version.format()}`;
|
||||
|
||||
await pipeExecFile("git", ["checkout", "-b", prBranch]);
|
||||
await pipeExecFile("git", ["add", "lerna.json", "packages/*/package.json"]);
|
||||
await pipeExecFile("git", ["add", "packages/*/package.json"]);
|
||||
await pipeExecFile("git", ["commit", "-sm", `Release ${version.format()}`]);
|
||||
await pipeExecFile("git", ["push", "--set-upstream", "origin", prBranch]);
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@k8slens/semver",
|
||||
"version": "6.5.0-alpha.0",
|
||||
"version": "6.5.0-alpha.1",
|
||||
"description": "CLI over semver package for picking parts of a version",
|
||||
"license": "MIT",
|
||||
"private": true,
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@k8slens/application",
|
||||
"private": false,
|
||||
"version": "6.5.0-alpha.0",
|
||||
"version": "6.5.0-alpha.1",
|
||||
"description": "Package for creating Lens applications",
|
||||
"type": "commonjs",
|
||||
"files": [
|
||||
@ -37,9 +37,8 @@
|
||||
"@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2",
|
||||
"lodash": "^4.17.15"
|
||||
},
|
||||
|
||||
"devDependencies": {
|
||||
"@async-fn/jest": "^1.6.4",
|
||||
"@k8slens/eslint-config": "*"
|
||||
"@k8slens/eslint-config": "6.5.0-alpha.1"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@k8slens/application-for-electron-main",
|
||||
"private": false,
|
||||
"version": "6.5.0-alpha.0",
|
||||
"version": "6.5.0-alpha.1",
|
||||
"description": "Electron's main specifics for creating Lens applications",
|
||||
"type": "commonjs",
|
||||
"files": [
|
||||
@ -31,16 +31,15 @@
|
||||
"lint:fix": "lens-lint --fix"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@k8slens/feature-core": "^6.5.0-alpha.0",
|
||||
"@k8slens/application": "^6.5.0-alpha.0",
|
||||
"@k8slens/feature-core": "^6.5.0-alpha.0",
|
||||
"@ogre-tools/injectable": "^15.1.2",
|
||||
"@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2",
|
||||
"electron": "^19.1.9"
|
||||
},
|
||||
|
||||
"devDependencies": {
|
||||
"@async-fn/jest": "^1.6.4",
|
||||
"@ogre-tools/test-utils": "^15.1.2",
|
||||
"@k8slens/eslint-config": "*"
|
||||
"@k8slens/eslint-config": "6.5.0-alpha.1",
|
||||
"@ogre-tools/test-utils": "^15.1.2"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,15 +1,13 @@
|
||||
{
|
||||
"name": "@k8slens/feature-core",
|
||||
"private": false,
|
||||
"version": "6.5.0-alpha.0",
|
||||
"version": "6.5.0-alpha.1",
|
||||
"description": "Code that is common to all Features and those registering them.",
|
||||
"type": "commonjs",
|
||||
|
||||
"publishConfig": {
|
||||
"access": "public",
|
||||
"registry": "https://registry.npmjs.org/"
|
||||
},
|
||||
|
||||
"files": [
|
||||
"dist"
|
||||
],
|
||||
@ -35,8 +33,7 @@
|
||||
"peerDependencies": {
|
||||
"@ogre-tools/injectable": "^15.1.2"
|
||||
},
|
||||
|
||||
"devDependencies": {
|
||||
"@k8slens/eslint-config": "*"
|
||||
"@k8slens/eslint-config": "6.5.0-alpha.1"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@k8slens/run-many",
|
||||
"version": "1.0.0",
|
||||
"version": "1.0.0-alpha.1",
|
||||
"type": "commonjs",
|
||||
"description": "A package containing runMany and runManySync",
|
||||
"publishConfig": {
|
||||
@ -25,8 +25,8 @@
|
||||
"test": "jest --coverage --runInBand"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@k8slens/test-utils": "^1.0.0",
|
||||
"@k8slens/utilities": "^1.0.0",
|
||||
"@k8slens/test-utils": "^1.0.0-alpha.1",
|
||||
"@k8slens/utilities": "^1.0.0-alpha.1",
|
||||
"@ogre-tools/fp": "^15.1.1",
|
||||
"@ogre-tools/injectable": "^15.1.1"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@k8slens/test-utils",
|
||||
"version": "1.0.0",
|
||||
"version": "1.0.0-alpha.1",
|
||||
"description": "A collection of utilities for testing",
|
||||
"type": "commonjs",
|
||||
"main": "dist/index.js",
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@k8slens/utilities",
|
||||
"description": "A collection of useful types",
|
||||
"version": "1.0.0",
|
||||
"version": "1.0.0-alpha.1",
|
||||
"type": "commonjs",
|
||||
"main": "dist/index.js",
|
||||
"types": "dist/index.d.ts",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user