diff --git a/Makefile b/Makefile index 857f14b2cb..ca9a7f1634 100644 --- a/Makefile +++ b/Makefile @@ -68,6 +68,7 @@ $(extension_node_modules): node_modules $(extension_dists): src/extensions/npm/extensions/dist $(extension_node_modules) cd $(@:/dist=) && ../../node_modules/.bin/npm run build + rm -rf ./node_modules/$(shell basename $(@:/dist=)) .PHONY: clean-old-extensions clean-old-extensions: @@ -75,6 +76,7 @@ clean-old-extensions: .PHONY: build-extensions build-extensions: node_modules clean-old-extensions $(extension_dists) + yarn install --check-files --frozen-lockfile --network-timeout=100000 .PHONY: test-extensions test-extensions: $(extension_node_modules) diff --git a/package.json b/package.json index 02bfb459d4..f6ba43ab11 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "extensions": [ "kube-object-event-status", "metrics-cluster-feature", - "node-menu", + "node-menu", "pod-menu" ] }, @@ -248,9 +248,14 @@ "joi": "^17.7.0", "js-yaml": "^4.1.0", "jsdom": "^16.7.0", + "kube-object-event-status": "file:./extensions/kube-object-event-status", + "lens-metrics-cluster-feature": "file:./extensions/metrics-cluster-feature", + "lens-node-menu": "file:./extensions/node-menu", + "lens-pod-menu": "file:./extensions/pod-menu", "lodash": "^4.17.15", "marked": "^4.2.3", "md5-file": "^5.0.0", + "metrics-cluster-feature": "file:./extensions/metrics-cluster-feature", "mobx": "^6.7.0", "mobx-observable-history": "^2.0.3", "mobx-react": "^7.6.0", @@ -261,10 +266,12 @@ "monaco-editor": "^0.29.1", "monaco-editor-webpack-plugin": "^5.0.0", "node-fetch": "^3.3.0", + "node-menu": "file:./extensions/node-menu", "node-pty": "0.10.1", "npm": "^8.19.3", "p-limit": "^3.1.0", "path-to-regexp": "^6.2.0", + "pod-menu": "file:./extensions/pod-menu", "proper-lockfile": "^4.1.2", "react": "^17.0.2", "react-dom": "^17.0.2", @@ -287,11 +294,7 @@ "winston": "^3.8.2", "winston-transport-browserconsole": "^1.0.5", "ws": "^8.11.0", - "xterm-link-provider": "^1.3.1", - "kube-object-event-status": "file:./extensions/kube-object-event-status", - "metrics-cluster-feature": "file:./extensions/metrics-cluster-feature", - "node-menu": "file:./extensions/node-menu", - "pod-menu": "file:./extensions/pod-menu" + "xterm-link-provider": "^1.3.1" }, "devDependencies": { "@async-fn/jest": "1.6.4", diff --git a/yarn.lock b/yarn.lock index bf11282470..9be811e117 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8276,6 +8276,15 @@ lazy-val@^1.0.4, lazy-val@^1.0.5: resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== +"lens-metrics-cluster-feature@file:./extensions/metrics-cluster-feature": + version "6.1.0" + +"lens-node-menu@file:./extensions/node-menu": + version "6.1.0" + +"lens-pod-menu@file:./extensions/pod-menu": + version "6.1.0" + less@^4.1.1: version "4.1.2" resolved "https://registry.yarnpkg.com/less/-/less-4.1.2.tgz#6099ee584999750c2624b65f80145f8674e4b4b0"