fix: build and test failures caused by @devfile/api

Signed-off-by: Oleksii Kurinnyi <okurinny@redhat.com>
eclipse-che · Dec 13, 2024 · 2ca70ce · 2ca70ce
1 parent 96e170e
commit 2ca70ce
Show file tree

Hide file tree

Showing 58 changed files with 25,006 additions and 24,816 deletions.
diff --git a/.deps/EXCLUDED/dev.md b/.deps/EXCLUDED/dev.md
@@ -2,6 +2,7 @@ This file contains a manual contribution to .deps/dev.md and it's needed because
 
 | Packages | Resolved CQs |
 | --- | --- |
+| `@adobe/css-tools@4.4.1` | transitive dependency |
 | `@csstools/selector-specificity@3.0.0` | transitive dependency |
 | `@nrwl/nx-darwin-arm64@15.9.7` | transitive dependency |
 | `@nrwl/nx-darwin-x64@15.9.7` | transitive dependency |
@@ -14,4 +15,3 @@ This file contains a manual contribution to .deps/dev.md and it's needed because
 | `fsevents@2.3.3` | transitive dependency |
 | `node-gyp@10.1.0` | transitive dependency |
 | `nx@19.0.7` | transitive dependency |
-| `@devfile/api@2.3.0-1721400636` | [clearlydefined](https://clearlydefined.io/definitions/npm/npmjs/@devfile/api/2.3.0-1721400636) |
diff --git a/.deps/EXCLUDED/prod.md b/.deps/EXCLUDED/prod.md
@@ -11,9 +11,10 @@ This file lists dependencies that do not need CQs or auto-detection does not wor
 | `blueimp-md5@2.19.0` | [clearlydefined](https://clearlydefined.io/definitions/npm/npmjs/-/blueimp-md5/2.19.0) |
 | `codemirror@5.65.16` | [clearlydefined](https://clearlydefined.io/definitions/npm/npmjs/-/codemirror/5.65.16) |
 | `cookie-signature@1.2.1` | [clearlydefined](https://clearlydefined.io/definitions/npm/npmjs/-/cookie-signature/1.2.1) |
-| `ecc-jsbn@0.1.2` | [clearlydefined](https://clearlydefined.io/definitions/npm/npmjs/-/ecc-jsbn/0.1.2) |
+| `elliptic@6.6.1` | [clearlydefined](https://clearlydefined.io/definitions/npm/npmjs/-/elliptic/6.6.1) |
 | `fast-uri@2.4.0` | [clearlydefined](https://clearlydefined.io/definitions/npm/npmjs/-/fast-uri/2.4.0) |
 | `fastify@4.28.1` | [clearlydefined](https://clearlydefined.io/definitions/npm/npmjs/-/fastify/4.28.1) |
 | `jsep@1.3.9` | [clearlydefined](https://clearlydefined.io/definitions/npm/npmjs/-/jsep/1.3.9) |
-| `real-require@0.2.0` | [clearlydefined](https://clearlydefined.io/definitions/npm/npmjs/-/real-require/0.2.0) |
 | `light-my-request@5.14.0` | [clearlydefined](https://clearlydefined.io/definitions/npm/npmjs/-/light-my-request/5.14.0) |
+| `real-require@0.2.0` | [clearlydefined](https://clearlydefined.io/definitions/npm/npmjs/-/real-require/0.2.0) |
+| `devfile-api@0.0.1` | monorepo package |
diff --git a/.deps/dev.md b/.deps/dev.md
diff --git a/.deps/prod.md b/.deps/prod.md
diff --git a/package.json b/package.json
@@ -7,7 +7,8 @@
     "packages": [
       "packages/common",
       "packages/dashboard-backend",
-      "packages/dashboard-frontend"
+      "packages/dashboard-frontend",
+      "packages/devfile-api"
     ]
   },
   "bugs": {
@@ -29,7 +30,7 @@
     "license:generate": "$PWD/scripts/container_tool.sh run --rm -t -v $PWD/:/workspace/project quay.io/che-incubator/dash-licenses:next",
     "test": "yarn run pretest && yarn wrksps test --no-cache",
     "test:check": "yarn run pretest && yarn workspace @eclipse-che/dashboard-frontend test --config=jest.config.check.js",
-    "pretest": "yarn workspace @eclipse-che/common run build",
+    "pretest": "yarn workspace @eclipse-che/common run build && yarn workspace devfile-api run build",
     "test:coverage": "yarn run pretest && yarn wrksps test --coverage",
     "format:check": "yarn wrksps format:check",
     "format:fix": "yarn wrksps format:fix",

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -17,7 +17,7 @@
     "test:watch": "yarn test --watch"
   },
   "devDependencies": {
-    "@devfile/api": "2.3.0-1721400636",
+    "@devfile/api": "2.3.0-1725380172",
     "@kubernetes/client-node": "^0.22.1",
     "@types/jest": "^29.5.3",
     "@typescript-eslint/eslint-plugin": "^6.3.0",

diff --git a/packages/dashboard-backend/jest.config.js b/packages/dashboard-backend/jest.config.js
@@ -21,14 +21,7 @@ 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,
 

diff --git a/packages/dashboard-backend/package.json b/packages/dashboard-backend/package.json
@@ -26,7 +26,6 @@
   ],
   "license": "EPL-2.0",
   "dependencies": {
-    "@devfile/api": "2.3.0-1721400636",
     "@eclipse-che/che-devworkspace-generator": "7.95.0",
     "@fastify/cors": "^9.0.1",
     "@fastify/error": "^3.4.1",

diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceApi.spec.ts b/packages/dashboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceApi.spec.ts
@@ -12,11 +12,15 @@
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 
-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';
+import {
+  devworkspaceGroup,
+  devworkspaceLatestVersion,
+  devworkspacePlural,
+  V1alpha2DevWorkspace,
+} from 'devfile-api';
 import { IncomingMessage } from 'http';
 
 import { DevWorkspaceApiService } from '@/devworkspaceClient/services/devWorkspaceApi';

diff --git a/...ashboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceClusterApi.spec.ts b/...ashboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceClusterApi.spec.ts
@@ -10,10 +10,14 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { V1alpha2DevWorkspace } from '@devfile/api';
-import { devworkspaceGroup, devworkspaceLatestVersion, devworkspacePlural } from '@devfile/api/api';
 import * as mockClient from '@kubernetes/client-node';
 import { CustomObjectsApi } from '@kubernetes/client-node';
+import {
+  devworkspaceGroup,
+  devworkspaceLatestVersion,
+  devworkspacePlural,
+  V1alpha2DevWorkspace,
+} from 'devfile-api';
 
 import {
   CheClusterCustomResource,

diff --git a/...shboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceTemplateApi.spec.ts b/...shboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceTemplateApi.spec.ts
@@ -12,15 +12,15 @@
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 
-import { V1alpha2DevWorkspaceTemplate } from '@devfile/api';
+import { api } from '@eclipse-che/common';
+import * as mockClient from '@kubernetes/client-node';
+import { CustomObjectsApi } from '@kubernetes/client-node';
 import {
   devworkspacetemplateGroup,
   devworkspacetemplateLatestVersion,
   devworkspacetemplatePlural,
-} from '@devfile/api/api';
-import { api } from '@eclipse-che/common';
-import * as mockClient from '@kubernetes/client-node';
-import { CustomObjectsApi } from '@kubernetes/client-node';
+  V1alpha2DevWorkspaceTemplate,
+} from 'devfile-api';
 
 import {
   DevWorkspaceTemplateApiService,

diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/__tests__/editorsApi.spec.ts b/packages/dashboard-backend/src/devworkspaceClient/services/__tests__/editorsApi.spec.ts
@@ -10,8 +10,8 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { V230Devfile } from '@devfile/api';
 import { V1ConfigMapList } from '@kubernetes/client-node/dist/gen/model/v1ConfigMapList';
+import { V230Devfile } from 'devfile-api';
 import http from 'http';
 import * as yaml from 'js-yaml';
 

diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/devWorkspaceApi.ts b/packages/dashboard-backend/src/devworkspaceClient/services/devWorkspaceApi.ts
@@ -10,11 +10,15 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-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';
+import {
+  devworkspaceGroup,
+  devworkspaceLatestVersion,
+  devworkspacePlural,
+  V1alpha2DevWorkspace,
+} from 'devfile-api';
 import http, { IncomingHttpHeaders } from 'http';
 
 import { createError } from '@/devworkspaceClient/services/helpers/createError';

diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/devWorkspaceClusterApiService.ts b/packages/dashboard-backend/src/devworkspaceClient/services/devWorkspaceClusterApiService.ts
@@ -10,11 +10,15 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-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';
+import {
+  devworkspaceGroup,
+  devworkspaceLatestVersion,
+  devworkspacePlural,
+  V1alpha2DevWorkspace,
+} from 'devfile-api';
 import http from 'http';
 
 import { prepareCustomObjectWatch } from '@/devworkspaceClient/services/helpers/prepareCustomObjectWatch';

diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/devWorkspaceTemplateApi.ts b/packages/dashboard-backend/src/devworkspaceClient/services/devWorkspaceTemplateApi.ts
@@ -10,14 +10,14 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { V1alpha2DevWorkspaceTemplate } from '@devfile/api';
+import { api } from '@eclipse-che/common';
+import * as k8s from '@kubernetes/client-node';
 import {
   devworkspacetemplateGroup,
   devworkspacetemplateLatestVersion,
   devworkspacetemplatePlural,
-} from '@devfile/api/api';
-import { api } from '@eclipse-che/common';
-import * as k8s from '@kubernetes/client-node';
+  V1alpha2DevWorkspaceTemplate,
+} from 'devfile-api';
 
 import { createError } from '@/devworkspaceClient/services/helpers/createError';
 import {

diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/editorsApi.ts b/packages/dashboard-backend/src/devworkspaceClient/services/editorsApi.ts
@@ -10,8 +10,8 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { V230Devfile } from '@devfile/api';
 import { V1ConfigMapList } from '@kubernetes/client-node/dist/gen/model/v1ConfigMapList';
+import { V230Devfile } from 'devfile-api';
 import http from 'http';
 import * as yaml from 'js-yaml';
 

diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/serverConfigApi.ts b/packages/dashboard-backend/src/devworkspaceClient/services/serverConfigApi.ts
@@ -10,9 +10,9 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { V230DevfileComponents } from '@devfile/api';
 import { api } from '@eclipse-che/common';
 import * as k8s from '@kubernetes/client-node';
+import { V230DevfileComponents } from 'devfile-api';
 import { readFileSync } from 'fs';
 import path from 'path';
 

diff --git a/packages/dashboard-backend/src/devworkspaceClient/types/index.ts b/packages/dashboard-backend/src/devworkspaceClient/types/index.ts
@@ -10,14 +10,14 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
+import { api } from '@eclipse-che/common';
+import * as k8s from '@kubernetes/client-node';
 import {
   V1alpha2DevWorkspace,
   V1alpha2DevWorkspaceTemplate,
   V230Devfile,
   V230DevfileComponents,
-} from '@devfile/api';
-import { api } from '@eclipse-che/common';
-import * as k8s from '@kubernetes/client-node';
+} from 'devfile-api';
 import { IncomingHttpHeaders } from 'http';
 
 import { MessageListener } from '@/services/types/Observer';

diff --git a/packages/dashboard-backend/src/models/restParams.ts b/packages/dashboard-backend/src/models/restParams.ts
@@ -10,8 +10,8 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { V1alpha2DevWorkspace, V1alpha2DevWorkspaceTemplate } from '@devfile/api';
 import { api } from '@eclipse-che/common';
+import { V1alpha2DevWorkspace, V1alpha2DevWorkspaceTemplate } from 'devfile-api';
 
 export interface ISchemaParams {
   [key: string]: unknown;

diff --git a/packages/dashboard-backend/src/routes/api/devworkspaceResources.ts b/packages/dashboard-backend/src/routes/api/devworkspaceResources.ts
@@ -10,9 +10,9 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { V1alpha2DevWorkspaceTemplate } from '@devfile/api';
 import { Main as DevworkspaceGenerator } from '@eclipse-che/che-devworkspace-generator/lib/main';
 import { api } from '@eclipse-che/common';
+import { V1alpha2DevWorkspaceTemplate } from 'devfile-api';
 import { FastifyInstance, FastifyRequest } from 'fastify';
 import { dump } from 'js-yaml';
 
@@ -37,8 +37,6 @@ export function registerDevworkspaceResourcesRoute(instance: FastifyInstance) {
           {
             devfileContent,
             editorPath,
-            pluginRegistryUrl: undefined,
-            editorEntry: undefined,
             editorContent,
             projects: [],
           },

diff --git a/packages/dashboard-backend/src/routes/api/helpers/__mocks__/getDevWorkspaceClient.ts b/packages/dashboard-backend/src/routes/api/helpers/__mocks__/getDevWorkspaceClient.ts
@@ -12,13 +12,13 @@
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 
+import { api } from '@eclipse-che/common';
 import {
   V1alpha2DevWorkspace,
   V1alpha2DevWorkspaceTemplate,
   V230Devfile,
   V230DevfileComponents,
-} from '@devfile/api';
-import { api } from '@eclipse-che/common';
+} from 'devfile-api';
 import { IncomingHttpHeaders } from 'http';
 
 import {

diff --git a/packages/dashboard-backend/webpack.config.common.js b/packages/dashboard-backend/webpack.config.common.js
@@ -44,10 +44,6 @@ 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: {},

diff --git a/packages/dashboard-frontend/package.json b/packages/dashboard-frontend/package.json
@@ -71,7 +71,6 @@
     "sanitize-html": "^2.11.0"
   },
   "devDependencies": {
-    "@devfile/api": "2.3.0-1721400636",
     "@eclipse-che/api": "^7.86.0",
     "@kubernetes/client-node": "^0.22.1",
     "@react-mock/state": "^0.1.8",

diff --git a/...rd-frontend/src/components/WorkspaceProgress/CreatingSteps/Apply/Devfile/getGitRemotes.ts b/...rd-frontend/src/components/WorkspaceProgress/CreatingSteps/Apply/Devfile/getGitRemotes.ts
@@ -10,8 +10,8 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { V230DevfileProjects, V230DevfileProjectsItemsGit } from '@devfile/api';
 import common from '@eclipse-che/common';
+import { V230DevfileProjects, V230DevfileProjectsItemsGit } from 'devfile-api';
 
 import { getProjectFromLocation } from '@/components/WorkspaceProgress/CreatingSteps/Apply/Devfile/getProjectFromLocation';
 import devfileApi from '@/services/devfileApi';

diff --git a/...nd/src/components/WorkspaceProgress/CreatingSteps/Apply/Devfile/getProjectFromLocation.ts b/...nd/src/components/WorkspaceProgress/CreatingSteps/Apply/Devfile/getProjectFromLocation.ts
@@ -10,7 +10,7 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { V230DevfileProjects } from '@devfile/api';
+import { V230DevfileProjects } from 'devfile-api';
 
 import { FactoryLocationAdapter } from '@/services/factory-location-adapter';
 import { getProjectName } from '@/services/helpers/getProjectName';

diff --git a/...onents/WorkspaceProgress/CreatingSteps/Apply/Resources/__tests__/prepareResources.spec.ts b/...onents/WorkspaceProgress/CreatingSteps/Apply/Resources/__tests__/prepareResources.spec.ts
@@ -10,7 +10,7 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { V1alpha2DevWorkspace } from '@devfile/api';
+import { V1alpha2DevWorkspace } from 'devfile-api';
 
 import prepareResources from '@/components/WorkspaceProgress/CreatingSteps/Apply/Resources/prepareResources';
 import { DEVWORKSPACE_STORAGE_TYPE_ATTR } from '@/services/devfileApi/devWorkspace/spec/template';

diff --git a/packages/dashboard-frontend/src/components/WorkspaceProgress/index.tsx b/packages/dashboard-frontend/src/components/WorkspaceProgress/index.tsx
@@ -10,7 +10,7 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { V1alpha2DevWorkspaceStatusConditions } from '@devfile/api';
+import { V1alpha2DevWorkspaceStatusConditions } from 'devfile-api';
 import isEqual from 'lodash/isEqual';
 import React from 'react';
 import { connect, ConnectedProps } from 'react-redux';

diff --git a/packages/dashboard-frontend/src/components/WorkspaceProgress/utils.ts b/packages/dashboard-frontend/src/components/WorkspaceProgress/utils.ts
@@ -10,7 +10,7 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { V1alpha2DevWorkspaceStatusConditions } from '@devfile/api';
+import { V1alpha2DevWorkspaceStatusConditions } from 'devfile-api';
 
 import devfileApi from '@/services/devfileApi';
 import { DevWorkspaceStatus } from '@/services/helpers/types';

diff --git a/packages/dashboard-frontend/src/services/devfileApi/devWorkspace/index.ts b/packages/dashboard-frontend/src/services/devfileApi/devWorkspace/index.ts
@@ -10,7 +10,7 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { V1alpha2DevWorkspace } from '@devfile/api';
+import { V1alpha2DevWorkspace } from 'devfile-api';
 
 import { DevWorkspaceMetadata } from '@/services/devfileApi/devWorkspace/metadata';
 import { DevWorkspaceSpec } from '@/services/devfileApi/devWorkspace/spec';

diff --git a/packages/dashboard-frontend/src/services/devfileApi/devWorkspace/metadata.ts b/packages/dashboard-frontend/src/services/devfileApi/devWorkspace/metadata.ts
@@ -10,7 +10,7 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { V1alpha2DevWorkspaceMetadata } from '@devfile/api';
+import { V1alpha2DevWorkspaceMetadata } from 'devfile-api';
 
 export const DEVWORKSPACE_CHE_EDITOR = 'che.eclipse.org/che-editor';
 // used by devworkspace-controller to allow to mount the corresponding Che7 workspace folder

diff --git a/packages/dashboard-frontend/src/services/devfileApi/devWorkspace/spec/index.ts b/packages/dashboard-frontend/src/services/devfileApi/devWorkspace/spec/index.ts
@@ -10,7 +10,7 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { V1alpha2DevWorkspaceSpec } from '@devfile/api';
+import { V1alpha2DevWorkspaceSpec } from 'devfile-api';
 
 import { DevWorkspaceSpecTemplate } from '@/services/devfileApi/devWorkspace/spec/template';
 

diff --git a/packages/dashboard-frontend/src/services/devfileApi/devWorkspace/spec/template.ts b/packages/dashboard-frontend/src/services/devfileApi/devWorkspace/spec/template.ts
@@ -10,7 +10,7 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { V1alpha2DevWorkspaceSpecTemplate } from '@devfile/api';
+import { V1alpha2DevWorkspaceSpecTemplate } from 'devfile-api';
 
 export const DEVWORKSPACE_CONFIG_ATTR = 'controller.devfile.io/devworkspace-config';
 export const DEVWORKSPACE_CONTAINER_BUILD_ATTR = 'controller.devfile.io/scc';

diff --git a/packages/dashboard-frontend/src/services/devfileApi/devWorkspaceTemplate/index.ts b/packages/dashboard-frontend/src/services/devfileApi/devWorkspaceTemplate/index.ts
@@ -10,7 +10,7 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { V1alpha2DevWorkspaceTemplate } from '@devfile/api';
+import { V1alpha2DevWorkspaceTemplate } from 'devfile-api';
 
 import { DevWorkspaceTemplateMetadata } from '@/services/devfileApi/devWorkspaceTemplate/metadata';