From 8855f61f67efc722b5c0bc107b264d2970be43b2 Mon Sep 17 00:00:00 2001 From: Oliver Sand Date: Wed, 20 Jan 2021 09:31:07 +0100 Subject: [PATCH 1/2] Update @asyncapi/react-component to 0.18.2 The package was also renamed from @kyma-project/asyncapi-react to @asyncapi/react-component which dependabot isn't able to handle. --- .changeset/rich-geckos-lie.md | 5 ++ package.json | 2 +- plugins/api-docs/package.json | 2 +- .../AsyncApiDefinitionWidget.tsx | 6 +-- yarn.lock | 46 +++++++++---------- 5 files changed, 33 insertions(+), 28 deletions(-) create mode 100644 .changeset/rich-geckos-lie.md diff --git a/.changeset/rich-geckos-lie.md b/.changeset/rich-geckos-lie.md new file mode 100644 index 0000000000..61ff7600f6 --- /dev/null +++ b/.changeset/rich-geckos-lie.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-api-docs': patch +--- + +Update `@asyncapi/react-component` to 0.18.2 diff --git a/package.json b/package.json index aaa68e67de..758a8ba884 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ }, "jest": { "transformModules": [ - "@kyma-project/asyncapi-react" + "@asyncapi/react-component" ] } } diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json index 39e202eef8..571b4a3067 100644 --- a/plugins/api-docs/package.json +++ b/plugins/api-docs/package.json @@ -29,11 +29,11 @@ "clean": "backstage-cli clean" }, "dependencies": { + "@asyncapi/react-component": "^0.18.2", "@backstage/catalog-model": "^0.6.0", "@backstage/core": "^0.4.4", "@backstage/plugin-catalog": "^0.2.9", "@backstage/theme": "^0.2.2", - "@kyma-project/asyncapi-react": "^0.14.2", "@material-icons/font": "^1.0.2", "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", diff --git a/plugins/api-docs/src/components/AsyncApiDefinitionWidget/AsyncApiDefinitionWidget.tsx b/plugins/api-docs/src/components/AsyncApiDefinitionWidget/AsyncApiDefinitionWidget.tsx index 86f524d099..a908a91b14 100644 --- a/plugins/api-docs/src/components/AsyncApiDefinitionWidget/AsyncApiDefinitionWidget.tsx +++ b/plugins/api-docs/src/components/AsyncApiDefinitionWidget/AsyncApiDefinitionWidget.tsx @@ -14,10 +14,10 @@ * limitations under the License. */ -import AsyncApi from '@kyma-project/asyncapi-react'; +import AsyncApi from '@asyncapi/react-component'; +import '@asyncapi/react-component/lib/styles/fiori.css'; +import { fade, makeStyles } from '@material-ui/core/styles'; import React from 'react'; -import { makeStyles, fade } from '@material-ui/core/styles'; -import '@kyma-project/asyncapi-react/lib/styles/fiori.css'; const useStyles = makeStyles(theme => ({ root: { diff --git a/yarn.lock b/yarn.lock index 6710c7e8e7..a6f4146b40 100644 --- a/yarn.lock +++ b/yarn.lock @@ -68,10 +68,10 @@ dependencies: "@openapi-contrib/openapi-schema-to-json-schema" "^3.0.0" -"@asyncapi/parser@^1.0.1": - version "1.1.0" - resolved "https://registry.npmjs.org/@asyncapi/parser/-/parser-1.1.0.tgz#b366c85a6322e182e040d60f36400a0b5c26393c" - integrity sha512-0+NeTiW5sPNYaFf4P2VCcy7Z7MLMP7H969cgOp3gvVTKroI5idkYnWo/C16tKAxs+2oOQ9WnPolsNgc+jb/qtg== +"@asyncapi/parser@^1.3.2": + version "1.3.2" + resolved "https://registry.npmjs.org/@asyncapi/parser/-/parser-1.3.2.tgz#6ff22680ff0e9aaf732121040e01e1f5836a305d" + integrity sha512-YDGdxoVA3+gQ3jvWDp+J3IV5XsvAe+nSHSytPg9m5hfJ48R+mBPMnO7Bnh//gR17LjbmyebPj27h4Ceyaa4d3Q== dependencies: "@apidevtools/json-schema-ref-parser" "^9.0.6" "@asyncapi/specs" "^2.7.5" @@ -82,6 +82,21 @@ node-fetch "^2.6.0" tiny-merge-patch "^0.1.2" +"@asyncapi/react-component@^0.18.2": + version "0.18.2" + resolved "https://registry.npmjs.org/@asyncapi/react-component/-/react-component-0.18.2.tgz#74882b4c2a5ecd00c156898f38d0a5c9e8c4384d" + integrity sha512-vsD3acSM0hTxxSsTJoU79kpI9FXVA64OqNCu8xrawfaU4wdsSQWWn0y7SD8pUfwe4gohwmms0xNcAaMzYIhGLw== + dependencies: + "@asyncapi/avro-schema-parser" "^0.2.0" + "@asyncapi/openapi-schema-parser" "^2.0.0" + "@asyncapi/parser" "^1.3.2" + constate "^1.2.0" + dompurify "^2.1.1" + markdown-it "^11.0.1" + merge "^2.1.0" + openapi-sampler "^1.0.0-beta.15" + react-use "^12.2.0" + "@asyncapi/specs@^2.7.5": version "2.7.5" resolved "https://registry.npmjs.org/@asyncapi/specs/-/specs-2.7.5.tgz#3a516d198fc41a1103695bd889fdd4fbbebe7f5d" @@ -3734,21 +3749,6 @@ dependencies: stream "^0.0.2" -"@kyma-project/asyncapi-react@^0.14.2": - version "0.14.2" - resolved "https://registry.npmjs.org/@kyma-project/asyncapi-react/-/asyncapi-react-0.14.2.tgz#6d99ef878f0481b05db0f3be7c94f4534176675f" - integrity sha512-lf3zcIuCTaVEIkCpF7Vwulrucgdfp1zXUIvkqjYPteOJjOuT6BAvnYwgvFUYibitmD/ADkvK8ybIeKdNJcyaPw== - dependencies: - "@asyncapi/avro-schema-parser" "^0.2.0" - "@asyncapi/openapi-schema-parser" "^2.0.0" - "@asyncapi/parser" "^1.0.1" - constate "^1.2.0" - dompurify "^2.1.1" - markdown-it "^11.0.1" - merge "^1.2.1" - openapi-sampler "^1.0.0-beta.15" - react-use "^12.2.0" - "@lerna/add@3.21.0": version "3.21.0" resolved "https://registry.npmjs.org/@lerna/add/-/add-3.21.0.tgz#27007bde71cc7b0a2969ab3c2f0ae41578b4577b" @@ -18180,10 +18180,10 @@ merge2@^1.2.3, merge2@^1.3.0: resolved "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81" integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw== -merge@^1.2.1: - version "1.2.1" - resolved "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145" - integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ== +merge@^2.1.0: + version "2.1.0" + resolved "https://registry.npmjs.org/merge/-/merge-2.1.0.tgz#91fff62458ba2eca378dd395fa85f1690bf87f60" + integrity sha512-TcuhVDV+e6X457MQAm7xIb19rWhZuEDEho7RrwxMpQ/3GhD5sDlnP188gjQQuweXHy9igdke5oUtVOXX1X8Sxg== methods@^1.0.0, methods@^1.1.1, methods@^1.1.2, methods@~1.1.2: version "1.1.2" From a284f5bc1f8d9bf14b1bfa5089389bb1167d664b Mon Sep 17 00:00:00 2001 From: Oliver Sand Date: Wed, 20 Jan 2021 10:17:47 +0100 Subject: [PATCH 2/2] Adjust jest.transformModules in create-app The package name has changed from `@kyma-project/asyncapi-react` to `@asyncapi/react-component`. --- .changeset/fair-geckos-collect.md | 16 ++++++++++++++++ .../templates/default-app/package.json.hbs | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 .changeset/fair-geckos-collect.md diff --git a/.changeset/fair-geckos-collect.md b/.changeset/fair-geckos-collect.md new file mode 100644 index 0000000000..204041b195 --- /dev/null +++ b/.changeset/fair-geckos-collect.md @@ -0,0 +1,16 @@ +--- +'@backstage/create-app': patch +--- + +Due to a package name change from `@kyma-project/asyncapi-react` to +`@asyncapi/react-component` the jest configuration in the root `package.json` +has to be updated: + +```diff + "jest": { + "transformModules": [ +- "@kyma-project/asyncapi-react ++ "@asyncapi/react-component" + ] + } +``` diff --git a/packages/create-app/templates/default-app/package.json.hbs b/packages/create-app/templates/default-app/package.json.hbs index 1353e33072..3fa350fa7c 100644 --- a/packages/create-app/templates/default-app/package.json.hbs +++ b/packages/create-app/templates/default-app/package.json.hbs @@ -45,7 +45,7 @@ }, "jest": { "transformModules": [ - "@kyma-project/asyncapi-react" + "@asyncapi/react-component" ] } }