Skip to content

Commit

Permalink
feat: node 14 support + TS 4.1 + actions cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
AndrewLeedham committed Dec 1, 2020
1 parent bad0119 commit c05b647
Show file tree
Hide file tree
Showing 7 changed files with 655 additions and 195 deletions.
16 changes: 0 additions & 16 deletions .dependabot/config.yml

This file was deleted.

11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: 'npm'
directory: '/'
schedule:
interval: 'daily'
target-branch: 'next'
allow:
- dependency-type: 'direct'
20 changes: 9 additions & 11 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
node-version: [10.x, 12.x]
node-version: [10.x, 12.x, 14.x]

steps:
- uses: actions/checkout@v2
Expand All @@ -24,12 +24,11 @@ jobs:
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: actions/cache@v2
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ matrix.node-version }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ matrix.node-version }}-yarn-
path: |
node_modules
key: ${{ matrix.node-version}}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
- run: yarn install
- run: yarn lint
- run: yarn type-check
Expand All @@ -49,12 +48,11 @@ jobs:
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: actions/cache@v2
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: 12.x-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
12.x-yarn-
path: |
node_modules
key: ${{ matrix.node-version}}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
- uses: webfactory/[email protected]
with:
ssh-private-key: ${{secrets.SSH_PRIVATE_KEY}}
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
node-version: [10.x, 12.x]
node-version: [10.x, 12.x, 14.x]

steps:
- uses: actions/checkout@v2
Expand All @@ -27,12 +27,11 @@ jobs:
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: actions/cache@v2
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ matrix.node-version }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ matrix.node-version }}-yarn-
path: |
node_modules
key: ${{ matrix.node-version}}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
- run: yarn install
- run: yarn lint
- run: yarn type-check
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12
14
28 changes: 8 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"prepublishOnly": "yarn run build"
},
"engines": {
"node": ">=10 <=12"
"node": ">=10 <=14"
},
"browserslist": [
"current node"
Expand Down Expand Up @@ -59,34 +59,22 @@
"@types/jest": "^26.0.0",
"@types/node": "^12.12.39",
"@types/node-fetch": "^2.1.7",
"@xerox/commitlint-config": "^2.1.1",
"@xerox/eslint-config": "^3.1.3",
"@xerox/prettier-config": "^2.2.1",
"@xerox/semantic-release-config": "^2.2.2",
"@xerox/commitlint-config": "^2.1.6",
"@xerox/eslint-config": "^3.1.9",
"@xerox/prettier-config": "^2.2.6",
"@xerox/semantic-release-config": "^2.3.5",
"eslint": "^7.2.0",
"husky": "^4.0.0",
"jest": "^26.0.1",
"jest-circus": "^26.0.1",
"jest-package-audit": "^3.1.2",
"prettier": "^2.0.2",
"semantic-release": "^17.0.4",
"semantic-release": "^17.3.0",
"ts-jest": "^26.0.0",
"typescript": "^4.0.2"
"typescript": "^4.1.2"
},
"dependencies": {
"browserslist": "^4.6.3",
"browserslist": "^4.14.7",
"node-fetch": "^2.3.0"
},
"resolutions": {
"set-value": ">=2.0.1",
"mem": ">=4.0.0",
"https-proxy-agent": ">=2.2.3",
"handlebars": ">=4.5.2",
"acorn": ">=7.1.1",
"kind-of": ">=6.0.3",
"minimist": ">=1.2.3",
"yargs-parser": ">=13.1.2 <14.0.0 || >=15.0.1 <16.0.0 || >=18.1.2",
"@types/node": "^12.12.39",
"dot-prop": ">=5.1.1"
}
}
Loading

0 comments on commit c05b647

Please sign in to comment.