From 220c14bbae13077fd7de26c737ded9850ad389c8 Mon Sep 17 00:00:00 2001 From: Oleksii Kurinnyi Date: Fri, 13 Dec 2024 19:53:18 +0200 Subject: [PATCH] fixup! fixup! fix: build and test failures caused by @devfile/api --- .deps/dev.md | 6 --- .deps/problems.md | 4 -- packages/devfile-api/package.json | 2 +- scripts/yarn/old_version/.deps/dev.md | 1 - scripts/yarn/old_version/yarn.lock | 47 ------------------- yarn.lock | 65 +-------------------------- 6 files changed, 2 insertions(+), 123 deletions(-) diff --git a/.deps/dev.md b/.deps/dev.md index 738c75257..9e41cfce0 100644 --- a/.deps/dev.md +++ b/.deps/dev.md @@ -354,7 +354,6 @@ | `glob-parent@5.1.2` | ISC | clearlydefined | | `glob-parent@6.0.2` | ISC | clearlydefined | | [`glob-to-regexp@0.4.1`](https://github.com/fitzgen/glob-to-regexp.git) | BSD-2-Clause | clearlydefined | -| [`glob@11.0.0`](git://github.com/isaacs/node-glob.git) | ISC | | | [`glob@7.2.3`](git://github.com/isaacs/node-glob.git) | ISC | clearlydefined | | [`global-modules@2.0.0`](https://github.com/jonschlinkert/global-modules) | MIT | clearlydefined | | [`global-prefix@3.0.0`](https://github.com/jonschlinkert/global-prefix) | MIT | clearlydefined | @@ -443,7 +442,6 @@ | [`istanbul-lib-source-maps@4.0.1`](git+ssh://git@github.com/istanbuljs/istanbuljs.git) | BSD-3-Clause | clearlydefined | | [`istanbul-reports@3.1.6`](git+ssh://git@github.com/istanbuljs/istanbuljs.git) | BSD-3-Clause | #1710 | | [`iterator.prototype@1.1.2`](git+https://github.com/ljharb/Iterator.prototype.git) | MIT | clearlydefined | -| [`jackspeak@4.0.2`](git+https://github.com/isaacs/jackspeak.git) | BlueOak-1.0.0 | clearlydefined | | [`jest-changed-files@29.7.0`](https://github.com/jestjs/jest.git) | MIT | clearlydefined | | [`jest-circus@29.7.0`](https://github.com/jestjs/jest.git) | MIT | clearlydefined | | [`jest-cli@29.7.0`](https://github.com/jestjs/jest.git) | MIT | clearlydefined | @@ -502,7 +500,6 @@ | [`lodash.truncate@4.4.2`](https://lodash.com/) | MIT | clearlydefined | | [`lodash.uniq@4.5.0`](https://lodash.com/) | MIT | clearlydefined | | [`lower-case@2.0.2`](git://github.com/blakeembrey/change-case.git) | MIT | clearlydefined | -| [`lru-cache@11.0.2`](git://github.com/isaacs/node-lru-cache.git) | ISC | clearlydefined | | `lru-cache@5.1.1` | ISC | clearlydefined | | [`lz-string@1.5.0`](https://github.com/pieroxy/lz-string.git) | MIT | #8398 | | `make-dir@1.3.0` | MIT | clearlydefined | @@ -524,7 +521,6 @@ | `mimic-fn@4.0.0` | MIT | clearlydefined | | `min-indent@1.0.1` | MIT | clearlydefined | | [`mini-css-extract-plugin@2.9.0`](https://github.com/webpack-contrib/mini-css-extract-plugin) | MIT | #17035 | -| [`minimatch@10.0.1`](git://github.com/isaacs/minimatch.git) | ISC | clearlydefined | | [`minimatch@3.1.2`](git://github.com/isaacs/minimatch.git) | ISC | clearlydefined | | `minimist-options@4.1.0` | MIT | clearlydefined | | [`mkdirp@0.5.6`](https://github.com/substack/node-mkdirp.git) | MIT | clearlydefined | @@ -573,7 +569,6 @@ | `path-is-absolute@1.0.1` | MIT | clearlydefined | | `path-key@4.0.0` | MIT | clearlydefined | | [`path-parse@1.0.7`](https://github.com/jbgutierrez/path-parse.git) | MIT | clearlydefined | -| [`path-scurry@2.0.0`](git+https://github.com/isaacs/path-scurry) | BlueOak-1.0.0 | clearlydefined | | `path-type@4.0.0` | MIT | clearlydefined | | `picocolors@1.1.1` | ISC | clearlydefined | | [`picomatch@2.3.1`](https://github.com/micromatch/picomatch) | MIT | clearlydefined | @@ -656,7 +651,6 @@ | `rimraf@2.7.1` | ISC | clearlydefined | | `rimraf@3.0.2` | ISC | clearlydefined | | `rimraf@5.0.5` | ISC | #10787 | -| `rimraf@6.0.1` | ISC | clearlydefined | | `run-applescript@5.0.0` | MIT | clearlydefined | | [`run-parallel@1.2.0`](git://github.com/feross/run-parallel.git) | MIT | clearlydefined | | [`safe-array-concat@1.0.1`](git+https://github.com/ljharb/safe-array-concat.git) | MIT | #10335 | diff --git a/.deps/problems.md b/.deps/problems.md index 6a1242871..b93b35439 100644 --- a/.deps/problems.md +++ b/.deps/problems.md @@ -7,7 +7,3 @@ ## UNRESOLVED Production dependencies 1. `elliptic@6.6.1` - -## UNRESOLVED Development dependencies - -1. `glob@11.0.0` diff --git a/packages/devfile-api/package.json b/packages/devfile-api/package.json index 7a623837b..bc455ed7a 100644 --- a/packages/devfile-api/package.json +++ b/packages/devfile-api/package.json @@ -19,7 +19,7 @@ }, "devDependencies": { "encoding": "^0.1.13", - "rimraf": "^6.0.1", + "rimraf": "^5.0.1", "source-map-loader": "^5.0.0", "ts-loader": "^9.4.4", "webpack": "^5.94.0" diff --git a/scripts/yarn/old_version/.deps/dev.md b/scripts/yarn/old_version/.deps/dev.md index fe6b0415c..fc4c4b7a7 100644 --- a/scripts/yarn/old_version/.deps/dev.md +++ b/scripts/yarn/old_version/.deps/dev.md @@ -694,7 +694,6 @@ | [`which-collection@1.0.1`](git+https://github.com/inspect-js/which-collection.git) | MIT | clearlydefined | | [`which-typed-array@1.1.13`](git://github.com/inspect-js/which-typed-array.git) | MIT | #4864 | | [`wildcard@2.0.1`](git://github.com/DamonOehlman/wildcard.git) | MIT | #8274 | -| [`wrap-ansi@7.0.0`](https://github.com/chalk/wrap-ansi.git) | MIT | clearlydefined | | [`write-file-atomic@5.0.1`](https://github.com/npm/write-file-atomic.git) | ISC | #8219 | | [`write-json-file@2.3.0`](https://github.com/sindresorhus/write-json-file.git) | MIT | clearlydefined | | [`xml-name-validator@4.0.0`](https://github.com/jsdom/xml-name-validator.git) | Apache-2.0 | clearlydefined | diff --git a/scripts/yarn/old_version/yarn.lock b/scripts/yarn/old_version/yarn.lock index c33cd0207..253d3e706 100644 --- a/scripts/yarn/old_version/yarn.lock +++ b/scripts/yarn/old_version/yarn.lock @@ -4327,18 +4327,6 @@ glob@^10.3.4, glob@^10.3.7: package-json-from-dist "^1.0.0" path-scurry "^1.11.1" -glob@^11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-11.0.0.tgz#6031df0d7b65eaa1ccb9b29b5ced16cea658e77e" - integrity sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g== - dependencies: - foreground-child "^3.1.0" - jackspeak "^4.0.1" - minimatch "^10.0.0" - minipass "^7.1.2" - package-json-from-dist "^1.0.0" - path-scurry "^2.0.0" - glob@^7.1.3, glob@^7.1.4: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" @@ -5284,13 +5272,6 @@ jackspeak@^3.1.2: optionalDependencies: "@pkgjs/parseargs" "^0.11.0" -jackspeak@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-4.0.2.tgz#11f9468a3730c6ff6f56823a820d7e3be9bef015" - integrity sha512-bZsjR/iRjl1Nk1UkjGpAzLNfQtzuijhn2g+pbZb98HQ1Gk8vM9hfbxeMBP+M2/UUdwj0RqGG3mlvk2MsAqwvEw== - dependencies: - "@isaacs/cliui" "^8.0.2" - jest-changed-files@^29.7.0: version "29.7.0" resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.7.0.tgz#1c06d07e77c78e1585d020424dedc10d6e17ac3a" @@ -6031,11 +6012,6 @@ lru-cache@^10.2.0: resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119" integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ== -lru-cache@^11.0.0: - version "11.0.2" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.0.2.tgz#fbd8e7cf8211f5e7e5d91905c415a3f55755ca39" - integrity sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA== - lru-cache@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" @@ -6527,13 +6503,6 @@ minimalistic-crypto-utils@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg== -minimatch@^10.0.0: - version "10.0.1" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.0.1.tgz#ce0521856b453c86e25f2c4c0d03e6ff7ddc440b" - integrity sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ== - dependencies: - brace-expansion "^2.0.1" - minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" @@ -7068,14 +7037,6 @@ path-scurry@^1.11.1: lru-cache "^10.2.0" minipass "^5.0.0 || ^6.0.2 || ^7.0.0" -path-scurry@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-2.0.0.tgz#9f052289f23ad8bf9397a2a0425e7b8615c58580" - integrity sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg== - dependencies: - lru-cache "^11.0.0" - minipass "^7.1.2" - path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" @@ -8176,14 +8137,6 @@ rimraf@^5.0.5: dependencies: glob "^10.3.7" -rimraf@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-6.0.1.tgz#ffb8ad8844dd60332ab15f52bc104bc3ed71ea4e" - integrity sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A== - dependencies: - glob "^11.0.0" - package-json-from-dist "^1.0.0" - ripemd160@^2.0.0, ripemd160@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" diff --git a/yarn.lock b/yarn.lock index ad22f2e6a..d2d6ab8e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4646,7 +4646,7 @@ __metadata: dependencies: "@devfile/api": 2.3.0-1725380172 encoding: ^0.1.13 - rimraf: ^6.0.1 + rimraf: ^5.0.1 source-map-loader: ^5.0.0 ts-loader: ^9.4.4 webpack: ^5.94.0 @@ -6160,22 +6160,6 @@ __metadata: languageName: node linkType: hard -"glob@npm:^11.0.0": - version: 11.0.0 - resolution: "glob@npm:11.0.0" - dependencies: - foreground-child: ^3.1.0 - jackspeak: ^4.0.1 - minimatch: ^10.0.0 - minipass: ^7.1.2 - package-json-from-dist: ^1.0.0 - path-scurry: ^2.0.0 - bin: - glob: dist/esm/bin.mjs - checksum: 8a2dd914d5776987be5244624d9491bbcaf19f2387e06783737003ff696ebfd2264190c47014f8709c1c02d8bc892f17660cf986c587b107e194c0a3151ab333 - languageName: node - linkType: hard - "glob@npm:^7.1.3, glob@npm:^7.1.4": version: 7.2.3 resolution: "glob@npm:7.2.3" @@ -7455,15 +7439,6 @@ __metadata: languageName: node linkType: hard -"jackspeak@npm:^4.0.1": - version: 4.0.2 - resolution: "jackspeak@npm:4.0.2" - dependencies: - "@isaacs/cliui": ^8.0.2 - checksum: 210030029edfa1658328799ad88c3d0fc057c4cb8a069fc4137cc8d2cc4b65c9721c6e749e890f9ca77a954bb54f200f715b8896e50d330e5f3e902e72b40974 - languageName: node - linkType: hard - "jest-changed-files@npm:^29.7.0": version: 29.7.0 resolution: "jest-changed-files@npm:29.7.0" @@ -8436,13 +8411,6 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^11.0.0": - version: 11.0.2 - resolution: "lru-cache@npm:11.0.2" - checksum: f9c27c58919a30f42834de9444de9f75bcbbb802c459239f96dd449ad880d8f9a42f51556d13659864dc94ab2dbded9c4a4f42a3e25a45b6da01bb86111224df - languageName: node - linkType: hard - "lru-cache@npm:^5.1.1": version: 5.1.1 resolution: "lru-cache@npm:5.1.1" @@ -9080,15 +9048,6 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^10.0.0": - version: 10.0.1 - resolution: "minimatch@npm:10.0.1" - dependencies: - brace-expansion: ^2.0.1 - checksum: f5b63c2f30606091a057c5f679b067f84a2cd0ffbd2dbc9143bda850afd353c7be81949ff11ae0c86988f07390eeca64efd7143ee05a0dab37f6c6b38a2ebb6c - languageName: node - linkType: hard - "minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": version: 3.1.2 resolution: "minimatch@npm:3.1.2" @@ -9937,16 +9896,6 @@ __metadata: languageName: node linkType: hard -"path-scurry@npm:^2.0.0": - version: 2.0.0 - resolution: "path-scurry@npm:2.0.0" - dependencies: - lru-cache: ^11.0.0 - minipass: ^7.1.2 - checksum: 9953ce3857f7e0796b187a7066eede63864b7e1dfc14bf0484249801a5ab9afb90d9a58fc533ebb1b552d23767df8aa6a2c6c62caf3f8a65f6ce336a97bbb484 - languageName: node - linkType: hard - "path-type@npm:^4.0.0": version: 4.0.0 resolution: "path-type@npm:4.0.0" @@ -11515,18 +11464,6 @@ __metadata: languageName: node linkType: hard -"rimraf@npm:^6.0.1": - version: 6.0.1 - resolution: "rimraf@npm:6.0.1" - dependencies: - glob: ^11.0.0 - package-json-from-dist: ^1.0.0 - bin: - rimraf: dist/esm/bin.mjs - checksum: 8ba5b84131c1344e9417cb7e8c05d8368bb73cbe5dd4c1d5eb49fc0b558209781658d18c450460e30607d0b7865bb067482839a2f343b186b07ae87715837e66 - languageName: node - linkType: hard - "ripemd160@npm:^2.0.0, ripemd160@npm:^2.0.1": version: 2.0.2 resolution: "ripemd160@npm:2.0.2"