Merge pull request #1273 from eclipse-che/updateYarn1Lockfile

Update Yarn 1 lockfile for downstream build

.deps/problems.md

@@ -0,0 +1,9 @@
+# Dependency analysis
+
+## UNUSED Excludes
+
+1. `ecc-jsbn@0.1.2`
+
+## UNRESOLVED Production dependencies
+
+1. `elliptic@6.6.1`

.deps/prod.md

@@ -8,8 +8,8 @@
 | [`@codemirror/language@6.10.3`](https://github.com/codemirror/language.git) | MIT | clearlydefined |
 | [`@codemirror/state@6.4.1`](https://github.com/codemirror/state.git) | MIT | clearlydefined |
 | [`@codemirror/view@6.34.2`](https://github.com/codemirror/view.git) | MIT | clearlydefined |
-| [`@devfile/api@2.3.0-1721400636`](https://github.com/GIT_USER_ID/GIT_REPO_ID.git) | Apache-2.0 | clearlydefined |
-| [`@eclipse-che/che-devworkspace-generator@7.90.0-next-4510df7`](git+https://github.com/devfile/devworkspace-generator.git) | EPL-2.0 | ecd.che |
+| [`@devfile/api@2.3.0-1725380172`](https://github.com/GIT_USER_ID/GIT_REPO_ID.git) | Apache-2.0 | clearlydefined |
+| [`@eclipse-che/che-devworkspace-generator@7.95.0`](git+https://github.com/devfile/devworkspace-generator.git) | EPL-2.0 | ecd.che |
 | [`@fastify/accept-negotiator@1.1.0`](git+https://github.com/fastify/accept-negotiator.git) | MIT | clearlydefined |
 | [`@fastify/ajv-compiler@3.6.0`](git+https://github.com/fastify/ajv-compiler.git) | MIT | clearlydefined |
 | [`@fastify/busboy@2.0.0`](https://github.com/fastify/busboy.git) | MIT | clearlydefined |
@@ -78,7 +78,7 @@
 | [`abbrev@2.0.0`](https://github.com/npm/abbrev-js.git) | ISC | clearlydefined |
 | [`abort-controller@3.0.0`](git+https://github.com/mysticatea/abort-controller.git) | MIT | #7592 |
 | [`abstract-logging@2.0.1`](git+https://github.com/jsumners/abstract-logging.git) | MIT | clearlydefined |
-| [`agent-base@7.1.1`](https://github.com/TooTallNate/proxy-agents.git) | MIT | clearlydefined |
+| [`agent-base@7.1.1`](https://github.com/TooTallNate/proxy-agents.git) | MIT | #17896 |
 | `aggregate-error@3.1.0` | MIT | clearlydefined |
 | [`ajv-formats@2.1.1`](git+https://github.com/ajv-validator/ajv-formats.git) | MIT | clearlydefined |
 | [`ajv-formats@3.0.1`](git+https://github.com/ajv-validator/ajv-formats.git) | MIT | clearlydefined |
@@ -172,7 +172,7 @@
 | [`duplexify@4.1.3`](git://github.com/mafintosh/duplexify) | MIT | clearlydefined |
 | `eastasianwidth@0.2.0` | MIT | clearlydefined |
 | [`ecc-jsbn@0.1.2`](https://github.com/quartzjer/ecc-jsbn.git) | MIT | [clearlydefined](https://clearlydefined.io/definitions/npm/npmjs/-/ecc-jsbn/0.1.2) |
-| [`elliptic@6.6.1`](git@github.com:indutny/elliptic) | MIT | clearlydefined |
+| [`elliptic@6.6.1`](git@github.com:indutny/elliptic) | MIT |  |
 | [`emoji-regex@8.0.0`](https://github.com/mathiasbynens/emoji-regex.git) | MIT | clearlydefined |
 | [`emoji-regex@9.2.2`](https://github.com/mathiasbynens/emoji-regex.git) | MIT | clearlydefined |
 | `encoding@0.1.13` | MIT | #1016 |
@@ -253,7 +253,7 @@
 | `http-errors@2.0.0` | MIT | clearlydefined |
 | [`http-proxy-agent@7.0.2`](https://github.com/TooTallNate/proxy-agents.git) | MIT | clearlydefined |
 | [`http-signature@1.2.0`](git://github.com/joyent/node-http-signature.git) | MIT | #2732 |
-| [`https-proxy-agent@7.0.5`](https://github.com/TooTallNate/proxy-agents.git) | MIT | clearlydefined |
+| [`https-proxy-agent@7.0.5`](https://github.com/TooTallNate/proxy-agents.git) | MIT | #17900 |
 | `https@1.0.0` | ISC | clearlydefined |
 | [`iconv-lite@0.6.3`](git://github.com/ashtuchkin/iconv-lite.git) | MIT | clearlydefined |
 | [`ieee754@1.2.1`](git://github.com/feross/ieee754.git) | BSD-3-Clause | clearlydefined |
@@ -326,20 +326,20 @@
 | `micromark-factory-space@2.0.0` | MIT | clearlydefined |
 | `micromark-factory-title@2.0.0` | MIT | clearlydefined |
 | `micromark-factory-whitespace@2.0.0` | MIT | clearlydefined |
-| `micromark-util-character@2.1.0` | MIT | clearlydefined |
+| `micromark-util-character@2.1.0` | MIT | #17409 |
 | `micromark-util-chunked@2.0.0` | MIT | clearlydefined |
 | `micromark-util-classify-character@2.0.0` | MIT | clearlydefined |
 | `micromark-util-combine-extensions@2.0.0` | MIT | clearlydefined |
 | `micromark-util-decode-numeric-character-reference@2.0.1` | MIT | clearlydefined |
 | `micromark-util-decode-string@2.0.0` | MIT | clearlydefined |
-| `micromark-util-encode@2.0.0` | MIT | clearlydefined |
+| `micromark-util-encode@2.0.0` | MIT | #17395 |
 | `micromark-util-html-tag-name@2.0.0` | MIT | clearlydefined |
 | `micromark-util-normalize-identifier@2.0.0` | MIT | clearlydefined |
 | `micromark-util-resolve-all@2.0.0` | MIT | clearlydefined |
-| `micromark-util-sanitize-uri@2.0.0` | MIT | clearlydefined |
+| `micromark-util-sanitize-uri@2.0.0` | MIT | #17416 |
 | `micromark-util-subtokenize@2.0.1` | MIT | clearlydefined |
-| `micromark-util-symbol@2.0.0` | MIT | clearlydefined |
-| `micromark-util-types@2.0.0` | MIT | clearlydefined |
+| `micromark-util-symbol@2.0.0` | MIT | #17394 |
+| `micromark-util-types@2.0.0` | MIT | #17405 |
 | `micromark@4.0.0` | MIT | clearlydefined |
 | [`miller-rabin@4.0.1`](git@github.com:indutny/miller-rabin) | MIT | clearlydefined |
 | `mime-db@1.52.0` | MIT | clearlydefined |
@@ -559,6 +559,6 @@
 | [`wrappy@1.0.2`](https://github.com/npm/wrappy) | ISC | clearlydefined |
 | [`yallist@4.0.0`](git+https://github.com/isaacs/yallist.git) | ISC | clearlydefined |
 | [`yallist@5.0.0`](git+https://github.com/isaacs/yallist.git) | BlueOak-1.0.0 | clearlydefined |
-| [`yaml@2.6.0`](https://eemeli.org/yaml/) | ISC | clearlydefined |
+| [`yaml@2.6.0`](https://eemeli.org/yaml/) | ISC | #17714 |
 | `yocto-queue@0.1.0` | MIT | clearlydefined |
 | `zwitch@2.0.4` | MIT | clearlydefined |

build/dockerfiles/Dockerfile

@@ -30,6 +30,9 @@ COPY ${FRONTEND}/package.json /dashboard/${FRONTEND}/
 ENV BACKEND=packages/dashboard-backend
 COPY ${BACKEND}/package.json /dashboard/${BACKEND}/
 
+ENV DEVFILE_API=packages/devfile-api
+COPY ${DEVFILE_API}/package.json /dashboard/${DEVFILE_API}/
+
 WORKDIR /dashboard
 RUN yarn install --network-timeout 3600000
 COPY packages/ /dashboard/packages

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",

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",

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,
 

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",

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';

packages/dashboard-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,

packages/dashboard-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,

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';
 

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';

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';

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 {

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';
 

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';
 

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';

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;

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: [],
           },

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 {

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: {},

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",

packages/dashboard-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';

packages/dashboard-frontend/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';

packages/dashboard-frontend/src/components/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';