From e8a5b3096f2c24836aadf112b029e2484a77a97f Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Fri, 9 Oct 2026 10:25:15 +0000 Subject: [PATCH 1/2] build: update octokit monorepo See associated pull request for more information. Closes #3946 as a pr takeover --- .github/local-actions/labels-sync/BUILD.bazel | 1 - .../local-actions/labels-sync/package.json | 1 - .../local-actions/lock-closed/package.json | 1 - github-actions/labeling/issue/BUILD.bazel | 4 +-- .../labeling/issue/lib/issue-labeling.spec.ts | 1 - .../labeling/issue/lib/issue-labeling.ts | 4 +-- github-actions/labeling/package.json | 1 - github-actions/org-file-sync/package.json | 2 +- ng-dev/package.json | 5 ++- ng-dev/utils/BUILD.bazel | 1 - ng-dev/utils/git/octokit-types.ts | 4 +-- pnpm-lock.yaml | 32 ++++++------------- 12 files changed, 18 insertions(+), 39 deletions(-) diff --git a/.github/local-actions/labels-sync/BUILD.bazel b/.github/local-actions/labels-sync/BUILD.bazel index 0708881ad3..a9c6bc0cd3 100644 --- a/.github/local-actions/labels-sync/BUILD.bazel +++ b/.github/local-actions/labels-sync/BUILD.bazel @@ -13,7 +13,6 @@ ts_project( "//.github/local-actions/labels-sync:node_modules/@actions/core", "//.github/local-actions/labels-sync:node_modules/@actions/github", "//.github/local-actions/labels-sync:node_modules/@octokit/rest", - "//.github/local-actions/labels-sync:node_modules/@octokit/types", "//.github/local-actions/labels-sync:node_modules/@types/node", "//github-actions:utils", "//ng-dev/pr/common/labels", diff --git a/.github/local-actions/labels-sync/package.json b/.github/local-actions/labels-sync/package.json index a3e6caaade..d7d2cfe40c 100644 --- a/.github/local-actions/labels-sync/package.json +++ b/.github/local-actions/labels-sync/package.json @@ -3,7 +3,6 @@ "@actions/core": "3.0.1", "@actions/github": "9.1.1", "@octokit/rest": "22.0.1", - "@octokit/types": "17.0.0", "@types/node": "24.19.1" } } diff --git a/.github/local-actions/lock-closed/package.json b/.github/local-actions/lock-closed/package.json index a3e6caaade..d7d2cfe40c 100644 --- a/.github/local-actions/lock-closed/package.json +++ b/.github/local-actions/lock-closed/package.json @@ -3,7 +3,6 @@ "@actions/core": "3.0.1", "@actions/github": "9.1.1", "@octokit/rest": "22.0.1", - "@octokit/types": "17.0.0", "@types/node": "24.19.1" } } diff --git a/github-actions/labeling/issue/BUILD.bazel b/github-actions/labeling/issue/BUILD.bazel index 11e9739881..286c0fa8fd 100644 --- a/github-actions/labeling/issue/BUILD.bazel +++ b/github-actions/labeling/issue/BUILD.bazel @@ -14,7 +14,6 @@ ts_project( "//github-actions/labeling:node_modules/@actions/core", "//github-actions/labeling:node_modules/@actions/github", "//github-actions/labeling:node_modules/@google/genai", - "//github-actions/labeling:node_modules/@octokit/openapi-types", "//github-actions/labeling:node_modules/@octokit/rest", "//github-actions/labeling:node_modules/@types/node", "//github-actions/labeling/shared", @@ -33,7 +32,6 @@ ts_project( "//github-actions/labeling:node_modules/@actions/core", "//github-actions/labeling:node_modules/@actions/github", "//github-actions/labeling:node_modules/@google/genai", - "//github-actions/labeling:node_modules/@octokit/openapi-types", "//github-actions/labeling:node_modules/@octokit/rest", "//github-actions/labeling:node_modules/@types/jasmine", "//github-actions/labeling:node_modules/@types/node", @@ -48,7 +46,7 @@ jasmine_test( ], env = { "GITHUB_REPOSITORY": "angular/angular", - "GITHUB_EVENT_PATH": "$(location :issue-context.json)", + "GITHUB_EVENT_PATH": "$(rootpath :issue-context.json)", }, ) diff --git a/github-actions/labeling/issue/lib/issue-labeling.spec.ts b/github-actions/labeling/issue/lib/issue-labeling.spec.ts index 96266b6ffa..82fef807fb 100644 --- a/github-actions/labeling/issue/lib/issue-labeling.spec.ts +++ b/github-actions/labeling/issue/lib/issue-labeling.spec.ts @@ -1,5 +1,4 @@ import {Octokit} from '@octokit/rest'; -import * as core from '@actions/core'; import {context} from '@actions/github'; import { IssueLabeling as _IssueLabeling, diff --git a/github-actions/labeling/issue/lib/issue-labeling.ts b/github-actions/labeling/issue/lib/issue-labeling.ts index 4f3e3ba840..b37e39add9 100644 --- a/github-actions/labeling/issue/lib/issue-labeling.ts +++ b/github-actions/labeling/issue/lib/issue-labeling.ts @@ -1,7 +1,7 @@ import * as core from '@actions/core'; import {context} from '@actions/github'; import {GoogleGenAI} from '@google/genai'; -import {components} from '@octokit/openapi-types'; +import type {RestEndpointMethodTypes} from '@octokit/rest'; import {Labeling} from '../../shared/labeling.js'; export const NEEDS_TRIAGE_MILESTONE = 'needsTriage'; @@ -12,7 +12,7 @@ export class IssueLabeling extends Labeling { /** Set of area labels available in the current repository. */ repoAreaLabels = new Map(); /** The issue data fetched from Github. */ - issueData?: components['schemas']['issue']; + issueData?: RestEndpointMethodTypes['issues']['get']['response']['data']; /** Labels added during this run. */ private addedLabels: string[] = []; diff --git a/github-actions/labeling/package.json b/github-actions/labeling/package.json index 8a3f26fd1a..3755d460ac 100644 --- a/github-actions/labeling/package.json +++ b/github-actions/labeling/package.json @@ -10,7 +10,6 @@ "@types/node": "24.19.1", "micromatch": "^4.0.8", "typed-graphqlify": "3.1.6", - "@octokit/openapi-types": "28.0.0", "jasmine": "6.3.0" } } diff --git a/github-actions/org-file-sync/package.json b/github-actions/org-file-sync/package.json index 9725a1a7e3..9b9581ef17 100644 --- a/github-actions/org-file-sync/package.json +++ b/github-actions/org-file-sync/package.json @@ -4,7 +4,7 @@ "@actions/core": "3.0.1", "@actions/github": "9.1.1", "@octokit/rest": "22.0.1", - "@octokit/types": "17.0.0", + "@octokit/types": "18.0.0", "@types/node": "24.19.1", "typed-graphqlify": "3.1.6" } diff --git a/ng-dev/package.json b/ng-dev/package.json index 78b2f3f3f3..bd9b4ebb75 100644 --- a/ng-dev/package.json +++ b/ng-dev/package.json @@ -24,12 +24,11 @@ "@octokit/core": "7.0.8", "@octokit/graphql-schema": "15.26.1", "@octokit/graphql": "9.0.5", - "@octokit/openapi-types": "28.0.0", - "@octokit/plugin-paginate-rest": "15.0.0", + "@octokit/plugin-paginate-rest": "16.0.0", "@octokit/plugin-rest-endpoint-methods": "18.0.0", "@octokit/request-error": "7.1.2", "@octokit/rest": "22.0.1", - "@octokit/types": "17.0.0", + "@octokit/types": "18.0.0", "@types/cli-progress": "3.11.6", "@types/ejs": "3.1.5", "@types/events": "3.0.3", diff --git a/ng-dev/utils/BUILD.bazel b/ng-dev/utils/BUILD.bazel index 2a67d2268f..7c01117390 100644 --- a/ng-dev/utils/BUILD.bazel +++ b/ng-dev/utils/BUILD.bazel @@ -46,7 +46,6 @@ ts_project( "//ng-dev:node_modules/@octokit/auth-app", "//ng-dev:node_modules/@octokit/core", "//ng-dev:node_modules/@octokit/graphql", - "//ng-dev:node_modules/@octokit/openapi-types", "//ng-dev:node_modules/@octokit/plugin-paginate-rest", "//ng-dev:node_modules/@octokit/plugin-rest-endpoint-methods", "//ng-dev:node_modules/@octokit/request-error", diff --git a/ng-dev/utils/git/octokit-types.ts b/ng-dev/utils/git/octokit-types.ts index cb85ca6126..6cf4a0a4b2 100644 --- a/ng-dev/utils/git/octokit-types.ts +++ b/ng-dev/utils/git/octokit-types.ts @@ -1,4 +1,4 @@ -import {components} from '@octokit/openapi-types'; +import type {RestEndpointMethodTypes} from '@octokit/rest'; type DeepPartial = T extends object ? { @@ -6,6 +6,6 @@ type DeepPartial = T extends object } : T; -export type Commit = components['schemas']['commit']; +export type Commit = RestEndpointMethodTypes['repos']['getCommit']['response']['data']; export type PartialCommit = DeepPartial; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c0be014d90..a7640df29d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -244,9 +244,6 @@ importers: '@octokit/rest': specifier: 22.0.1 version: 22.0.1 - '@octokit/types': - specifier: 17.0.0 - version: 17.0.0 '@types/node': specifier: 24.19.1 version: 24.19.1 @@ -262,9 +259,6 @@ importers: '@octokit/rest': specifier: 22.0.1 version: 22.0.1 - '@octokit/types': - specifier: 17.0.0 - version: 17.0.0 '@types/node': specifier: 24.19.1 version: 24.19.1 @@ -565,9 +559,6 @@ importers: '@google/genai': specifier: ^2.0.0 version: 2.28.0(@modelcontextprotocol/sdk@1.32.1(supports-color@11.0.0))(bufferutil@4.1.0)(supports-color@11.0.0)(utf-8-validate@6.0.6) - '@octokit/openapi-types': - specifier: 28.0.0 - version: 28.0.0 '@octokit/rest': specifier: 22.0.1 version: 22.0.1 @@ -602,8 +593,8 @@ importers: specifier: 22.0.1 version: 22.0.1 '@octokit/types': - specifier: 17.0.0 - version: 17.0.0 + specifier: 18.0.0 + version: 18.0.0 '@types/node': specifier: 24.19.1 version: 24.19.1 @@ -709,12 +700,9 @@ importers: '@octokit/graphql-schema': specifier: 15.26.1 version: 15.26.1 - '@octokit/openapi-types': - specifier: 28.0.0 - version: 28.0.0 '@octokit/plugin-paginate-rest': - specifier: 15.0.0 - version: 15.0.0(@octokit/core@7.0.8) + specifier: 16.0.0 + version: 16.0.0(@octokit/core@7.0.8) '@octokit/plugin-rest-endpoint-methods': specifier: 18.0.0 version: 18.0.0(@octokit/core@7.0.8) @@ -725,8 +713,8 @@ importers: specifier: 22.0.1 version: 22.0.1 '@octokit/types': - specifier: 17.0.0 - version: 17.0.0 + specifier: 18.0.0 + version: 18.0.0 '@types/cli-progress': specifier: 3.11.6 version: 3.11.6 @@ -2311,8 +2299,8 @@ packages: peerDependencies: '@octokit/core': '>=6' - '@octokit/plugin-paginate-rest@15.0.0': - resolution: {integrity: sha512-lw9A9YL5s4VPj+VEx8uMxaxQm2YTgrPDkrLEuZuu18R8TK3oPcXF4K6t52nx6xn1RcogZC9i188sAr/4XYJaQQ==} + '@octokit/plugin-paginate-rest@16.0.0': + resolution: {integrity: sha512-7RtUeGZypAK4EA4LrjTCnsLALNOoUcYh5vOnCNXpdIQVTQCPh4OFu7324iPqAls3KGgVnZktKUnNKZCOKyHrlA==} engines: {node: '>= 20'} peerDependencies: '@octokit/core': '>=6' @@ -7859,10 +7847,10 @@ snapshots: '@octokit/core': 7.0.8 '@octokit/types': 16.0.0 - '@octokit/plugin-paginate-rest@15.0.0(@octokit/core@7.0.8)': + '@octokit/plugin-paginate-rest@16.0.0(@octokit/core@7.0.8)': dependencies: '@octokit/core': 7.0.8 - '@octokit/types': 17.0.0 + '@octokit/types': 18.0.0 '@octokit/plugin-request-log@6.0.0(@octokit/core@7.0.8)': dependencies: From 6daba1a814587b11fa2d05d4a4c4af6cb1d9a220 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Fri, 9 Oct 2026 10:32:45 +0000 Subject: [PATCH 2/2] build: remove unused @octokit/plugin-paginate-rest dependency --- ng-dev/package.json | 1 - ng-dev/utils/BUILD.bazel | 1 - pnpm-lock.yaml | 14 -------------- 3 files changed, 16 deletions(-) diff --git a/ng-dev/package.json b/ng-dev/package.json index bd9b4ebb75..a741f8a3a6 100644 --- a/ng-dev/package.json +++ b/ng-dev/package.json @@ -24,7 +24,6 @@ "@octokit/core": "7.0.8", "@octokit/graphql-schema": "15.26.1", "@octokit/graphql": "9.0.5", - "@octokit/plugin-paginate-rest": "16.0.0", "@octokit/plugin-rest-endpoint-methods": "18.0.0", "@octokit/request-error": "7.1.2", "@octokit/rest": "22.0.1", diff --git a/ng-dev/utils/BUILD.bazel b/ng-dev/utils/BUILD.bazel index 7c01117390..d484607b1b 100644 --- a/ng-dev/utils/BUILD.bazel +++ b/ng-dev/utils/BUILD.bazel @@ -46,7 +46,6 @@ ts_project( "//ng-dev:node_modules/@octokit/auth-app", "//ng-dev:node_modules/@octokit/core", "//ng-dev:node_modules/@octokit/graphql", - "//ng-dev:node_modules/@octokit/plugin-paginate-rest", "//ng-dev:node_modules/@octokit/plugin-rest-endpoint-methods", "//ng-dev:node_modules/@octokit/request-error", "//ng-dev:node_modules/@octokit/rest", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a7640df29d..378bbdb95d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -700,9 +700,6 @@ importers: '@octokit/graphql-schema': specifier: 15.26.1 version: 15.26.1 - '@octokit/plugin-paginate-rest': - specifier: 16.0.0 - version: 16.0.0(@octokit/core@7.0.8) '@octokit/plugin-rest-endpoint-methods': specifier: 18.0.0 version: 18.0.0(@octokit/core@7.0.8) @@ -2299,12 +2296,6 @@ packages: peerDependencies: '@octokit/core': '>=6' - '@octokit/plugin-paginate-rest@16.0.0': - resolution: {integrity: sha512-7RtUeGZypAK4EA4LrjTCnsLALNOoUcYh5vOnCNXpdIQVTQCPh4OFu7324iPqAls3KGgVnZktKUnNKZCOKyHrlA==} - engines: {node: '>= 20'} - peerDependencies: - '@octokit/core': '>=6' - '@octokit/plugin-request-log@6.0.0': resolution: {integrity: sha512-UkOzeEN3W91/eBq9sPZNQ7sUBvYCqYbrrD8gTbBuGtHEuycE4/awMXcYvx6sVYo7LypPhmQwwpUe4Yyu4QZN5Q==} engines: {node: '>= 20'} @@ -7847,11 +7838,6 @@ snapshots: '@octokit/core': 7.0.8 '@octokit/types': 16.0.0 - '@octokit/plugin-paginate-rest@16.0.0(@octokit/core@7.0.8)': - dependencies: - '@octokit/core': 7.0.8 - '@octokit/types': 18.0.0 - '@octokit/plugin-request-log@6.0.0(@octokit/core@7.0.8)': dependencies: '@octokit/core': 7.0.8