Skip to content

Commit 1edd5c9

Browse files
Merge pull request #234 from shiftcode/update-dependencies
Update dependencies
2 parents 5c25d39 + c42842a commit 1edd5c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+10123
-9497
lines changed

.lintstagedrc.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
linters:
2-
"src/**/*(!spec).ts":
3-
- prettier --write --config ./.prettierrc.yml
4-
- tslint --project ./tsconfig.json -t codeFrame --fix
5-
- git add
6-
"(src/**/*.spec.ts|test/**/*.ts)":
7-
- prettier --write --config ./.prettierrc.yml
8-
# TODO LOW tslint will not work because of the following error
9-
# ✖ tslint --project ./tsconfig.jest.json -t codeFrame --fix found some errors. Please fix them and try committing again.
10-
#'/Users/michaelwittwer/dev/shiftcode/dynamo-easy/test/models/complex.model.ts' is not included in project.
11-
# - tslint --project ./tsconfig.jest.json -t codeFrame --fix
12-
- git add
13-
"**/package.json":
14-
- sort-package-json
15-
- git add
1+
"src/**/!(*.spec).ts":
2+
- prettier --write --config ./.prettierrc.yml
3+
- tslint --project ./tsconfig.json -t codeFrame --fix
4+
- git add
5+
"(src/**/*.spec.ts|test/**/*.ts)":
6+
- prettier --write --config ./.prettierrc.yml
7+
# TODO LOW tslint will not work because of the following error
8+
# ✖ tslint --project ./tsconfig.jest.json -t codeFrame --fix found some errors. Please fix them and try committing again.
9+
#'/Users/michaelwittwer/dev/shiftcode/dynamo-easy/test/models/complex.model.ts' is not included in project.
10+
# - tslint --project ./tsconfig.jest.json -t codeFrame --fix
11+
- git add
12+
"**/package.json":
13+
- sort-package-json
14+
- git add

jest.config.js

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,4 @@
11
module.exports = {
2-
testEnvironment: "node",
3-
globals: {
4-
"ts-jest": {
5-
tsConfig: "./tsconfig.jest.json"
6-
}
7-
},
8-
transform: {
9-
".(ts|tsx|js)": "ts-jest"
10-
},
11-
testRegex: "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
12-
moduleFileExtensions: [
13-
"ts",
14-
"tsx",
15-
"js"
16-
],
172
coveragePathIgnorePatterns: [
183
"/node_modules/",
194
"/test/"
@@ -26,8 +11,26 @@ module.exports = {
2611
statements: 10
2712
}
2813
},
14+
globals: {
15+
"ts-jest": {
16+
diagnostics: {
17+
ignoreCodes: [151001]
18+
},
19+
tsConfig: "./tsconfig.jest.json"
20+
}
21+
},
22+
moduleFileExtensions: [
23+
"ts",
24+
"tsx",
25+
"js"
26+
],
2927
setupFiles: [
3028
"reflect-metadata",
3129
'./test/jest-setup.ts'
32-
]
33-
};
30+
],
31+
testEnvironment: "node",
32+
testRegex: "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
33+
transform: {
34+
".(ts|tsx|js)": "ts-jest"
35+
}
36+
}

0 commit comments

Comments
 (0)