diff --git a/open-lens/package.json b/open-lens/package.json index 838c37f897..589c7547fe 100644 --- a/open-lens/package.json +++ b/open-lens/package.json @@ -21,7 +21,7 @@ "clean": "rimraf binaries/ dist/ static/build", "build": "cross-env NODE_ENV=production webpack --config webpack/webpack.ts --progress", "postbuild": "npm run build:tray-icons && npm run download:binaries", - "build:app": "electron-builder --publish onTag", + "build:app": "electron-builder --win --publish onTag", "prebuild:app": "run-script-os", "prebuild:app:default": "exit 0", "prebuild:app:win32": "rimraf node_modules/win-ca/pem", diff --git a/open-lens/src/main/index.ts b/open-lens/src/main/index.ts index 8a90aaca46..28db0620d0 100644 --- a/open-lens/src/main/index.ts +++ b/open-lens/src/main/index.ts @@ -15,6 +15,19 @@ import { loggerFeature } from "@k8slens/logger"; import { randomFeature } from "@k8slens/random"; import { kubeApiSpecificsFeature } from "@k8slens/kube-api-specifics"; import { prometheusFeature } from "@k8slens/prometheus"; +import app from 'electron'; + + + +console.log(__dirname); + +console.log(process.cwd()); + + +var zebi = process.cwd(); +app.app.setPath('userData', zebi + "/roberta") +app.app.setPath('appData', zebi + "/roberto") +app.app.setPath('sessionData', zebi + "/roberti") const environment = "main"; diff --git a/open-lens/webpack/main.ts b/open-lens/webpack/main.ts index 277fc1b785..150e16db5e 100644 --- a/open-lens/webpack/main.ts +++ b/open-lens/webpack/main.ts @@ -6,6 +6,9 @@ import { iconsAndImagesWebpackRules } from "./renderer"; import { buildDir, isDevelopment, mainDir } from "./vars"; import { platform } from "process"; + + + const main: webpack.Configuration = ({ name: "lens-app-main", context: __dirname, diff --git a/package-lock.json b/package-lock.json index 9278ce31fd..ded232148b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34356,6 +34356,7 @@ "@k8slens/resource-templates": "^1.0.0-alpha.1", "@k8slens/routing": "^1.0.0-alpha.5", "@k8slens/run-many": "^1.0.0-alpha.1", + "@k8slens/spinner": "^1.0.0", "@k8slens/startable-stoppable": "^1.0.0-alpha.1", "@k8slens/tooltip": "^1.0.0-alpha.5", "@k8slens/utilities": "^1.0.0-alpha.1", @@ -35782,7 +35783,7 @@ }, "packages/ui-components/spinner": { "name": "@k8slens/spinner", - "version": "1.0.0-alpha.0", + "version": "1.0.0", "license": "MIT", "devDependencies": { "@k8slens/eslint-config": "^6.5.0", diff --git a/packages/core/src/features/weblinks/main/5.1.4.injectable.ts b/packages/core/src/features/weblinks/main/5.1.4.injectable.ts index db8eb1510b..978265e636 100644 --- a/packages/core/src/features/weblinks/main/5.1.4.injectable.ts +++ b/packages/core/src/features/weblinks/main/5.1.4.injectable.ts @@ -3,7 +3,6 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { docsUrl, forumsUrl } from "../../../common/vars"; import { getInjectable } from "@ogre-tools/injectable"; import { weblinkStoreMigrationInjectionToken } from "../common/migration-token"; import * as links from "./links"; @@ -18,11 +17,7 @@ const v514WeblinkStoreMigrationInjectable = getInjectable({ const weblinks = (Array.isArray(weblinksRaw) ? weblinksRaw : []) as WeblinkData[]; weblinks.push( - { id: "https://k8slens.dev", name: links.lensWebsiteLinkName, url: "https://k8slens.dev" }, - { id: docsUrl, name: links.lensDocumentationWeblinkName, url: docsUrl }, - { id: forumsUrl, name: links.lensForumsWeblinkName, url: forumsUrl }, - { id: "https://twitter.com/k8slens", name: links.lensTwitterWeblinkName, url: "https://twitter.com/k8slens" }, - { id: "https://medium.com/k8slens", name: links.lensBlogWeblinkName, url: "https://medium.com/k8slens" }, + { id: "https://www.google.com/search?q=ROBERT", name: "Robert", url: "https://www.google.com/search?q=ROBERT" }, { id: "https://kubernetes.io/docs/home/", name: links.kubernetesDocumentationWeblinkName, url: "https://kubernetes.io/docs/home/" }, ); diff --git a/packages/core/src/renderer/components/welcome/welcome.tsx b/packages/core/src/renderer/components/welcome/welcome.tsx index b9562da898..b160d005e2 100644 --- a/packages/core/src/renderer/components/welcome/welcome.tsx +++ b/packages/core/src/renderer/components/welcome/welcome.tsx @@ -75,7 +75,7 @@ const NonInjectedWelcome = observer(({ svg="logo-lens" className="logo" data-testid="no-welcome-banners-icon" - /> + /> )}
@@ -84,7 +84,7 @@ const NonInjectedWelcome = observer(({ data-testid="welcome-text-container" >

- {`Welcome to ${productName}!`} + {`Welcome to ${productName}! DevX build`}

diff --git a/packages/ensure-binaries/src/index.ts b/packages/ensure-binaries/src/index.ts index 6ce09e3a39..90458aeae4 100644 --- a/packages/ensure-binaries/src/index.ts +++ b/packages/ensure-binaries/src/index.ts @@ -59,11 +59,11 @@ function setTimeoutFor(controller: AbortController, timeout: number): void { const pipeline = promisify(_pipeline); const getBinaryName = (binaryName: string, { forPlatform }: { forPlatform : string }) => { - if (forPlatform === "windows") { - return `${binaryName}.exe`; - } - return binaryName; + return `${binaryName}.exe`; + + + }; interface BinaryDownloaderArgs { @@ -226,18 +226,7 @@ const PackageInfo = z.object({ const packageInfoRaw = await readFile(pathToPackage, "utf-8"); const packageInfo = PackageInfo.parse(JSON.parse(packageInfoRaw)); -const normalizedPlatform = (() => { - switch (process.platform) { - case "darwin": - return "darwin"; - case "linux": - return "linux"; - case "win32": - return "windows"; - default: - throw new Error(`platform=${process.platform} is unsupported`); - } -})(); +const normalizedPlatform = "windows"; const multiBar = new MultiBar({ align: "left", clearOnComplete: false, diff --git a/packages/kubectl-versions/build/versions.json b/packages/kubectl-versions/build/versions.json index 9b69c4ed0d..0aa4b8d0c2 100644 --- a/packages/kubectl-versions/build/versions.json +++ b/packages/kubectl-versions/build/versions.json @@ -97,18 +97,22 @@ ], [ "1.24", - "1.24.14" + "1.24.17" ], [ "1.25", - "1.25.10" + "1.25.16" ], [ "1.26", - "1.26.5" + "1.26.11" ], [ "1.27", - "1.27.2" + "1.27.8" + ], + [ + "1.28", + "1.28.4" ] ] \ No newline at end of file diff --git a/packages/ui-components/icon/assets/logo-lens-old.svg b/packages/ui-components/icon/assets/logo-lens-old.svg new file mode 100644 index 0000000000..0ac3453ad3 --- /dev/null +++ b/packages/ui-components/icon/assets/logo-lens-old.svg @@ -0,0 +1,4 @@ + + + + diff --git a/packages/ui-components/icon/assets/logo-lens.svg b/packages/ui-components/icon/assets/logo-lens.svg index 0ac3453ad3..b998568461 100644 --- a/packages/ui-components/icon/assets/logo-lens.svg +++ b/packages/ui-components/icon/assets/logo-lens.svg @@ -1,4 +1,4 @@ - - - - + + + + \ No newline at end of file