Skip to content

Fix lint and unit test errors - migrate to new JSX transform #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"test:all": "backstage-cli repo test --coverage",
"test:e2e": "playwright test",
"fix": "backstage-cli repo fix",
"lint": "backstage-cli repo lint --since origin/main",
"lint": "backstage-cli repo lint --since main",
"lint:all": "backstage-cli repo lint",
"prettier:check": "prettier --check .",
"new": "backstage-cli new --scope internal",
Expand Down
3 changes: 3 additions & 0 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@
"@emotion/styled": "^11.11.5",
"@fontsource/inter": "^5.0.18",
"@internal/backstage-plugin-plausible": "^0.1.0",
"@material-ui/core": "^4.12.4",
"@mui/icons-material": "^5.15.19",
"@mui/joy": "^5.0.0-beta.36",
"@mui/material": "^5.15.19",
"@mui/styles": "^5.18.0",
"@mui/system": "^5.15.19",
"@mui/utils": "^5.15.14",
"@mui/x-charts": "^8.0.0",
"history": "^5.0.0",
Expand All @@ -65,6 +67,7 @@
"@testing-library/user-event": "^14.0.0",
"@types/jest": "^29.5.12",
"@types/node": "^20.14.9",
"@types/react": "^18",
"@types/react-dom": "*",
"@types/webpack-env": "^1.18.5",
"cross-env": "^7.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/App.test.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';

import { render, waitFor } from '@testing-library/react';
import App from './App';

Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';

import { Route } from 'react-router-dom';
import { apiDocsPlugin, ApiExplorerPage } from '@backstage/plugin-api-docs';
import {
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/components/Root/Root.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { PropsWithChildren } from 'react';
import { PropsWithChildren } from 'react';
import { styled } from '@mui/material/styles';
import Home from '@mui/icons-material/Home';
import LogoFull from './LogoFull';
Expand Down
4 changes: 2 additions & 2 deletions packages/app/src/components/catalog/EntityPage.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';

import {
EntityApiDefinitionCard,
EntityConsumedApisCard,
Expand Down Expand Up @@ -250,7 +250,7 @@ const apiPage = (
<Grid item md={6} marginBottom={-1}>
<EntityCatalogGraphCard variant="gridItem" height={400} />
</Grid>
<Grid md={8}>
<Grid item md={8}>
<Grid item md={12}>
<EntityProvidingComponentsCard variant="gridItem" />
</Grid>
Expand Down
5 changes: 3 additions & 2 deletions packages/app/src/components/home/HomePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ import Groups3Icon from '@mui/icons-material/Groups3';
import ArrowForwardIcon from '@mui/icons-material/ArrowForward';
import TrendingUpIcon from '@mui/icons-material/TrendingUp';
import TrendingDownIcon from '@mui/icons-material/TrendingDown';
import React from 'react';
import { useState } from 'react';

import Box from '@mui/material/Box';
import Typography from '@mui/material/Typography';
import CardContent from '@mui/material/CardContent';
Expand Down Expand Up @@ -73,7 +74,7 @@ const PageHeading: React.FC<{ icon: React.ReactNode; title: string }> = ({
);

export const HomePage = () => {
const [isSquad, setIsSquad] = React.useState(true);
const [isSquad, setIsSquad] = useState(true);
const theme = useTheme();

const months = [
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/components/icons/Aws.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';

interface IconProps {
width: number;
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/components/icons/Azure.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';

interface IconProps {
width: number;
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/components/icons/Bitbucket.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';

interface IconProps {
width: number;
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/components/icons/Confluence.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';

interface IconProps {
width: number;
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/components/icons/Discord.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';

interface IconProps {
width: number;
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/components/icons/Grafana.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';

interface IconProps {
width: number;
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/components/icons/Jira.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';

interface IconProps {
width: number;
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/components/icons/Prometheus.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';

interface IconProps {
width: number;
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/components/icons/Slack.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';

interface IconProps {
width: number;
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/components/search/SearchPage.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';

import { styled } from '@mui/material/styles';

import { CatalogSearchResultListItem } from '@backstage/plugin-catalog';
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import '@backstage/cli/asset-types';
import React from 'react';

import ReactDOM from 'react-dom/client';
import App from './App';

Expand Down
2 changes: 1 addition & 1 deletion plugins/plausible/dev/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';

import { createDevApp } from '@backstage/dev-utils';
import { plausiblePlugin } from '../src/plugin';

Expand Down
6 changes: 5 additions & 1 deletion plugins/plausible/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,16 @@
"@backstage/core-app-api": "^1.17.0",
"@backstage/dev-utils": "^1.1.10",
"@backstage/test-utils": "^1.7.8",
"@testing-library/dom": "^9.0.0",
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.0.0",
"@types/react": "^18",
"@types/react-helmet": "^6",
"msw": "^1.0.0",
"react": "^16.13.1 || ^17.0.0 || ^18.0.0"
"react": "^16.13.1 || ^17.0.0 || ^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^6.0.0"
},
"files": [
"dist",
Expand Down
2 changes: 1 addition & 1 deletion plugins/plausible/src/components/PlausibleAnalytics.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useApi, configApiRef } from '@backstage/core-plugin-api';
import React from 'react';

import { Helmet } from 'react-helmet';

export const PlausibleAnalytics = () => {
Expand Down
2 changes: 1 addition & 1 deletion plugins/plausible/src/plugin.test.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';

import { render, waitFor } from '@testing-library/react';
import { ConfigApi, configApiRef } from '@backstage/core-plugin-api';
import { TestApiProvider } from '@backstage/test-utils';
Expand Down
1 change: 1 addition & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"compilerOptions": {
"outDir": "dist-types",
"rootDir": ".",
"jsx": "react-jsx",
"noUnusedLocals": false
}
}
Loading