Skip to content

Commit

Permalink
chore(deps): Merge pull request #308 from KTH/issues/KUI-1268
Browse files Browse the repository at this point in the history
This PR is updating minor/patch updates as well as a couple of major updates.

The following dependencies are left unchanged.

- `date-fns`, because `date-fns-tz` is not compatible with it yet (see marnusw/date-fns-tz#260) 
- `prettier-2` only exists as a temporary workaround and will not be needed anymore as soon as `jest@30` is released. (see jestjs/jest#14305) 

```
 date-fns            ^2.30.0  →  ^3.4.0
 prettier-2  npm:prettier@^2  →      ^3
```
  • Loading branch information
belanglos authored Mar 14, 2024
2 parents ec1142d + 494b606 commit cdae8b2
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 54 deletions.
3 changes: 0 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx lint-staged
3 changes: 0 additions & 3 deletions .husky/pre-push
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npm run test
83 changes: 43 additions & 40 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"test:notify": "jest --watch --notify",
"docker": "npm install --development && npm run build && npm prune --production",
"lint": "eslint . && prettier-eslint --list-different **/*.js",
"prepare": "husky install",
"prepare": "husky",
"start": "bash -c 'cat /KTH_NODEJS; NODE_ENV=production node app.js'",
"start-dev": "bash -c 'NODE_ENV=development concurrently --kill-others -n build,app \"npm run build-dev\" \"nodemon app.js\"'"
},
Expand All @@ -39,7 +39,7 @@
"body-parser": "^1.20.2",
"cookie-parser": "^1.4.6",
"date-fns": "^2.30.0",
"date-fns-tz": "^2.0.0",
"date-fns-tz": "^2.0.1",
"dotenv": "^16.4.5",
"express": "^4.18.3",
"express-handlebars": "^7.1.2",
Expand All @@ -53,9 +53,9 @@
"react": "^18.2.0",
"react-data-table-component": "^7.6.2",
"react-dom": "^18.2.0",
"react-icons": "^4.12.0",
"react-router": "^6.22.2",
"react-router-dom": "^6.22.2",
"react-icons": "^5.0.1",
"react-router": "^6.22.3",
"react-router-dom": "^6.22.3",
"reactstrap": "^9.2.2",
"rimraf": "^5.0.5",
"sanitize-html": "^2.12.1",
Expand All @@ -64,7 +64,7 @@
"xlsx": "^0.18.5"
},
"devDependencies": {
"@babel/cli": "^7.23.4",
"@babel/cli": "^7.23.9",
"@babel/core": "^7.24.0",
"@babel/eslint-parser": "^7.23.10",
"@babel/plugin-transform-runtime": "^7.24.0",
Expand All @@ -85,7 +85,7 @@
"decache": "^4.6.2",
"eslint": "^8.57.0",
"file-loader": "^6.2.0",
"husky": "^8.0.3",
"husky": "^9.0.11",
"jest": "^29.7.0",
"jest-environment-jsdom": "29.7.0",
"jest-extended": "^4.0.2",
Expand All @@ -99,7 +99,7 @@
"prettier-eslint-cli": "^8.0.1",
"react-error-boundary": "^4.0.13",
"sass": "^1.71.1",
"sass-loader": "^13.3.2",
"sass-loader": "^14.1.1",
"set-value": "^4.1.0",
"terser-webpack-plugin": "^5.3.10",
"webpack": "^5.90.3",
Expand Down

0 comments on commit cdae8b2

Please sign in to comment.