rebase fixups

Signed-off-by: Emma Indal <emma.indahl@gmail.com>
This commit is contained in:
Emma Indal
2022-04-09 13:48:49 +02:00
parent b4ed5c1226
commit 88fd7d1e55
3 changed files with 9 additions and 255 deletions
+4 -4
View File
@@ -34,9 +34,9 @@
"start": "backstage-cli package start"
},
"dependencies": {
"@backstage/catalog-model": "^0.13.0",
"@backstage/core-components": "^0.9.1",
"@backstage/core-plugin-api": "^0.8.0",
"@backstage/catalog-model": "^1.0.1-next.1",
"@backstage/core-components": "^0.9.3-next.1",
"@backstage/core-plugin-api": "^1.0.0",
"@material-ui/core": "^4.12.2",
"@material-ui/lab": "4.0.0-alpha.57",
"@material-ui/styles": "^4.11.0",
@@ -51,7 +51,7 @@
},
"devDependencies": {
"@testing-library/react-hooks": "^7.0.2",
"@backstage/test-utils": "^0.3.0"
"@backstage/test-utils": "^1.0.1-next.1"
},
"files": [
"dist"
+1 -1
View File
@@ -44,7 +44,7 @@
"@backstage/integration": "^1.1.0-next.1",
"@backstage/integration-react": "^1.0.1-next.1",
"@backstage/plugin-catalog-react": "^1.0.1-next.2",
"@backstage/plugin-catalog": "^0.10.0",
"@backstage/plugin-catalog": "^1.1.0-next.2",
"@backstage/plugin-search": "^0.7.5-next.0",
"@backstage/techdocs-addons": "^0.0.0",
"@backstage/theme": "^0.2.15",
+4 -250
View File
@@ -1456,15 +1456,6 @@
"@babel/helper-validator-identifier" "^7.16.7"
to-fast-properties "^2.0.0"
"@backstage/catalog-client@^0.9.0":
version "0.9.0"
resolved "https://registry.npmjs.org/@backstage/catalog-client/-/catalog-client-0.9.0.tgz#3e1024fab13fd8e2000d33833d2463ea9be5df9d"
integrity sha1-PhAk+rE/2OIADTODPSRj6pvl350=
dependencies:
"@backstage/catalog-model" "^0.13.0"
"@backstage/errors" "^0.2.2"
cross-fetch "^3.1.5"
"@backstage/catalog-client@^1.0.0":
version "1.0.0"
resolved "https://registry.npmjs.org/@backstage/catalog-client/-/catalog-client-1.0.0.tgz#05f9ee3b771ca17e4800f5116d63bd183fe0c4d6"
@@ -1474,19 +1465,6 @@
"@backstage/errors" "^1.0.0"
cross-fetch "^3.1.5"
"@backstage/catalog-model@^0.13.0":
version "0.13.0"
resolved "https://registry.npmjs.org/@backstage/catalog-model/-/catalog-model-0.13.0.tgz#abeb91522ac7ef7907907ad5bc889803131db209"
integrity sha1-q+uRUirH73kHkHrVvIiYAxMdsgk=
dependencies:
"@backstage/config" "^0.1.15"
"@backstage/errors" "^0.2.2"
"@backstage/types" "^0.1.3"
ajv "^7.0.3"
json-schema "^0.4.0"
lodash "^4.17.21"
uuid "^8.0.0"
"@backstage/catalog-model@^1.0.0":
version "1.0.0"
resolved "https://registry.npmjs.org/@backstage/catalog-model/-/catalog-model-1.0.0.tgz#0aa8694a3182aaf4232725842da751bf5f78bd68"
@@ -1500,47 +1478,7 @@
lodash "^4.17.21"
uuid "^8.0.0"
"@backstage/config@^0.1.15":
version "0.1.15"
resolved "https://registry.npmjs.org/@backstage/config/-/config-0.1.15.tgz#4bad122ad861be5bd61a60639f92d2494fa245c5"
integrity sha512-eNJEYYSEu9MkrkBYiMpUBWEc3Bu64YgB9pZZGCMW7/9350tV2wbylEdoBJHslilJlJhiUyTXBckn8Ua7DOH7rw==
dependencies:
"@backstage/types" "^0.1.3"
lodash "^4.17.21"
"@backstage/core-app-api@^0.6.0":
version "0.6.0"
resolved "https://registry.npmjs.org/@backstage/core-app-api/-/core-app-api-0.6.0.tgz#691f0586d97682f1af67828ab2c67014397a530a"
integrity sha512-v1t1w/U/JHjm9eZupPmJpKH5WB0vysEFxRo6/Ia77VP6ZcPxszG4IG+d+S3Km5fM3lu4oosGiz+RaKUTLrttBA==
dependencies:
"@backstage/config" "^0.1.15"
"@backstage/core-plugin-api" "^0.8.0"
"@backstage/types" "^0.1.3"
"@backstage/version-bridge" "^0.1.2"
"@types/prop-types" "^15.7.3"
prop-types "^15.7.2"
react-router-dom "6.0.0-beta.0"
react-use "^17.2.4"
zen-observable "^0.8.15"
zod "^3.11.6"
"@backstage/core-app-api@^1.0.0":
version "1.0.0"
resolved "https://registry.npmjs.org/@backstage/core-app-api/-/core-app-api-1.0.0.tgz#2dae97b050b2f2e5ec1ea42b3d95c57e8bf434d6"
integrity sha512-hmoFMPCxAfHgDPQTHbf6rquiG0SCSycWTUrScpYeLwkH3UOekgX8o8ThKT0t3w7WPx83LwT0NqcbSH6zqI9nag==
dependencies:
"@backstage/config" "^1.0.0"
"@backstage/core-plugin-api" "^1.0.0"
"@backstage/types" "^1.0.0"
"@backstage/version-bridge" "^1.0.0"
"@types/prop-types" "^15.7.3"
prop-types "^15.7.2"
react-router-dom "6.0.0-beta.0"
react-use "^17.2.4"
zen-observable "^0.8.15"
zod "^3.11.6"
"@backstage/core-components@^0.9.0", "@backstage/core-components@^0.9.1", "@backstage/core-components@^0.9.2":
"@backstage/core-components@^0.9.0", "@backstage/core-components@^0.9.2":
version "0.9.2"
resolved "https://registry.npmjs.org/@backstage/core-components/-/core-components-0.9.2.tgz#9a3d79a15039256bbc007e5daa08c983050e0238"
integrity sha512-kh0FB0FmjC55W+xSEkKrAc7D6hvbYLY7N1UUd6M4VBghYXD61Y8RrJFKmBM3bAfPgYaryQNjYgA0BsoTo53PJA==
@@ -1584,43 +1522,6 @@
zen-observable "^0.8.15"
zod "^3.11.6"
"@backstage/core-plugin-api@^0.8.0":
version "0.8.0"
resolved "https://registry.npmjs.org/@backstage/core-plugin-api/-/core-plugin-api-0.8.0.tgz#e2096bff679183168a7f9b47ed27c50a01970e32"
integrity sha1-4glr/2eRgxaKf5tH7SfFCgGXDjI=
dependencies:
"@backstage/config" "^0.1.15"
"@backstage/types" "^0.1.3"
"@backstage/version-bridge" "^0.1.2"
history "^5.0.0"
prop-types "^15.7.2"
react-router-dom "6.0.0-beta.0"
zen-observable "^0.8.15"
"@backstage/errors@^0.2.2":
version "0.2.2"
resolved "https://registry.npmjs.org/@backstage/errors/-/errors-0.2.2.tgz#2113e0bc859e645b8b59bfcb435f7535739b02f8"
integrity sha1-IRPgvIWeZFuLWb/LQ191NXObAvg=
dependencies:
"@backstage/types" "^0.1.3"
cross-fetch "^3.1.5"
serialize-error "^8.0.1"
"@backstage/integration-react@^0.1.25":
version "0.1.25"
resolved "https://registry.npmjs.org/@backstage/integration-react/-/integration-react-0.1.25.tgz#ebbdd30d66e1d210b7cd33a682ad2be0d5ea5fc0"
integrity sha1-673TDWbh0hC3zTOmgq0r4NXqX8A=
dependencies:
"@backstage/config" "^0.1.15"
"@backstage/core-components" "^0.9.1"
"@backstage/core-plugin-api" "^0.8.0"
"@backstage/integration" "^0.8.0"
"@backstage/theme" "^0.2.15"
"@material-ui/core" "^4.12.2"
"@material-ui/icons" "^4.9.1"
"@material-ui/lab" "4.0.0-alpha.57"
react-use "^17.2.4"
"@backstage/integration-react@^1.0.0":
version "1.0.0"
resolved "https://registry.npmjs.org/@backstage/integration-react/-/integration-react-1.0.0.tgz#8075e65c6b5387631d27a9c242e7a4fff6f92417"
@@ -1636,19 +1537,6 @@
"@material-ui/lab" "4.0.0-alpha.57"
react-use "^17.2.4"
"@backstage/integration@^0.8.0":
version "0.8.0"
resolved "https://registry.npmjs.org/@backstage/integration/-/integration-0.8.0.tgz#d74131ad347272b4935973aa4bd098fad9548ce6"
integrity sha1-10ExrTRycrSTWXOqS9CY+tlUjOY=
dependencies:
"@backstage/config" "^0.1.15"
"@octokit/auth-app" "^3.4.0"
"@octokit/rest" "^18.5.3"
cross-fetch "^3.1.5"
git-url-parse "^11.6.0"
lodash "^4.17.21"
luxon "^2.0.2"
"@backstage/integration@^1.0.0":
version "1.0.0"
resolved "https://registry.npmjs.org/@backstage/integration/-/integration-1.0.0.tgz#e307cfddea014bfb0eb2281a5ae25ea0b742e9cf"
@@ -1662,41 +1550,6 @@
lodash "^4.17.21"
luxon "^2.0.2"
"@backstage/plugin-catalog-common@^0.2.2":
version "0.2.2"
resolved "https://registry.npmjs.org/@backstage/plugin-catalog-common/-/plugin-catalog-common-0.2.2.tgz#2f039ecd829d1d8e017609cb0bbf9af7c231ab63"
integrity sha1-LwOezYKdHY4BdgnLC7+a98Ixq2M=
dependencies:
"@backstage/plugin-permission-common" "^0.5.2"
"@backstage/search-common" "^0.3.1"
"@backstage/plugin-catalog-react@^0.9.0":
version "0.9.0"
resolved "https://registry.npmjs.org/@backstage/plugin-catalog-react/-/plugin-catalog-react-0.9.0.tgz#ff8c09ec455655fadb2c2fafd578908138b858bc"
integrity sha1-/4wJ7EVWVfrbLC+v1XiQgTi4WLw=
dependencies:
"@backstage/catalog-client" "^0.9.0"
"@backstage/catalog-model" "^0.13.0"
"@backstage/core-components" "^0.9.1"
"@backstage/core-plugin-api" "^0.8.0"
"@backstage/errors" "^0.2.2"
"@backstage/integration" "^0.8.0"
"@backstage/plugin-permission-common" "^0.5.2"
"@backstage/plugin-permission-react" "^0.3.3"
"@backstage/types" "^0.1.3"
"@backstage/version-bridge" "^0.1.2"
"@material-ui/core" "^4.12.2"
"@material-ui/icons" "^4.9.1"
"@material-ui/lab" "4.0.0-alpha.57"
classnames "^2.2.6"
jwt-decode "^3.1.0"
lodash "^4.17.21"
qs "^6.9.4"
react-router "6.0.0-beta.0"
react-use "^17.2.4"
yaml "^1.10.0"
zen-observable "^0.8.15"
"@backstage/plugin-catalog-react@^1.0.0":
version "1.0.0"
resolved "https://registry.npmjs.org/@backstage/plugin-catalog-react/-/plugin-catalog-react-1.0.0.tgz#4f42c070ffe5c9690e45a5288e18bacd8d4e0e66"
@@ -1725,33 +1578,7 @@
yaml "^1.10.0"
zen-observable "^0.8.15"
"@backstage/plugin-catalog@^0.10.0":
version "0.10.0"
resolved "https://registry.npmjs.org/@backstage/plugin-catalog/-/plugin-catalog-0.10.0.tgz#7b7f1b54704380c51f7506bfba948a3e0ff0575d"
integrity sha1-e38bVHBDgMUfdQa/upSKPg/wV10=
dependencies:
"@backstage/catalog-client" "^0.9.0"
"@backstage/catalog-model" "^0.13.0"
"@backstage/core-components" "^0.9.1"
"@backstage/core-plugin-api" "^0.8.0"
"@backstage/errors" "^0.2.2"
"@backstage/integration-react" "^0.1.25"
"@backstage/plugin-catalog-common" "^0.2.2"
"@backstage/plugin-catalog-react" "^0.9.0"
"@backstage/plugin-search-common" "^0.3.1"
"@backstage/theme" "^0.2.15"
"@backstage/types" "^0.1.2"
"@material-ui/core" "^4.12.2"
"@material-ui/icons" "^4.9.1"
"@material-ui/lab" "4.0.0-alpha.57"
history "^5.0.0"
lodash "^4.17.21"
react-helmet "6.1.0"
react-router "6.0.0-beta.0"
react-use "^17.2.4"
zen-observable "^0.8.15"
"@backstage/plugin-permission-common@^0.5.2", "@backstage/plugin-permission-common@^0.5.3":
"@backstage/plugin-permission-common@^0.5.3":
version "0.5.3"
resolved "https://registry.npmjs.org/@backstage/plugin-permission-common/-/plugin-permission-common-0.5.3.tgz#a1a4446e603584f2c82763745051f75f4a942eb1"
integrity sha512-zppDsNZEK9ffgXbf/Zx0sw4ffuOVOEvBZlft1+Oph2rO4+uN7dmCLMRRcKsYeNQ6/F50e6BMyNWpPZQDR/JQsA==
@@ -1762,7 +1589,7 @@
uuid "^8.0.0"
zod "^3.11.6"
"@backstage/plugin-permission-react@^0.3.3", "@backstage/plugin-permission-react@^0.3.4":
"@backstage/plugin-permission-react@^0.3.4":
version "0.3.4"
resolved "https://registry.npmjs.org/@backstage/plugin-permission-react/-/plugin-permission-react-0.3.4.tgz#e769dc1489c35d9c924234c0764a584558891716"
integrity sha512-S8s1cvCZFmxP4Dn5V9fOls31s4V1rgx3YUXqHSkgLatYHOXczf+GM/c5rdGLQyOb/+Hb+MQqaPAkojvSxNliow==
@@ -1775,53 +1602,6 @@
react-use "^17.2.4"
swr "^1.1.2"
"@backstage/plugin-search-common@0.3.2", "@backstage/plugin-search-common@^0.3.1":
version "0.3.2"
resolved "https://registry.npmjs.org/@backstage/plugin-search-common/-/plugin-search-common-0.3.2.tgz#15984ba4c14f8a9119168e8c79344ef8101863dc"
integrity sha1-FZhLpMFPipEZFo6MeTRO+BAYY9w=
dependencies:
"@backstage/plugin-permission-common" "^0.5.3"
"@backstage/types" "^1.0.0"
"@backstage/search-common@^0.3.1":
version "0.3.2"
resolved "https://registry.npmjs.org/@backstage/search-common/-/search-common-0.3.2.tgz#608a4eddf7eae71ed807ec1f723a80c6f7cdf3e4"
integrity sha1-YIpO3ffq5x7YB+wfcjqAxvfN8+Q=
dependencies:
"@backstage/plugin-search-common" "0.3.2"
"@backstage/test-utils@^0.3.0":
version "0.3.0"
resolved "https://registry.npmjs.org/@backstage/test-utils/-/test-utils-0.3.0.tgz#9c47efd97cdfa3809fe8493a39795a59373d00bd"
integrity sha512-UmJE0dZhtZGKcl58Yru2whEApamY71eJaC4uV0APySUjh0Z39pPxOOkM8a9VKH0/oafqoS4LXUJ4vGDzmy11UQ==
dependencies:
"@backstage/config" "^0.1.15"
"@backstage/core-app-api" "^0.6.0"
"@backstage/core-plugin-api" "^0.8.0"
"@backstage/plugin-permission-common" "^0.5.2"
"@backstage/plugin-permission-react" "^0.3.3"
"@backstage/theme" "^0.2.15"
"@backstage/types" "^0.1.3"
"@material-ui/core" "^4.12.2"
"@material-ui/icons" "^4.11.2"
"@testing-library/jest-dom" "^5.10.1"
"@testing-library/react" "^11.2.5"
"@testing-library/user-event" "^13.1.8"
cross-fetch "^3.1.5"
react-router "6.0.0-beta.0"
react-router-dom "6.0.0-beta.0"
zen-observable "^0.8.15"
"@backstage/types@^0.1.2", "@backstage/types@^0.1.3":
version "0.1.3"
resolved "https://registry.npmjs.org/@backstage/types/-/types-0.1.3.tgz#6613d8cbdf97d42d31cd1e66a833df533e7ccf14"
integrity sha512-fJVi4oVrlO+G3PRv1fYSll9/X4pE11HLnkI//Geare9sP6wSfp/2zXpLYfKVsG0e24jOl7Swkc8lwLkQ90zMaQ==
"@backstage/version-bridge@^0.1.2":
version "0.1.2"
resolved "https://registry.npmjs.org/@backstage/version-bridge/-/version-bridge-0.1.2.tgz#a24f42e0f383d497576f8c9d43851c6538345c03"
integrity sha1-ok9C4POD1JdXb4ydQ4UcZTg0XAM=
"@balena/dockerignore@^1.0.2":
version "1.0.2"
resolved "https://registry.npmjs.org/@balena/dockerignore/-/dockerignore-1.0.2.tgz#9ffe4726915251e8eb69f44ef3547e0da2c03e0d"
@@ -5751,20 +5531,6 @@
"@babel/runtime" "^7.14.6"
"@testing-library/dom" "^8.1.0"
"@testing-library/dom@^7.28.1":
version "7.31.2"
resolved "https://registry.npmjs.org/@testing-library/dom/-/dom-7.31.2.tgz#df361db38f5212b88555068ab8119f5d841a8c4a"
integrity sha512-3UqjCpey6HiTZT92vODYLPxTBWlM8ZOOjr3LX5F37/VRipW2M1kX6I/Cm4VXzteZqfGfagg8yXywpcOgQBlNsQ==
dependencies:
"@babel/code-frame" "^7.10.4"
"@babel/runtime" "^7.12.5"
"@types/aria-query" "^4.2.0"
aria-query "^4.2.2"
chalk "^4.1.0"
dom-accessibility-api "^0.5.6"
lz-string "^1.4.4"
pretty-format "^26.6.2"
"@testing-library/dom@^8.0.0", "@testing-library/dom@^8.1.0":
version "8.11.3"
resolved "https://registry.npmjs.org/@testing-library/dom/-/dom-8.11.3.tgz#38fd63cbfe14557021e88982d931e33fb7c1a808"
@@ -5805,14 +5571,6 @@
"@types/react-test-renderer" ">=16.9.0"
react-error-boundary "^3.1.0"
"@testing-library/react@^11.2.5":
version "11.2.7"
resolved "https://registry.npmjs.org/@testing-library/react/-/react-11.2.7.tgz#b29e2e95c6765c815786c0bc1d5aed9cb2bf7818"
integrity sha512-tzRNp7pzd5QmbtXNG/mhdcl7Awfu/Iz1RaVHY75zTdOkmHCuzMhRL83gWHSgOAcjS3CCbyfwUHMZgRJb4kAfpA==
dependencies:
"@babel/runtime" "^7.12.5"
"@testing-library/dom" "^7.28.1"
"@testing-library/react@^12.1.3":
version "12.1.4"
resolved "https://registry.npmjs.org/@testing-library/react/-/react-12.1.4.tgz#09674b117e550af713db3f4ec4c0942aa8bbf2c0"
@@ -12358,11 +12116,6 @@ event-source-polyfill@1.0.25:
resolved "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-1.0.25.tgz#d8bb7f99cb6f8119c2baf086d9f6ee0514b6d9c8"
integrity sha512-hQxu6sN1Eq4JjoI7ITdQeGGUN193A2ra83qC0Ltm9I2UJVAten3OFVN6k5RX4YWeCS0BoC8xg/5czOCIHVosQg==
event-source-polyfill@^1.0.25:
version "1.0.26"
resolved "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-1.0.26.tgz#86c04d088ef078279168eefa028f928fec5059a4"
integrity sha512-IwDLs9fUTcGAyacHBeS53T8wcEkDyDn0UP4tfQqJ4wQP8AyH0mszuQf2ULTylnpI0sMquzJ4usrNV7+uztwI9A==
event-stream@=3.3.4:
version "3.3.4"
resolved "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
@@ -24004,6 +23757,7 @@ tdigest@^0.1.1:
"@backstage/integration-react" "^1.0.1-next.1"
"@backstage/plugin-catalog" "^1.1.0-next.1"
"@backstage/plugin-techdocs" "^1.0.1-next.1"
"@backstage/techdocs-addons" "^0.0.0"
"@backstage/test-utils" "^1.0.1-next.1"
"@backstage/theme" "^0.2.15"
"@material-ui/core" "^4.11.0"