paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 40 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
# Conflicts:
#	packages/core/src/components/Table/Table.tsx
#	yarn.lock
This commit is contained in:
Nikita Nek Dudnik
2020-05-11 11:12:52 +02:00
parent 9cd104a103 24928cf283
commit cae74aac85
32 changed files with 455 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/explore/package.json
+5 -4
View File
@@ -9,6 +9,7 @@
"build": "backstage-cli plugin:build",
"lint": "backstage-cli lint",
"test": "backstage-cli test",
"diff": "backstage-cli plugin:diff",
"clean": "backstage-cli clean"
},
"dependencies": {
@@ -18,9 +19,9 @@
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.45",
"classnames": "^2.2.6",
"react": "16.13.1",
"react-dom": "16.13.1",
"react-use": "^13.0.0"
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-use": "^13.24.0"
},
"devDependencies": {
"@backstage/cli": "^0.1.1-alpha.4",
@@ -30,7 +31,7 @@
"@testing-library/user-event": "^7.1.2",
"@types/jest": "^24.0.0",
"@types/node": "^12.0.0",
"@types/testing-library__jest-dom": "5.0.4",
"@types/testing-library__jest-dom": "^5.0.4",
"jest-fetch-mock": "^3.0.3"
},
"files": [
plugins/explore/src/components/ExplorePluginPage.tsx
+1 -1
View File
@@ -59,7 +59,7 @@ const toolsCards = [
title: 'GraphiQL',
description:
'Integrates GraphiQL as a tool to browse GraphiQL endpoints inside Backstage.',
url: 'graphiql',
url: '/graphiql',
image:
'https://camo.githubusercontent.com/517398c3fbe0687d3d4dcbe05da82970b882e75a/68747470733a2f2f64337676366c703535716a6171632e636c6f756466726f6e742e6e65742f6974656d732f33413061324e314c3346324f304c3377326e316a2f477261706869514c382e706e673f582d436c6f75644170702d56697369746f722d49643d3433363432',
tags: ['graphql', 'dev'],
plugins/graphiql/package.json
+5 -4
View File
@@ -23,6 +23,7 @@
"start": "backstage-cli plugin:serve",
"lint": "backstage-cli lint",
"test": "backstage-cli test",
"diff": "backstage-cli plugin:diff",
"clean": "backstage-cli clean"
},
"dependencies": {
@@ -33,9 +34,9 @@
"@material-ui/lab": "4.0.0-alpha.45",
"graphiql": "^1.0.0-alpha.8",
"graphql": "15.0.0",
"react": "16.13.1",
"react-dom": "16.13.1",
"react-use": "^13.0.0"
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-use": "^13.24.0"
},
"devDependencies": {
"@backstage/cli": "^0.1.1-alpha.4",
@@ -46,7 +47,7 @@
"@testing-library/user-event": "^7.1.2",
"@types/jest": "^24.0.0",
"@types/node": "^12.0.0",
"@types/testing-library__jest-dom": "5.0.4",
"@types/testing-library__jest-dom": "^5.0.4",
"jest-fetch-mock": "^3.0.3",
"react-router-dom": "^5.1.2"
},
plugins/home-page/package.json
+7 -4
View File
@@ -10,6 +10,7 @@
"start": "backstage-cli plugin:serve",
"lint": "backstage-cli lint",
"test": "backstage-cli test",
"diff": "backstage-cli plugin:diff",
"clean": "backstage-cli clean"
},
"dependencies": {
@@ -18,8 +19,9 @@
"@material-ui/core": "^4.9.1",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.45",
"react": "16.13.1",
"react-dom": "16.13.1"
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-use": "^13.24.0"
},
"devDependencies": {
"@backstage/cli": "^0.1.1-alpha.4",
@@ -29,8 +31,9 @@
"@testing-library/user-event": "^7.1.2",
"@types/jest": "^24.0.0",
"@types/node": "^12.0.0",
"@types/testing-library__jest-dom": "5.0.4",
"react-router-dom": "^5.1.2"
"@types/testing-library__jest-dom": "^5.0.4",
"react-router-dom": "^5.1.2",
"jest-fetch-mock": "^3.0.3"
},
"files": [
"dist"
plugins/inventory/package.json
+5 -4
View File
@@ -10,6 +10,7 @@
"start": "backstage-cli plugin:serve",
"lint": "backstage-cli lint",
"test": "backstage-cli test",
"diff": "backstage-cli plugin:diff",
"clean": "backstage-cli clean"
},
"dependencies": {
@@ -18,9 +19,9 @@
"@material-ui/core": "^4.9.1",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.45",
"react": "16.13.1",
"react-dom": "16.13.1",
"react-use": "^13.0.0"
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-use": "^13.24.0"
},
"devDependencies": {
"@backstage/cli": "^0.1.1-alpha.4",
@@ -29,7 +30,7 @@
"@testing-library/user-event": "^7.1.2",
"@types/jest": "^24.0.0",
"@types/node": "^12.0.0",
"@types/testing-library__jest-dom": "5.0.4",
"@types/testing-library__jest-dom": "^5.0.4",
"jest-fetch-mock": "^3.0.3"
},
"files": [
plugins/lighthouse/package.json
+2 -2
View File
@@ -6,10 +6,10 @@
"license": "Apache-2.0",
"private": true,
"scripts": {
"build:watch": "backstage-cli plugin:build --watch",
"build": "backstage-cli plugin:build",
"lint": "backstage-cli lint",
"test": "backstage-cli test",
"diff": "backstage-cli plugin:diff",
"clean": "backstage-cli clean"
},
"dependencies": {
@@ -32,7 +32,7 @@
"@testing-library/user-event": "^7.1.2",
"@types/jest": "^24.0.0",
"@types/node": "^12.0.0",
"@types/testing-library__jest-dom": "5.0.4",
"@types/testing-library__jest-dom": "^5.0.4",
"jest-fetch-mock": "^3.0.3"
},
"files": [
plugins/lighthouse/tsconfig.json
+1 -4
View File
@@ -1,8 +1,5 @@
{
"extends": "../../tsconfig.json",
"include": ["src"],
"compilerOptions": {
"resolveJsonModule": true,
"esModuleInterop": true
}
"compilerOptions": {}
}
plugins/scaffolder/package.json
+5 -4
View File
@@ -10,6 +10,7 @@
"start": "backstage-cli plugin:serve",
"lint": "backstage-cli lint",
"test": "backstage-cli test",
"diff": "backstage-cli plugin:diff",
"clean": "backstage-cli clean"
},
"dependencies": {
@@ -18,9 +19,9 @@
"@material-ui/core": "^4.9.1",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.45",
"react": "16.13.1",
"react-dom": "16.13.1",
"react-use": "^13.0.0"
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-use": "^13.24.0"
},
"devDependencies": {
"@backstage/cli": "^0.1.1-alpha.4",
@@ -29,7 +30,7 @@
"@testing-library/user-event": "^7.1.2",
"@types/jest": "^24.0.0",
"@types/node": "^12.0.0",
"@types/testing-library__jest-dom": "5.0.4",
"@types/testing-library__jest-dom": "^5.0.4",
"jest-fetch-mock": "^3.0.3"
},
"files": [
plugins/tech-radar/package.json
+9 -5
View File
@@ -9,6 +9,7 @@
"build": "backstage-cli plugin:build",
"lint": "backstage-cli lint",
"test": "backstage-cli test",
"diff": "backstage-cli plugin:diff",
"clean": "backstage-cli clean"
},
"dependencies": {
@@ -21,9 +22,9 @@
"color": "^3.1.2",
"d3-force": "^2.0.1",
"prop-types": "^15.7.2",
"react": "16.13.1",
"react-dom": "16.13.1",
"react-use": "^13.0.0"
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-use": "^13.24.0"
},
"devDependencies": {
"@backstage/cli": "^0.1.1-alpha.4",
@@ -34,7 +35,10 @@
"@types/d3-force": "^1.2.1",
"@types/jest": "^24.0.0",
"@types/node": "^12.0.0",
"@types/testing-library__jest-dom": "5.0.4",
"@types/testing-library__jest-dom": "^5.0.4",
"jest-fetch-mock": "^3.0.3"
}
},
"files": [
"dist"
]
}
plugins/welcome/package.json
+7 -4
View File
@@ -9,6 +9,7 @@
"build": "backstage-cli plugin:build",
"lint": "backstage-cli lint",
"test": "backstage-cli test",
"diff": "backstage-cli plugin:diff",
"clean": "backstage-cli clean"
},
"dependencies": {
@@ -17,9 +18,10 @@
"@material-ui/core": "^4.9.1",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.45",
"react": "16.13.1",
"react-dom": "16.13.1",
"react-router-dom": "5.1.2"
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-router-dom": "5.1.2",
"react-use": "^13.24.0"
},
"devDependencies": {
"@backstage/cli": "^0.1.1-alpha.4",
@@ -28,7 +30,8 @@
"@testing-library/user-event": "^7.1.2",
"@types/jest": "^24.0.0",
"@types/node": "^12.0.0",
"@types/testing-library__jest-dom": "5.0.4"
"@types/testing-library__jest-dom": "^5.0.4",
"jest-fetch-mock": "^3.0.3"
},
"files": [
"dist"