Skip to content

Commit

Permalink
chore: update dependencies (#187)
Browse files Browse the repository at this point in the history
* chore: migrate to husky 5
* chore: update all dependencies
* chore: fix webpack config typings
  • Loading branch information
rodmax authored Feb 16, 2021
1 parent 4fc1020 commit 878b640
Show file tree
Hide file tree
Showing 7 changed files with 3,717 additions and 2,129 deletions.
1 change: 1 addition & 0 deletions .husky/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_
5 changes: 5 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh
# shellcheck disable=SC1090
. "$(dirname "$0")/_/husky.sh"

"$(npm bin)"/lint-staged
5 changes: 5 additions & 0 deletions .husky/pre-push
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh
# shellcheck disable=SC1090
. "$(dirname "$0")/_/husky.sh"

npm run pre-push
1 change: 1 addition & 0 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"repos",
"Rodionov",
"rodmax",
"shellcheck",
"stylelint",
"testcafe"
]
Expand Down
5,756 changes: 3,668 additions & 2,088 deletions package-lock.json

Large diffs are not rendered by default.

74 changes: 35 additions & 39 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,8 @@
"g:all-to-check": "./tools/plop/generate-templates-to-check.sh",
"cspell:base": "cspell lint --no-progress",
"cspell:all": "cspell lint --no-progress $(git ls-files)",
"i18n:extract-keys": "i18next --config tools/i18n/parser.config.js"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged",
"pre-push": "npm run pre-push"
}
"i18n:extract-keys": "i18next --config tools/i18n/parser.config.js",
"postinstall": "husky install"
},
"lint-staged": {
"*.{md,json,yaml,yml}": "prettier --write",
Expand All @@ -68,8 +63,8 @@
],
"dependencies": {
"classnames": "2.2.6",
"core-js": "3.8.2",
"i18next": "19.8.4",
"core-js": "3.8.3",
"i18next": "19.8.7",
"react": "17.0.1",
"react-dom": "17.0.1",
"react-redux": "7.2.2",
Expand All @@ -81,57 +76,58 @@
"router5": "8.0.1",
"router5-plugin-browser": "8.0.1",
"rxjs": "6.6.3",
"tslib": "2.0.3"
"tslib": "2.1.0"
},
"devDependencies": {
"@cspell/dict-ru_ru": "1.3.4",
"@testing-library/react": "11.2.2",
"@testing-library/user-event": "12.6.0",
"@testing-library/react": "11.2.5",
"@testing-library/user-event": "12.7.1",
"@types/classnames": "2.2.11",
"@types/eslint": "7.2.6",
"@types/html-webpack-plugin": "3.2.4",
"@types/jest": "26.0.19",
"@types/prettier": "2.1.6",
"@types/react": "17.0.0",
"@types/react-dom": "17.0.0",
"@types/react-redux": "7.1.15",
"@types/jest": "26.0.20",
"@types/prettier": "2.2.1",
"@types/react": "17.0.2",
"@types/react-dom": "17.0.1",
"@types/react-redux": "7.1.16",
"@types/stylelint": "9.10.1",
"@typescript-eslint/eslint-plugin": "4.12.0",
"@typescript-eslint/parser": "4.12.0",
"autoprefixer": "9.8.6",
"cspell": "5.1.3",
"css-loader": "5.0.1",
"@typescript-eslint/eslint-plugin": "4.15.1",
"@typescript-eslint/parser": "4.15.1",
"autoprefixer": "10.2.4",
"cspell": "5.2.4",
"css-loader": "5.0.2",
"css-mqpacker": "7.0.0",
"cssnano": "4.1.10",
"dependency-cruiser": "9.21.4",
"eslint": "7.18.0",
"dependency-cruiser": "9.23.0",
"eslint": "7.20.0",
"eslint-plugin-eslint-comments": "3.2.0",
"eslint-plugin-jest": "24.1.3",
"eslint-plugin-react": "7.22.0",
"eslint-plugin-react-hooks": "4.2.0",
"factory-t": "0.3.0",
"html-webpack-plugin": "4.5.1",
"husky": "4.3.6",
"html-webpack-plugin": "5.1.0",
"husky": "5.0.9",
"i18next-parser": "3.6.0",
"jest": "26.6.3",
"lint-staged": "10.5.3",
"mini-css-extract-plugin": "1.3.3",
"lint-staged": "10.5.4",
"mini-css-extract-plugin": "1.3.7",
"node-sass": "5.0.0",
"npm-run-all": "4.1.5",
"plop": "2.7.4",
"postcss-loader": "4.1.0",
"postcss": "8.2.6",
"postcss-loader": "5.0.0",
"prettier": "2.2.1",
"sass-loader": "10.1.0",
"sass-loader": "11.0.1",
"style-loader": "2.0.0",
"stylelint": "13.8.0",
"stylelint": "13.10.0",
"stylelint-config-recommended": "3.0.0",
"testcafe": "1.10.1",
"ts-jest": "26.4.4",
"ts-loader": "8.0.14",
"typescript": "4.1.3",
"webpack": "5.11.1",
"webpack-bundle-analyzer": "4.3.0",
"webpack-cli": "4.3.1",
"webpack-dev-server": "3.11.1"
"testcafe": "1.11.0",
"ts-jest": "26.5.1",
"ts-loader": "8.0.17",
"typescript": "4.1.5",
"webpack": "5.22.0",
"webpack-bundle-analyzer": "4.4.0",
"webpack-cli": "4.5.0",
"webpack-dev-server": "3.11.2"
}
}
4 changes: 2 additions & 2 deletions tools/env.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ env.buildAssetsDir = path.join(env.buildDir, 'assets')
env.srcDir = path.join(env.rootDir, 'src')
env.applicationConfigFile = path.join(env.buildDir, 'config.json')

env.devServerPort = '3000'
env.staticServerPort = process.env.APP_PORT || '5000' // Used to e2e tests of prod application build
env.devServerPort = 3000
env.staticServerPort = +(process.env.APP_PORT || 5000) // Used to e2e tests of prod application build
/**
* @type { 'production' | 'development' }
*/
Expand Down

0 comments on commit 878b640

Please sign in to comment.