From 1b36cd7ade0f4bd67ee55639d72a683e0e39c4d4 Mon Sep 17 00:00:00 2001 From: Jim Ehrismann <40840436+jim-docker@users.noreply.github.com> Date: Tue, 30 May 2023 10:24:27 -0400 Subject: [PATCH 1/2] Temporary fix for extensions always disabled on startup (#7801) Signed-off-by: Jim Ehrismann --- .../features/extensions/enabled/common/storage.injectable.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/core/src/features/extensions/enabled/common/storage.injectable.ts b/packages/core/src/features/extensions/enabled/common/storage.injectable.ts index 47a9930ccfe3..d2bd14ee15c0 100644 --- a/packages/core/src/features/extensions/enabled/common/storage.injectable.ts +++ b/packages/core/src/features/extensions/enabled/common/storage.injectable.ts @@ -7,7 +7,6 @@ import { getInjectable } from "@ogre-tools/injectable"; import { action, toJS } from "mobx"; import createPersistentStorageInjectable from "../../../../common/persistent-storage/create.injectable"; import persistentStorageMigrationsInjectable from "../../../../common/persistent-storage/migrations.injectable"; -import storageMigrationVersionInjectable from "../../../../common/persistent-storage/storage-migration-version.injectable"; import { enabledExtensionsMigrationDeclarationInjectionToken } from "./migrations"; import type { LensExtensionState } from "./state.injectable"; import enabledExtensionsStateInjectable from "./state.injectable"; @@ -30,7 +29,7 @@ const enabledExtensionsPersistentStorageInjectable = getInjectable({ toJSON: () => ({ extensions: [...toJS(state)], }), - projectVersion: di.inject(storageMigrationVersionInjectable, enabledExtensionsMigrationDeclarationInjectionToken), + projectVersion: "6.5.0", // temporary fix for #7784, otherwise calculated wrong on the renderer process migrations: di.inject(persistentStorageMigrationsInjectable, enabledExtensionsMigrationDeclarationInjectionToken), }); }, From 942a91620755ce739ef7c968f55a3e10a8c98583 Mon Sep 17 00:00:00 2001 From: Jim Ehrismann Date: Tue, 30 May 2023 11:04:44 -0400 Subject: [PATCH 2/2] Release 6.5.2 Signed-off-by: Jim Ehrismann --- open-lens/package.json | 6 +++--- package-lock.json | 16 ++++++++-------- packages/core/package.json | 2 +- packages/extension-api/package.json | 4 ++-- packages/legacy-extension-example/package.json | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/open-lens/package.json b/open-lens/package.json index 9dbce5e98ec3..c159827ddd6c 100644 --- a/open-lens/package.json +++ b/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.5.1", + "version": "6.5.2", "repository": { "type": "git", "url": "git+https://github.com/lensapp/lens.git" @@ -184,7 +184,7 @@ "@k8slens/application-for-electron-main": "^6.5.0", "@k8slens/button": "^1.0.0", "@k8slens/cluster-settings": "^6.5.0", - "@k8slens/core": "^6.5.1", + "@k8slens/core": "^6.5.2", "@k8slens/ensure-binaries": "^6.5.0", "@k8slens/error-boundary": "^1.0.0", "@k8slens/event-emitter": "^1.0.0", @@ -192,7 +192,7 @@ "@k8slens/keyboard-shortcuts": "^1.0.0", "@k8slens/kube-object": "^1.0.0", "@k8slens/kubectl-versions": "^1.0.0", - "@k8slens/legacy-extension-example": "^1.0.1", + "@k8slens/legacy-extension-example": "^1.0.2", "@k8slens/legacy-extensions": "^1.0.0", "@k8slens/legacy-global-di": "^1.0.0", "@k8slens/list-layout": "^1.0.0", diff --git a/package-lock.json b/package-lock.json index afabbdd4d66e..e8368c28815b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33974,7 +33974,7 @@ } }, "open-lens": { - "version": "6.5.1", + "version": "6.5.2", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -33985,7 +33985,7 @@ "@k8slens/application-for-electron-main": "^6.5.0", "@k8slens/button": "^1.0.0", "@k8slens/cluster-settings": "^6.5.0", - "@k8slens/core": "^6.5.1", + "@k8slens/core": "^6.5.2", "@k8slens/ensure-binaries": "^6.5.0", "@k8slens/error-boundary": "^1.0.0", "@k8slens/event-emitter": "^1.0.0", @@ -33993,7 +33993,7 @@ "@k8slens/keyboard-shortcuts": "^1.0.0", "@k8slens/kube-object": "^1.0.0", "@k8slens/kubectl-versions": "^1.0.0", - "@k8slens/legacy-extension-example": "^1.0.1", + "@k8slens/legacy-extension-example": "^1.0.2", "@k8slens/legacy-extensions": "^1.0.0", "@k8slens/legacy-global-di": "^1.0.0", "@k8slens/list-layout": "^1.0.0", @@ -34191,7 +34191,7 @@ }, "packages/core": { "name": "@k8slens/core", - "version": "6.5.1", + "version": "6.5.2", "license": "MIT", "devDependencies": { "@async-fn/jest": "1.6.4", @@ -34450,10 +34450,10 @@ }, "packages/extension-api": { "name": "@k8slens/extensions", - "version": "6.5.1", + "version": "6.5.2", "license": "MIT", "dependencies": { - "@k8slens/core": "6.5.1" + "@k8slens/core": "6.5.2" }, "devDependencies": { "@types/node": "^16.18.25", @@ -34967,10 +34967,10 @@ }, "packages/legacy-extension-example": { "name": "@k8slens/legacy-extension-example", - "version": "1.0.1", + "version": "1.0.2", "license": "MIT", "devDependencies": { - "@k8slens/extensions": "^6.5.1", + "@k8slens/extensions": "^6.5.2", "@types/node": "^16.18.25", "typescript": "^4.9.5", "webpack": "^5.81.0", diff --git a/packages/core/package.json b/packages/core/package.json index cabd7896f77e..e854fa63c87a 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,7 +3,7 @@ "productName": "", "description": "Lens Desktop Core", "homepage": "https://github.com/lensapp/lens", - "version": "6.5.1", + "version": "6.5.2", "repository": { "type": "git", "url": "git+https://github.com/lensapp/lens.git" diff --git a/packages/extension-api/package.json b/packages/extension-api/package.json index 5ca21895acec..58c03dbd512e 100644 --- a/packages/extension-api/package.json +++ b/packages/extension-api/package.json @@ -2,7 +2,7 @@ "name": "@k8slens/extensions", "productName": "OpenLens extensions", "description": "OpenLens - Open Source Kubernetes IDE: extensions", - "version": "6.5.1", + "version": "6.5.2", "copyright": "© 2022 OpenLens Authors", "license": "MIT", "main": "dist/extension-api.js", @@ -25,7 +25,7 @@ "clean": "rimraf dist/" }, "dependencies": { - "@k8slens/core": "6.5.1" + "@k8slens/core": "6.5.2" }, "devDependencies": { "@types/node": "^16.18.25", diff --git a/packages/legacy-extension-example/package.json b/packages/legacy-extension-example/package.json index fedc55d1e87e..ebc3d29f0343 100644 --- a/packages/legacy-extension-example/package.json +++ b/packages/legacy-extension-example/package.json @@ -2,7 +2,7 @@ "name": "@k8slens/legacy-extension-example", "private": false, "description": "An example bundled Lens extensions using the v1 API", - "version": "1.0.1", + "version": "1.0.2", "type": "commonjs", "files": [ "dist" @@ -36,7 +36,7 @@ "lint:fix": "lens-lint --fix" }, "devDependencies": { - "@k8slens/extensions": "^6.5.1", + "@k8slens/extensions": "^6.5.2", "@types/node": "^16.18.25", "typescript": "^4.9.5", "webpack": "^5.81.0",