From 89cd28e4e153cdc068a978dd2504b735a53efd16 Mon Sep 17 00:00:00 2001 From: Oleksii Orel Date: Tue, 29 Oct 2024 15:05:54 +0200 Subject: [PATCH] fixup! fix: change package manager script Signed-off-by: Oleksii Orel --- build/dockerfiles/Dockerfile | 1 - package.json | 4 +--- packages/common/package.json | 2 +- packages/dashboard-backend/package.json | 2 +- packages/dashboard-frontend/package.json | 2 +- scripts/yarn/old_version/yarn.lock | 4 ++-- yarn.lock | 8 ++++---- 7 files changed, 10 insertions(+), 13 deletions(-) diff --git a/build/dockerfiles/Dockerfile b/build/dockerfiles/Dockerfile index f8d4c471a..83103b766 100644 --- a/build/dockerfiles/Dockerfile +++ b/build/dockerfiles/Dockerfile @@ -34,7 +34,6 @@ ENV BACKEND=packages/dashboard-backend COPY ${BACKEND}/package.json /dashboard/${BACKEND}/ COPY .yarn/releases/yarn-*.cjs /dashboard/.yarn/releases/ -COPY .yarnrc.yml /dashboard/ WORKDIR /dashboard RUN yarn install --network-timeout 3600000 COPY packages/ /dashboard/packages diff --git a/package.json b/package.json index a2cb79aca..fc25a26d1 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,6 @@ }, "resolutions": { "@adobe/css-tools": "^4.3.2", - "@kubernetes/client-node": "^0.22.1", "@hapi/hoek": "^10.0.1", "axios": "^1.7.4", "braces": "^3.0.3", @@ -51,7 +50,6 @@ "undici": "^5.28.3", "find-my-way": "9.0.1", "webpack": "^5.94.0", - "ws": "^8.17.1", - "jsonpath-plus": "10.1.0" + "ws": "^8.17.1" } } diff --git a/packages/common/package.json b/packages/common/package.json index 9a1166eea..07ad686c0 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -18,7 +18,7 @@ }, "devDependencies": { "@devfile/api": "2.3.0-1721400636", - "@kubernetes/client-node": "^0.21.0", + "@kubernetes/client-node": "^0.22.1", "@types/jest": "^29.5.3", "@typescript-eslint/eslint-plugin": "^6.3.0", "@typescript-eslint/parser": "^6.3.0", diff --git a/packages/dashboard-backend/package.json b/packages/dashboard-backend/package.json index 55bcabe92..c8a672208 100644 --- a/packages/dashboard-backend/package.json +++ b/packages/dashboard-backend/package.json @@ -37,7 +37,7 @@ "@fastify/swagger": "^8.14.0", "@fastify/swagger-ui": "3.0.0", "@fastify/websocket": "^10.0.1", - "@kubernetes/client-node": "^0.21.0", + "@kubernetes/client-node": "^0.22.1", "args": "^5.0.3", "axios": "^1.7.0", "fastify": "^4.27.0", diff --git a/packages/dashboard-frontend/package.json b/packages/dashboard-frontend/package.json index d89f00000..0593bf50c 100644 --- a/packages/dashboard-frontend/package.json +++ b/packages/dashboard-frontend/package.json @@ -70,7 +70,7 @@ "devDependencies": { "@devfile/api": "2.3.0-1721400636", "@eclipse-che/api": "^7.86.0", - "@kubernetes/client-node": "^0.21.0", + "@kubernetes/client-node": "^0.22.1", "@react-mock/state": "^0.1.8", "@testing-library/dom": "^10.4.0", "@testing-library/jest-dom": "^6.5.0", diff --git a/scripts/yarn/old_version/yarn.lock b/scripts/yarn/old_version/yarn.lock index 2d43de180..90e0c658a 100644 --- a/scripts/yarn/old_version/yarn.lock +++ b/scripts/yarn/old_version/yarn.lock @@ -907,7 +907,7 @@ resolved "https://registry.yarnpkg.com/@jsep-plugin/regex/-/regex-1.0.3.tgz#3aeaa2e5fa45d89de116aeafbfa41c95935b7f6d" integrity sha512-XfZgry4DwEZvSFtS/6Y+R48D7qJYJK6R9/yJFyUFHCIUMEEHuJ4X95TDgJp5QkmzfLYvapMPzskV5HpIDrREug== -"@kubernetes/client-node@^0.21.0", "@kubernetes/client-node@^0.22.1": +"@kubernetes/client-node@^0.22.1": version "0.22.1" resolved "https://registry.yarnpkg.com/@kubernetes/client-node/-/client-node-0.22.1.tgz#b5a1a9a3e946c873a5f2a4c5daf989667cdfb9a7" integrity sha512-bNz2uoxJTA/m10h2TsM5e021I9OndpxYYj5hGdHnrmhA+Dk56ohhbbvnJz7TADTEgyBHQ6NAT0QrILypbdFusQ== @@ -5736,7 +5736,7 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -jsonpath-plus@10.1.0, jsonpath-plus@^10.0.0: +jsonpath-plus@^10.0.0: version "10.1.0" resolved "https://registry.yarnpkg.com/jsonpath-plus/-/jsonpath-plus-10.1.0.tgz#e8724c721ac60ff2db667066131b1a2c992ffcf0" integrity sha512-gHfV1IYqH8uJHYVTs8BJX1XKy2/rR93+f8QQi0xhx95aCiXn1ettYAd5T+7FU6wfqyDoX/wy0pm/fL3jOKJ9Lg== diff --git a/yarn.lock b/yarn.lock index fe821887c..c4983f8c9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -551,7 +551,7 @@ __metadata: resolution: "@eclipse-che/common@workspace:packages/common" dependencies: "@devfile/api": 2.3.0-1721400636 - "@kubernetes/client-node": ^0.21.0 + "@kubernetes/client-node": ^0.22.1 "@types/jest": ^29.5.3 "@typescript-eslint/eslint-plugin": ^6.3.0 "@typescript-eslint/parser": ^6.3.0 @@ -584,7 +584,7 @@ __metadata: "@fastify/swagger": ^8.14.0 "@fastify/swagger-ui": 3.0.0 "@fastify/websocket": ^10.0.1 - "@kubernetes/client-node": ^0.21.0 + "@kubernetes/client-node": ^0.22.1 "@types/args": ^5.0.0 "@types/fs-extra": ^11.0.1 "@types/jest": ^29.5.3 @@ -635,7 +635,7 @@ __metadata: dependencies: "@devfile/api": 2.3.0-1721400636 "@eclipse-che/api": ^7.86.0 - "@kubernetes/client-node": ^0.21.0 + "@kubernetes/client-node": ^0.22.1 "@patternfly/react-core": ^4.276.11 "@patternfly/react-icons": ^4.93.7 "@patternfly/react-table": ^4.113.3 @@ -7955,7 +7955,7 @@ __metadata: languageName: node linkType: hard -"jsonpath-plus@npm:10.1.0": +"jsonpath-plus@npm:^10.0.0": version: 10.1.0 resolution: "jsonpath-plus@npm:10.1.0" dependencies: