Skip to content

Commit

Permalink
Security: Upgrade @rails/webpacker and jest (chatwoot#540)
Browse files Browse the repository at this point in the history
* Security: Upgrade @rails/webpacker and jest

* Upgrade jest from 24.9.0 to 25.1.0
* Upgrade @rails/webpacker from 4.0.7 to 4.2.2

* Update test to use 1 worker
  • Loading branch information
pranavrajs authored Feb 22, 2020
1 parent 708d268 commit 6340eb3
Show file tree
Hide file tree
Showing 2 changed files with 2,133 additions and 969 deletions.
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
"scripts": {
"eslint": "eslint app/javascript --fix",
"pretest": "rimraf .jest-cache",
"test": "jest --no-cache",
"test:watch": "jest --watch --no-cache",
"test:coverage": "jest --no-cache --collectCoverage",
"test": "jest -w 1 --no-cache",
"test:watch": "jest -w 1 --watch --no-cache",
"test:coverage": "jest -w 1 --no-cache --collectCoverage",
"webpacker-start": "webpack-dev-server -d --config webpack.dev.config.js --content-base public/ --progress --colors",
"start:dev": "foreman start -f ./Procfile.dev"
},
"dependencies": {
"@babel/polyfill": "^7.6.0",
"@babel/preset-env": "~7.3.4",
"@rails/actioncable": "^6.0.0",
"@rails/webpacker": "^4.0.7",
"@rails/webpacker": "^4.2.2",
"axios": "^0.19.0",
"babel-helper-vue-jsx-merge-props": "^2.0.3",
"babel-plugin-syntax-jsx": "^6.18.0",
Expand Down Expand Up @@ -59,7 +59,7 @@
"@vue/test-utils": "^1.0.0-beta.29",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-jest": "^24.9.0",
"babel-jest": "^25.1.0",
"eslint": "^5.13.0",
"eslint-config-airbnb": "^17.1.0",
"eslint-config-prettier": "^4.0.0",
Expand All @@ -72,7 +72,7 @@
"eslint-plugin-vue": "^5.2.3",
"expect-more-jest": "^2.4.2",
"husky": ">=1",
"jest": "^24.8.0",
"jest": "^25.1.0",
"jest-serializer-vue": "^2.0.2",
"jest-transform-stub": "^2.0.0",
"lint-staged": ">=8",
Expand Down
Loading

0 comments on commit 6340eb3

Please sign in to comment.