Skip to content

Commit

Permalink
Merge pull request #234 from shiftcode/update-dependencies
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
simonmumenthaler authored Sep 3, 2019
2 parents 5c25d39 + c42842a commit 1edd5c9
Show file tree
Hide file tree
Showing 48 changed files with 10,123 additions and 9,497 deletions.
29 changes: 14 additions & 15 deletions .lintstagedrc.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
linters:
"src/**/*(!spec).ts":
- prettier --write --config ./.prettierrc.yml
- tslint --project ./tsconfig.json -t codeFrame --fix
- git add
"(src/**/*.spec.ts|test/**/*.ts)":
- prettier --write --config ./.prettierrc.yml
# TODO LOW tslint will not work because of the following error
# ✖ tslint --project ./tsconfig.jest.json -t codeFrame --fix found some errors. Please fix them and try committing again.
#'/Users/michaelwittwer/dev/shiftcode/dynamo-easy/test/models/complex.model.ts' is not included in project.
# - tslint --project ./tsconfig.jest.json -t codeFrame --fix
- git add
"**/package.json":
- sort-package-json
- git add
"src/**/!(*.spec).ts":
- prettier --write --config ./.prettierrc.yml
- tslint --project ./tsconfig.json -t codeFrame --fix
- git add
"(src/**/*.spec.ts|test/**/*.ts)":
- prettier --write --config ./.prettierrc.yml
# TODO LOW tslint will not work because of the following error
# ✖ tslint --project ./tsconfig.jest.json -t codeFrame --fix found some errors. Please fix them and try committing again.
#'/Users/michaelwittwer/dev/shiftcode/dynamo-easy/test/models/complex.model.ts' is not included in project.
# - tslint --project ./tsconfig.jest.json -t codeFrame --fix
- git add
"**/package.json":
- sort-package-json
- git add
37 changes: 20 additions & 17 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
module.exports = {
testEnvironment: "node",
globals: {
"ts-jest": {
tsConfig: "./tsconfig.jest.json"
}
},
transform: {
".(ts|tsx|js)": "ts-jest"
},
testRegex: "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
moduleFileExtensions: [
"ts",
"tsx",
"js"
],
coveragePathIgnorePatterns: [
"/node_modules/",
"/test/"
Expand All @@ -26,8 +11,26 @@ module.exports = {
statements: 10
}
},
globals: {
"ts-jest": {
diagnostics: {
ignoreCodes: [151001]
},
tsConfig: "./tsconfig.jest.json"
}
},
moduleFileExtensions: [
"ts",
"tsx",
"js"
],
setupFiles: [
"reflect-metadata",
'./test/jest-setup.ts'
]
};
],
testEnvironment: "node",
testRegex: "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
transform: {
".(ts|tsx|js)": "ts-jest"
}
}
Loading

0 comments on commit 1edd5c9

Please sign in to comment.