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
6 changes: 6 additions & 0 deletions workspaces/jaeger/.changeset/version-bump-1-38-1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@backstage-community/plugin-jaeger': minor
'@backstage-community/plugin-jaeger-common': minor
---

Backstage version bump to v1.38.1
2 changes: 1 addition & 1 deletion workspaces/jaeger/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ To start the app, run:

```sh
yarn install
yarn dev
yarn start
```

To generate knip reports for this app, run:
Expand Down
2 changes: 1 addition & 1 deletion workspaces/jaeger/backstage.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.37.0"
"version": "1.38.1"
}
8 changes: 3 additions & 5 deletions workspaces/jaeger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
"node": "20 || 22"
},
"scripts": {
"dev": "yarn workspaces foreach -A --include backend --include app --parallel -v -i run start",
"start": "yarn workspace app start",
"start-backend": "yarn workspace backend start",
"start": "backstage-cli repo start",
"tsc": "tsc",
"tsc:full": "tsc --skipLibCheck false --incremental false",
"build:all": "backstage-cli repo build --all",
Expand Down Expand Up @@ -38,9 +36,9 @@
"directory": "workspaces/jaeger"
},
"devDependencies": {
"@backstage/cli": "^0.31.0",
"@backstage/cli": "^0.32.0",
"@backstage/e2e-test-utils": "^0.1.1",
"@backstage/repo-tools": "^0.13.1",
"@backstage/repo-tools": "^0.13.2",
"@changesets/cli": "^2.27.1",
"knip": "^5.27.4",
"node-gyp": "^10.0.0",
Expand Down
46 changes: 23 additions & 23 deletions workspaces/jaeger/packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,30 +21,30 @@
"dependencies": {
"@backstage-community/plugin-jaeger": "workspace:^",
"@backstage-community/plugin-tech-radar": "^0.7.4",
"@backstage/app-defaults": "^1.6.0",
"@backstage/app-defaults": "^1.6.1",
"@backstage/catalog-model": "^1.7.3",
"@backstage/cli": "^0.31.0",
"@backstage/core-app-api": "^1.16.0",
"@backstage/core-components": "^0.17.0",
"@backstage/core-plugin-api": "^1.10.5",
"@backstage/integration-react": "^1.2.5",
"@backstage/plugin-api-docs": "^0.12.5",
"@backstage/plugin-catalog": "^1.28.0",
"@backstage/cli": "^0.32.0",
"@backstage/core-app-api": "^1.16.1",
"@backstage/core-components": "^0.17.1",
"@backstage/core-plugin-api": "^1.10.6",
"@backstage/integration-react": "^1.2.6",
"@backstage/plugin-api-docs": "^0.12.6",
"@backstage/plugin-catalog": "^1.29.0",
"@backstage/plugin-catalog-common": "^1.1.3",
"@backstage/plugin-catalog-graph": "^0.4.17",
"@backstage/plugin-catalog-import": "^0.12.11",
"@backstage/plugin-catalog-react": "^1.16.0",
"@backstage/plugin-kubernetes": "^0.12.5",
"@backstage/plugin-org": "^0.6.37",
"@backstage/plugin-permission-react": "^0.4.32",
"@backstage/plugin-scaffolder": "^1.29.0",
"@backstage/plugin-search": "^1.4.24",
"@backstage/plugin-search-react": "^1.8.7",
"@backstage/plugin-techdocs": "^1.12.4",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.22",
"@backstage/plugin-techdocs-react": "^1.2.15",
"@backstage/plugin-user-settings": "^0.8.20",
"@backstage/theme": "^0.6.4",
"@backstage/plugin-catalog-graph": "^0.4.18",
"@backstage/plugin-catalog-import": "^0.12.13",
"@backstage/plugin-catalog-react": "^1.17.0",
"@backstage/plugin-kubernetes": "^0.12.6",
"@backstage/plugin-org": "^0.6.38",
"@backstage/plugin-permission-react": "^0.4.33",
"@backstage/plugin-scaffolder": "^1.30.1",
"@backstage/plugin-search": "^1.4.25",
"@backstage/plugin-search-react": "^1.8.8",
"@backstage/plugin-techdocs": "^1.12.5",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.23",
"@backstage/plugin-techdocs-react": "^1.2.16",
"@backstage/plugin-user-settings": "^0.8.21",
"@backstage/theme": "^0.6.5",
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"history": "^5.0.0",
Expand All @@ -55,7 +55,7 @@
"react-use": "^17.2.4"
},
"devDependencies": {
"@backstage/test-utils": "^1.7.6",
"@backstage/test-utils": "^1.7.7",
"@playwright/test": "^1.32.3",
"@testing-library/dom": "^9.0.0",
"@testing-library/jest-dom": "^6.0.0",
Expand Down
1 change: 0 additions & 1 deletion workspaces/jaeger/packages/app/src/App.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import React from 'react';
import { render, waitFor } from '@testing-library/react';
import App from './App';

Expand Down
1 change: 0 additions & 1 deletion workspaces/jaeger/packages/app/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import React from 'react';
import { Navigate, Route } from 'react-router-dom';
import { apiDocsPlugin, ApiExplorerPage } from '@backstage/plugin-api-docs';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import React from 'react';
import { makeStyles } from '@material-ui/core';

const useStyles = makeStyles({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import React from 'react';
import { makeStyles } from '@material-ui/core';

const useStyles = makeStyles({
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 React, { PropsWithChildren } from 'react';
import { PropsWithChildren } from 'react';
import { makeStyles } from '@material-ui/core';
import HomeIcon from '@material-ui/icons/Home';
import ExtensionIcon from '@material-ui/icons/Extension';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import React from 'react';
import { Button, Grid } from '@material-ui/core';
import {
EntityApiDefinitionCard,
Expand Down Expand Up @@ -97,7 +96,6 @@ const cicdContent = (
<EntityGithubActionsContent />
</EntitySwitch.Case>
*/}

<EntitySwitch.Case>
<EmptyState
title="No CI/CD available for this entity"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import React from 'react';
import { makeStyles, Theme, Grid, Paper } from '@material-ui/core';

import { CatalogSearchResultListItem } from '@backstage/plugin-catalog';
Expand Down
1 change: 0 additions & 1 deletion workspaces/jaeger/packages/app/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* limitations under the License.
*/
import '@backstage/cli/asset-types';
import React from 'react';
import ReactDOM from 'react-dom/client';
import App from './App';

Expand Down
42 changes: 21 additions & 21 deletions workspaces/jaeger/packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,35 @@
"build-image": "docker build ../.. -f Dockerfile --tag backstage"
},
"dependencies": {
"@backstage/backend-defaults": "^0.8.2",
"@backstage/backend-defaults": "^0.9.0",
"@backstage/config": "^1.3.2",
"@backstage/plugin-app-backend": "^0.5.0",
"@backstage/plugin-auth-backend": "^0.24.4",
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.6",
"@backstage/plugin-auth-node": "^0.6.1",
"@backstage/plugin-catalog-backend": "^1.32.0",
"@backstage/plugin-catalog-backend-module-logs": "^0.1.8",
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.6",
"@backstage/plugin-kubernetes-backend": "^0.19.4",
"@backstage/plugin-permission-backend": "^0.5.55",
"@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.6",
"@backstage/plugin-app-backend": "^0.5.1",
"@backstage/plugin-auth-backend": "^0.24.5",
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.7",
"@backstage/plugin-auth-node": "^0.6.2",
"@backstage/plugin-catalog-backend": "^1.32.1",
"@backstage/plugin-catalog-backend-module-logs": "^0.1.9",
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.7",
"@backstage/plugin-kubernetes-backend": "^0.19.5",
"@backstage/plugin-permission-backend": "^0.6.0",
"@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.7",
"@backstage/plugin-permission-common": "^0.8.4",
"@backstage/plugin-permission-node": "^0.9.0",
"@backstage/plugin-proxy-backend": "^0.6.0",
"@backstage/plugin-scaffolder-backend": "^1.31.0",
"@backstage/plugin-search-backend": "^2.0.0",
"@backstage/plugin-search-backend-module-catalog": "^0.3.2",
"@backstage/plugin-search-backend-module-pg": "^0.5.42",
"@backstage/plugin-search-backend-module-techdocs": "^0.4.0",
"@backstage/plugin-search-backend-node": "^1.3.9",
"@backstage/plugin-techdocs-backend": "^2.0.0",
"@backstage/plugin-permission-node": "^0.9.1",
"@backstage/plugin-proxy-backend": "^0.6.1",
"@backstage/plugin-scaffolder-backend": "^1.32.1",
"@backstage/plugin-search-backend": "^2.0.1",
"@backstage/plugin-search-backend-module-catalog": "^0.3.3",
"@backstage/plugin-search-backend-module-pg": "^0.5.43",
"@backstage/plugin-search-backend-module-techdocs": "^0.4.1",
"@backstage/plugin-search-backend-node": "^1.3.10",
"@backstage/plugin-techdocs-backend": "^2.0.1",
"app": "link:../app",
"better-sqlite3": "^9.0.0",
"node-gyp": "^10.0.0",
"pg": "^8.11.3"
},
"devDependencies": {
"@backstage/cli": "^0.31.0"
"@backstage/cli": "^0.32.0"
},
"files": [
"dist"
Expand Down
2 changes: 1 addition & 1 deletion workspaces/jaeger/plugins/jaeger-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"postpack": "backstage-cli package postpack"
},
"devDependencies": {
"@backstage/cli": "^0.31.0"
"@backstage/cli": "^0.32.0"
},
"files": [
"dist"
Expand Down
1 change: 0 additions & 1 deletion workspaces/jaeger/plugins/jaeger/dev/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import React from 'react';
import { createDevApp } from '@backstage/dev-utils';
import { jaegerPlugin, JaegerCard } from '../src/plugin';

Expand Down
16 changes: 8 additions & 8 deletions workspaces/jaeger/plugins/jaeger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
"dependencies": {
"@backstage-community/plugin-jaeger-common": "workspace:^",
"@backstage/catalog-model": "^1.7.3",
"@backstage/core-components": "^0.17.0",
"@backstage/core-plugin-api": "^1.10.5",
"@backstage/core-components": "^0.17.1",
"@backstage/core-plugin-api": "^1.10.6",
"@backstage/errors": "^1.2.7",
"@backstage/plugin-catalog-react": "^1.16.0",
"@backstage/theme": "^0.6.4",
"@backstage/plugin-catalog-react": "^1.17.0",
"@backstage/theme": "^0.6.5",
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.61",
Expand All @@ -50,10 +50,10 @@
"react": "^16.13.1 || ^17.0.0 || ^18.0.0"
},
"devDependencies": {
"@backstage/cli": "^0.31.0",
"@backstage/core-app-api": "^1.16.0",
"@backstage/dev-utils": "^1.1.8",
"@backstage/test-utils": "^1.7.6",
"@backstage/cli": "^0.32.0",
"@backstage/core-app-api": "^1.16.1",
"@backstage/dev-utils": "^1.1.9",
"@backstage/test-utils": "^1.7.7",
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.0.0",
Expand Down
4 changes: 1 addition & 3 deletions workspaces/jaeger/plugins/jaeger/report.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).

```ts
/// <reference types="react" />

import { BackstagePlugin } from '@backstage/core-plugin-api';
import { Entity } from '@backstage/catalog-model';
import { JSX as JSX_2 } from 'react';
import { JSX as JSX_2 } from 'react/jsx-runtime';
import { RouteRef } from '@backstage/core-plugin-api';

// @public (undocumented)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* limitations under the License.
*/

import React from 'react';
import { Grid } from '@material-ui/core';
import { Content } from '@backstage/core-components';
import { JaegerFetchComponent } from './JaegerFetchComponent';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* limitations under the License.
*/

import React from 'react';
import {
Table,
TableColumn,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* limitations under the License.
*/

import React from 'react';
import { Table, TableColumn } from '@backstage/core-components';
import prettyMilliseconds from 'pretty-ms';
import { Span } from '@backstage-community/plugin-jaeger-common';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import React, { ChangeEvent, useState } from 'react';
import { ChangeEvent, useState } from 'react';

import Drawer from '@material-ui/core/Drawer';
import Grid from '@material-ui/core/Grid';
Expand Down
3 changes: 2 additions & 1 deletion workspaces/jaeger/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"rootDir": ".",
"lib": ["DOM", "DOM.Iterable", "ScriptHost", "ES2022"],
"target": "ES2022",
"useUnknownInCatchVariables": false
"useUnknownInCatchVariables": false,
"jsx": "react-jsx"
}
}
Loading