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
+10
View File
@@ -1,5 +1,15 @@
# @backstage/plugin-gcalendar
## 0.3.3-next.3
### Patch Changes
- a70869e775: Updated dependency `msw` to `^0.43.0`.
- 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
## 0.3.3-next.2
### Patch Changes
+9 -9
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-gcalendar",
"version": "0.3.3-next.2",
"version": "0.3.3-next.3",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -22,8 +22,8 @@
"postpack": "backstage-cli package postpack"
},
"dependencies": {
"@backstage/core-components": "^0.10.0-next.2",
"@backstage/core-plugin-api": "^1.0.3",
"@backstage/core-components": "^0.10.0-next.3",
"@backstage/core-plugin-api": "^1.0.4-next.0",
"@backstage/errors": "^1.1.0-next.0",
"@backstage/theme": "^0.2.16-next.1",
"@material-ui/core": "^4.12.2",
@@ -34,7 +34,7 @@
"cross-fetch": "^3.1.5",
"dompurify": "^2.3.6",
"lodash": "^4.17.21",
"luxon": "^2.3.0",
"luxon": "^3.0.0",
"material-ui-popup-state": "^1.9.3",
"react-query": "^3.34.16",
"react-use": "^17.2.4"
@@ -43,10 +43,10 @@
"react": "^16.13.1 || ^17.0.0"
},
"devDependencies": {
"@backstage/cli": "^0.18.0-next.2",
"@backstage/core-app-api": "^1.0.4-next.0",
"@backstage/dev-utils": "^1.0.4-next.2",
"@backstage/test-utils": "^1.1.2-next.1",
"@backstage/cli": "^0.18.0-next.3",
"@backstage/core-app-api": "^1.0.4-next.1",
"@backstage/dev-utils": "^1.0.4-next.3",
"@backstage/test-utils": "^1.1.2-next.2",
"@testing-library/jest-dom": "^5.10.1",
"@testing-library/react": "^12.1.3",
"@testing-library/user-event": "^14.0.0",
@@ -55,7 +55,7 @@
"@types/node": "^16.11.26",
"@types/sanitize-html": "^2.6.2",
"cross-fetch": "^3.1.5",
"msw": "^0.43.0"
"msw": "^0.44.0"
},
"files": [
"dist"