Skip to content

Commit 0abf1cb

Browse files
chore(deps-dev): bump eslint from 7.21.0 to 7.22.0 (#57)
1 parent 0176d5f commit 0abf1cb

8 files changed

Lines changed: 43 additions & 87 deletions

File tree

.github/workflows/build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,19 @@ jobs:
1212
steps:
1313
- name: Checkout
1414
uses: actions/checkout@v2
15+
with:
16+
ref: ${{ github.event.pull_request.head.ref }}
17+
repository: ${{ github.event.pull_request.head.repo.full_name }}
1518
- name: Install dependencies
1619
run: yarn install --check-files --frozen-lockfile
1720
- name: Synthesize project files
1821
run: npx projen
19-
- name: Anti-tamper check
20-
run: git diff --exit-code
2122
- name: Set git identity
2223
run: |-
2324
git config user.name "Auto-bump"
2425
git config user.email "github-actions@github.com"
2526
- name: Build
2627
run: npx projen build
27-
- name: Anti-tamper check
28-
run: git diff --exit-code
28+
- name: Commit and push changes (if any)
29+
run: 'git diff --exit-code || (git commit -am "chore: self mutation" && git push
30+
origin HEAD:${{ github.event.pull_request.head.ref }})'

.github/workflows/rebuild-bot.yml

Lines changed: 0 additions & 56 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ jobs:
3232
run: npx projen build
3333
- name: Anti-tamper check
3434
run: git diff --exit-code
35-
- name: Push changes
36-
run: git push --follow-tags origin $BRANCH
37-
env:
38-
BRANCH: ${{ github.ref }}
35+
- name: Push commits
36+
run: git push origin HEAD:${{ github.ref }}
37+
- name: Push tags
38+
run: git push --follow-tags origin ${{ github.ref }}
3939
- name: Upload artifact
4040
uses: actions/upload-artifact@v2.1.1
4141
with:

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ yarn-error.log*
3131
!/.github/dependabot.yml
3232
!/.github/pull_request_template.md
3333
!/.github/workflows/build.yml
34-
!/.github/workflows/rebuild-bot.yml
3534
!/.github/workflows/release.yml
3635
!/.mergify.yml
3736
!/.npmignore

.mergify.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,7 @@ pull_request_rules:
2929
- status-success=build
3030
actions:
3131
merge:
32-
method: merge
32+
method: squash
3333
commit_message: title+body
34+
strict: smart
35+
strict_method: merge

.projen/deps.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@
1111
},
1212
{
1313
"name": "@typescript-eslint/eslint-plugin",
14-
"version": "^4.3.0",
1514
"type": "build"
1615
},
1716
{
1817
"name": "@typescript-eslint/parser",
19-
"version": "^4.3.0",
2018
"type": "build"
2119
},
2220
{
@@ -50,12 +48,12 @@
5048
},
5149
{
5250
"name": "projen",
53-
"version": "^0.16.3",
51+
"version": "^0.17.16",
5452
"type": "build"
5553
},
5654
{
5755
"name": "standard-version",
58-
"version": "^9.0.0",
56+
"version": "^9",
5957
"type": "build"
6058
},
6159
{
@@ -64,7 +62,6 @@
6462
},
6563
{
6664
"name": "typescript",
67-
"version": "^3.9.5",
6865
"type": "build"
6966
},
7067
{

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
"jest": "^26.6.3",
4848
"jest-junit": "^12",
4949
"json-schema": "^0.3.0",
50-
"projen": "^0.16.3",
51-
"standard-version": "^9.0.0",
50+
"projen": "^0.17.16",
51+
"standard-version": "^9",
5252
"ts-jest": "^26.5.0",
5353
"typescript": "^3.9.5"
5454
},

yarn.lock

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1935,9 +1935,9 @@ eslint-visitor-keys@^2.0.0:
19351935
integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
19361936

19371937
eslint@^7.19.0:
1938-
version "7.21.0"
1939-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.21.0.tgz#4ecd5b8c5b44f5dedc9b8a110b01bbfeb15d1c83"
1940-
integrity sha512-W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg==
1938+
version "7.22.0"
1939+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.22.0.tgz#07ecc61052fec63661a2cab6bd507127c07adc6f"
1940+
integrity sha512-3VawOtjSJUQiiqac8MQc+w457iGLfuNGLFn8JmF051tTKbh5/x/0vlcEj8OgDCaw7Ysa2Jn8paGshV7x2abKXg==
19411941
dependencies:
19421942
"@babel/code-frame" "7.12.11"
19431943
"@eslint/eslintrc" "^0.4.0"
@@ -1956,15 +1956,15 @@ eslint@^7.19.0:
19561956
file-entry-cache "^6.0.1"
19571957
functional-red-black-tree "^1.0.1"
19581958
glob-parent "^5.0.0"
1959-
globals "^12.1.0"
1959+
globals "^13.6.0"
19601960
ignore "^4.0.6"
19611961
import-fresh "^3.0.0"
19621962
imurmurhash "^0.1.4"
19631963
is-glob "^4.0.0"
19641964
js-yaml "^3.13.1"
19651965
json-stable-stringify-without-jsonify "^1.0.1"
19661966
levn "^0.4.1"
1967-
lodash "^4.17.20"
1967+
lodash "^4.17.21"
19681968
minimatch "^3.0.4"
19691969
natural-compare "^1.4.0"
19701970
optionator "^0.9.1"
@@ -2462,6 +2462,13 @@ globals@^12.1.0:
24622462
dependencies:
24632463
type-fest "^0.8.1"
24642464

2465+
globals@^13.6.0:
2466+
version "13.6.0"
2467+
resolved "https://registry.yarnpkg.com/globals/-/globals-13.6.0.tgz#d77138e53738567bb96a3916ff6f6b487af20ef7"
2468+
integrity sha512-YFKCX0SiPg7l5oKYCJ2zZGxcXprVXHcSnVuvzrT3oSENQonVLqM5pf9fN5dLGZGyCjhw8TN8Btwe/jKnZ0pjvQ==
2469+
dependencies:
2470+
type-fest "^0.20.2"
2471+
24652472
globby@^11.0.1:
24662473
version "11.0.2"
24672474
resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.2.tgz#1af538b766a3b540ebfb58a32b2e2d5897321d83"
@@ -3674,10 +3681,10 @@ lodash.templatesettings@^4.0.0:
36743681
dependencies:
36753682
lodash._reinterpolate "^3.0.0"
36763683

3677-
lodash@4.x, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20:
3678-
version "4.17.20"
3679-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
3680-
integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
3684+
lodash@4.x, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21:
3685+
version "4.17.21"
3686+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
3687+
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
36813688

36823689
loud-rejection@^1.0.0:
36833690
version "1.6.0"
@@ -4366,10 +4373,10 @@ progress@^2.0.0:
43664373
resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
43674374
integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
43684375

4369-
projen@^0.16.3:
4370-
version "0.16.3"
4371-
resolved "https://registry.yarnpkg.com/projen/-/projen-0.16.3.tgz#68df9b02e8725f3efae4c91148285fed28d7c094"
4372-
integrity sha512-FjJip+KrDVBYdbv40cR0ZJ3Tz+y3lkd5tgdSqw9/Q6eAjY889dJ1twm20U7K0H8JUJFo09MO8i33D5oPdr28FA==
4376+
projen@^0.17.16:
4377+
version "0.17.16"
4378+
resolved "https://registry.yarnpkg.com/projen/-/projen-0.17.16.tgz#40d109f74bf82280ee1dbc836635d199d80e2fd6"
4379+
integrity sha512-WPTvT7uK3mBrHt5CemkS791/3++OzyIcaTB2vPUt/6KViULkjpRIYYNknTXBp7hGJHKPn6NJ05/eRNATjiaiiw==
43734380
dependencies:
43744381
"@iarna/toml" "^2.2.5"
43754382
chalk "^4.1.0"
@@ -5005,7 +5012,7 @@ stack-utils@^2.0.2:
50055012
dependencies:
50065013
escape-string-regexp "^2.0.0"
50075014

5008-
standard-version@^9.0.0:
5015+
standard-version@^9:
50095016
version "9.1.1"
50105017
resolved "https://registry.yarnpkg.com/standard-version/-/standard-version-9.1.1.tgz#7561df6351b075a44544ce3d3ebcffcb9582ba5a"
50115018
integrity sha512-PF9JnRauBwH7DAkmefYu1mB2Kx0MVG13udqDTFmDUiogbyikBAHBdMrVuauxtAb2YIkyZ3FMYCNv0hqUKMOPww==
@@ -5407,6 +5414,11 @@ type-fest@^0.18.0:
54075414
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
54085415
integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
54095416

5417+
type-fest@^0.20.2:
5418+
version "0.20.2"
5419+
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
5420+
integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
5421+
54105422
type-fest@^0.6.0:
54115423
version "0.6.0"
54125424
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"

0 commit comments

Comments
 (0)