Stop overriding intree extension versions on build (#6239)

Makefile

@@ -53,7 +53,6 @@ integration: build
 
 .PHONY: build
 build: node_modules binaries/client
-	yarn run npm:fix-build-version
 	$(MAKE) build-extensions -B
 	yarn run build:tray-icons
 	yarn run compile
@@ -63,10 +62,6 @@ ifeq "$(DETECTED_OS)" "Windows"
 endif
 	yarn run electron-builder --publish onTag $(ELECTRON_BUILDER_EXTRA_ARGS)
 
-.PHONY: update-extension-locks
-update-extension-locks:
-	$(foreach dir, $(extensions), (cd $(dir) && rm package-lock.json && ../../node_modules/.bin/npm install --package-lock-only);)
-
 .NOTPARALLEL: $(extension_node_modules)
 $(extension_node_modules): node_modules
 	cd $(@:/node_modules=) && ../../node_modules/.bin/npm install --no-audit --no-fund --no-save
@@ -92,7 +87,7 @@ src/extensions/npm/extensions/dist: src/extensions/npm/extensions/node_modules
 	yarn compile:extension-types
 
 src/extensions/npm/extensions/node_modules: src/extensions/npm/extensions/package.json
-	cd src/extensions/npm/extensions/ && ../../../../node_modules/.bin/npm install --no-audit --no-fund
+	cd src/extensions/npm/extensions/ && ../../../../node_modules/.bin/npm install --no-audit --no-fund --no-save
 
 .PHONY: build-npm
 build-npm: build-extension-types src/extensions/npm/extensions/__mocks__

build/set_build_version.ts

@@ -1,68 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import * as fse from "fs-extra";
-import * as path from "path";
-import appInfo from "../package.json";
-import semver from "semver";
-import fastGlob from "fast-glob";
-
-const packagePath = path.join(__dirname, "../package.json");
-const versionInfo = semver.parse(appInfo.version);
-const buildNumber = process.env.BUILD_NUMBER || Date.now().toString();
-
-function getBuildChannel(): string {
-  const preRelease = versionInfo.prerelease?.[0];
-
-  switch (preRelease) {
-    case "alpha":
-    case "beta":
-    case "rc":
-      return preRelease;
-    case undefined:
-    case "latest":
-      return "latest"; // needed because electron-updater does not take build information into account when resolving if update is available
-    default:
-      throw new Error(`invalid pre-release ${preRelease}`);
-  }
-}
-
-async function writeOutExtensionVersion(manifestPath: string) {
-  const extensionPackageJson = await fse.readJson(manifestPath);
-
-  extensionPackageJson.version = appInfo.version;
-
-  return fse.writeJson(manifestPath, extensionPackageJson, {
-    spaces: 2,
-  });
-}
-
-async function writeOutNewVersions() {
-  await Promise.all([
-    fse.writeJson(packagePath, appInfo, {
-      spaces: 2,
-    }),
-    ...(await fastGlob(["extensions/*/package.json"])).map(writeOutExtensionVersion),
-  ]);
-}
-
-function main() {
-  const prereleaseParts: string[] = [getBuildChannel()];
-
-  if (versionInfo.prerelease && versionInfo.prerelease.length > 1) {
-    prereleaseParts.push(versionInfo.prerelease[1].toString());
-  }
-
-  prereleaseParts.push(buildNumber);
-
-  appInfo.version = `${versionInfo.major}.${versionInfo.minor}.${versionInfo.patch}-${prereleaseParts.join(".")}`;
-
-  writeOutNewVersions()
-    .catch((error) => {
-      console.error(error);
-      process.exit(1);
-    });
-}
-
-main();

extensions/kube-object-event-status/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kube-object-event-status",
-  "version": "0.0.1",
+  "version": "6.1.0",
   "description": "Adds kube object status from events",
   "renderer": "dist/renderer.js",
   "lens": {

extensions/metrics-cluster-feature/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lens-metrics-cluster-feature",
-  "version": "0.0.1",
+  "version": "6.1.0",
   "description": "Lens metrics cluster feature",
   "renderer": "dist/renderer.js",
   "lens": {

extensions/node-menu/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lens-node-menu",
-  "version": "0.0.1",
+  "version": "6.1.0",
   "description": "Lens node menu",
   "renderer": "dist/renderer.js",
   "lens": {

extensions/pod-menu/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lens-pod-menu",
-  "version": "0.0.1",
+  "version": "6.1.0",
   "description": "Lens pod menu",
   "renderer": "dist/renderer.js",
   "lens": {

package.json

@@ -26,7 +26,6 @@
     "compile:main": "yarn run webpack --config webpack/main.ts",
     "compile:renderer": "yarn run webpack --config webpack/renderer.ts",
     "compile:extension-types": "yarn run webpack --config webpack/extensions.ts",
-    "npm:fix-build-version": "yarn run ts-node build/set_build_version.ts",
     "npm:fix-package-version": "yarn run ts-node build/set_npm_version.ts",
     "build:linux": "yarn run compile && electron-builder --linux --dir",
     "build:mac": "yarn run compile && electron-builder --mac --dir",

src/extensions/npm/extensions/package.json

@@ -16,8 +16,8 @@
     "name": "OpenLens Authors"
   },
   "dependencies": {
-    "@material-ui/core": "4.12.3",
-    "@types/node": "14.17.14",
+    "@material-ui/core": "^4.12.3",
+    "@types/node": "^16.11.58",
     "@types/react": "^17.0.45",
     "@types/react-dom": "^17.0.16",
     "@types/react-router": "^5.1.18",