From 1b20db2d7819e0438ff22764f25501647877d7a0 Mon Sep 17 00:00:00 2001 From: Kevin Schmidt Date: Thu, 4 Nov 2021 16:08:01 -0600 Subject: [PATCH 1/2] chore(husky): upgrade husky to v7 --- .husky/commit-msg | 1 + .husky/post-merge | 1 + .husky/post-rewrite | 1 + package.json | 12 +++--------- 4 files changed, 6 insertions(+), 9 deletions(-) create mode 100755 .husky/commit-msg create mode 100755 .husky/post-merge create mode 100755 .husky/post-rewrite diff --git a/.husky/commit-msg b/.husky/commit-msg new file mode 100755 index 0000000..70bd3dd --- /dev/null +++ b/.husky/commit-msg @@ -0,0 +1 @@ +npx --no-install commitlint --edit "$1" diff --git a/.husky/post-merge b/.husky/post-merge new file mode 100755 index 0000000..da94093 --- /dev/null +++ b/.husky/post-merge @@ -0,0 +1 @@ +npm run package:update diff --git a/.husky/post-rewrite b/.husky/post-rewrite new file mode 100755 index 0000000..da94093 --- /dev/null +++ b/.husky/post-rewrite @@ -0,0 +1 @@ +npm run package:update diff --git a/package.json b/package.json index 1c4dcf0..f80dba0 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,8 @@ "compile:resolve": "os-resolve --outputDir .build --exclude resources", "build": "echo 'Please run the build script in the opensphere project' && exit 1", "package:update": "if git diff --name-only ORIG_HEAD HEAD | grep --quiet package.json; then echo 'UPDATE: package.json updated, consider running yarn in the workspace root'; fi", - "semantic-release": "semantic-release" + "semantic-release": "semantic-release", + "postinstall": "husky install" }, "keywords": [ "opensphere", @@ -92,7 +93,7 @@ "angular-mocks": "~1.8.x", "eslint": "^8.0.1", "eslint-config-opensphere": "^6.0.2", - "husky": "^3.0.2", + "husky": "^7.0.4", "karma": "^4.3.0", "karma-chrome-launcher": "^3.1.0", "karma-coverage-istanbul-reporter": "^3.0.3", @@ -114,12 +115,5 @@ "better-sqlite3": "7.4.1", "nan": "2.14.0", "opensphere": "0.0.0-development" - }, - "husky": { - "hooks": { - "commit-msg": "commitlint -E HUSKY_GIT_PARAMS", - "post-merge": "npm run package:update", - "post-rewrite": "npm run package:update" - } } } From ee91dc213b616cc86f73ee0348ca025045c61605 Mon Sep 17 00:00:00 2001 From: Kevin Schmidt Date: Mon, 8 Nov 2021 12:55:08 -0700 Subject: [PATCH 2/2] chore(deps): upgrade dependencies with non-breaking changes --- package.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index f80dba0..bcffc23 100644 --- a/package.json +++ b/package.json @@ -80,35 +80,35 @@ ] }, "devDependencies": { - "@commitlint/cli": "^11.0.0", - "@commitlint/config-conventional": "^11.0.0", + "@commitlint/cli": "^14.1.0", + "@commitlint/config-conventional": "^14.1.0", "@ngageoint/closure-webpack-plugin": "^3.0.0", "@ngageoint/opensphere-coverage-loader": "^1.0.0", - "@semantic-release/changelog": "^3.0.2", - "@semantic-release/commit-analyzer": "^6.1.0", - "@semantic-release/git": "^7.0.8", - "@semantic-release/github": "^5.2.10", - "@semantic-release/npm": "^5.1.4", - "@semantic-release/release-notes-generator": "^7.1.4", + "@semantic-release/changelog": "^6.0.1", + "@semantic-release/commit-analyzer": "^9.0.1", + "@semantic-release/git": "^10.0.1", + "@semantic-release/github": "^8.0.2", + "@semantic-release/npm": "^8.0.3", + "@semantic-release/release-notes-generator": "^10.0.2", "angular-mocks": "~1.8.x", "eslint": "^8.0.1", "eslint-config-opensphere": "^6.0.2", "husky": "^7.0.4", - "karma": "^4.3.0", + "karma": "^6.3.8", "karma-chrome-launcher": "^3.1.0", "karma-coverage-istanbul-reporter": "^3.0.3", - "karma-firefox-launcher": "^1.2.0", + "karma-firefox-launcher": "^2.1.2", "karma-jasmine": "^0.1.0", - "karma-junit-reporter": "^1.2.0", - "mkdirp": "^0.5.1", + "karma-junit-reporter": "^2.0.1", + "mkdirp": "^1.0.4", "modernizr": "^3.8.0", "npm-run-all": "^4.1.5", "opensphere-build-closure-helper": "^7.0.0", "opensphere-build-resolver": "^10.0.0", - "rimraf": "^2.5.4", + "rimraf": "^3.0.2", "stylelint": "^14.0.0", "stylelint-config-opensphere": "^1.0.0", - "semantic-release": "^15.13.32" + "semantic-release": "^18.0.0" }, "dependencies": { "@ngageoint/geopackage": "^4.0.0-beta.36",