From ca2cc728136dd49256d5d074f2a58ae5d603c06e Mon Sep 17 00:00:00 2001 From: Valeriy Svydenko Date: Tue, 30 Jul 2024 16:10:36 +0300 Subject: [PATCH] chore: bump devfile/api to 2.3.0 Signed-off-by: Valeriy Svydenko --- package.json | 2 +- src/generate.ts | 10 +++++----- yarn.lock | 39 +++++++-------------------------------- 3 files changed, 13 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index ff7bbfd..75d442a 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ }, "homepage": "https://github.com/eclipse-che/che-devfile-registry#readme", "dependencies": { - "@devfile/api": "2.2.2-1716821574", + "@devfile/api": "2.3.0-1721400636", "jsonschema": "^1.4.1", "axios": "^1.7.0", "fs-extra": "^11.2.0", diff --git a/src/generate.ts b/src/generate.ts index f06ccb6..f1ec2e0 100644 --- a/src/generate.ts +++ b/src/generate.ts @@ -9,8 +9,8 @@ ***********************************************************************/ import { - V222Devfile, - V222DevfileMetadata, + V230Devfile, + V230DevfileMetadata, V1alpha2DevWorkspace, V1alpha2DevWorkspaceMetadata, V1alpha2DevWorkspaceSpecContributions, @@ -23,8 +23,8 @@ import * as fs from 'fs-extra'; import { DevfileContext } from './api/devfile-context'; import { DevContainerComponentFinder } from './devfile/dev-container-component-finder'; -type DevfileLike = V222Devfile & { - metadata: V222DevfileMetadata & { +type DevfileLike = V230Devfile & { + metadata: V230DevfileMetadata & { generateName?: string; }; }; @@ -92,7 +92,7 @@ export class Generate { // transform it into a devWorkspace const devfileMetadata = this.createDevWorkspaceMetadata(devfile, true); - const devfileCopy: V222Devfile = Object.assign({}, devfile); + const devfileCopy: V230Devfile = Object.assign({}, devfile); delete devfileCopy.schemaVersion; delete devfileCopy.metadata; const editorSpecContribution: V1alpha2DevWorkspaceSpecContributions = { diff --git a/yarn.lock b/yarn.lock index 84a2833..f8d34a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -367,10 +367,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@devfile/api@2.2.2-1716821574": - version "2.2.2-1716821574" - resolved "https://registry.yarnpkg.com/@devfile/api/-/api-2.2.2-1716821574.tgz#a9d5f82d015974e0c11338089db8759843c23127" - integrity sha512-PbtkJualxyD7MiFULCKHOi4rHXONiXMXImMJ0XjjGsPPnbmHt7yUcjm6OzmA+1loYLqR+BrRk+JLUO5zRf062A== +"@devfile/api@2.3.0-1721400636": + version "2.3.0-1721400636" + resolved "https://registry.yarnpkg.com/@devfile/api/-/api-2.3.0-1721400636.tgz#94f7ba0f45b294beb8cd023ffeaa8aa5ff228b44" + integrity sha512-W6g9uYSo22VcAeLj49YyVzOWTWZh5sRWP8fzgRcao6DRLd7FwkG3w4ZWCMTY5tMgyfcpaNBBoV1mqlRJuCvhTA== dependencies: "@types/node" "*" "@types/node-fetch" "^2.5.7" @@ -3178,16 +3178,7 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^4.1.0, string-width@^4.2.0: +"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -3205,14 +3196,7 @@ string-width@^5.0.1, string-width@^5.1.2: emoji-regex "^9.2.2" strip-ansi "^7.0.1" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -3519,16 +3503,7 @@ word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f" integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==