diff --git a/package.json b/package.json index dea771130..1f6bcfbda 100644 --- a/package.json +++ b/package.json @@ -63,6 +63,7 @@ "@babel/preset-env": "^7.20.2", "@babel/preset-react": "^7.18.6", "@babel/preset-typescript": "^7.18.6", + "@octokit/openapi-types": "18.0.0", "@octokit/rest": "18.1.0", "@testing-library/jest-dom": "^5.9.0", "@testing-library/react": "^13.1.0", diff --git a/scripts/performRelease/performLernaRelease.ts b/scripts/performRelease/performLernaRelease.ts index 114188d5f..7b8bbaa16 100644 --- a/scripts/performRelease/performLernaRelease.ts +++ b/scripts/performRelease/performLernaRelease.ts @@ -6,7 +6,9 @@ import { PR } from './types'; const exec = util.promisify(childProcess.exec); export function isReleasePR(pr: PR) { - return RELEASE_LABELS.some(releaseLabel => pr.labels.some(label => label.name === releaseLabel)); + return RELEASE_LABELS.some((releaseLabel) => + pr.labels.some((label) => label.name === releaseLabel), + ); } export default async function performLernaRelease(prsSinceLastTag: PR[]) { @@ -18,17 +20,17 @@ export default async function performLernaRelease(prsSinceLastTag: PR[]) { } // run lerna based on the type of release - const isPreRelease = releasePRsSinceLastTag.some(pr => + const isPreRelease = releasePRsSinceLastTag.some((pr) => // note that this logic requires that all alpha tags be removed from PRs // in order to trigger a non-alpha release. git keeps tag history so // preserving context should not be an issue - pr.labels.some(label => label.name === ALPHA_RELEASE), + pr.labels.some((label) => label.name === ALPHA_RELEASE), ); - const isMinor = releasePRsSinceLastTag.some(pr => - pr.labels.some(label => label.name === MINOR_RELEASE), + const isMinor = releasePRsSinceLastTag.some((pr) => + pr.labels.some((label) => label.name === MINOR_RELEASE), ); - const isMajor = releasePRsSinceLastTag.some(pr => - pr.labels.some(label => label.name === MAJOR_RELEASE), + const isMajor = releasePRsSinceLastTag.some((pr) => + pr.labels.some((label) => label.name === MAJOR_RELEASE), ); // perform release @@ -43,7 +45,7 @@ export default async function performLernaRelease(prsSinceLastTag: PR[]) { const { stdout, stderr } = await exec( // --no-verify-access is needed because the CI token isn't valid for that endpoint - `npx lerna publish ${version} --exact --yes --no-verify-access --dist-tag ${distTag}`, + `npx lerna publish ${version} --exact --yes --dist-tag ${distTag}`, ); if (stdout) { console.log('Lerna output', stdout); diff --git a/scripts/performRelease/types.ts b/scripts/performRelease/types.ts index daeff8f61..f84562a2a 100644 --- a/scripts/performRelease/types.ts +++ b/scripts/performRelease/types.ts @@ -1,3 +1,3 @@ -import { components } from '@octokit/openapi-types/generated/types'; +import type { components } from '@octokit/openapi-types'; export type PR = components['schemas']['pull-request-simple']; diff --git a/yarn.lock b/yarn.lock index 706e47e6b..b2d65e91b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2297,7 +2297,7 @@ "@octokit/types" "^9.0.0" universal-user-agent "^6.0.0" -"@octokit/openapi-types@^18.0.0": +"@octokit/openapi-types@18.0.0", "@octokit/openapi-types@^18.0.0": version "18.0.0" resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-18.0.0.tgz#f43d765b3c7533fd6fb88f3f25df079c24fccf69" integrity sha512-V8GImKs3TeQRxRtXFpG2wl19V7444NIOTDF24AWuIbmNaNYOQMWRbjcGDXV5B+0n887fgDcuMNOmlul+k+oJtw==