Merge branch 'master' into renovate/prettier-2.x

This commit is contained in:
Marc Cataford 2021-06-05 11:03:03 -04:00 committed by GitHub
commit 6e265ba2a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 115 deletions

101
.github/dependabot.yml vendored
View file

@ -1,101 +0,0 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: daily
time: "10:00"
open-pull-requests-limit: 10
reviewers:
- mcataford
labels:
- dependencies
ignore:
- dependency-name: "@types/node"
versions:
- 14.14.31
- 14.14.32
- 14.14.33
- 14.14.34
- 14.14.35
- 14.14.36
- 14.14.37
- 14.14.39
- 14.14.41
- 15.0.0
- dependency-name: eslint-config-prettier
versions:
- 8.0.0
- 8.1.0
- 8.2.0
- dependency-name: "@babel/core"
versions:
- 7.13.1
- 7.13.10
- 7.13.14
- 7.13.15
- 7.13.8
- dependency-name: "@typescript-eslint/eslint-plugin"
versions:
- 4.15.2
- 4.16.1
- 4.17.0
- 4.18.0
- 4.19.0
- 4.20.0
- 4.21.0
- dependency-name: "@typescript-eslint/parser"
versions:
- 4.15.2
- 4.16.1
- 4.17.0
- 4.18.0
- 4.19.0
- 4.20.0
- 4.21.0
- dependency-name: "@babel/cli"
versions:
- 7.13.0
- 7.13.10
- 7.13.14
- dependency-name: "@babel/preset-env"
versions:
- 7.12.11
- 7.12.13
- 7.12.16
- 7.13.0
- 7.13.10
- 7.13.12
- 7.13.5
- 7.13.8
- 7.13.9
- dependency-name: typescript
versions:
- 4.2.2
- 4.2.3
- dependency-name: eslint
versions:
- 7.18.0
- 7.19.0
- 7.20.0
- dependency-name: prettier
versions:
- 2.2.1
- dependency-name: jest
versions:
- 26.6.3
- dependency-name: mock-fs
versions:
- 4.13.0
- dependency-name: semantic-release
versions:
- 17.2.3
- dependency-name: eslint-plugin-import
versions:
- 2.22.1
- dependency-name: eslint-plugin-jest
versions:
- 24.1.3
- dependency-name: node-fetch
versions:
- 2.6.1

View file

@ -9,7 +9,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Use Node.js 12.x - name: Use Node.js 12.x
uses: actions/setup-node@v1 uses: actions/setup-node@v2
with: with:
node-version: 12.x node-version: 12.x
- run: yarn - run: yarn
@ -24,7 +24,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }} - name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1 uses: actions/setup-node@v2
with: with:
node-version: ${{ matrix.node-version }} node-version: ${{ matrix.node-version }}
- run: yarn - run: yarn
@ -44,7 +44,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }} - name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1 uses: actions/setup-node@v2
with: with:
node-version: ${{ matrix.node-version }} node-version: ${{ matrix.node-version }}
- run: yarn --immutable - run: yarn --immutable

View file

@ -13,9 +13,9 @@ jobs:
needs: [build, lint, test] needs: [build, lint, test]
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v1 uses: actions/checkout@v2
- name: Node setup - name: Node setup
uses: actions/setup-node@v1 uses: actions/setup-node@v2
with: with:
node-version: 14 node-version: 14
- name: Prepare - name: Prepare

View file

@ -45,11 +45,11 @@
"@babel/preset-typescript": "^7.12.7", "@babel/preset-typescript": "^7.12.7",
"@tophat/eslint-config": "^0.7.0", "@tophat/eslint-config": "^0.7.0",
"@types/jest": "26.0.23", "@types/jest": "26.0.23",
"@types/node": "^14.14.13", "@types/node": "14.17.2",
"@typescript-eslint/eslint-plugin": "^4.9.1", "@typescript-eslint/eslint-plugin": "^4.9.1",
"@typescript-eslint/parser": "^4.9.1", "@typescript-eslint/parser": "^4.9.1",
"eslint": "^7.0.0", "eslint": "^7.0.0",
"eslint-config-prettier": "^7.2.0", "eslint-config-prettier": "8.3.0",
"eslint-import-resolver-node": "^0.3.4", "eslint-import-resolver-node": "^0.3.4",
"eslint-plugin-import": "^2.22.1", "eslint-plugin-import": "^2.22.1",
"eslint-plugin-jest": "^24.1.5", "eslint-plugin-jest": "^24.1.5",

View file

@ -1846,13 +1846,20 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/node@npm:*, @types/node@npm:^14.14.13": "@types/node@npm:*":
version: 14.14.30 version: 14.14.30
resolution: "@types/node@npm:14.14.30" resolution: "@types/node@npm:14.14.30"
checksum: 9283bf3233cb1508a06df34d078107b014bf737efd14f656769608e9b4190d118c045ff6172ab04fc1e2c61ff10712df92ac0403542886e063f5500b5f654538 checksum: 9283bf3233cb1508a06df34d078107b014bf737efd14f656769608e9b4190d118c045ff6172ab04fc1e2c61ff10712df92ac0403542886e063f5500b5f654538
languageName: node languageName: node
linkType: hard linkType: hard
"@types/node@npm:14.17.2":
version: 14.17.2
resolution: "@types/node@npm:14.17.2"
checksum: 7a2e90989ce2948d3cdfc1d15fb5f0439ea53971d81a466ad049922bb23ef38252f6639271ae5899670ab93d48ed62542ad687767e45ffa6fe902ce59f518e5b
languageName: node
linkType: hard
"@types/prettier@npm:^2.1.5": "@types/prettier@npm:^2.1.5":
version: 2.2.3 version: 2.2.3
resolution: "@types/prettier@npm:2.2.3" resolution: "@types/prettier@npm:2.2.3"
@ -3207,14 +3214,14 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"eslint-config-prettier@npm:^7.2.0": "eslint-config-prettier@npm:8.3.0":
version: 7.2.0 version: 8.3.0
resolution: "eslint-config-prettier@npm:7.2.0" resolution: "eslint-config-prettier@npm:8.3.0"
peerDependencies: peerDependencies:
eslint: ">=7.0.0" eslint: ">=7.0.0"
bin: bin:
eslint-config-prettier: bin/cli.js eslint-config-prettier: bin/cli.js
checksum: 6812150ea49703cd64035527205b4905bc1edcd34646e71f71665e1acff9ab4648f872598389bdb209964093ad73993830a2c821ba12642764a5293513b92a58 checksum: 94ccbb50fb67e5e47e8ba6cfa257b5cbf53619990ab13f46b99518cfe9b900394b93bdf6ffedbde1a8e2997d301b0fbd73a6b4202146bc53475dfb30a8c812f2
languageName: node languageName: node
linkType: hard linkType: hard
@ -5820,11 +5827,11 @@ __metadata:
"@babel/preset-typescript": ^7.12.7 "@babel/preset-typescript": ^7.12.7
"@tophat/eslint-config": ^0.7.0 "@tophat/eslint-config": ^0.7.0
"@types/jest": 26.0.23 "@types/jest": 26.0.23
"@types/node": ^14.14.13 "@types/node": 14.17.2
"@typescript-eslint/eslint-plugin": ^4.9.1 "@typescript-eslint/eslint-plugin": ^4.9.1
"@typescript-eslint/parser": ^4.9.1 "@typescript-eslint/parser": ^4.9.1
eslint: ^7.0.0 eslint: ^7.0.0
eslint-config-prettier: ^7.2.0 eslint-config-prettier: 8.3.0
eslint-import-resolver-node: ^0.3.4 eslint-import-resolver-node: ^0.3.4
eslint-plugin-import: ^2.22.1 eslint-plugin-import: ^2.22.1
eslint-plugin-jest: ^24.1.5 eslint-plugin-jest: ^24.1.5