Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
tibdex committed Aug 1, 2023
1 parent 6c3859b commit f3accb1
Show file tree
Hide file tree
Showing 8 changed files with 1,497 additions and 935 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
name: Publish
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- uses: dylanvann/publish-github-action@v1.1.49
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
17 changes: 6 additions & 11 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,9 @@ jobs:
name: Test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Install
run: yarn install --frozen-lockfile
- name: Deduplicate dependencies
run: yarn run yarn-deduplicate --fail
- name: Build
run: yarn run build
- name: Format
run: yarn run prettier --check
- name: Lint
run: yarn run xo
- uses: actions/checkout@v3
- run: yarn install --frozen-lockfile
- run: yarn run yarn-deduplicate --strategy fewer --fail
- run: yarn run build
- run: yarn run prettier --check
- run: yarn run xo
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
The MIT License (MIT)
Copyright (c) 2022 Thibault Derousseaux <tibdex@gmail.com>
Copyright (c) 2023 Thibault Derousseaux <tibdex@gmail.com>

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
34 changes: 18 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,39 +1,41 @@
{
"name": "backport",
"version": "2.0.3",
"version": "2.0.4",
"license": "MIT",
"main": "dist/index.js",
"type": "module",
"files": [
"action.yml",
"dist"
],
"scripts": {
"prebuild": "tsc --build",
"build": "ncc build src/index.ts --minify --target es2021 --v8-cache",
"build": "ncc build src/index.ts --minify --target es2022 --v8-cache",
"prettier": "prettier --ignore-path .gitignore \"./**/*.{cjs,js,json,md,ts,yml}\"",
"xo": "xo"
},
"dependencies": {
"@actions/core": "^1.10.0",
"@actions/exec": "^1.1.1",
"@actions/github": "^5.0.1",
"@actions/github": "^5.1.1",
"ensure-error": "^4.0.0",
"lodash-es": "^4.17.21"
},
"devDependencies": {
"@octokit/webhooks-types": "^5.5.1",
"@trivago/prettier-plugin-sort-imports": "^4.2.0",
"@octokit/webhooks-types": "^7.1.0",
"@types/error-cause": "^1.0.1",
"@types/lodash-es": "^4.17.6",
"@types/node": "^16.11.26",
"@vercel/ncc": "^0.33.3",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-sort-destructure-keys": "^1.4.0",
"eslint-plugin-typescript-sort-keys": "^2.1.0",
"prettier": "^2.6.2",
"prettier-plugin-packagejson": "^2.2.17",
"typescript": "^4.6.3",
"xo": "^0.48.0",
"yarn-deduplicate": "^4.0.0"
"@types/lodash-es": "^4.17.8",
"@types/node": "^20.4.5",
"@vercel/ncc": "^0.36.1",
"eslint-config-prettier": "^8.9.0",
"eslint-plugin-import": "^2.28.0",
"eslint-plugin-sort-destructure-keys": "^1.5.0",
"eslint-plugin-typescript-sort-keys": "^2.3.0",
"prettier": "^3.0.0",
"prettier-plugin-packagejson": "^2.4.5",
"typescript": "^5.1.6",
"xo": "^0.55.0",
"yarn-deduplicate": "^6.0.2"
}
}
5 changes: 0 additions & 5 deletions prettier.config.cjs

This file was deleted.

3 changes: 2 additions & 1 deletion src/backport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const getBaseBranchFromLabel = (
): string | undefined => {
const result = labelRegExp.exec(label);

if (!result || !result.groups) {
if (!result?.groups) {
return;
}

Expand Down Expand Up @@ -63,6 +63,7 @@ const warnIfSquashIsNotTheOnlyAllowedMergeMethod = async ({
const {
data: { allow_merge_commit, allow_rebase_merge },
} = await github.request("GET /repos/{owner}/{repo}", { owner, repo });
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
if (allow_merge_commit || allow_rebase_merge) {
warning(
[
Expand Down
11 changes: 7 additions & 4 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
{
"compilerOptions": {
"forceConsistentCasingInFileNames": true,
"module": "esnext",
"moduleResolution": "node",
"isolatedModules": true,
"module": "ES2022",
"moduleResolution": "Node16",
"noEmit": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"strict": true,
"target": "es2021",
"types": ["node", "error-cause/auto"]
"target": "ES2022",
"types": ["node"]
},
"include": ["src"]
}
Loading

0 comments on commit f3accb1

Please sign in to comment.