Skip to content

Commit

Permalink
Bump deps
Browse files Browse the repository at this point in the history
  • Loading branch information
sorenlouv committed Mar 5, 2024
1 parent 49a74c9 commit 8da3639
Show file tree
Hide file tree
Showing 6 changed files with 153 additions and 228 deletions.
1 change: 1 addition & 0 deletions jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const baseConfig: JestConfigWithTsJest = {
},
snapshotSerializers: ['jest-snapshot-serializer-ansi'],
setupFiles: ['./src/test/setupFiles/automatic-mocks.ts'],
setupFilesAfterEnv: ['./src/test/setupFiles/setup-after-env.ts'],
preset: 'ts-jest',
testRegex: 'src/.*test.ts$',
testEnvironment: 'node',
Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,28 +89,28 @@
"@types/core-js": "^2.5.5",
"@types/dedent": "^0.7.0",
"@types/inquirer": "^8.2.6",
"@types/jest": "^29.5.5",
"@types/jest": "^29.5.12",
"@types/lodash": "^4.14.199",
"@types/node": "^20.8.6",
"@types/node": "^20.11.24",
"@types/safe-json-stringify": "^1.1.3",
"@types/yargs": "^17.0.28",
"@types/yargs-parser": "^21.0.1",
"@typescript-eslint/eslint-plugin": "^6.8.0",
"@typescript-eslint/parser": "^6.8.0",
"eslint": "^8.51.0",
"@typescript-eslint/eslint-plugin": "^7.1.1",
"@typescript-eslint/parser": "^7.1.1",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-jest": "^27.4.2",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^27.9.0",
"eslint-plugin-prettier": "^5.1.3",
"graphql-config": "^5.0.3",
"husky": "^8.0.3",
"jest": "^29.7.0",
"jest-snapshot-serializer-ansi": "^1.0.0",
"lint-staged": "^14.0.1",
"nock": "^13.3.4",
"prettier": "^3.0.3",
"prettier": "^3.2.5",
"strip-ansi": "^6.0.1",
"ts-jest": "^29.1.1",
"ts-jest": "^29.1.2",
"ts-node": "^10.9.1",
"typescript": "5.3.3"
}
Expand Down
6 changes: 3 additions & 3 deletions src/lib/github/v3/createPullRequest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ export function getPullRequestBody({

const customPrDescription = options.prDescription
?.replaceAll('{{defaultPrDescription}}', defaultPrDescription)
?.replaceAll('{defaultPrDescription}', defaultPrDescription) // retain backwards compatibility
?.replaceAll('{{commitsStringified}}', JSON.stringify(commits))
?.replaceAll('{commits}', JSON.stringify(commits)); // retain backwards compatibility
.replaceAll('{defaultPrDescription}', defaultPrDescription) // retain backwards compatibility
.replaceAll('{{commitsStringified}}', JSON.stringify(commits))
.replaceAll('{commits}', JSON.stringify(commits)); // retain backwards compatibility

const template = Handlebars.compile(
customPrDescription ?? defaultPrDescription,
Expand Down
5 changes: 3 additions & 2 deletions src/lib/github/v3/createStatusComment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,9 @@ ${manualBackportCommand}${questionsAndLinkToBackport}${packageVersionSection}`;
) {
const unmergedBackports =
result.error.errorContext.commitsWithoutBackports.map((c) => {
return ` - [${getFirstLine(c.commit.sourceCommit.message)}](${c
.commit.sourcePullRequest?.url})`;
return ` - [${getFirstLine(c.commit.sourceCommit.message)}](${
c.commit.sourcePullRequest?.url
})`;
});

const unmergedBackportsSection =
Expand Down
1 change: 1 addition & 0 deletions src/test/setupFiles/setup-after-env.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
jest.retryTimes(2);
Loading

0 comments on commit 8da3639

Please sign in to comment.