Skip to content

Commit

Permalink
chore(orchestrator): resolve dependencies issue (#149)
Browse files Browse the repository at this point in the history
  • Loading branch information
batzionb authored Dec 9, 2024
1 parent d342ac4 commit 5b90f96
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 28 deletions.
6 changes: 6 additions & 0 deletions workspaces/orchestrator/.changeset/empty-plants-dream.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@red-hat-developer-hub/backstage-plugin-orchestrator-backend': patch
'@red-hat-developer-hub/backstage-plugin-orchestrator-common': patch
---

resolve dependency issues
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
import type { JsonObject } from '@backstage/types';

import { JSONSchema7 } from 'json-schema';
import type { JSONSchema7 } from 'json-schema';

import { WorkflowDefinition } from '@red-hat-developer-hub/backstage-plugin-orchestrator-common';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
import type { JsonObject } from '@backstage/types';

import { JSONSchema7 } from 'json-schema';
import type { JSONSchema7 } from 'json-schema';

import { WorkflowDefinition } from '@red-hat-developer-hub/backstage-plugin-orchestrator-common';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { JSONSchema7 } from 'json-schema';
import type { JSONSchema7 } from 'json-schema';

import { WorkflowDefinition } from '@red-hat-developer-hub/backstage-plugin-orchestrator-common';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
"express-promise-router": "^4.1.1",
"fs-extra": "^10.1.0",
"isomorphic-git": "^1.23.0",
"json-schema": "^0.4.0",
"moment": "^2.29.4",
"openapi-backend": "^5.10.5",
"yn": "^5.0.0"
Expand Down
14 changes: 4 additions & 10 deletions workspaces/orchestrator/plugins/orchestrator-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,24 +56,18 @@
"openapi:generate": "./scripts/openapi.sh generate",
"openapi:check": "./scripts/openapi.sh check"
},
"peerDependencies": {
"dependencies": {
"@backstage/plugin-permission-common": "^0.8.1",
"@backstage/types": "^1.1.1",
"@severlessworkflow/sdk-typescript": "^3.0.3",
"axios": "^1.7.4",
"js-yaml": "^4.1.0"
},
"devDependencies": {
"@backstage/cli": "0.28.2",
"@backstage/plugin-permission-common": "^0.8.1",
"@backstage/types": "1.1.1",
"@backstage/types": "^1.1.1",
"@openapitools/openapi-generator-cli": "2.13.4",
"@severlessworkflow/sdk-typescript": "3.0.3",
"axios": "^1.7.4",
"js-yaml": "^4.1.0",
"js-yaml-cli": "0.6.0",
"json-schema": "0.4.0",
"prettier": "3.3.3"
"@types/json-schema": "7.0.15",
"js-yaml-cli": "0.6.0"
},
"maintainers": [
"@mlibra",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
},
"dependencies": {
"@backstage/core-plugin-api": "^1.10.0",
"@backstage/types": "^1.1.1",
"@rjsf/core": "^5.21.2",
"@rjsf/utils": "^5.21.2"
},
Expand All @@ -37,6 +36,7 @@
},
"devDependencies": {
"@backstage/cli": "0.28.2",
"@backstage/types": "^1.1.1",
"@types/json-schema": "7.0.15",
"@types/react": "^18.2.58",
"prettier": "3.3.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"dependencies": {
"@backstage/core-components": "^0.15.1",
"@backstage/core-plugin-api": "^1.10.0",
"@backstage/types": "^1.1.1",
"@material-ui/core": "^4.12.4",
"@red-hat-developer-hub/backstage-plugin-orchestrator-form-api": "workspace:^",
"@rjsf/core": "^5.21.2",
Expand All @@ -50,6 +49,7 @@
},
"devDependencies": {
"@backstage/cli": "0.28.2",
"@backstage/types": "^1.1.1",
"@types/json-schema": "7.0.15",
"@types/lodash": "^4.14.151",
"@types/react": "^18.2.58",
Expand Down
16 changes: 4 additions & 12 deletions workspaces/orchestrator/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11955,7 +11955,6 @@ __metadata:
express-promise-router: ^4.1.1
fs-extra: ^10.1.0
isomorphic-git: ^1.23.0
json-schema: ^0.4.0
moment: ^2.29.4
openapi-backend: ^5.10.5
prettier: 3.3.3
Expand All @@ -11971,21 +11970,14 @@ __metadata:
resolution: "@red-hat-developer-hub/backstage-plugin-orchestrator-common@workspace:plugins/orchestrator-common"
dependencies:
"@backstage/cli": 0.28.2
"@backstage/plugin-permission-common": ^0.8.1
"@backstage/types": 1.1.1
"@openapitools/openapi-generator-cli": 2.13.4
"@severlessworkflow/sdk-typescript": 3.0.3
axios: ^1.7.4
js-yaml: ^4.1.0
js-yaml-cli: 0.6.0
json-schema: 0.4.0
prettier: 3.3.3
peerDependencies:
"@backstage/plugin-permission-common": ^0.8.1
"@backstage/types": ^1.1.1
"@openapitools/openapi-generator-cli": 2.13.4
"@severlessworkflow/sdk-typescript": ^3.0.3
"@types/json-schema": 7.0.15
axios: ^1.7.4
js-yaml: ^4.1.0
js-yaml-cli: 0.6.0
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -12599,7 +12591,7 @@ __metadata:
languageName: node
linkType: hard

"@severlessworkflow/sdk-typescript@npm:3.0.3, @severlessworkflow/sdk-typescript@npm:^3.0.3":
"@severlessworkflow/sdk-typescript@npm:^3.0.3":
version: 3.0.3
resolution: "@severlessworkflow/sdk-typescript@npm:3.0.3"
dependencies:
Expand Down

0 comments on commit 5b90f96

Please sign in to comment.