Skip to content

Commit f662be3

Browse files
Merge branch 'main' into feature/readme
2 parents fa5a4cb + 3a60d43 commit f662be3

File tree

6 files changed

+233
-237
lines changed

6 files changed

+233
-237
lines changed

.github/workflows/npm-publish.yml

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,7 @@ on:
55
types: [created]
66

77
jobs:
8-
validate:
9-
runs-on: ubuntu-latest
10-
steps:
11-
- uses: actions/checkout@v3
12-
- uses: actions/setup-node@v3
13-
with:
14-
node-version: 16
15-
- run: |
16-
npm i -g yarn
17-
yarn install
18-
yarn tsc
19-
20-
publish-npm:
21-
needs: validate
8+
validate-and-publish:
229
runs-on: ubuntu-latest
2310
steps:
2411
- uses: actions/checkout@v3
@@ -27,9 +14,9 @@ jobs:
2714
node-version: 16
2815
registry-url: https://registry.npmjs.org/
2916
- run: |
17+
npm i -g yarn
3018
yarn install
3119
yarn tsc
3220
yarn build
33-
npm publish
3421
env:
3522
NODE_AUTH_TOKEN: ${{secrets.npm_token}}

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@statusneo/backstage-plugin-github",
3-
"version": "0.2.0",
3+
"version": "0.2.1",
44
"main": "src/index.ts",
55
"types": "src/index.ts",
66
"license": "ISC",
@@ -11,7 +11,7 @@
1111
},
1212
"repository": {
1313
"type": "git",
14-
"url": ""
14+
"url": "https://github.com/StatusNeo/backstage-plugin-github"
1515
},
1616
"backstage": {
1717
"role": "frontend-plugin"
@@ -36,14 +36,15 @@
3636
"@backstage/errors": "^1.1.4",
3737
"@backstage/theme": "^0.2.16",
3838
"@material-table/core": "v3.1.0",
39-
"@material-ui/core": "^4.9.13",
39+
"@material-ui/core": "^4.12.2",
4040
"@material-ui/icons": "^4.9.1",
4141
"@material-ui/lab": "^4.0.0-alpha.57",
4242
"@tanstack/react-query": "^4.22.0",
4343
"react-use": "^17.2.4"
4444
},
4545
"peerDependencies": {
46-
"react": "^16.13.1 || ^17.0.0"
46+
"react": "^16.13.1 || ^17.0.0",
47+
"react-dom": "^16.13.1 || ^17.0.0"
4748
},
4849
"devDependencies": {
4950
"@backstage/cli": "^0.22.1",

src/components/SignInContent.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ type Props = {
2121
handleAuthClick: React.MouseEventHandler<HTMLElement>;
2222
};
2323

24-
2524
export const SignInContent = ({ handleAuthClick }: Props) => {
2625
return (
2726
// @ts-ignore
2827
<Box position="relative" height="100%" width="100%" minHeight={100}>
29-
// @ts-ignore
28+
{/* @ts-ignore */}
3029
<Box
3130
height="100%"
3231
width="100%"

src/components/UserPullRequestsCard/columns.tsx

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,14 @@ export const titleColumn: TableColumn<PullRequest> = {
2323
key={`${row.id}_pull-req-title`}
2424
>
2525
<RequestStatus req={row as PullRequest} />
26-
<Box ml={1} component="span">
27-
<Link href={row.html_url} target="_blank">
28-
{row.title}
29-
</Link>
30-
</Box>
26+
<>
27+
{/* @ts-ignore */}
28+
<Box ml={1} component="span">
29+
<Link href={row.html_url} target="_blank">
30+
{row.title}
31+
</Link>
32+
</Box>
33+
</>
3134
</Typography>
3235
),
3336
};
@@ -45,7 +48,7 @@ export const authorColumn: TableColumn<PullRequest> = {
4548
height: 32,
4649
width: 32,
4750
margin: 'auto',
48-
border: '2px solid #e2e2e2'
51+
border: '2px solid #e2e2e2',
4952
}}
5053
picture={row.user?.avatar_url || row.user?.gravatar_id}
5154
displayName={row.user?.login || ''}
@@ -62,17 +65,17 @@ export const repositoryColumn: TableColumn<PullRequest> = {
6265
sorting: false,
6366
render: (row: PullRequest) => (
6467
<Typography
65-
variant="body2"
66-
noWrap
67-
align="left"
68-
style={{
69-
width: 'inherit',
70-
}}
71-
component={Link}
72-
href={`https://www.github.com${row.repository_url.split('/repos')[1]}`}
73-
target="_blank"
74-
key={`${row.id}_pull-req-repo`}
75-
>
68+
variant="body2"
69+
noWrap
70+
align="left"
71+
style={{
72+
width: 'inherit',
73+
}}
74+
component={Link}
75+
href={`https://www.github.com${row.repository_url.split('/repos')[1]}`}
76+
target="_blank"
77+
key={`${row.id}_pull-req-repo`}
78+
>
7679
{row.repository_url.split('/').reverse()[0]}
7780
</Typography>
7881
),

tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
],
66
"compilerOptions": {
77
"outDir": "dist-types",
8-
"rootDir": ".",
9-
"useUnknownInCatchVariables": false
8+
"incremental": false
109
}
1110
}

0 commit comments

Comments
 (0)