From 550a2fd2808539f930899dcc0265fabd26401864 Mon Sep 17 00:00:00 2001 From: Roman Nikitenko Date: Mon, 15 Jul 2024 13:12:57 +0300 Subject: [PATCH 1/2] feat: Support 2.3.0 Devfile Signed-off-by: Roman Nikitenko rh-pre-commit.version: 2.2.0 rh-pre-commit.check-secrets: ENABLED --- code/extensions/che-remote/package.json | 2 +- code/extensions/che-remote/yarn.lock | 31 ++++++++++++++++--------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/code/extensions/che-remote/package.json b/code/extensions/che-remote/package.json index dc33b9b093a..ecf4cb668d3 100644 --- a/code/extensions/che-remote/package.json +++ b/code/extensions/che-remote/package.json @@ -32,7 +32,7 @@ "dependencies": { "vscode-nls": "^5.0.0", "axios": "1.6.0", - "@eclipse-che/che-devworkspace-generator": "7.86.0", + "@eclipse-che/che-devworkspace-generator": "7.88.0-next-a2e5c63", "https": "^1.0.0", "js-yaml": "^4.0.0" }, diff --git a/code/extensions/che-remote/yarn.lock b/code/extensions/che-remote/yarn.lock index 52b935d6052..ea1c8962946 100644 --- a/code/extensions/che-remote/yarn.lock +++ b/code/extensions/che-remote/yarn.lock @@ -286,10 +286,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@devfile/api@2.2.2-1700686170": - version "2.2.2-1700686170" - resolved "https://registry.yarnpkg.com/@devfile/api/-/api-2.2.2-1700686170.tgz#faf3627f1f9d5df60705813add60b349eb3166bb" - integrity sha512-mCIzvSce4Bu50HNybY0gWtSD1kujnXGvMVkzk0AAKMt1eSIAKtJeuTRPqQcLfrcfMRjF5t+AVOIIJ5LtlEfknA== +"@devfile/api@2.2.2-1715367693": + version "2.2.2-1715367693" + resolved "https://registry.yarnpkg.com/@devfile/api/-/api-2.2.2-1715367693.tgz#0e0bbd8a54b5d4f05c2aa9b6cc725a2404629a5c" + integrity sha512-dWGyC7I6cV3L+K2TMOY/hUzmMqp+X1wMp3M3OusoXZrKWExvQVcZZwVd9BB6vPot+0THEHK56U8qYTEy/Ojy0w== dependencies: "@types/node" "*" "@types/node-fetch" "^2.5.7" @@ -298,13 +298,13 @@ node-fetch "^2.6.0" url-parse "^1.4.3" -"@eclipse-che/che-devworkspace-generator@7.86.0": - version "7.86.0" - resolved "https://registry.yarnpkg.com/@eclipse-che/che-devworkspace-generator/-/che-devworkspace-generator-7.86.0.tgz#6ee14f31e79a9c9b52979cda6e303b1b0429d54e" - integrity sha512-7FxGzvEkB/GbCQRgzdNpCWd2pIHhkzjpckRMKOIjpAroLFlnkRZSeoosPhSiRYKLNt2YAf2F1BXhqzUrswTuFQ== +"@eclipse-che/che-devworkspace-generator@7.88.0-next-a2e5c63": + version "7.88.0-next-a2e5c63" + resolved "https://registry.yarnpkg.com/@eclipse-che/che-devworkspace-generator/-/che-devworkspace-generator-7.88.0-next-a2e5c63.tgz#2516aad6674fefeb9376974cf27855d573e2de36" + integrity sha512-70VbsUzONiyJr9pe/rslzta/SM4RvDsSR/kLIxMS4EbS9YgxEvT3rSM9B8eFLMbeZksnCuEQYxiyjSN6P4UV7A== dependencies: - "@devfile/api" "2.2.2-1700686170" - axios "1.6.0" + "@devfile/api" "2.2.2-1715367693" + axios "^1.7.0" fs-extra "^10.0.0" inversify "^5.0.1" js-yaml "^4.0.0" @@ -834,6 +834,15 @@ axios@1.6.0: form-data "^4.0.0" proxy-from-env "^1.1.0" +axios@^1.7.0: + version "1.7.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621" + integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw== + dependencies: + follow-redirects "^1.15.6" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + babel-jest@^27.4.6: version "27.4.6" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.4.6.tgz#4d024e69e241cdf4f396e453a07100f44f7ce314" @@ -1412,7 +1421,7 @@ flatted@^3.2.9: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a" integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw== -follow-redirects@^1.15.0: +follow-redirects@^1.15.0, follow-redirects@^1.15.6: version "1.15.6" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== From b718e066829c021b9fc8c31c4cddfc5da8961a3a Mon Sep 17 00:00:00 2001 From: Roman Nikitenko Date: Mon, 15 Jul 2024 17:41:12 +0300 Subject: [PATCH 2/2] fix: axios 1.7.0 is required for the che-devworkspace-generator Signed-off-by: Roman Nikitenko rh-pre-commit.version: 2.2.0 rh-pre-commit.check-secrets: ENABLED --- code/extensions/che-remote/package.json | 2 +- code/extensions/che-remote/yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/extensions/che-remote/package.json b/code/extensions/che-remote/package.json index ecf4cb668d3..1940b1a19e6 100644 --- a/code/extensions/che-remote/package.json +++ b/code/extensions/che-remote/package.json @@ -31,7 +31,7 @@ }, "dependencies": { "vscode-nls": "^5.0.0", - "axios": "1.6.0", + "axios": "1.7.0", "@eclipse-che/che-devworkspace-generator": "7.88.0-next-a2e5c63", "https": "^1.0.0", "js-yaml": "^4.0.0" diff --git a/code/extensions/che-remote/yarn.lock b/code/extensions/che-remote/yarn.lock index ea1c8962946..f502e9be836 100644 --- a/code/extensions/che-remote/yarn.lock +++ b/code/extensions/che-remote/yarn.lock @@ -825,12 +825,12 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= -axios@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz#f1e5292f26b2fd5c2e66876adc5b06cdbd7d2102" - integrity sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg== +axios@1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.0.tgz#b48f715325457ededfcb3f0a44a3fb9d5742acb6" + integrity sha512-IiB0wQeKyPRdsFVhBgIo31FbzOyf2M6wYl7/NVutFwFBRMiAbjNiydJIHKeLmPugF4kJLfA1uWZ82Is2QzqqFA== dependencies: - follow-redirects "^1.15.0" + follow-redirects "^1.15.6" form-data "^4.0.0" proxy-from-env "^1.1.0" @@ -1421,7 +1421,7 @@ flatted@^3.2.9: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a" integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw== -follow-redirects@^1.15.0, follow-redirects@^1.15.6: +follow-redirects@^1.15.6: version "1.15.6" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==