Merge remote-tracking branch 'origin/master' into reconfigure

# Conflicts:
#	packages/app/package.json
#	yarn.lock
This commit is contained in:
bnechyporenko
2022-07-13 10:53:56 +02:00
315 changed files with 5753 additions and 1508 deletions
+14
View File
@@ -1,5 +1,19 @@
# @backstage/plugin-bazaar
## 0.1.22-next.3
### Patch Changes
- 4e9a90e307: Updated dependency `luxon` to `^3.0.0`.
- Updated dependencies
- @backstage/core-plugin-api@1.0.4-next.0
- @backstage/core-components@0.10.0-next.3
- @backstage/catalog-client@1.0.4-next.2
- @backstage/cli@0.18.0-next.3
- @backstage/catalog-model@1.1.0-next.3
- @backstage/plugin-catalog-react@1.1.2-next.3
- @backstage/plugin-catalog@1.4.0-next.3
## 0.1.22-next.2
### Patch Changes
+11 -11
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-bazaar",
"version": "0.1.22-next.2",
"version": "0.1.22-next.3",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -24,20 +24,20 @@
"clean": "backstage-cli package clean"
},
"dependencies": {
"@backstage/catalog-client": "^1.0.4-next.1",
"@backstage/catalog-model": "^1.1.0-next.2",
"@backstage/cli": "^0.18.0-next.2",
"@backstage/core-components": "^0.10.0-next.2",
"@backstage/core-plugin-api": "^1.0.3",
"@backstage/plugin-catalog": "^1.4.0-next.2",
"@backstage/plugin-catalog-react": "^1.1.2-next.2",
"@backstage/catalog-client": "^1.0.4-next.2",
"@backstage/catalog-model": "^1.1.0-next.3",
"@backstage/cli": "^0.18.0-next.3",
"@backstage/core-components": "^0.10.0-next.3",
"@backstage/core-plugin-api": "^1.0.4-next.0",
"@backstage/plugin-catalog": "^1.4.0-next.3",
"@backstage/plugin-catalog-react": "^1.1.2-next.3",
"@date-io/luxon": "1.x",
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
"@material-ui/pickers": "^3.3.10",
"@testing-library/jest-dom": "^5.10.1",
"luxon": "^2.0.2",
"luxon": "^3.0.0",
"material-ui-search-bar": "^1.0.0",
"react-hook-form": "^7.13.0",
"react-router-dom": "6.0.0-beta.0",
@@ -47,8 +47,8 @@
"react": "^16.13.1 || ^17.0.0"
},
"devDependencies": {
"@backstage/cli": "^0.18.0-next.2",
"@backstage/dev-utils": "^1.0.4-next.2",
"@backstage/cli": "^0.18.0-next.3",
"@backstage/dev-utils": "^1.0.4-next.3",
"@testing-library/jest-dom": "^5.10.1",
"cross-fetch": "^3.1.5"
},