From 411cfcababd7f92740a84a9500c4b07035392535 Mon Sep 17 00:00:00 2001 From: Maksim Eltyshev Date: Tue, 19 Apr 2022 02:52:19 +0500 Subject: [PATCH] Fix pre-commit hook, update dependencies --- .husky/pre-commit | 4 ++++ client/package-lock.json | 30 +++++++++++++++--------------- client/package.json | 2 +- package.json | 8 ++------ server/package-lock.json | 36 ++++++++++++++++++------------------ server/package.json | 4 ++-- 6 files changed, 42 insertions(+), 42 deletions(-) create mode 100755 .husky/pre-commit diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100755 index 00000000..36af2198 --- /dev/null +++ b/.husky/pre-commit @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")/_/husky.sh" + +npx lint-staged diff --git a/client/package-lock.json b/client/package-lock.json index d0335db2..ad85a356 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -26,7 +26,7 @@ "react-input-mask": "^2.0.4", "react-markdown": "^8.0.2", "react-redux": "^7.2.8", - "react-router-dom": "^5.2.0", + "react-router-dom": "^5.3.1", "react-scripts": "5.0.1", "react-textarea-autosize": "^8.3.3", "redux": "^4.1.2", @@ -18266,9 +18266,9 @@ } }, "node_modules/react-router": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.1.tgz", - "integrity": "sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.1.tgz", + "integrity": "sha512-v+zwjqb7bakqgF+wMVKlAPTca/cEmPOvQ9zt7gpSNyPXau1+0qvuYZ5BWzzNDP1y6s15zDwgb9rPN63+SIniRQ==", "dependencies": { "@babel/runtime": "^7.12.13", "history": "^4.9.0", @@ -18286,15 +18286,15 @@ } }, "node_modules/react-router-dom": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.0.tgz", - "integrity": "sha512-ObVBLjUZsphUUMVycibxgMdh5jJ1e3o+KpAZBVeHcNQZ4W+uUGGWsokurzlF4YOldQYRQL4y6yFRWM4m3svmuQ==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.1.tgz", + "integrity": "sha512-f0pj/gMAbv9e8gahTmCEY20oFhxhrmHwYeIwH5EO5xu0qme+wXtsdB8YfUOAZzUz4VaXmb58m3ceiLtjMhqYmQ==", "dependencies": { "@babel/runtime": "^7.12.13", "history": "^4.9.0", "loose-envify": "^1.3.1", "prop-types": "^15.6.2", - "react-router": "5.2.1", + "react-router": "5.3.1", "tiny-invariant": "^1.0.2", "tiny-warning": "^1.0.0" }, @@ -36318,9 +36318,9 @@ "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==" }, "react-router": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.1.tgz", - "integrity": "sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.1.tgz", + "integrity": "sha512-v+zwjqb7bakqgF+wMVKlAPTca/cEmPOvQ9zt7gpSNyPXau1+0qvuYZ5BWzzNDP1y6s15zDwgb9rPN63+SIniRQ==", "requires": { "@babel/runtime": "^7.12.13", "history": "^4.9.0", @@ -36342,15 +36342,15 @@ } }, "react-router-dom": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.0.tgz", - "integrity": "sha512-ObVBLjUZsphUUMVycibxgMdh5jJ1e3o+KpAZBVeHcNQZ4W+uUGGWsokurzlF4YOldQYRQL4y6yFRWM4m3svmuQ==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.1.tgz", + "integrity": "sha512-f0pj/gMAbv9e8gahTmCEY20oFhxhrmHwYeIwH5EO5xu0qme+wXtsdB8YfUOAZzUz4VaXmb58m3ceiLtjMhqYmQ==", "requires": { "@babel/runtime": "^7.12.13", "history": "^4.9.0", "loose-envify": "^1.3.1", "prop-types": "^15.6.2", - "react-router": "5.2.1", + "react-router": "5.3.1", "tiny-invariant": "^1.0.2", "tiny-warning": "^1.0.0" } diff --git a/client/package.json b/client/package.json index a8df6a4a..6f458109 100755 --- a/client/package.json +++ b/client/package.json @@ -83,7 +83,7 @@ "react-input-mask": "^2.0.4", "react-markdown": "^8.0.2", "react-redux": "^7.2.8", - "react-router-dom": "^5.2.0", + "react-router-dom": "^5.3.1", "react-scripts": "5.0.1", "react-textarea-autosize": "^8.3.3", "redux": "^4.1.2", diff --git a/package.json b/package.json index 4ba8441c..5b76c05d 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,9 @@ "client:lint": "npm run lint --prefix client", "client:start": "npm start --prefix client", "client:test": "npm test --prefix client", - "lint": "npm run server:lint && npm run client:lint", "postinstall": "npm i --prefix server && npm i --prefix client", + "prepare": "husky install", + "lint": "npm run server:lint && npm run client:lint", "server:console": "npm run console --prefix server", "server:db:init": "npm run db:init --prefix server", "server:db:migrate": "npm run db:migrate --prefix server", @@ -27,11 +28,6 @@ "start": "concurrently -n server,client \"npm run server:start\" \"npm run client:start\"", "test": "npm run server:test && npm run client:test" }, - "husky": { - "hooks": { - "pre-commit": "lint-staged" - } - }, "lint-staged": { "client/**/*.{js,jsx}": [ "npm run client:lint" diff --git a/server/package-lock.json b/server/package-lock.json index 026d6177..506d9372 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -13,13 +13,13 @@ "jsonwebtoken": "^8.5.1", "knex": "^1.0.7", "lodash": "^4.17.21", - "moment": "^2.29.2", + "moment": "^2.29.3", "rimraf": "^3.0.2", "sails": "^1.5.2", "sails-hook-orm": "^4.0.1", "sails-hook-sockets": "^2.0.1", "sails-postgresql-redacted": "^1.0.2-9", - "sharp": "^0.30.3", + "sharp": "^0.30.4", "stream-to-array": "^2.3.0", "uuid": "^8.3.2", "validator": "^13.7.0" @@ -4674,9 +4674,9 @@ } }, "node_modules/moment": { - "version": "2.29.2", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.2.tgz", - "integrity": "sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==", + "version": "2.29.3", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz", + "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==", "engines": { "node": "*" } @@ -6775,16 +6775,16 @@ "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" }, "node_modules/sharp": { - "version": "0.30.3", - "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.30.3.tgz", - "integrity": "sha512-rjpfJFK58ZOFSG8sxYSo3/JQb4ej095HjXp9X7gVu7gEn1aqSG8TCW29h/Rr31+PXrFADo1H/vKfw0uhMQWFtg==", + "version": "0.30.4", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.30.4.tgz", + "integrity": "sha512-3Onig53Y6lji4NIZo69s14mERXXY/GV++6CzOYx/Rd8bnTwbhFbL09WZd7Ag/CCnA0WxFID8tkY0QReyfL6v0Q==", "hasInstallScript": true, "dependencies": { - "color": "^4.2.1", + "color": "^4.2.3", "detect-libc": "^2.0.1", "node-addon-api": "^4.3.0", "prebuild-install": "^7.0.1", - "semver": "^7.3.5", + "semver": "^7.3.7", "simple-get": "^4.0.1", "tar-fs": "^2.1.1", "tunnel-agent": "^0.6.0" @@ -12101,9 +12101,9 @@ } }, "moment": { - "version": "2.29.2", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.2.tgz", - "integrity": "sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==" + "version": "2.29.3", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz", + "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==" }, "ms": { "version": "2.1.2", @@ -13773,15 +13773,15 @@ "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" }, "sharp": { - "version": "0.30.3", - "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.30.3.tgz", - "integrity": "sha512-rjpfJFK58ZOFSG8sxYSo3/JQb4ej095HjXp9X7gVu7gEn1aqSG8TCW29h/Rr31+PXrFADo1H/vKfw0uhMQWFtg==", + "version": "0.30.4", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.30.4.tgz", + "integrity": "sha512-3Onig53Y6lji4NIZo69s14mERXXY/GV++6CzOYx/Rd8bnTwbhFbL09WZd7Ag/CCnA0WxFID8tkY0QReyfL6v0Q==", "requires": { - "color": "^4.2.1", + "color": "^4.2.3", "detect-libc": "^2.0.1", "node-addon-api": "^4.3.0", "prebuild-install": "^7.0.1", - "semver": "^7.3.5", + "semver": "^7.3.7", "simple-get": "^4.0.1", "tar-fs": "^2.1.1", "tunnel-agent": "^0.6.0" diff --git a/server/package.json b/server/package.json index acf261e1..d7666358 100644 --- a/server/package.json +++ b/server/package.json @@ -45,13 +45,13 @@ "jsonwebtoken": "^8.5.1", "knex": "^1.0.7", "lodash": "^4.17.21", - "moment": "^2.29.2", + "moment": "^2.29.3", "rimraf": "^3.0.2", "sails": "^1.5.2", "sails-hook-orm": "^4.0.1", "sails-hook-sockets": "^2.0.1", "sails-postgresql-redacted": "^1.0.2-9", - "sharp": "^0.30.3", + "sharp": "^0.30.4", "stream-to-array": "^2.3.0", "uuid": "^8.3.2", "validator": "^13.7.0"