From b738ef79fe5d960c14ad798a533594c90bb94a72 Mon Sep 17 00:00:00 2001 From: blam Date: Thu, 27 Apr 2023 14:35:28 +0200 Subject: [PATCH 1/5] chore: does this work? Signed-off-by: blam --- packages/create-app/templates/default-app/package.json.hbs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/create-app/templates/default-app/package.json.hbs b/packages/create-app/templates/default-app/package.json.hbs index 0682114a35..2e17fd7f5d 100644 --- a/packages/create-app/templates/default-app/package.json.hbs +++ b/packages/create-app/templates/default-app/package.json.hbs @@ -39,7 +39,8 @@ }, "resolutions": { "@types/react": "^17", - "@types/react-dom": "^17" + "@types/react-dom": "^17", + "@octokit/openapi-types": "16^" }, "prettier": "@spotify/prettier-config", "lint-staged": { From bdd26de653e933eeb91e3bcf5a94affe423a62cf Mon Sep 17 00:00:00 2001 From: blam Date: Thu, 27 Apr 2023 15:25:48 +0200 Subject: [PATCH 2/5] chore: woops Signed-off-by: blam --- packages/create-app/templates/default-app/package.json.hbs | 2 +- plugins/kubernetes-backend/api-report.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/create-app/templates/default-app/package.json.hbs b/packages/create-app/templates/default-app/package.json.hbs index 2e17fd7f5d..44b218f6c7 100644 --- a/packages/create-app/templates/default-app/package.json.hbs +++ b/packages/create-app/templates/default-app/package.json.hbs @@ -40,7 +40,7 @@ "resolutions": { "@types/react": "^17", "@types/react-dom": "^17", - "@octokit/openapi-types": "16^" + "@octokit/openapi-types": "^16" }, "prettier": "@spotify/prettier-config", "lint-staged": { diff --git a/plugins/kubernetes-backend/api-report.md b/plugins/kubernetes-backend/api-report.md index 7dfb0635bd..668061cd31 100644 --- a/plugins/kubernetes-backend/api-report.md +++ b/plugins/kubernetes-backend/api-report.md @@ -298,6 +298,7 @@ export interface KubernetesFetcher { fetchPodMetricsByNamespaces( clusterDetails: ClusterDetails, namespaces: Set, + labelSelector?: string, ): Promise; } From ad8dc13ef7501dc4486ba43cc6ffe6c88bdd5181 Mon Sep 17 00:00:00 2001 From: blam Date: Thu, 27 Apr 2023 15:56:34 +0200 Subject: [PATCH 3/5] chore: try with all deps Signed-off-by: blam --- packages/create-app/templates/default-app/package.json.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-app/templates/default-app/package.json.hbs b/packages/create-app/templates/default-app/package.json.hbs index 44b218f6c7..d3dfe03630 100644 --- a/packages/create-app/templates/default-app/package.json.hbs +++ b/packages/create-app/templates/default-app/package.json.hbs @@ -40,7 +40,7 @@ "resolutions": { "@types/react": "^17", "@types/react-dom": "^17", - "@octokit/openapi-types": "^16" + "**/@octokit/openapi-types": "^16" }, "prettier": "@spotify/prettier-config", "lint-staged": { From 9c567706886c5efb4942e49ecba1f027518a167e Mon Sep 17 00:00:00 2001 From: blam Date: Thu, 27 Apr 2023 21:14:14 +0200 Subject: [PATCH 4/5] chore: lock down to older versions Signed-off-by: blam --- packages/create-app/templates/default-app/package.json.hbs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/create-app/templates/default-app/package.json.hbs b/packages/create-app/templates/default-app/package.json.hbs index d3dfe03630..f00500af68 100644 --- a/packages/create-app/templates/default-app/package.json.hbs +++ b/packages/create-app/templates/default-app/package.json.hbs @@ -40,7 +40,9 @@ "resolutions": { "@types/react": "^17", "@types/react-dom": "^17", - "**/@octokit/openapi-types": "^16" + "@octokit/rest": "18.5.6", + "@octokit/plugin-rest-endpoint-methods": "5.16.2", + "@octokit/plugin-paginate-rest": "2.7.0" }, "prettier": "@spotify/prettier-config", "lint-staged": { From 4027aa9e753dc64a5c27a93bb28373b658733193 Mon Sep 17 00:00:00 2001 From: blam Date: Fri, 28 Apr 2023 09:50:27 +0200 Subject: [PATCH 5/5] chroe: added changeset Signed-off-by: blam --- .changeset/tame-games-rule.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/tame-games-rule.md diff --git a/.changeset/tame-games-rule.md b/.changeset/tame-games-rule.md new file mode 100644 index 0000000000..408c8ca14b --- /dev/null +++ b/.changeset/tame-games-rule.md @@ -0,0 +1,5 @@ +--- +'@backstage/create-app': patch +--- + +Pin some octokit dependencies to avoid failing typescript build under `tsc:full`