fix: upgrade libs

.deps/EXCLUDED/dev.md

@@ -5,6 +5,7 @@ This file contains a manual contribution to .deps/dev.md and it's needed because
 | `@babel/[email protected]` | transitive dependency |
 | `@csstools/[email protected]` | transitive dependency |
 | `@csstools/[email protected]` | transitive dependency |
+| `@devfile/[email protected]` | N/A |
 | `@eslint/[email protected]` | transitive dependency |
 | `@nrwl/[email protected]` | transitive dependency |
 | `@nrwl/[email protected]` | transitive dependency |

.deps/dev.md

@@ -47,6 +47,7 @@
 | [`@csstools/[email protected]`](https://github.com/csstools/postcss-plugins.git) | MIT | clearlydefined |
 | [`@csstools/[email protected]`](https://github.com/csstools/postcss-plugins.git) | MIT | clearlydefined |
 | [`@csstools/[email protected]`](https://github.com/csstools/postcss-plugins.git) | MIT-0 | transitive dependency |
+| [`@devfile/[email protected]`](https://github.com/GIT_USER_ID/GIT_REPO_ID.git) | Apache-2.0 | N/A |
 | [`@discoveryjs/[email protected]`](https://github.com/discoveryjs/json-ext.git) | MIT | clearlydefined |
 | [`@eslint-community/[email protected]`](https://github.com/eslint-community/eslint-utils) | MIT | #8032 |
 | [`@eslint-community/[email protected]`](https://github.com/eslint-community/regexpp) | MIT | clearlydefined |
@@ -591,6 +592,7 @@
 | [`[email protected]`](https://github.com/jestjs/jest.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/jestjs/jest.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/jsdom/jsdom.git) | MIT | #7436 |
+| [`[email protected]`](https://github.com/mathiasbynens/jsesc.git) | MIT | clearlydefined |
 | [`[email protected]`](git://github.com/dominictarr/json-buffer.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/zkat/json-parse-better-errors) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/npm/json-parse-even-better-errors.git) | MIT | clearlydefined |
@@ -782,7 +784,6 @@
 | [`[email protected]`](https://github.com/remy/pstree.git) | MIT | clearlydefined |
 | [`[email protected]`](git+https://github.com/dubzzz/pure-rand.git) | MIT | #8423 |
 | [`[email protected]`](git://github.com/kriskowal/q.git) | MIT | #1020 |
-| [`[email protected]`](https://github.com/unshiftio/querystringify) | MIT | clearlydefined |
 | [`[email protected]`](git://github.com/feross/queue-microtask.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/sindresorhus/quick-lru.git) | MIT | clearlydefined |
 | [`[email protected]`](git+https://github.com/facebook/react.git) | MIT | clearlydefined |
@@ -802,7 +803,6 @@
 | [`[email protected]`](git://github.com/stevenvachon/relateurl.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/AriaMinaei/RenderKid.git) | MIT | clearlydefined |
 | [`[email protected]`](git://github.com/troygoode/node-require-directory.git) | MIT | clearlydefined |
-| [`[email protected]`](https://github.com/unshiftio/requires-port) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/sindresorhus/resolve-cwd.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/sindresorhus/resolve-from.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/lukeed/resolve.exports.git) | MIT | clearlydefined |
@@ -890,6 +890,7 @@
 | [`[email protected]`](https://github.com/rvagg/through2.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/dominictarr/through.git) | MIT | #1036 |
 | [`[email protected]`](https://github.com/sindresorhus/titleize.git) | MIT | clearlydefined |
+| [`[email protected]`](https://github.com/sindresorhus/to-fast-properties.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/micromatch/to-regex-range.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/lukeed/totalist.git) | MIT | clearlydefined |
 | [`[email protected]`](git://github.com/isaacs/node-touch.git) | ISC | clearlydefined |
@@ -920,7 +921,6 @@
 | [`[email protected]`](https://github.com/sindresorhus/untildify.git) | MIT | clearlydefined |
 | [`[email protected]`](git://github.com/anodynos/upath) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/browserslist/update-db.git) | MIT | #8237 |
-| [`[email protected]`](https://github.com/unshiftio/url-parse.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/AriaMinaei/utila.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/uuidjs/uuid.git) | MIT | #2438 |
 | [`[email protected]`](https://github.com/zertosh/v8-compile-cache.git) | MIT | clearlydefined |

.deps/prod.md

@@ -3,9 +3,9 @@
 | Packages | License | Resolved CQs |
 | --- | --- | --- |
 | [`@babel/[email protected]`](https://github.com/babel/babel.git) | MIT | #10718 |
-| [`@devfile/[email protected].1-alpha-1667236163`](https://github.com/devfile/api.git) | Apache-2.0 | clearlydefined |
+| [`@devfile/[email protected].0-alpha-1637255314`](https://github.com/devfile/api.git) | EPL-2.0 | clearlydefined |
 | `@eclipse-che/[email protected]` | EPL-2.0 | ecd.che |
-| [`@eclipse-che/che-devworkspace-generator@7.78.0`](git+https://github.com/eclipse-che/che-devfile-registry.git) | EPL-2.0 | ecd.che |
+| [`@eclipse-che/che-devworkspace-generator@7.79.0-next-1427c19`](git+https://github.com/eclipse-che/che-devfile-registry.git) | EPL-2.0 | ecd.che |
 | [`@eclipse-che/[email protected]`](https://github.com/eclipse-che/che-dashboard) | EPL-2.0 | ecd.che |
 | [`@eclipse-che/[email protected]`](https://github.com/eclipse-che/che-dashboard) | EPL-2.0 | ecd.che |
 | [`@eclipse-che/[email protected]`](git://github.com/eclipse/che-dashboard.git) | EPL-2.0 | ecd.che |
@@ -45,6 +45,7 @@
 | [`@types/[email protected]`](https://github.com/DefinitelyTyped/DefinitelyTyped.git) | MIT | clearlydefined |
 | [`@types/[email protected]`](https://github.com/DefinitelyTyped/DefinitelyTyped.git) | MIT | clearlydefined |
 | [`@types/[email protected]`](https://github.com/DefinitelyTyped/DefinitelyTyped.git) | MIT | clearlydefined |
+| [`@types/[email protected]`](https://github.com/DefinitelyTyped/DefinitelyTyped.git) | MIT | #11004 |
 | [`@types/[email protected]`](https://github.com/DefinitelyTyped/DefinitelyTyped.git) | MIT | #10804 |
 | [`@types/[email protected]`](https://github.com/DefinitelyTyped/DefinitelyTyped.git) | MIT | clearlydefined |
 | [`@types/[email protected]`](https://github.com/DefinitelyTyped/DefinitelyTyped.git) | MIT | #10970 |
@@ -123,7 +124,7 @@
 | [`[email protected]`]([email protected]:crypto-browserify/createHash.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/crypto-browserify/createHmac.git) | MIT | clearlydefined |
 | [`[email protected]`](git://github.com/crypto-browserify/crypto-browserify.git) | MIT | #1033 |
-| [`[email protected]`](https://github.com/frenic/csstype) | MIT | clearlydefined |
+| [`[email protected]`](https://github.com/frenic/csstype) | MIT | #11847 |
 | [`[email protected]`](git://github.com/trentm/node-dashdash.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/date-fns/date-fns) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/felixge/node-dateformat.git) | MIT | clearlydefined |
@@ -144,6 +145,7 @@
 | [`[email protected]`]([email protected]:indutny/elliptic) | MIT | [CQ23022](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23022) |
 | [`[email protected]`](git://github.com/mafintosh/end-of-stream.git) | MIT | clearlydefined |
 | [`[email protected]`](git://github.com/fb55/entities.git) | BSD-2-Clause | #7910 |
+| [`[email protected]`](git://github.com/stefanpenner/es6-promise.git) | MIT | #2898 |
 | [`[email protected]`](https://github.com/component/escape-html.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/sindresorhus/escape-string-regexp.git) | MIT | clearlydefined |
 | [`[email protected]`](http://github.com/estools/esutils.git) | BSD-2-Clause | #120 |
@@ -259,6 +261,7 @@
 | [`[email protected]`](https://github.com/zeit/ms.git) | MIT | #5895 |
 | [`[email protected]`](git://github.com/evangelion1204/multi-ini.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/ai/nanoid.git) | MIT | #7571 |
+| [`[email protected]`](https://github.com/bitinn/node-fetch.git) | MIT | #10509 |
 | [`[email protected]`](https://github.com/mikeal/oauth-sign) | Apache-2.0 | clearlydefined |
 | [`[email protected]`](https://github.com/sindresorhus/object-assign.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/puleos/object-hash) | MIT | clearlydefined |
@@ -298,6 +301,7 @@
 | [`[email protected]`](https://github.com/mathiasbynens/punycode.js.git) | MIT | #6373 |
 | [`[email protected]`](https://github.com/ljharb/qs.git) | BSD-3-Clause | #7556 |
 | [`[email protected]`](git://github.com/Gozala/querystring.git) | MIT | #1054 |
+| [`[email protected]`](https://github.com/unshiftio/querystringify) | MIT | clearlydefined |
 | [`[email protected]`](git+https://github.com/davidmarkclements/quick-format.git) | MIT | clearlydefined |
 | [`[email protected]`]([email protected]:crypto-browserify/randombytes.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/crypto-browserify/randomfill.git) | MIT | clearlydefined |
@@ -324,6 +328,7 @@
 | [`[email protected]`](https://github.com/sindresorhus/repeating.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/request/request.git) | Apache-2.0 | #997 |
 | [`[email protected]`](https://github.com/floatdrop/require-from-string.git) | MIT | clearlydefined |
+| [`[email protected]`](https://github.com/unshiftio/requires-port) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/reduxjs/reselect.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/mjackson/resolve-pathname.git) | MIT | clearlydefined |
 | [`[email protected]`](git://github.com/fent/ret.js.git) | MIT | clearlydefined |
@@ -376,6 +381,7 @@
 | [`[email protected]`](git+https://github.com/sudodoki/toggle-selection) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/component/toidentifier.git) | MIT | clearlydefined |
 | [`[email protected]`](git://github.com/salesforce/tough-cookie.git) | BSD-3-Clause | clearlydefined |
+| [`[email protected]`](git+https://github.com/Sebmaster/tr46.js.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/sindresorhus/trim-right.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/Microsoft/tslib.git) | 0BSD | #9189 |
 | [`[email protected]`](https://github.com/mikeal/tunnel-agent) | Apache-2.0 | clearlydefined |
@@ -386,11 +392,14 @@
 | [`[email protected]`](git+https://github.com/nodejs/undici.git) | MIT | clearlydefined |
 | [`[email protected]`](git+https://github.com/RyanZim/universalify.git) | MIT | clearlydefined |
 | [`[email protected]`](http://github.com/garycourt/uri-js) | BSD-2-Clause | #1086 |
+| [`[email protected]`](https://github.com/unshiftio/url-parse.git) | MIT | clearlydefined |
 | [`[email protected]`](git://github.com/TooTallNate/util-deprecate.git) | MIT | #5885 |
 | [`[email protected]`](https://github.com/uuidjs/uuid.git) | MIT | #2733 |
 | [`[email protected]`](https://github.com/mjackson/value-equal.git) | MIT | clearlydefined |
 | [`[email protected]`](git://github.com/davepacheco/node-verror.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/BerkeleyTrue/warning.git) | MIT | [CQ22359](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=22359) |
+| [`[email protected]`](https://github.com/jsdom/webidl-conversions.git) | BSD-2-Clause | clearlydefined |
+| [`[email protected]`](https://github.com/jsdom/whatwg-url.git) | MIT | clearlydefined |
 | [`[email protected]`](https://github.com/npm/wrappy) | ISC | clearlydefined |
 | [`[email protected]`](git+https://github.com/websockets/ws.git) | MIT | #10503 |
 | [`[email protected]`](git+https://github.com/isaacs/yallist.git) | ISC | clearlydefined |

packages/common/package.json

@@ -17,7 +17,7 @@
     "test:watch": "yarn test --watch"
   },
   "devDependencies": {
-    "@devfile/api": "^2.2.1-alpha-1667236163",
+    "@devfile/api": "2.2.2-1700686170",
     "@kubernetes/client-node": "^0.18.1",
     "@types/jest": "^29.5.3",
     "@typescript-eslint/eslint-plugin": "^6.3.0",

packages/common/src/dto/api/index.ts

@@ -10,7 +10,7 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { V1alpha2DevWorkspace, V221DevfileComponents } from '@devfile/api';
+import { V1alpha2DevWorkspace, V222DevfileComponents } from '@devfile/api';
 import { CoreV1EventList, V1PodList } from '@kubernetes/client-node';
 import * as webSocket from './webSocket';
 
@@ -104,7 +104,7 @@ export interface IServerConfig {
   };
   defaults: {
     editor: string | undefined;
-    components: V221DevfileComponents[];
+    components: V222DevfileComponents[];
     plugins: IWorkspacesDefaultPlugins[];
     pvcStrategy: string | undefined;
   };

packages/dashboard-backend/jest.config.js

@@ -21,7 +21,14 @@ module.exports = {
   moduleNameMapper: {
     // mapping for absolute imports (see tsconfig.json)
     '^@/(.*)$': '<rootDir>/src/$1',
+
+    // not everything we need is exported from the package
+    // so we need to alias the rest
+    '@devfile/api/(.*)$': '<rootDir>/../../node_modules/@devfile/api/$1.ts',
   },
+  transformIgnorePatterns: [
+    'node_modules/(?!@devfile/api)',
+  ],
   collectCoverageFrom: [
     ...base.collectCoverageFrom,
 

packages/dashboard-backend/package.json

@@ -26,8 +26,7 @@
   ],
   "license": "EPL-2.0",
   "dependencies": {
-    "@devfile/api": "^2.2.1-alpha-1667236163",
-    "@eclipse-che/che-devworkspace-generator": "7.78.0",
+    "@eclipse-che/che-devworkspace-generator": "7.79.0-next-1427c19",
     "@fastify/cors": "^8.3.0",
     "@fastify/error": "^3.3.0",
     "@fastify/http-proxy": "^9.2.1",
@@ -52,6 +51,7 @@
     "ws": "^8.13.0"
   },
   "devDependencies": {
+    "@devfile/api": "2.2.2-1700686170",
     "@types/args": "^5.0.0",
     "@types/fs-extra": "^11.0.1",
     "@types/jest": "^29.5.3",

packages/dashboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceApi.spec.ts

@@ -12,12 +12,8 @@
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 
-import {
-  devworkspaceGroup,
-  devworkspaceLatestVersion,
-  devworkspacePlural,
-  V1alpha2DevWorkspace,
-} from '@devfile/api';
+import { V1alpha2DevWorkspace } from '@devfile/api';
+import { devworkspaceGroup, devworkspaceLatestVersion, devworkspacePlural } from '@devfile/api/api';
 import { api } from '@eclipse-che/common';
 import * as mockClient from '@kubernetes/client-node';
 import { CustomObjectsApi } from '@kubernetes/client-node';

packages/dashboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceTemplateApi.spec.ts

@@ -12,12 +12,12 @@
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 
+import { V1alpha2DevWorkspaceTemplate } from '@devfile/api';
 import {
   devworkspacetemplateGroup,
   devworkspacetemplateLatestVersion,
   devworkspacetemplatePlural,
-  V1alpha2DevWorkspaceTemplate,
-} from '@devfile/api';
+} from '@devfile/api/api';
 import { api } from '@eclipse-che/common';
 import * as mockClient from '@kubernetes/client-node';
 import { CustomObjectsApi } from '@kubernetes/client-node';

packages/dashboard-backend/src/devworkspaceClient/services/devWorkspaceApi.ts

@@ -10,12 +10,8 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import {
-  devworkspaceGroup,
-  devworkspaceLatestVersion,
-  devworkspacePlural,
-  V1alpha2DevWorkspace,
-} from '@devfile/api';
+import { V1alpha2DevWorkspace } from '@devfile/api';
+import { devworkspaceGroup, devworkspaceLatestVersion, devworkspacePlural } from '@devfile/api/api';
 import { api } from '@eclipse-che/common';
 import * as k8s from '@kubernetes/client-node';
 import { V1Status } from '@kubernetes/client-node';

packages/dashboard-backend/src/devworkspaceClient/services/devWorkspaceTemplateApi.ts

@@ -10,12 +10,12 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
+import { V1alpha2DevWorkspaceTemplate } from '@devfile/api';
 import {
   devworkspacetemplateGroup,
   devworkspacetemplateLatestVersion,
   devworkspacetemplatePlural,
-  V1alpha2DevWorkspaceTemplate,
-} from '@devfile/api';
+} from '@devfile/api/api';
 import { api } from '@eclipse-che/common';
 import * as k8s from '@kubernetes/client-node';
 

packages/dashboard-backend/src/devworkspaceClient/services/serverConfigApi.ts

@@ -10,7 +10,7 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { V221DevfileComponents } from '@devfile/api';
+import { V222DevfileComponents } from '@devfile/api';
 import { api } from '@eclipse-che/common';
 import * as k8s from '@kubernetes/client-node';
 import { readFileSync } from 'fs';
@@ -131,7 +131,7 @@ export class ServerConfigApiService implements IServerConfigApi {
     );
   }
 
-  getDefaultComponents(cheCustomResource: CheClusterCustomResource): V221DevfileComponents[] {
+  getDefaultComponents(cheCustomResource: CheClusterCustomResource): V222DevfileComponents[] {
     if (cheCustomResource.spec.devEnvironments?.defaultComponents) {
       return cheCustomResource.spec.devEnvironments.defaultComponents;
     }

packages/dashboard-backend/src/devworkspaceClient/types/index.ts

@@ -13,7 +13,7 @@
 import {
   V1alpha2DevWorkspace,
   V1alpha2DevWorkspaceTemplate,
-  V221DevfileComponents,
+  V222DevfileComponents,
 } from '@devfile/api';
 import { api } from '@eclipse-che/common';
 import * as k8s from '@kubernetes/client-node';
@@ -144,7 +144,7 @@ export type CheClusterCustomResourceSpecDevEnvironments = {
   containerBuildConfiguration?: {
     openShiftSecurityContextConstraint?: string;
   };
-  defaultComponents?: V221DevfileComponents[];
+  defaultComponents?: V222DevfileComponents[];
   defaultEditor?: string;
   defaultPlugins?: api.IWorkspacesDefaultPlugins[];
   disableContainerBuildCapabilities?: boolean;
@@ -270,7 +270,7 @@ export interface IServerConfigApi {
    * Returns the default components applied to DevWorkspaces.
    * These default components are meant to be used when a Devfile does not contain any components.
    */
-  getDefaultComponents(cheCustomResource: CheClusterCustomResource): V221DevfileComponents[];
+  getDefaultComponents(cheCustomResource: CheClusterCustomResource): V222DevfileComponents[];
   /**
    * Returns the plugin registry.
    */

packages/dashboard-backend/src/routes/api/helpers/__mocks__/getDevWorkspaceClient.ts

@@ -15,7 +15,7 @@
 import {
   V1alpha2DevWorkspace,
   V1alpha2DevWorkspaceTemplate,
-  V221DevfileComponents,
+  V222DevfileComponents,
 } from '@devfile/api';
 import { api } from '@eclipse-che/common';
 import { IncomingHttpHeaders } from 'http';
@@ -41,7 +41,7 @@ export const stubContainerBuild = {
   disableContainerBuildCapabilities: true,
 };
 export const stubDashboardWarning = 'Dashboard warning';
-export const stubDefaultComponents: V221DevfileComponents[] = [];
+export const stubDefaultComponents: V222DevfileComponents[] = [];
 export const stubDefaultEditor = undefined;
 export const stubDefaultPlugins: api.IWorkspacesDefaultPlugins[] = [];
 export const stubPluginRegistry = { openVSXURL: 'openvsx-url' };

packages/dashboard-backend/webpack.config.common.js

@@ -44,6 +44,10 @@ module.exports = () => {
       alias: {
         // alias for absolute imports (see tsconfig.json)
         '@': path.resolve(__dirname, 'src/'),
+
+        // not everything we need is exported from the package
+        // so we need to alias the rest
+        '@devfile/api/api': path.resolve(__dirname, '../../node_modules/@devfile/api/api.ts'),
       },
     },
     resolveLoader: {},

packages/dashboard-frontend/package.json

@@ -70,7 +70,7 @@
     "stream-browserify": "^3.0.0"
   },
   "devDependencies": {
-    "@devfile/api": "^2.2.1-alpha-1667236163",
+    "@devfile/api": "2.2.2-1700686170",
     "@eclipse-che/api": "^7.18.1",
     "@kubernetes/client-node": "^0.18.1",
     "@react-mock/state": "^0.1.8",

packages/dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Apply/Devfile/getGitRemotes.ts

@@ -10,7 +10,7 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { V221DevfileProjects, V221DevfileProjectsItemsGit } from '@devfile/api';
+import { V222DevfileProjects, V222DevfileProjectsItemsGit } from '@devfile/api';
 import common from '@eclipse-che/common';
 
 import { getProjectFromLocation } from '@/components/WorkspaceProgress/CreatingSteps/Apply/Devfile/getProjectFromLocation';
@@ -149,7 +149,7 @@ export function configureProjectRemotes(
 /**
  * Returns the Git project to replace remotes for
  */
-function getGitProjectForConfiguringRemotes(projects: V221DevfileProjects[] | undefined) {
+function getGitProjectForConfiguringRemotes(projects: V222DevfileProjects[] | undefined) {
   if (!projects) {
     return undefined;
   }
@@ -175,7 +175,7 @@ function getGitProjectForConfiguringRemotes(projects: V221DevfileProjects[] | un
  * @param newRemotes The array of new Git remotes to add
  */
 function addRemotesToProject(
-  gitProject: V221DevfileProjectsItemsGit,
+  gitProject: V222DevfileProjectsItemsGit,
   checkoutRemote: GitRemote,
   newRemotes: GitRemote[],
 ): void {