diff --git a/.deps/problems.md b/.deps/problems.md new file mode 100644 index 000000000..b93b35439 --- /dev/null +++ b/.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` diff --git a/.deps/prod.md b/.deps/prod.md index 226426000..6072658d8 100644 --- a/.deps/prod.md +++ b/.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 | diff --git a/build/dockerfiles/Dockerfile b/build/dockerfiles/Dockerfile index cd0e62387..cc58453a5 100644 --- a/build/dockerfiles/Dockerfile +++ b/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 diff --git a/package.json b/package.json index 78f36c7e5..69f43a8e2 100644 --- 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 index b58d29a41..8e7cb1dac 100644 --- 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 index c5bbd513f..f2f5e2070 100644 --- 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) '^@/(.*)$': '/src/$1', - - // not everything we need is exported from the package - // so we need to alias the rest - '@devfile/api/(.*)$': '/../../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 index 4a4d281d6..659b42ca2 100644 --- 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 index bb63638f7..60427db49 100644 --- 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/packages/dashboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceClusterApi.spec.ts b/packages/dashboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceClusterApi.spec.ts index b4374c65a..fe41e8926 100644 --- a/packages/dashboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceClusterApi.spec.ts +++ b/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, diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceTemplateApi.spec.ts b/packages/dashboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceTemplateApi.spec.ts index a2bdaea24..727187b98 100644 --- a/packages/dashboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceTemplateApi.spec.ts +++ b/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, diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/__tests__/editorsApi.spec.ts b/packages/dashboard-backend/src/devworkspaceClient/services/__tests__/editorsApi.spec.ts index 2a656ff82..4fa634360 100644 --- 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 index a6db1200b..3d05bf0c7 100644 --- 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 index e259257ca..572d9be1c 100644 --- 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 index 3c8c18272..3ecd50946 100644 --- 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 index 27ece3644..5984c249e 100644 --- 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 index e212ff298..158538ff5 100644 --- 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 index 8c0d99eb9..a31a37795 100644 --- 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 index dbd650ced..2ef57077b 100644 --- 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 index 8347506e4..3fc5b9fd3 100644 --- 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 index 55ad00496..f66f2aee4 100644 --- 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 index 3ddfcafcf..94548edc2 100644 --- 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 index dbad2f2b1..f54aaa78d 100644 --- 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/packages/dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Apply/Devfile/getGitRemotes.ts b/packages/dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Apply/Devfile/getGitRemotes.ts index b2b187b27..f6314490b 100644 --- a/packages/dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Apply/Devfile/getGitRemotes.ts +++ b/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'; diff --git a/packages/dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Apply/Devfile/getProjectFromLocation.ts b/packages/dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Apply/Devfile/getProjectFromLocation.ts index cea758b9d..4fc5e4dce 100644 --- a/packages/dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Apply/Devfile/getProjectFromLocation.ts +++ b/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'; diff --git a/packages/dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Apply/Resources/__tests__/prepareResources.spec.ts b/packages/dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Apply/Resources/__tests__/prepareResources.spec.ts index 1e28951b3..e9ef70a12 100644 --- a/packages/dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Apply/Resources/__tests__/prepareResources.spec.ts +++ b/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'; diff --git a/packages/dashboard-frontend/src/components/WorkspaceProgress/index.tsx b/packages/dashboard-frontend/src/components/WorkspaceProgress/index.tsx index 35c241b42..e0f2af04e 100644 --- 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 index 36140f562..325ea3e8f 100644 --- 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 index 70b5781ea..e64e990d0 100644 --- 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 index e348c8f0e..7f427a973 100644 --- 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 index e225b3907..e47695b05 100644 --- 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 index b25fac6dd..b8869cb19 100644 --- 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 index 265107900..85123dbb0 100644 --- 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'; diff --git a/packages/dashboard-frontend/src/services/devfileApi/devWorkspaceTemplate/metadata.ts b/packages/dashboard-frontend/src/services/devfileApi/devWorkspaceTemplate/metadata.ts index eb97ba25d..2cc59162c 100644 --- a/packages/dashboard-frontend/src/services/devfileApi/devWorkspaceTemplate/metadata.ts +++ b/packages/dashboard-frontend/src/services/devfileApi/devWorkspaceTemplate/metadata.ts @@ -10,7 +10,7 @@ * Red Hat, Inc. - initial API and implementation */ -import { V1alpha2DevWorkspaceTemplateMetadata } from '@devfile/api'; +import { V1alpha2DevWorkspaceTemplateMetadata } from 'devfile-api'; export type DevWorkspaceTemplateMetadata = V1alpha2DevWorkspaceTemplateMetadata & Required>; diff --git a/packages/dashboard-frontend/src/services/devfileApi/devfile/index.ts b/packages/dashboard-frontend/src/services/devfileApi/devfile/index.ts index 360c483c8..2905ca061 100644 --- a/packages/dashboard-frontend/src/services/devfileApi/devfile/index.ts +++ b/packages/dashboard-frontend/src/services/devfileApi/devfile/index.ts @@ -10,7 +10,7 @@ * Red Hat, Inc. - initial API and implementation */ -import { V230Devfile } from '@devfile/api'; +import { V230Devfile } from 'devfile-api'; import { DevfileMetadata, DevfileMetadataLike } from '@/services/devfileApi/devfile/metadata'; diff --git a/packages/dashboard-frontend/src/services/devfileApi/devfile/metadata.ts b/packages/dashboard-frontend/src/services/devfileApi/devfile/metadata.ts index 002b10f28..0691c1fcc 100644 --- a/packages/dashboard-frontend/src/services/devfileApi/devfile/metadata.ts +++ b/packages/dashboard-frontend/src/services/devfileApi/devfile/metadata.ts @@ -10,7 +10,7 @@ * Red Hat, Inc. - initial API and implementation */ -import { V230DevfileMetadata } from '@devfile/api'; +import { V230DevfileMetadata } from 'devfile-api'; export type DevfileMetadataLike = V230DevfileMetadata & { namespace?: string; diff --git a/packages/dashboard-frontend/src/services/workspace-client/devworkspace/DevWorkspaceDefaultPluginsHandler.ts b/packages/dashboard-frontend/src/services/workspace-client/devworkspace/DevWorkspaceDefaultPluginsHandler.ts index c72cdeaf8..898f044ca 100644 --- a/packages/dashboard-frontend/src/services/workspace-client/devworkspace/DevWorkspaceDefaultPluginsHandler.ts +++ b/packages/dashboard-frontend/src/services/workspace-client/devworkspace/DevWorkspaceDefaultPluginsHandler.ts @@ -10,12 +10,12 @@ * Red Hat, Inc. - initial API and implementation */ +import { api } from '@eclipse-che/common'; +import { createHash } from 'crypto'; import { V1alpha2DevWorkspaceSpecContributions, V1alpha2DevWorkspaceSpecTemplateComponents, -} from '@devfile/api'; -import { api } from '@eclipse-che/common'; -import { createHash } from 'crypto'; +} from 'devfile-api'; import { injectable } from 'inversify'; import * as DwApi from '@/services/backend-client/devWorkspaceApi'; diff --git a/packages/dashboard-frontend/src/services/workspace-client/devworkspace/__tests__/__mocks__/editorDefinitions.ts b/packages/dashboard-frontend/src/services/workspace-client/devworkspace/__tests__/__mocks__/editorDefinitions.ts index f539162e9..d4c6e8ee4 100644 --- a/packages/dashboard-frontend/src/services/workspace-client/devworkspace/__tests__/__mocks__/editorDefinitions.ts +++ b/packages/dashboard-frontend/src/services/workspace-client/devworkspace/__tests__/__mocks__/editorDefinitions.ts @@ -10,7 +10,7 @@ * Red Hat, Inc. - initial API and implementation */ -import { V230Devfile } from '@devfile/api'; +import { V230Devfile } from 'devfile-api'; const getVSCodeEditorDefinition = (): V230Devfile => { return { diff --git a/packages/dashboard-frontend/src/services/workspace-client/devworkspace/converters/index.ts b/packages/dashboard-frontend/src/services/workspace-client/devworkspace/converters/index.ts index f108c46d0..48a9397ca 100644 --- a/packages/dashboard-frontend/src/services/workspace-client/devworkspace/converters/index.ts +++ b/packages/dashboard-frontend/src/services/workspace-client/devworkspace/converters/index.ts @@ -10,8 +10,8 @@ * Red Hat, Inc. - initial API and implementation */ -import { V1alpha2DevWorkspaceSpecTemplateComponents } from '@devfile/api'; import { helpers } from '@eclipse-che/common'; +import { V1alpha2DevWorkspaceSpecTemplateComponents } from 'devfile-api'; import { load } from 'js-yaml'; import devfileApi, { isDevfileV2 } from '@/services/devfileApi'; diff --git a/packages/dashboard-frontend/src/services/workspace-client/devworkspace/devWorkspaceClient.ts b/packages/dashboard-frontend/src/services/workspace-client/devworkspace/devWorkspaceClient.ts index 989c88bd8..b23cb82d5 100644 --- a/packages/dashboard-frontend/src/services/workspace-client/devworkspace/devWorkspaceClient.ts +++ b/packages/dashboard-frontend/src/services/workspace-client/devworkspace/devWorkspaceClient.ts @@ -10,13 +10,13 @@ * Red Hat, Inc. - initial API and implementation */ +import { api } from '@eclipse-che/common'; import { V1alpha2DevWorkspaceSpecTemplateComponents, V1alpha2DevWorkspaceTemplateSpec, V1alpha2DevWorkspaceTemplateSpecComponents, V230DevfileComponentsItemsContainer, -} from '@devfile/api'; -import { api } from '@eclipse-che/common'; +} from 'devfile-api'; import { inject, injectable } from 'inversify'; import { cloneDeep, isEqual } from 'lodash'; diff --git a/packages/dashboard-frontend/src/store/FactoryResolver/__tests__/helpers.normalizeDevfileV2.spec.ts b/packages/dashboard-frontend/src/store/FactoryResolver/__tests__/helpers.normalizeDevfileV2.spec.ts index 67ac77bc0..9d78186b6 100644 --- a/packages/dashboard-frontend/src/store/FactoryResolver/__tests__/helpers.normalizeDevfileV2.spec.ts +++ b/packages/dashboard-frontend/src/store/FactoryResolver/__tests__/helpers.normalizeDevfileV2.spec.ts @@ -10,7 +10,7 @@ * Red Hat, Inc. - initial API and implementation */ -import { V230Devfile, V230DevfileComponents } from '@devfile/api'; +import { V230Devfile, V230DevfileComponents } from 'devfile-api'; import { FactoryResolver } from '@/services/helpers/types'; import { che } from '@/services/models'; diff --git a/packages/dashboard-frontend/src/store/FactoryResolver/helpers.ts b/packages/dashboard-frontend/src/store/FactoryResolver/helpers.ts index 03f228f8d..f2d9f6ce5 100644 --- a/packages/dashboard-frontend/src/store/FactoryResolver/helpers.ts +++ b/packages/dashboard-frontend/src/store/FactoryResolver/helpers.ts @@ -10,9 +10,9 @@ * Red Hat, Inc. - initial API and implementation */ -import { V230DevfileComponents, V230DevfileProjects } from '@devfile/api'; import common, { api } from '@eclipse-che/common'; import axios from 'axios'; +import { V230DevfileComponents, V230DevfileProjects } from 'devfile-api'; import { dump } from 'js-yaml'; import { cloneDeep } from 'lodash'; diff --git a/packages/dashboard-frontend/src/store/ServerConfig/__tests__/reducer.spec.ts b/packages/dashboard-frontend/src/store/ServerConfig/__tests__/reducer.spec.ts index 9ba00effd..6d09355f7 100644 --- a/packages/dashboard-frontend/src/store/ServerConfig/__tests__/reducer.spec.ts +++ b/packages/dashboard-frontend/src/store/ServerConfig/__tests__/reducer.spec.ts @@ -10,8 +10,8 @@ * Red Hat, Inc. - initial API and implementation */ -import { V230DevfileComponents } from '@devfile/api'; import { api } from '@eclipse-che/common'; +import { V230DevfileComponents } from 'devfile-api'; import { UnknownAction } from 'redux'; import { diff --git a/packages/dashboard-frontend/src/store/ServerConfig/__tests__/selectors.spec.ts b/packages/dashboard-frontend/src/store/ServerConfig/__tests__/selectors.spec.ts index 4fafb4697..611c24e74 100644 --- a/packages/dashboard-frontend/src/store/ServerConfig/__tests__/selectors.spec.ts +++ b/packages/dashboard-frontend/src/store/ServerConfig/__tests__/selectors.spec.ts @@ -10,8 +10,8 @@ * Red Hat, Inc. - initial API and implementation */ -import { V230DevfileComponents } from '@devfile/api'; import { api } from '@eclipse-che/common'; +import { V230DevfileComponents } from 'devfile-api'; import { RootState } from '@/store'; import { diff --git a/packages/dashboard-frontend/src/store/Workspaces/devWorkspaces/actions/actionCreators/helpers/editorImage.ts b/packages/dashboard-frontend/src/store/Workspaces/devWorkspaces/actions/actionCreators/helpers/editorImage.ts index d289f613c..4b7360875 100644 --- a/packages/dashboard-frontend/src/store/Workspaces/devWorkspaces/actions/actionCreators/helpers/editorImage.ts +++ b/packages/dashboard-frontend/src/store/Workspaces/devWorkspaces/actions/actionCreators/helpers/editorImage.ts @@ -10,8 +10,8 @@ * Red Hat, Inc. - initial API and implementation */ -import { V230DevfileComponents } from '@devfile/api'; import common from '@eclipse-che/common'; +import { V230DevfileComponents } from 'devfile-api'; import { dump, load } from 'js-yaml'; import cloneDeep from 'lodash/cloneDeep'; diff --git a/packages/dashboard-frontend/src/store/Workspaces/devWorkspaces/reducer.ts b/packages/dashboard-frontend/src/store/Workspaces/devWorkspaces/reducer.ts index 76b86c6ef..ba7798490 100644 --- a/packages/dashboard-frontend/src/store/Workspaces/devWorkspaces/reducer.ts +++ b/packages/dashboard-frontend/src/store/Workspaces/devWorkspaces/reducer.ts @@ -10,8 +10,8 @@ * Red Hat, Inc. - initial API and implementation */ -import { V1alpha2DevWorkspaceStatus } from '@devfile/api'; import { createReducer } from '@reduxjs/toolkit'; +import { V1alpha2DevWorkspaceStatus } from 'devfile-api'; import devfileApi from '@/services/devfileApi'; import { getNewerResourceVersion } from '@/services/helpers/resourceVersion'; diff --git a/packages/dashboard-frontend/src/store/__mocks__/devWorkspaceBuilder.ts b/packages/dashboard-frontend/src/store/__mocks__/devWorkspaceBuilder.ts index 0a61e61f2..91bd00692 100644 --- a/packages/dashboard-frontend/src/store/__mocks__/devWorkspaceBuilder.ts +++ b/packages/dashboard-frontend/src/store/__mocks__/devWorkspaceBuilder.ts @@ -10,7 +10,7 @@ * Red Hat, Inc. - initial API and implementation */ -import { V1alpha2DevWorkspaceStatus, V1alpha2DevWorkspaceStatusConditions } from '@devfile/api'; +import { V1alpha2DevWorkspaceStatus, V1alpha2DevWorkspaceStatusConditions } from 'devfile-api'; import devfileApi from '@/services/devfileApi'; import { DevWorkspacePlugin } from '@/services/devfileApi/devWorkspace'; diff --git a/packages/devfile-api/.gitignore b/packages/devfile-api/.gitignore new file mode 100644 index 000000000..3781f2128 --- /dev/null +++ b/packages/devfile-api/.gitignore @@ -0,0 +1,6 @@ +lib/ +node_modules/ +coverage/ + +tsconfig.tsbuildinfo +.eslintcache diff --git a/packages/devfile-api/package.json b/packages/devfile-api/package.json new file mode 100644 index 000000000..bc455ed7a --- /dev/null +++ b/packages/devfile-api/package.json @@ -0,0 +1,27 @@ +{ + "name": "devfile-api", + "version": "0.0.1", + "license": "EPL-2.0", + "main": "./lib/index.js", + "description": "Devfile API re-export", + "scripts": { + "clean": "rimraf lib tsconfig.tsbuildinfo", + "build": "yarn clean && webpack --color --config webpack.config.js", + "build:dev": "yarn build", + "test": "echo \"no test specified\"", + "format:check": "echo \"no format check specified\"", + "format:fix": "yarn format:check", + "lint:check": "echo \"no lint check specified\"", + "lint:fix": "yarn lint:check" + }, + "dependencies": { + "@devfile/api": "2.3.0-1725380172" + }, + "devDependencies": { + "encoding": "^0.1.13", + "rimraf": "^5.0.1", + "source-map-loader": "^5.0.0", + "ts-loader": "^9.4.4", + "webpack": "^5.94.0" + } +} diff --git a/packages/devfile-api/src/index.ts b/packages/devfile-api/src/index.ts new file mode 100644 index 000000000..dfa8938b4 --- /dev/null +++ b/packages/devfile-api/src/index.ts @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2018-2024 Red Hat, Inc. + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + */ + +export * from '@devfile/api'; diff --git a/packages/devfile-api/tsconfig.json b/packages/devfile-api/tsconfig.json new file mode 100644 index 000000000..0ef450038 --- /dev/null +++ b/packages/devfile-api/tsconfig.json @@ -0,0 +1,16 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "outDir": "lib", + "rootDir": "src", + "composite": true, + "declaration": true + }, + "include": [ + "src", + ], + "exclude": [ + "node_modules", + "lib", + ] +} diff --git a/packages/devfile-api/webpack.config.js b/packages/devfile-api/webpack.config.js new file mode 100644 index 000000000..b31032f48 --- /dev/null +++ b/packages/devfile-api/webpack.config.js @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2018-2024 Red Hat, Inc. + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + */ + +const path = require('path'); +const webpack = require('webpack'); + +module.exports = () => { + return { + mode: 'production', + entry: path.join(__dirname, 'src/index.ts'), + output: { + filename: path.join('index.js'), + path: path.join(__dirname, 'lib'), + clean: true, + }, + module: { + rules: [ + { + test: /\.ts$/, + loader: 'ts-loader', + options: { + configFile: path.resolve(__dirname, 'tsconfig.json'), + }, + }, + { + test: /\.m?js/, + resolve: { + fullySpecified: false, + } + }, + ], + }, + resolve: { + extensions: ['.ts', '.js'], + }, + devtool: 'source-map', + resolveLoader: {}, + plugins: [ + new webpack.ProgressPlugin(), + ], + node: { + __dirname: false, + }, + target: 'node', + }; +}; diff --git a/run/wrksps.sh b/run/wrksps.sh index 77aa91506..9be0c4f74 100755 --- a/run/wrksps.sh +++ b/run/wrksps.sh @@ -13,6 +13,7 @@ set -e +yarn workspace devfile-api "$@" yarn workspace @eclipse-che/common "$@" yarn workspace @eclipse-che/dashboard-frontend "$@" yarn workspace @eclipse-che/dashboard-backend "$@" diff --git a/scripts/yarn/old_version/.deps/EXCLUDED/dev.md b/scripts/yarn/old_version/.deps/EXCLUDED/dev.md index 73a9c4e5e..28c0b9e74 100644 --- a/scripts/yarn/old_version/.deps/EXCLUDED/dev.md +++ b/scripts/yarn/old_version/.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/scripts/yarn/old_version/.deps/EXCLUDED/prod.md b/scripts/yarn/old_version/.deps/EXCLUDED/prod.md index 419536d28..1c5c2c1b5 100644 --- a/scripts/yarn/old_version/.deps/EXCLUDED/prod.md +++ b/scripts/yarn/old_version/.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/scripts/yarn/old_version/.deps/dev.md b/scripts/yarn/old_version/.deps/dev.md index eac2edebf..fc4c4b7a7 100644 --- a/scripts/yarn/old_version/.deps/dev.md +++ b/scripts/yarn/old_version/.deps/dev.md @@ -3,7 +3,7 @@ | Packages | License | Resolved CQs | | --- | --- | --- | | [`@aashutoshrathi/word-wrap@1.2.6`](git+https://github.com/aashutoshrathi/word-wrap.git) | MIT | #9212 | -| [`@adobe/css-tools@4.4.0`](https://github.com/adobe/css-tools.git) | MIT | clearlydefined | +| [`@adobe/css-tools@4.4.1`](https://github.com/adobe/css-tools.git) | MIT | transitive dependency | | [`@ampproject/remapping@2.2.1`](git+https://github.com/ampproject/remapping.git) | Apache-2.0 | clearlydefined | | [`@babel/code-frame@7.22.13`](https://github.com/babel/babel.git) | MIT | #8946 | | [`@babel/compat-data@7.23.2`](https://github.com/babel/babel.git) | MIT | #11554 | @@ -276,6 +276,7 @@ | [`electron-to-chromium@1.4.576`](https://github.com/kilian/electron-to-chromium/) | ISC | #1950 | | [`emittery@0.13.1`](https://github.com/sindresorhus/emittery.git) | MIT | clearlydefined | | [`emojis-list@3.0.0`](git+https://github.com/kikobeats/emojis-list.git) | MIT | clearlydefined | +| [`encoding@0.1.13`](https://github.com/andris9/encoding.git) | MIT | #1016 | | [`enhanced-resolve@5.15.0`](git://github.com/webpack/enhanced-resolve.git) | MIT | #8939 | | [`envinfo@7.11.0`](https://github.com/tabrindle/envinfo) | MIT | #13100 | | [`error-ex@1.3.2`](https://github.com/qix-/node-error-ex.git) | MIT | clearlydefined | @@ -609,7 +610,7 @@ | [`slice-ansi@4.0.0`](https://github.com/chalk/slice-ansi.git) | MIT | clearlydefined | | [`sort-keys@2.0.0`](https://github.com/sindresorhus/sort-keys.git) | MIT | clearlydefined | | [`source-list-map@2.0.1`](https://github.com/webpack/source-list-map.git) | MIT | #978 | -| [`source-map-loader@4.0.1`](https://github.com/webpack-contrib/source-map-loader.git) | MIT | clearlydefined | +| [`source-map-loader@5.0.0`](https://github.com/webpack-contrib/source-map-loader.git) | MIT | clearlydefined | | [`source-map-support@0.5.21`](https://github.com/evanw/node-source-map-support) | MIT | clearlydefined | | [`source-map@0.6.1`](http://github.com/mozilla/source-map.git) | BSD-3-Clause | #2417 | | [`spdx-correct@3.2.0`](https://github.com/jslicense/spdx-correct.js.git) | Apache-2.0 | #7493 | @@ -693,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/.deps/prod.md b/scripts/yarn/old_version/.deps/prod.md index 0582039dd..437a2b11b 100644 --- a/scripts/yarn/old_version/.deps/prod.md +++ b/scripts/yarn/old_version/.deps/prod.md @@ -8,11 +8,11 @@ | [`@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 | -| [`@eclipse-che/common@7.95.0-next`](https://github.com/eclipse-che/che-dashboard) | EPL-2.0 | ecd.che | -| [`@eclipse-che/dashboard-backend@7.95.0-next`](https://github.com/eclipse-che/che-dashboard) | EPL-2.0 | ecd.che | -| [`@eclipse-che/dashboard-frontend@7.95.0-next`](git://github.com/eclipse/che-dashboard.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 | +| [`@eclipse-che/common@7.95.1-next`](https://github.com/eclipse-che/che-dashboard) | EPL-2.0 | ecd.che | +| [`@eclipse-che/dashboard-backend@7.95.1-next`](https://github.com/eclipse-che/che-dashboard) | EPL-2.0 | ecd.che | +| [`@eclipse-che/dashboard-frontend@7.95.1-next`](git://github.com/eclipse/che-dashboard.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 | @@ -145,6 +145,7 @@ | [`dequal@2.0.3`](https://github.com/lukeed/dequal.git) | MIT | clearlydefined | | [`des.js@1.1.0`](git+ssh://git@github.com/indutny/des.js.git) | MIT | clearlydefined | | [`detect-browser@5.3.0`](https://github.com/DamonOehlman/detect-browser.git) | MIT | clearlydefined | +| `devfile-api@0.0.1` | EPL-2.0 | monorepo package | | [`devlop@1.1.0`](https://github.com/wooorm/devlop.git) | MIT | clearlydefined | | [`diffie-hellman@5.0.3`](https://github.com/crypto-browserify/diffie-hellman.git) | MIT | clearlydefined | | [`dom-serializer@2.0.0`](git://github.com/cheeriojs/dom-serializer.git) | MIT | clearlydefined | @@ -153,8 +154,8 @@ | [`domutils@3.1.0`](git://github.com/fb55/domutils.git) | BSD-2-Clause | #8391 | | [`duplexify@4.1.3`](git://github.com/mafintosh/duplexify) | MIT | clearlydefined | | [`eastasianwidth@0.2.0`](git://github.com/komagata/eastasianwidth.git) | 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 | +| [`ecc-jsbn@0.1.2`](https://github.com/quartzjer/ecc-jsbn.git) | MIT | #17389 | +| [`elliptic@6.6.1`](git@github.com:indutny/elliptic) | MIT | [clearlydefined](https://clearlydefined.io/definitions/npm/npmjs/-/elliptic/6.6.1) | | [`emoji-regex@8.0.0`](https://github.com/mathiasbynens/emoji-regex.git) | MIT | clearlydefined | | [`end-of-stream@1.4.4`](git://github.com/mafintosh/end-of-stream.git) | MIT | clearlydefined | | [`entities@4.5.0`](git://github.com/fb55/entities.git) | BSD-2-Clause | #7910 | @@ -279,20 +280,20 @@ | [`micromark-factory-space@2.0.0`](https://github.com/micromark/micromark/tree/main/packages/micromark-factory-space) | MIT | clearlydefined | | [`micromark-factory-title@2.0.0`](https://github.com/micromark/micromark/tree/main/packages/micromark-factory-title) | MIT | clearlydefined | | [`micromark-factory-whitespace@2.0.0`](https://github.com/micromark/micromark/tree/main/packages/micromark-factory-whitespace) | MIT | clearlydefined | -| [`micromark-util-character@2.1.0`](https://github.com/micromark/micromark/tree/main/packages/micromark-util-character) | MIT | clearlydefined | +| [`micromark-util-character@2.1.0`](https://github.com/micromark/micromark/tree/main/packages/micromark-util-character) | MIT | #17409 | | [`micromark-util-chunked@2.0.0`](https://github.com/micromark/micromark/tree/main/packages/micromark-util-chunked) | MIT | clearlydefined | | [`micromark-util-classify-character@2.0.0`](https://github.com/micromark/micromark/tree/main/packages/micromark-util-classify-character) | MIT | clearlydefined | | [`micromark-util-combine-extensions@2.0.0`](https://github.com/micromark/micromark/tree/main/packages/micromark-util-combine-extensions) | MIT | clearlydefined | | [`micromark-util-decode-numeric-character-reference@2.0.1`](https://github.com/micromark/micromark/tree/main/packages/micromark-util-decode-numeric-character-reference) | MIT | clearlydefined | | [`micromark-util-decode-string@2.0.0`](https://github.com/micromark/micromark/tree/main/packages/micromark-util-decode-string) | MIT | clearlydefined | -| [`micromark-util-encode@2.0.0`](https://github.com/micromark/micromark/tree/main/packages/micromark-util-encode) | MIT | clearlydefined | +| [`micromark-util-encode@2.0.0`](https://github.com/micromark/micromark/tree/main/packages/micromark-util-encode) | MIT | #17395 | | [`micromark-util-html-tag-name@2.0.0`](https://github.com/micromark/micromark/tree/main/packages/micromark-util-html-tag-name) | MIT | clearlydefined | | [`micromark-util-normalize-identifier@2.0.0`](https://github.com/micromark/micromark/tree/main/packages/micromark-util-normalize-identifier) | MIT | clearlydefined | | [`micromark-util-resolve-all@2.0.0`](https://github.com/micromark/micromark/tree/main/packages/micromark-util-resolve-all) | MIT | clearlydefined | -| [`micromark-util-sanitize-uri@2.0.0`](https://github.com/micromark/micromark/tree/main/packages/micromark-util-sanitize-uri) | MIT | clearlydefined | +| [`micromark-util-sanitize-uri@2.0.0`](https://github.com/micromark/micromark/tree/main/packages/micromark-util-sanitize-uri) | MIT | #17416 | | [`micromark-util-subtokenize@2.0.1`](https://github.com/micromark/micromark/tree/main/packages/micromark-util-subtokenize) | MIT | clearlydefined | -| [`micromark-util-symbol@2.0.0`](https://github.com/micromark/micromark/tree/main/packages/micromark-util-symbol) | MIT | clearlydefined | -| [`micromark-util-types@2.0.0`](https://github.com/micromark/micromark/tree/main/packages/micromark-util-types) | MIT | clearlydefined | +| [`micromark-util-symbol@2.0.0`](https://github.com/micromark/micromark/tree/main/packages/micromark-util-symbol) | MIT | #17394 | +| [`micromark-util-types@2.0.0`](https://github.com/micromark/micromark/tree/main/packages/micromark-util-types) | MIT | #17405 | | [`micromark@4.0.0`](https://github.com/micromark/micromark/tree/main/packages/micromark) | MIT | clearlydefined | | [`miller-rabin@4.0.1`](git@github.com:indutny/miller-rabin) | MIT | clearlydefined | | [`mime-db@1.52.0`](https://github.com/jshttp/mime-db.git) | MIT | clearlydefined | @@ -469,6 +470,6 @@ | [`wrappy@1.0.2`](https://github.com/npm/wrappy) | ISC | clearlydefined | | [`ws@8.17.1`](git+https://github.com/websockets/ws.git) | MIT | clearlydefined | | [`yallist@4.0.0`](git+https://github.com/isaacs/yallist.git) | ISC | clearlydefined | -| [`yaml@2.6.0`](https://github.com/eemeli/yaml.git) | ISC | clearlydefined | +| [`yaml@2.6.0`](https://github.com/eemeli/yaml.git) | ISC | #17714 | | [`yocto-queue@0.1.0`](https://github.com/sindresorhus/yocto-queue.git) | MIT | clearlydefined | | [`zwitch@2.0.4`](https://github.com/wooorm/zwitch.git) | MIT | clearlydefined | diff --git a/scripts/yarn/old_version/yarn.lock b/scripts/yarn/old_version/yarn.lock index 6409e2191..253d3e706 100644 --- a/scripts/yarn/old_version/yarn.lock +++ b/scripts/yarn/old_version/yarn.lock @@ -8,9 +8,9 @@ integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== "@adobe/css-tools@^4.3.2", "@adobe/css-tools@^4.4.0": - version "4.4.0" - resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.4.0.tgz#728c484f4e10df03d5a3acd0d8adcbbebff8ad63" - integrity sha512-Ff9+ksdQQB3rMncgqDK78uLznstjyfIf2Arnh22pW8kBpLs6rpKDwgnZT46hin5Hl1WzazzK64DOrhSwYpS7bQ== + version "4.4.1" + resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.4.1.tgz#2447a230bfe072c1659e6815129c03cf170710e3" + integrity sha512-12WGKBQzjUAI4ayyF4IAtfw2QR/IDoqk6jTddXDhtYTJF9ASmoE1zst7cVtP0aL/F1jUJL5r+JxKXKEgHNbEUQ== "@ampproject/remapping@^2.2.0": version "2.2.1" @@ -382,10 +382,10 @@ resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-3.0.0.tgz#798622546b63847e82389e473fd67f2707d82247" integrity sha512-hBI9tfBtuPIi885ZsZ32IMEU/5nlZH/KOVYJCOh7gyMxaVLGmLedYqFN6Ui1LXkI8JlC8IsuC0rF0btcRZKd5g== -"@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== +"@devfile/api@2.3.0-1725380172": + version "2.3.0-1725380172" + resolved "https://registry.yarnpkg.com/@devfile/api/-/api-2.3.0-1725380172.tgz#516b91e95c84d46468afd1fff4dc68e124a5fb41" + integrity sha512-J0O2h81M3kcbkwLnod64aHH9PAUzHRJyOvfDyOE8LSv62Yj+3tf0MYHPXOFWMwQWFUFTymMK2fHPnINWaV6MxQ== dependencies: "@types/node" "*" "@types/node-fetch" "^2.5.7" @@ -404,13 +404,13 @@ resolved "https://registry.yarnpkg.com/@eclipse-che/api/-/api-7.86.0.tgz#c4bfe23fb0a34e864ba5a45cd3d5b7f3332cef13" integrity sha512-WDmnzopqKXPO3jozfrZ8mXVxdy/7KnzOv/+o3SzIqKYfEXXcmulG2+FYxzWUAA37T3wgqE1lQ+MACwO7v4PhtA== -"@eclipse-che/che-devworkspace-generator@7.90.0-next-4510df7": - version "7.90.0-next-4510df7" - resolved "https://registry.yarnpkg.com/@eclipse-che/che-devworkspace-generator/-/che-devworkspace-generator-7.90.0-next-4510df7.tgz#62b4966c39542f9b96a1d6c260cdaa4eb500340a" - integrity sha512-i5tReZa6snaZ7A0hbP+iowZecdOyXdK8crnbIkM+kMKZmElDehxDFuwHZ/I2B/QliAt/2LiBXAk0TBaG8Xm21w== +"@eclipse-che/che-devworkspace-generator@7.95.0": + version "7.95.0" + resolved "https://registry.yarnpkg.com/@eclipse-che/che-devworkspace-generator/-/che-devworkspace-generator-7.95.0.tgz#bda08714a703ddf1604ae5f2a3aca5af6eb9a0af" + integrity sha512-uvvDG4i08/AysxAdWK8vRQBa6/2bud7od7hb11D4P1Iaa69lOtwlbCqRV36q0VGyGtEspvLbPuUVouGtrx89hg== dependencies: - "@devfile/api" "2.3.0-1721400636" - axios "^1.7.0" + "@devfile/api" "2.3.0-1725380172" + axios "^1.7.4" fs-extra "^11.2.0" inversify "^6.0.2" js-yaml "^4.0.0" @@ -3421,6 +3421,13 @@ emojis-list@^3.0.0: resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== +encoding@^0.1.13: + version "0.1.13" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== + dependencies: + iconv-lite "^0.6.2" + end-of-stream@^1.1.0, end-of-stream@^1.4.1, end-of-stream@^1.4.4: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" @@ -4745,7 +4752,7 @@ human-signals@^4.3.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2" integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ== -iconv-lite@0.6.3, iconv-lite@^0.6.3: +iconv-lite@0.6.3, iconv-lite@^0.6.2, iconv-lite@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== diff --git a/yarn.lock b/yarn.lock index c7ae96a3c..d2d6ab8e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -554,20 +554,6 @@ __metadata: languageName: node linkType: hard -"@devfile/api@npm:2.3.0-1721400636": - version: 2.3.0-1721400636 - resolution: "@devfile/api@npm:2.3.0-1721400636" - dependencies: - "@types/node": "*" - "@types/node-fetch": ^2.5.7 - es6-promise: ^4.2.4 - form-data: ^2.5.0 - node-fetch: ^2.6.0 - url-parse: ^1.4.3 - checksum: 98f5e2bc03e3b2d4ec649176aa57a5cf1538fa37a94d1dbe48ebfb4efbdf2d1ecbcf18a4f842f4be9f7bff9ace89fb5d6061d9eb7e24a1a7455ece67fbe36a14 - languageName: node - linkType: hard - "@devfile/api@npm:2.3.0-1725380172": version: 2.3.0-1725380172 resolution: "@devfile/api@npm:2.3.0-1725380172" @@ -618,7 +604,7 @@ __metadata: version: 0.0.0-use.local resolution: "@eclipse-che/common@workspace:packages/common" dependencies: - "@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 @@ -641,7 +627,6 @@ __metadata: version: 0.0.0-use.local resolution: "@eclipse-che/dashboard-backend@workspace:packages/dashboard-backend" 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 @@ -705,7 +690,6 @@ __metadata: "@codemirror/language": ^6.10.3 "@codemirror/state": ^6.4.1 "@codemirror/view": ^6.34.1 - "@devfile/api": 2.3.0-1721400636 "@eclipse-che/api": ^7.86.0 "@kubernetes/client-node": ^0.22.1 "@lezer/highlight": ^1.2.1 @@ -4656,6 +4640,19 @@ __metadata: languageName: node linkType: hard +"devfile-api@workspace:packages/devfile-api": + version: 0.0.0-use.local + resolution: "devfile-api@workspace:packages/devfile-api" + dependencies: + "@devfile/api": 2.3.0-1725380172 + encoding: ^0.1.13 + rimraf: ^5.0.1 + source-map-loader: ^5.0.0 + ts-loader: ^9.4.4 + webpack: ^5.94.0 + languageName: unknown + linkType: soft + "devlop@npm:^1.0.0, devlop@npm:^1.1.0": version: 1.1.0 resolution: "devlop@npm:1.1.0"