Merge branch 'master' into gitops-profiles

This commit is contained in:
Patrik Oldsberg
2020-06-09 23:24:34 +02:00
committed by GitHub
297 changed files with 9817 additions and 3623 deletions
+18 -17
View File
@@ -1,27 +1,28 @@
{
"name": "example-app",
"version": "0.1.1-alpha.6",
"version": "0.1.1-alpha.7",
"private": true,
"dependencies": {
"@backstage/cli": "^0.1.1-alpha.6",
"@backstage/core": "^0.1.1-alpha.6",
"@backstage/plugin-catalog": "^0.1.1-alpha.6",
"@backstage/plugin-circleci": "^0.1.1-alpha.6",
"@backstage/plugin-explore": "^0.1.1-alpha.6",
"@backstage/plugin-gitops-profiles": "^0.1.1-alpha.6",
"@backstage/plugin-home-page": "^0.1.1-alpha.6",
"@backstage/plugin-lighthouse": "^0.1.1-alpha.6",
"@backstage/plugin-register-component": "^0.1.1-alpha.6",
"@backstage/plugin-scaffolder": "^0.1.1-alpha.6",
"@backstage/plugin-sentry": "^0.1.1-alpha.6",
"@backstage/plugin-tech-radar": "^0.1.1-alpha.6",
"@backstage/plugin-welcome": "^0.1.1-alpha.6",
"@backstage/theme": "^0.1.1-alpha.6",
"@backstage/cli": "^0.1.1-alpha.7",
"@backstage/core": "^0.1.1-alpha.7",
"@backstage/plugin-catalog": "^0.1.1-alpha.7",
"@backstage/plugin-circleci": "^0.1.1-alpha.7",
"@backstage/plugin-explore": "^0.1.1-alpha.7",
"@backstage/plugin-gitops-profiles": "^0.1.1-alpha.7",
"@backstage/plugin-home-page": "^0.1.1-alpha.7",
"@backstage/plugin-lighthouse": "^0.1.1-alpha.7",
"@backstage/plugin-register-component": "^0.1.1-alpha.7",
"@backstage/plugin-scaffolder": "^0.1.1-alpha.7",
"@backstage/plugin-sentry": "^0.1.1-alpha.7",
"@backstage/plugin-tech-radar": "^0.1.1-alpha.7",
"@backstage/plugin-welcome": "^0.1.1-alpha.7",
"@backstage/theme": "^0.1.1-alpha.7",
"@material-ui/core": "^4.9.1",
"@material-ui/icons": "^4.9.1",
"prop-types": "^15.7.2",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"react-hot-loader": "^4.12.21",
"react-router-dom": "^5.2.0",
"react-use": "^14.2.0",
"zen-observable": "^0.8.15"
@@ -74,10 +75,10 @@
}
},
"/catalog/api": {
"target": "http://localhost:3003",
"target": "http://localhost:7000",
"changeOrigin": true,
"pathRewrite": {
"^/catalog/api/": "/"
"^/catalog/api/": "/catalog/"
}
}
}