diff --git a/lerna.json b/lerna.json index 5ad0e4f6da..deb005ae74 100644 --- a/lerna.json +++ b/lerna.json @@ -4,6 +4,6 @@ "packages": [ "packages/*" ], - "version": "6.4.0-alpha.2", + "version": "6.4.0-alpha.4", "npmClient": "yarn" } diff --git a/packages/core/package.json b/packages/core/package.json index 6c19382481..ce3a8aa4cd 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,7 +1,7 @@ { - "name": "@k8slens/open-lens", - "productName": "OpenLens", - "description": "OpenLens - Open Source IDE for Kubernetes", + "name": "@k8slens/core", + "productName": "", + "description": "Lens Desktop Core", "homepage": "https://github.com/lensapp/lens", "version": "6.4.0-alpha.4", "repository": { @@ -42,7 +42,7 @@ "types/*", "tsconfig.json" ], - "copyright": "© 2022 OpenLens Authors", + "copyright": "© 2023 OpenLens Authors", "license": "MIT", "author": "OpenLens Authors ", "scripts": { diff --git a/packages/extension-api/package.json b/packages/extension-api/package.json index cf0c2b9001..6d7217bf47 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.4.0-alpha.2", + "version": "6.4.0-alpha.4", "copyright": "© 2022 OpenLens Authors", "license": "MIT", "main": "dist/src/extension-api.js", @@ -22,7 +22,7 @@ "prepare:dev": "yarn run build" }, "dependencies": { - "@k8slens/open-lens": "^6.4.0-alpha.2" + "@k8slens/core": "^6.4.0-alpha.4" }, "devDependencies": { "@types/node": "^16.18.6", diff --git a/packages/extension-api/src/extension-api.ts b/packages/extension-api/src/extension-api.ts index 8d6c0048d0..db42de77cc 100644 --- a/packages/extension-api/src/extension-api.ts +++ b/packages/extension-api/src/extension-api.ts @@ -3,9 +3,9 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { extensionApi as main } from "@k8slens/open-lens/main"; -import { extensionApi as renderer } from "@k8slens/open-lens/renderer"; -import { extensionApi as common } from "@k8slens/open-lens/common"; +import { extensionApi as main } from "@k8slens/core/main"; +import { extensionApi as renderer } from "@k8slens/core/renderer"; +import { extensionApi as common } from "@k8slens/core/common"; const Main = { ... main } as typeof main; const Renderer = { ...renderer } as typeof renderer; diff --git a/packages/extension-api/webpack/extensions.ts b/packages/extension-api/webpack/extensions.ts index 3cb6ed2caa..6b354f9bae 100644 --- a/packages/extension-api/webpack/extensions.ts +++ b/packages/extension-api/webpack/extensions.ts @@ -35,9 +35,9 @@ export default function generateExtensionTypes(): webpack.Configuration { ], stats: "errors-warnings", externals: [ - "@k8slens/open-lens/common", - "@k8slens/open-lens/main", - "@k8slens/open-lens/renderer", + "@k8slens/core/common", + "@k8slens/core/main", + "@k8slens/core/renderer", ], module: { rules: [ diff --git a/packages/open-lens/package.json b/packages/open-lens/package.json index d162a8e759..116b426ee1 100644 --- a/packages/open-lens/package.json +++ b/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-alpha.2", + "version": "6.4.0-alpha.4", "repository": { "type": "git", "url": "git+https://github.com/lensapp/lens.git" @@ -97,8 +97,8 @@ "generateUpdatesFilesForAllChannels": true, "files": [ "static/**/*", - "!node_modules/@k8slens/open-lens/node_modules/**/*", - "!node_modules/@k8slens/open-lens/src" + "!node_modules/@k8slens/core/node_modules/**/*", + "!node_modules/@k8slens/core/src" ], "afterSign": "build/notarize.js", "extraResources": [ @@ -192,7 +192,7 @@ } }, "dependencies": { - "@k8slens/open-lens": "^6.4.0-alpha.2", + "@k8slens/core": "^6.4.0-alpha.4", "@ogre-tools/fp": "^12.0.1", "@ogre-tools/injectable": "^12.0.1", "@ogre-tools/injectable-extension-for-auto-registration": "^12.0.1", diff --git a/packages/open-lens/src/common/application-information.injectable.ts b/packages/open-lens/src/common/application-information.injectable.ts index 16f2321d47..603ea171ad 100644 --- a/packages/open-lens/src/common/application-information.injectable.ts +++ b/packages/open-lens/src/common/application-information.injectable.ts @@ -1,6 +1,6 @@ import { getInjectable } from "@ogre-tools/injectable"; -import { applicationInformationToken, ApplicationInformation } from "@k8slens/open-lens/common"; +import { applicationInformationToken, ApplicationInformation } from "@k8slens/core/common"; import packageJson from "../../package.json"; const applicationInformationInjectable = getInjectable({ diff --git a/packages/open-lens/src/main/index.ts b/packages/open-lens/src/main/index.ts index 45e8d121ad..f15308ffed 100644 --- a/packages/open-lens/src/main/index.ts +++ b/packages/open-lens/src/main/index.ts @@ -1,7 +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 } from "@k8slens/open-lens/main"; +import { createApp, extensionApi } from "@k8slens/core/main"; const di = createContainer("main"); const app = createApp({ diff --git a/packages/open-lens/src/renderer/index.ts b/packages/open-lens/src/renderer/index.ts index a87fdbe897..16f98fc7d0 100644 --- a/packages/open-lens/src/renderer/index.ts +++ b/packages/open-lens/src/renderer/index.ts @@ -1,7 +1,7 @@ -import "@k8slens/open-lens/styles"; +import "@k8slens/core/styles"; import { createContainer } from "@ogre-tools/injectable"; import { runInAction } from "mobx"; -import { createApp, extensionApi } from "@k8slens/open-lens/renderer"; +import { createApp, extensionApi } from "@k8slens/core/renderer"; import { autoRegister } from "@ogre-tools/injectable-extension-for-auto-registration"; const di = createContainer("renderer"); diff --git a/packages/open-lens/webpack/vars.ts b/packages/open-lens/webpack/vars.ts index 08824009eb..0179c20af0 100644 --- a/packages/open-lens/webpack/vars.ts +++ b/packages/open-lens/webpack/vars.ts @@ -11,9 +11,9 @@ export const mainDir = path.join(process.cwd(), "src", "main"); export const buildDir = path.join(process.cwd(), "static", "build"); export const assetsFolderName = "assets"; export const rendererDir = path.join(process.cwd(), "src", "renderer"); -export const htmlTemplate = path.resolve(__dirname, "..", "node_modules", "@k8slens", "open-lens", "src/renderer", "template.html"); +export const htmlTemplate = path.resolve(__dirname, "..", "node_modules", "@k8slens", "core", "src/renderer", "template.html"); export const publicPath = "/build/"; -export const sassCommonVars = path.resolve(__dirname, "..", "node_modules", "@k8slens", "open-lens", "src", "renderer", "components/vars.scss"); +export const sassCommonVars = path.resolve(__dirname, "..", "node_modules", "@k8slens", "core", "src", "renderer", "components/vars.scss"); export const webpackDevServerPort = Number(process.env.WEBPACK_DEV_SERVER_PORT) || 9191; assert(Number.isInteger(webpackDevServerPort), "WEBPACK_DEV_SERVER_PORT environment variable must only be an integer"); diff --git a/packages/release-tool/package.json b/packages/release-tool/package.json index 48b982e3ff..f9bf09f842 100644 --- a/packages/release-tool/package.json +++ b/packages/release-tool/package.json @@ -1,6 +1,6 @@ { "name": "@k8slens/release-tool", - "version": "6.4.0-alpha.2", + "version": "6.4.0-alpha.4", "description": "Release tool for lens monorepo", "main": "dist/index.mjs", "license": "MIT",