Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@red-hat-developer-hub/backstage-plugin-orchestrator': patch
'@red-hat-developer-hub/backstage-plugin-orchestrator-common': patch
'@red-hat-developer-hub/backstage-plugin-orchestrator-form-widgets': patch
'@red-hat-developer-hub/backstage-plugin-orchestrator-form-react': patch
'@red-hat-developer-hub/backstage-plugin-scaffolder-backend-module-orchestrator': patch
---

Fix TypeScript compilation errors in orchestrator plugins
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
"devDependencies": {
"@backstage/cli": "^0.34.5",
"@openapitools/openapi-generator-cli": "2.25.2",
"@types/js-yaml": "^4.0.0",
"@types/json-schema": "7.0.15",
"js-yaml-cli": "^0.6.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
import { useEffect } from 'react';

import { JsonObject } from '@backstage/types/index';
import { JsonObject } from '@backstage/types';

import { Widget } from '@rjsf/utils';
import type { JSONSchema7 } from 'json-schema';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@
"tss-react": "^4.9.18"
},
"peerDependencies": {
"react": "^16.13.1 || ^17.0.0 || ^18.0.0"
"react": "^16.13.1 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0",
"react-router-dom": "^6.3.0"
},
"scalprum": {
"name": "red-hat-developer-hub.backstage-plugin-orchestrator-form-widgets",
Expand All @@ -86,7 +88,9 @@
"@testing-library/user-event": "^14.0.0",
"express": "^5.1.0",
"msw": "^1.0.0",
"react": "^16.13.1 || ^17.0.0 || ^18.0.0"
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^6.3.0"
},
"files": [
"app-config.yaml",
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 { JsonValue } from '@backstage/types/index';
import { JsonValue } from '@backstage/types';
import { TypographyVariant } from '@mui/material/styles';

export type UiProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import { JsonValue } from '@backstage/types/index';
import { JsonValue } from '@backstage/types';
import { evaluateTemplate, evaluateTemplateProps } from './evaluateTemplate';
import get from 'lodash/get';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import { useApi, fetchApiRef } from '@backstage/core-plugin-api';
import { JsonObject } from '@backstage/types/index';
import { JsonObject } from '@backstage/types';
import { useState } from 'react';
import { UiProps } from '../uiPropTypes';
import { getErrorMessage } from './errorUtils';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import { JsonObject } from '@backstage/types/index';
import { JsonObject } from '@backstage/types';
import React, { useState, useEffect } from 'react';
import { UiProps } from '../uiPropTypes';
import { getErrorMessage } from './errorUtils';
Expand Down
5 changes: 4 additions & 1 deletion workspaces/orchestrator/plugins/orchestrator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@
"@types/react": "^18.2.58",
"@types/react-dom": "^18.2.19",
"@types/uuid": "^9.0.0",
"prettier": "3.6.2"
"prettier": "3.6.2",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^6.3.0"
},
"peerDependencies": {
"@mui/icons-material": "^5.17.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import { JsonObject } from '@backstage/types/index';
import { JsonObject } from '@backstage/types';

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@
"@backstage/cli": "^0.34.5",
"@backstage/plugin-scaffolder-node-test-utils": "^0.3.5",
"@janus-idp/cli": "3.6.1",
"@spotify/prettier-config": "^15.0.0"
"@spotify/prettier-config": "^15.0.0",
"@types/js-yaml": "^4.0.0"
},
"files": [
"app-config.yaml",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import { AuthService } from '@backstage/backend-plugin-api';
import { DiscoveryApi } from '@backstage/plugin-permission-common';
import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
import { JsonObject } from '@backstage/types/index';
import { JsonObject } from '@backstage/types';

import { isAxiosError } from 'axios';
import { dump } from 'js-yaml';
Expand Down
13 changes: 11 additions & 2 deletions workspaces/orchestrator/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12726,6 +12726,7 @@ __metadata:
"@backstage/types": ^1.2.2
"@openapitools/openapi-generator-cli": 2.25.2
"@serverlessworkflow/sdk-typescript": ^0.8.4
"@types/js-yaml": ^4.0.0
"@types/json-schema": 7.0.15
axios: ^1.11.0
js-yaml: ^4.1.0
Expand Down Expand Up @@ -12815,11 +12816,15 @@ __metadata:
jsonata: ^2.0.6
lodash: ^4.17.21
msw: ^1.0.0
react: ^16.13.1 || ^17.0.0 || ^18.0.0
react: ^18.0.0
react-dom: ^18.0.0
react-router-dom: ^6.3.0
react-use: ^17.2.4
tss-react: ^4.9.18
peerDependencies:
react: ^16.13.1 || ^17.0.0 || ^18.0.0
react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
react-router-dom: ^6.3.0
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -12859,6 +12864,9 @@ __metadata:
lodash: ^4.17.21
luxon: ^3.7.2
prettier: 3.6.2
react: ^18.0.0
react-dom: ^18.0.0
react-router-dom: ^6.3.0
react-use: ^17.4.0
swr: ^2.0.0
tss-react: ^4.9.18
Expand Down Expand Up @@ -12887,6 +12895,7 @@ __metadata:
"@janus-idp/cli": 3.6.1
"@red-hat-developer-hub/backstage-plugin-orchestrator-common": "workspace:^"
"@spotify/prettier-config": ^15.0.0
"@types/js-yaml": ^4.0.0
axios: ^1.11.0
js-yaml: ^4.1.0
languageName: unknown
Expand Down Expand Up @@ -16038,7 +16047,7 @@ __metadata:
languageName: node
linkType: hard

"@types/js-yaml@npm:^4.0.1":
"@types/js-yaml@npm:^4.0.0, @types/js-yaml@npm:^4.0.1":
version: 4.0.9
resolution: "@types/js-yaml@npm:4.0.9"
checksum: e5e5e49b5789a29fdb1f7d204f82de11cb9e8f6cb24ab064c616da5d6e1b3ccfbf95aa5d1498a9fbd3b9e745564e69b4a20b6c530b5a8bbb2d4eb830cda9bc69
Expand Down