Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/packages/testing/l…
Browse files Browse the repository at this point in the history
…odash-4.17.14
  • Loading branch information
reel committed Jul 15, 2019
2 parents 88ad79c + b73067a commit 27c86f7
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 385 deletions.
9 changes: 7 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"private": true,
"license": "MIT",
"scripts": {
"precommit": "lint-staged",
"prepublish": "node scripts/prepublish.js",
"pretest": "lerna bootstrap",
"test:watch": "jest --coverage --watch",
"test:precommit": "jest --coverage",
"test:ci": "jest --coverage --forceExit --runInBand --verbose --bail",
"coveralls": "nyc --instrument=false --source-map=false report --temp-directory=./coverage --reporter=text-lcov | coveralls",
"publish-canary": "lerna publish --yes --skip-git --exact -c",
Expand Down Expand Up @@ -40,7 +40,7 @@
"babel-eslint": "^10.0.2",
"babel-plugin-syntax-object-rest-spread": "^6.13.0",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"coveralls": "^3.0.4",
"coveralls": "^3.0.5",
"cross-env": "^5.2.0",
"eslint": "^6.0.1",
"eslint-config-react-app": "^4.0.1",
Expand Down Expand Up @@ -101,5 +101,10 @@
},
"dependencies": {
"eslint-plugin-react-hooks": "^1.6.1"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged && jest --coverage"
}
}
}
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"merge-graphql-schemas": "^1.5.8",
"moment": "^2.24.0",
"node-notifier": "^5.4.0",
"nodemailer": "^6.2.1",
"nodemailer": "^6.3.0",
"passport": "^0.4.0",
"passport-jwt": "^4.0.0",
"passport-local": "^1.0.0",
Expand Down

0 comments on commit 27c86f7

Please sign in to comment.