From b660479ac47bb00f83df8f516b40a7b21354f1ad Mon Sep 17 00:00:00 2001 From: blam Date: Fri, 13 May 2022 12:45:38 +0200 Subject: [PATCH 1/7] chore: add explicit toolkit dep in this package Signed-off-by: blam --- plugins/graphiql/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json index e19a3e40d1..d43b5f2267 100644 --- a/plugins/graphiql/package.json +++ b/plugins/graphiql/package.json @@ -41,6 +41,7 @@ "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", "graphiql": "^1.5.12", + "@graphiql/toolkit": "0.4.4", "graphql": "^16.0.0", "react-use": "^17.2.4" }, From 91d0c9d18692cbd6e9e54a558fea9c45d01e0b4b Mon Sep 17 00:00:00 2001 From: blam Date: Fri, 13 May 2022 12:58:17 +0200 Subject: [PATCH 2/7] chore: added changeset for reverting the package Signed-off-by: blam --- .changeset/tall-tables-smash.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/tall-tables-smash.md diff --git a/.changeset/tall-tables-smash.md b/.changeset/tall-tables-smash.md new file mode 100644 index 0000000000..25595c9c54 --- /dev/null +++ b/.changeset/tall-tables-smash.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-graphiql': patch +--- + +Lock the dependency of `@graphiql/toolkit` because of broken release From 8462ccbc65d346c0190f478ef95c84cf9349372c Mon Sep 17 00:00:00 2001 From: blam Date: Fri, 13 May 2022 13:20:48 +0200 Subject: [PATCH 3/7] chore: add the dependency Signed-off-by: blam --- plugins/graphiql/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json index d43b5f2267..67855607d6 100644 --- a/plugins/graphiql/package.json +++ b/plugins/graphiql/package.json @@ -41,7 +41,7 @@ "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", "graphiql": "^1.5.12", - "@graphiql/toolkit": "0.4.4", + "graphql-ws": "5.5.5", "graphql": "^16.0.0", "react-use": "^17.2.4" }, diff --git a/yarn.lock b/yarn.lock index c1f374323b..6ec8648cac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2246,9 +2246,9 @@ xdg-basedir "^4.0.0" "@graphiql/toolkit@^0.4.4": - version "0.4.4" - resolved "https://registry.npmjs.org/@graphiql/toolkit/-/toolkit-0.4.4.tgz#c5f2cd0d7fc47707f68406655836aedc5e6ca2b1" - integrity sha512-HrppQ5u0uJPYpImLqQUJWNrS9E97Cmz8DO3Dn0dXeCg1iBoKjRnZoFf2rjFF5ge9Uc9RihL181Uph/Iw9YYMFg== + version "0.4.5" + resolved "https://registry.npmjs.org/@graphiql/toolkit/-/toolkit-0.4.5.tgz#9fb5020444712562eae9581724695c235f610836" + integrity sha512-QXuuMSSK/0GfBS7tltrGZdyhIvm6oe9TK4VW9pfa8dALYttpzyJ64Q4Sx9I1Ng++yOMJWziM/ksa043zkNHsjQ== dependencies: "@n1ru4l/push-pull-async-iterable-iterator" "^3.1.0" meros "^1.1.4" @@ -13485,7 +13485,7 @@ graphql-type-json@^0.3.2: resolved "https://registry.npmjs.org/graphql-type-json/-/graphql-type-json-0.3.2.tgz#f53a851dbfe07bd1c8157d24150064baab41e115" integrity sha512-J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg== -graphql-ws@^5.4.1: +graphql-ws@5.5.5, graphql-ws@^5.4.1: version "5.5.5" resolved "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.5.5.tgz#f375486d3f196e2a2527b503644693ae3a8670a9" integrity sha512-hvyIS71vs4Tu/yUYHPvGXsTgo0t3arU820+lT5VjZS2go0ewp2LqyCgxEN56CzOG7Iys52eRhHBiD1gGRdiQtw== From 0ca550ddc73f737e29114c515dc18e66e59d8866 Mon Sep 17 00:00:00 2001 From: blam Date: Fri, 13 May 2022 13:22:19 +0200 Subject: [PATCH 4/7] chore: updating changeset Signed-off-by: blam --- .changeset/tall-tables-smash.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/tall-tables-smash.md b/.changeset/tall-tables-smash.md index 25595c9c54..e06914af71 100644 --- a/.changeset/tall-tables-smash.md +++ b/.changeset/tall-tables-smash.md @@ -2,4 +2,4 @@ '@backstage/plugin-graphiql': patch --- -Lock the dependency of `@graphiql/toolkit` because of broken release +Add the dependency `graphql-ws` to fix the latest release of `@graphiql/toolkit` that has a missing dependency From a4a6a72a95f24dd947881db8fdfe56e8253d3b21 Mon Sep 17 00:00:00 2001 From: blam Date: Fri, 13 May 2022 13:37:19 +0200 Subject: [PATCH 5/7] chore: pull any version Signed-off-by: blam --- packages/backend/src/plugins/auth.ts | 6 +----- plugins/graphiql/package.json | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/backend/src/plugins/auth.ts b/packages/backend/src/plugins/auth.ts index cd0c42afe5..984ddd9651 100644 --- a/packages/backend/src/plugins/auth.ts +++ b/packages/backend/src/plugins/auth.ts @@ -42,11 +42,7 @@ export default async function createPlugin( // It is important that each real user always gets resolved to // the same sign-in identity. The code below will not do that. // It is here for demo purposes only. - github: providers.github.create({ - signIn: { - resolver: providers.github.resolvers.usernameMatchingUserEntityName(), - }, - }), + github: providers.github.create(), gitlab: providers.gitlab.create({ signIn: { async resolver({ result: { fullProfile } }, ctx) { diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json index 67855607d6..99903cb63c 100644 --- a/plugins/graphiql/package.json +++ b/plugins/graphiql/package.json @@ -41,7 +41,7 @@ "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", "graphiql": "^1.5.12", - "graphql-ws": "5.5.5", + "graphql-ws": "^5.4.1", "graphql": "^16.0.0", "react-use": "^17.2.4" }, From cf58f3415a5b2ce5c764e90f6c9b54136affd585 Mon Sep 17 00:00:00 2001 From: blam Date: Fri, 13 May 2022 13:39:32 +0200 Subject: [PATCH 6/7] chore: bump api-docs too Signed-off-by: blam --- .changeset/tall-tables-smash.md | 1 + plugins/api-docs/package.json | 1 + 2 files changed, 2 insertions(+) diff --git a/.changeset/tall-tables-smash.md b/.changeset/tall-tables-smash.md index e06914af71..2bf277879e 100644 --- a/.changeset/tall-tables-smash.md +++ b/.changeset/tall-tables-smash.md @@ -1,5 +1,6 @@ --- '@backstage/plugin-graphiql': patch +'@backstage/plugin-api-docs': patch --- Add the dependency `graphql-ws` to fix the latest release of `@graphiql/toolkit` that has a missing dependency diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json index 1c00a4b01e..ddf837493b 100644 --- a/plugins/api-docs/package.json +++ b/plugins/api-docs/package.json @@ -44,6 +44,7 @@ "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", "graphiql": "^1.8.8", + "graphql-ws": "^5.4.1", "graphql": "^16.0.0", "isomorphic-form-data": "^2.0.0", "react-router": "6.0.0-beta.0", From 2658e9420f6a2a530f7d0e9d37a5765549bf014a Mon Sep 17 00:00:00 2001 From: blam Date: Fri, 13 May 2022 13:40:00 +0200 Subject: [PATCH 7/7] chore: reset Signed-off-by: blam --- packages/backend/src/plugins/auth.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/backend/src/plugins/auth.ts b/packages/backend/src/plugins/auth.ts index 984ddd9651..cd0c42afe5 100644 --- a/packages/backend/src/plugins/auth.ts +++ b/packages/backend/src/plugins/auth.ts @@ -42,7 +42,11 @@ export default async function createPlugin( // It is important that each real user always gets resolved to // the same sign-in identity. The code below will not do that. // It is here for demo purposes only. - github: providers.github.create(), + github: providers.github.create({ + signIn: { + resolver: providers.github.resolvers.usernameMatchingUserEntityName(), + }, + }), gitlab: providers.gitlab.create({ signIn: { async resolver({ result: { fullProfile } }, ctx) {