Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Nikita Nek Dudnik
2020-05-15 11:37:02 +02:00
176 changed files with 4778 additions and 838 deletions
+15 -14
View File
@@ -1,19 +1,20 @@
{
"name": "example-app",
"version": "0.1.1-alpha.4",
"version": "0.1.1-alpha.5",
"private": true,
"dependencies": {
"@backstage/cli": "^0.1.1-alpha.4",
"@backstage/core": "^0.1.1-alpha.4",
"@backstage/cli": "^0.1.1-alpha.5",
"@backstage/core": "^0.1.1-alpha.5",
"@backstage/plugin-circleci": "^0.1.1-alpha.4",
"@backstage/plugin-explore": "^0.1.1-alpha.4",
"@backstage/plugin-home-page": "^0.1.1-alpha.4",
"@backstage/plugin-inventory": "^0.1.1-alpha.4",
"@backstage/plugin-lighthouse": "^0.1.1-alpha.4",
"@backstage/plugin-scaffolder": "^0.1.1-alpha.4",
"@backstage/plugin-tech-radar": "^0.1.1-alpha.4",
"@backstage/plugin-welcome": "^0.1.1-alpha.4",
"@backstage/theme": "^0.1.1-alpha.4",
"@backstage/plugin-catalog": "^0.1.1-alpha.5",
"@backstage/plugin-explore": "^0.1.1-alpha.5",
"@backstage/plugin-home-page": "^0.1.1-alpha.5",
"@backstage/plugin-lighthouse": "^0.1.1-alpha.5",
"@backstage/plugin-register-component": "^0.1.1-alpha.5",
"@backstage/plugin-scaffolder": "^0.1.1-alpha.5",
"@backstage/plugin-tech-radar": "^0.1.1-alpha.5",
"@backstage/plugin-welcome": "^0.1.1-alpha.5",
"@backstage/theme": "^0.1.1-alpha.5",
"@material-ui/core": "^4.9.1",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.45",
@@ -21,8 +22,8 @@
"prop-types": "^15.7.2",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"react-router-dom": "^5.1.2",
"react-use": "^13.24.0",
"react-router-dom": "^5.2.0",
"react-use": "^14.2.0",
"zen-observable": "^0.8.15"
},
"devDependencies": {
@@ -30,7 +31,7 @@
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2",
"@types/jest": "^24.0.0",
"@types/jest": "^25.2.1",
"@types/jquery": "^3.3.34",
"@types/node": "^12.0.0",
"@types/react-router-dom": "^5.1.3",