diff --git a/.changeset/five-knives-flash.md b/.changeset/five-knives-flash.md
new file mode 100644
index 0000000000..9076f6f456
--- /dev/null
+++ b/.changeset/five-knives-flash.md
@@ -0,0 +1,10 @@
+---
+'@backstage/backend-common': patch
+'@backstage/create-app': patch
+'@backstage/integration': patch
+'@backstage/plugin-catalog-import': patch
+'@backstage/plugin-github-actions': patch
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+The default `@octokit/rest` dependency was bumped to `"^18.5.3"`.
diff --git a/packages/app/package.json b/packages/app/package.json
index 402d09ade4..fb1ea02699 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -39,7 +39,7 @@
"@backstage/theme": "^0.2.6",
"@material-ui/core": "^4.11.0",
"@material-ui/icons": "^4.9.1",
- "@octokit/rest": "^18.0.12",
+ "@octokit/rest": "^18.5.3",
"@roadiehq/backstage-plugin-buildkite": "^1.0.0",
"@roadiehq/backstage-plugin-github-insights": "^1.0.0",
"@roadiehq/backstage-plugin-github-pull-requests": "^1.0.0",
diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index 998ac475d9..64e3137f7c 100644
--- a/packages/backend-common/package.json
+++ b/packages/backend-common/package.json
@@ -35,7 +35,7 @@
"@backstage/errors": "^0.1.1",
"@backstage/integration": "^0.5.1",
"@google-cloud/storage": "^5.8.0",
- "@octokit/rest": "^18.0.12",
+ "@octokit/rest": "^18.5.3",
"@types/cors": "^2.8.6",
"@types/dockerode": "^3.2.1",
"@types/express": "^4.17.6",
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 440ceca8e5..0422088d64 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -47,7 +47,7 @@
"@backstage/plugin-techdocs-backend": "^0.7.0",
"@backstage/plugin-todo-backend": "^0.1.3",
"@gitbeaker/node": "^28.0.2",
- "@octokit/rest": "^18.0.12",
+ "@octokit/rest": "^18.5.3",
"azure-devops-node-api": "^10.1.1",
"dockerode": "^3.2.1",
"example-app": "^0.2.25",
diff --git a/packages/create-app/templates/default-app/packages/backend/package.json.hbs b/packages/create-app/templates/default-app/packages/backend/package.json.hbs
index 138bcaec8d..e2b5b04a60 100644
--- a/packages/create-app/templates/default-app/packages/backend/package.json.hbs
+++ b/packages/create-app/templates/default-app/packages/backend/package.json.hbs
@@ -29,7 +29,7 @@
"@backstage/plugin-scaffolder-backend": "^{{version '@backstage/plugin-scaffolder-backend'}}",
"@backstage/plugin-techdocs-backend": "^{{version '@backstage/plugin-techdocs-backend'}}",
"@gitbeaker/node": "^28.0.2",
- "@octokit/rest": "^18.0.12",
+ "@octokit/rest": "^18.5.3",
"dockerode": "^3.2.1",
"express": "^4.17.1",
"express-promise-router": "^4.1.0",
diff --git a/packages/integration/package.json b/packages/integration/package.json
index 797a2c0b48..b7c8bee957 100644
--- a/packages/integration/package.json
+++ b/packages/integration/package.json
@@ -32,7 +32,7 @@
"@backstage/config": "^0.1.2",
"cross-fetch": "^3.0.6",
"git-url-parse": "^11.4.4",
- "@octokit/rest": "^18.0.12",
+ "@octokit/rest": "^18.5.3",
"@octokit/auth-app": "^3.4.0",
"luxon": "^1.25.0"
},
diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index ca540fe8be..ccc2dd24a7 100644
--- a/plugins/catalog-import/package.json
+++ b/plugins/catalog-import/package.json
@@ -40,7 +40,7 @@
"@material-ui/core": "^4.11.0",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.45",
- "@octokit/rest": "^18.0.12",
+ "@octokit/rest": "^18.5.3",
"@types/react": "^16.9",
"git-url-parse": "^11.4.4",
"js-base64": "^3.6.0",
diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json
index 2c26061cf3..89b569bd95 100644
--- a/plugins/github-actions/package.json
+++ b/plugins/github-actions/package.json
@@ -40,7 +40,7 @@
"@material-ui/core": "^4.11.0",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.45",
- "@octokit/rest": "^18.0.12",
+ "@octokit/rest": "^18.5.3",
"moment": "^2.27.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
diff --git a/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx b/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx
index 38d84a4b6d..0624438ffe 100644
--- a/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx
+++ b/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx
@@ -202,13 +202,13 @@ export const WorkflowRunDetails = ({ entity }: { entity: Entity }) => {
Message
- {details.value?.head_commit.message}
+ {details.value?.head_commit?.message}
Commit ID
- {details.value?.head_commit.id}
+ {details.value?.head_commit?.id}
@@ -231,7 +231,7 @@ export const WorkflowRunDetails = ({ entity }: { entity: Entity }) => {
Author
- {`${details.value?.head_commit.author?.name} (${details.value?.head_commit.author?.email})`}
+ {`${details.value?.head_commit?.author?.name} (${details.value?.head_commit?.author?.email})`}
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index 355bed4de0..bbeeecceb0 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -37,7 +37,7 @@
"@backstage/integration": "^0.5.1",
"@gitbeaker/core": "^28.0.2",
"@gitbeaker/node": "^28.0.2",
- "@octokit/rest": "^18.0.12",
+ "@octokit/rest": "^18.5.3",
"@types/dockerode": "^3.2.1",
"@types/express": "^4.17.6",
"@types/git-url-parse": "^9.0.0",
diff --git a/yarn.lock b/yarn.lock
index 4d4549357c..61abdf1b85 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4086,20 +4086,12 @@
resolved "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.2.tgz#394d59ec734cd2f122431fbaf05099861ece3c44"
integrity sha512-oTJSNAmBqyDR41uSMunLQKMX0jmEXbwD1fpz8FG27lScV3RhtGfBa1/BBLym+PxcC16IBlF7KH9vP1BUYxA+Eg==
-"@octokit/plugin-rest-endpoint-methods@4.13.5":
- version "4.13.5"
- resolved "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.13.5.tgz#ad76285b82fe05fbb4adf2774a9c887f3534a880"
- integrity sha512-kYKcWkFm4Ldk8bZai2RVEP1z97k1C/Ay2FN9FNTBg7JIyKoiiJjks4OtT6cuKeZX39tqa+C3J9xeYc6G+6g8uQ==
+"@octokit/plugin-rest-endpoint-methods@5.0.1":
+ version "5.0.1"
+ resolved "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.0.1.tgz#631b8d4edc6798b03489911252a25f2a4e58c594"
+ integrity sha512-vvWbPtPqLyIzJ7A4IPdTl+8IeuKAwMJ4LjvmqWOOdfSuqWQYZXq2CEd0hsnkidff2YfKlguzujHs/reBdAx8Sg==
dependencies:
- "@octokit/types" "^6.12.2"
- deprecation "^2.3.1"
-
-"@octokit/plugin-rest-endpoint-methods@5.0.0":
- version "5.0.0"
- resolved "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.0.0.tgz#cf2cdeb24ea829c31688216a5b165010b61f9a98"
- integrity sha512-Jc7CLNUueIshXT+HWt6T+M0sySPjF32mSFQAK7UfAg8qGeRI6OM1GSBxDLwbXjkqy2NVdnqCedJcP1nC785JYg==
- dependencies:
- "@octokit/types" "^6.13.0"
+ "@octokit/types" "^6.13.1"
deprecation "^2.3.1"
"@octokit/request-error@^2.0.0", "@octokit/request-error@^2.0.5":
@@ -4123,25 +4115,15 @@
node-fetch "^2.6.1"
universal-user-agent "^6.0.0"
-"@octokit/rest@^18.0.12", "@octokit/rest@^18.1.0":
- version "18.3.5"
- resolved "https://registry.npmjs.org/@octokit/rest/-/rest-18.3.5.tgz#a89903d46e0b4273bd3234674ec2777a651d68ab"
- integrity sha512-ZPeRms3WhWxQBEvoIh0zzf8xdU2FX0Capa7+lTca8YHmRsO3QNJzf1H3PcuKKsfgp91/xVDRtX91sTe1kexlbw==
+"@octokit/rest@^18.1.0", "@octokit/rest@^18.1.1", "@octokit/rest@^18.5.3":
+ version "18.5.3"
+ resolved "https://registry.npmjs.org/@octokit/rest/-/rest-18.5.3.tgz#6a2e6006a87ebbc34079c419258dd29ec9ff659d"
+ integrity sha512-KPAsUCr1DOdLVbZJgGNuE/QVLWEaVBpFQwDAz/2Cnya6uW2wJ/P5RVGk0itx7yyN1aGa8uXm2pri4umEqG1JBA==
dependencies:
"@octokit/core" "^3.2.3"
"@octokit/plugin-paginate-rest" "^2.6.2"
"@octokit/plugin-request-log" "^1.0.2"
- "@octokit/plugin-rest-endpoint-methods" "4.13.5"
-
-"@octokit/rest@^18.1.1":
- version "18.5.2"
- resolved "https://registry.npmjs.org/@octokit/rest/-/rest-18.5.2.tgz#0369e554b7076e3749005147be94c661c7a5a74b"
- integrity sha512-Kz03XYfKS0yYdi61BkL9/aJ0pP2A/WK5vF/syhu9/kY30J8He3P68hv9GRpn8bULFx2K0A9MEErn4v3QEdbZcw==
- dependencies:
- "@octokit/core" "^3.2.3"
- "@octokit/plugin-paginate-rest" "^2.6.2"
- "@octokit/plugin-request-log" "^1.0.2"
- "@octokit/plugin-rest-endpoint-methods" "5.0.0"
+ "@octokit/plugin-rest-endpoint-methods" "5.0.1"
"@octokit/types@^5.0.0", "@octokit/types@^5.0.1":
version "5.5.0"
@@ -4150,7 +4132,7 @@
dependencies:
"@types/node" ">= 8"
-"@octokit/types@^6.0.0", "@octokit/types@^6.0.1", "@octokit/types@^6.0.3", "@octokit/types@^6.10.0", "@octokit/types@^6.12.2", "@octokit/types@^6.13.0", "@octokit/types@^6.7.1", "@octokit/types@^6.8.2":
+"@octokit/types@^6.0.0", "@octokit/types@^6.0.1", "@octokit/types@^6.0.3", "@octokit/types@^6.10.0", "@octokit/types@^6.12.2", "@octokit/types@^6.13.0", "@octokit/types@^6.13.1", "@octokit/types@^6.7.1", "@octokit/types@^6.8.2":
version "6.14.2"
resolved "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz#64c9457f38fb8522bdbba3c8cc814590a2d61bf5"
integrity sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==