Skip to content

Commit

Permalink
chore: TCM-100 - upgrade dependencies (#29)
Browse files Browse the repository at this point in the history
* chore: upgrade lerna

* chore: upgrade jest & typescript

* chore: upgrade conventional-changelog & husky

* chore: upgrade jsonld to latest minor

* chore: set node version 16

* chore: safe minor version bumps

* chore: add resolutions to packages with vulnerabilities

* chore: upgrade github actions

* chore: use exact package versions
  • Loading branch information
barendb authored Jun 20, 2022
1 parent 3d63100 commit a4ddafc
Show file tree
Hide file tree
Showing 13 changed files with 4,227 additions and 4,781 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/any.pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x]
node-version: [16.x]
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- run: yarn install --frozen-lockfile
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/github_backup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
id-token: write
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Configure aws credentials
uses: aws-actions/configure-aws-credentials@v1
Expand All @@ -30,4 +30,4 @@ jobs:
SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
AWS_SESSION_TOKEN: ${{ env.AWS_SESSION_TOKEN }}
with:
args: --overwrite --remove
args: --overwrite --remove
10 changes: 3 additions & 7 deletions .github/workflows/push-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,20 @@ on:
jobs:
build_test_publish:
name: Build, test, and publish unstable release
if: "! contains(github.event.head_commit.message, '[skip ci]')"
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
# checkout master explicitly as workflow triggered on a tag which results in checkout of detached HEAD
ref: master
# 0 indicates all history, needed for correct unstable version generation (commit count since last release)
fetch-depth: 0

- name: Setup nodejs
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: 10.x
node-version: 16.x
registry-url: "https://registry.npmjs.org"

- name: Install, lint and build
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/push-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,20 @@ jobs:
name: Build, test, and publish stable release
if: "contains(github.event.head_commit.message, 'chore(release): publish')"
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x]

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
# checkout master explicitly as workflow triggered on a tag which results in checkout of detached HEAD
ref: master
# 0 indicates all history, needed for correct unstable version generation (commit count since last release)
fetch-depth: 0

- name: Setup nodejs
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: 10.x
node-version: 16.x
registry-url: "https://registry.npmjs.org"

- name: Install, lint and build
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ out/
######################
.vscode/

######################
# Webstorm
######################
.idea

######################
# Windows
######################
Expand Down
4 changes: 4 additions & 0 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

[[ -n $HUSKY_BYPASS ]] || npx --no-install commitlint --edit $1
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

[[ -n $HUSKY_BYPASS ]] || npx --no-install pretty-quick --staged
1 change: 1 addition & 0 deletions commitlint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = { extends: ["@commitlint/config-conventional"] };
51 changes: 26 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,35 +23,36 @@
"lint:fix": "prettier --check \"**/*.ts\" \"**/*.md\" \"!**/lib/**\" && tslint --project ./tsconfig.json --fix",
"publish:unstable": "lerna publish --canary --dist-tag=unstable --preid=unstable --yes --exact",
"publish:release": "lerna publish from-git --yes",
"version:release": "lerna version minor --yes --exact --no-push"
"version:release": "lerna version minor --yes --exact --no-push",
"prepare": "husky install"
},
"devDependencies": {
"@commitlint/cli": "8.1.0",
"@commitlint/config-conventional": "8.1.0",
"cz-conventional-changelog": "3.0.2",
"husky": "3.0.4",
"jest": "24.9.0",
"jest-html-reporters": "1.2.0",
"lerna": "3.16.4",
"prettier": "1.19.1",
"pretty-quick": "1.11.1",
"ts-jest": "24.0.2",
"tslint": "5.16.0",
"@commitlint/cli": "17.0.2",
"@commitlint/config-conventional": "17.0.2",
"cz-conventional-changelog": "3.3.0",
"husky": "8.0.1",
"jest": "28.1.1",
"jest-html-reporters": "3.0.9",
"lerna": "5.1.2",
"prettier": "2.6.2",
"pretty-quick": "3.1.3",
"ts-jest": "28.0.5",
"tslint": "5.20.1",
"tslint-config-prettier": "1.18.0",
"tslint-consistent-codestyle": "1.15.1",
"tslint-immutable": "6.0.0",
"typescript": "3.7.5"
"tslint-consistent-codestyle": "1.16.0",
"tslint-immutable": "6.0.1",
"typescript": "4.3.5"
},
"husky": {
"hooks": {
"commit-msg": "[[ -n $HUSKY_BYPASS ]] || commitlint -E HUSKY_GIT_PARAMS",
"pre-commit": "[[ -n $HUSKY_BYPASS ]] || pretty-quick --staged"
}
},
"commitlint": {
"extends": [
"@commitlint/config-conventional"
]
"@comment: resolutions": [
"packages listed below resolve high/critical vulnerabilities"
],
"resolutions": {
"@commitlint/cli/**/ini": "1.3.6",
"@commitlint/cli/**/ansi-regex": "5.0.1",
"cz-conventional-changelog/**/minimist": "1.2.6",
"cz-conventional-changelog/**/merge": "2.1.1",
"lerna/**/ini": "1.3.6",
"lodash": "4.17.21"
},
"config": {
"commitizen": {
Expand Down
10 changes: 5 additions & 5 deletions packages/jsonld-lint-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
"build": "rm -rf bin/ && tsc --pretty && cp src/index.js bin/index.js"
},
"devDependencies": {
"@types/jest": "25.2.1",
"@types/node": "14.0.27",
"jest": "25.4.0",
"ts-jest": "25.4.0",
"typescript": "3.7.5"
"@types/jest": "28.1.1",
"@types/node": "17.0.42",
"jest": "28.1.1",
"ts-jest": "28.0.5",
"typescript": "4.3.5"
},
"dependencies": {
"commander": "6.0.0",
Expand Down
18 changes: 9 additions & 9 deletions packages/jsonld-lint-vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@
"test:integration": "node ./out/test/runTest.js"
},
"devDependencies": {
"@types/glob": "^7.1.3",
"@types/mocha": "^8.0.0",
"@types/node": "^14.0.27",
"@types/vscode": "^1.46.1",
"eslint": "^7.6.0",
"glob": "^7.1.6",
"mocha": "^8.0.1",
"typescript": "3.7.5",
"vscode-test": "^1.4.0"
"@types/glob": "7.2.0",
"@types/mocha": "8.0.0",
"@types/node": "17.0.42",
"@types/vscode": "1.68.0",
"eslint": "7.6.0",
"glob": "7.1.6",
"mocha": "8.0.1",
"typescript": "4.3.5",
"vscode-test": "1.4.0"
},
"dependencies": {
"jsonld-lint": "0.3.0"
Expand Down
12 changes: 6 additions & 6 deletions packages/jsonld-lint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
"test": "jest"
},
"devDependencies": {
"@types/jest": "25.2.1",
"@types/jest": "28.1.1",
"@types/lru-cache": "5.1.0",
"@types/node": "14.0.27",
"jest": "25.4.0",
"ts-jest": "25.4.0",
"typescript": "3.7.5"
"@types/node": "17.0.42",
"jest": "28.1.1",
"ts-jest": "28.0.5",
"typescript": "4.3.5"
},
"dependencies": {
"jsonld": "3.1.1",
"jsonld": "3.3.2",
"lru-cache": "6.0.0",
"vscode-json-languageservice": "3.8.1"
}
Expand Down
Loading

0 comments on commit a4ddafc

Please sign in to comment.