jest-config
Advanced tools
Comparing version 29.0.1 to 29.0.2
@@ -247,10 +247,10 @@ 'use strict'; | ||
} | ||
} // TS 3.5 forces us to split these into 2 | ||
} | ||
const mergeModuleNameMapperWithPreset = (options, preset) => { | ||
if (options['moduleNameMapper'] && preset['moduleNameMapper']) { | ||
options['moduleNameMapper'] = { | ||
...options['moduleNameMapper'], | ||
...preset['moduleNameMapper'], | ||
...options['moduleNameMapper'] | ||
const mergeOptionWithPreset = (options, preset, optionName) => { | ||
if (options[optionName] && preset[optionName]) { | ||
options[optionName] = { | ||
...options[optionName], | ||
...preset[optionName], | ||
...options[optionName] | ||
}; | ||
@@ -260,12 +260,2 @@ } | ||
const mergeTransformWithPreset = (options, preset) => { | ||
if (options['transform'] && preset['transform']) { | ||
options['transform'] = { | ||
...options['transform'], | ||
...preset['transform'], | ||
...options['transform'] | ||
}; | ||
} | ||
}; | ||
const mergeGlobalsWithPreset = (options, preset) => { | ||
@@ -365,4 +355,4 @@ if (options['globals'] && preset['globals']) { | ||
mergeModuleNameMapperWithPreset(options, preset); | ||
mergeTransformWithPreset(options, preset); | ||
mergeOptionWithPreset(options, preset, 'moduleNameMapper'); | ||
mergeOptionWithPreset(options, preset, 'transform'); | ||
mergeGlobalsWithPreset(options, preset); | ||
@@ -369,0 +359,0 @@ return {...preset, ...options}; |
{ | ||
"name": "jest-config", | ||
"version": "29.0.1", | ||
"version": "29.0.2", | ||
"repository": { | ||
@@ -33,5 +33,5 @@ "type": "git", | ||
"@babel/core": "^7.11.6", | ||
"@jest/test-sequencer": "^29.0.1", | ||
"@jest/types": "^29.0.1", | ||
"babel-jest": "^29.0.1", | ||
"@jest/test-sequencer": "^29.0.2", | ||
"@jest/types": "^29.0.2", | ||
"babel-jest": "^29.0.2", | ||
"chalk": "^4.0.0", | ||
@@ -42,13 +42,13 @@ "ci-info": "^3.2.0", | ||
"graceful-fs": "^4.2.9", | ||
"jest-circus": "^29.0.1", | ||
"jest-environment-node": "^29.0.1", | ||
"jest-circus": "^29.0.2", | ||
"jest-environment-node": "^29.0.2", | ||
"jest-get-type": "^29.0.0", | ||
"jest-regex-util": "^29.0.0", | ||
"jest-resolve": "^29.0.1", | ||
"jest-runner": "^29.0.1", | ||
"jest-util": "^29.0.1", | ||
"jest-validate": "^29.0.1", | ||
"jest-resolve": "^29.0.2", | ||
"jest-runner": "^29.0.2", | ||
"jest-util": "^29.0.2", | ||
"jest-validate": "^29.0.2", | ||
"micromatch": "^4.0.4", | ||
"parse-json": "^5.2.0", | ||
"pretty-format": "^29.0.1", | ||
"pretty-format": "^29.0.2", | ||
"slash": "^3.0.0", | ||
@@ -63,3 +63,3 @@ "strip-json-comments": "^3.1.1" | ||
"ts-node": "^10.5.0", | ||
"typescript": "^4.7.4" | ||
"typescript": "^4.8.2" | ||
}, | ||
@@ -72,3 +72,3 @@ "engines": { | ||
}, | ||
"gitHead": "b959a3d3bdf324ed1c7358f76ab238a8b0b0cf93" | ||
"gitHead": "616fcf56bb8481d29ba29cc34be32a92b1cf85e5" | ||
} |
107511
3279
Updated@jest/test-sequencer@^29.0.2
Updated@jest/types@^29.0.2
Updatedbabel-jest@^29.0.2
Updatedjest-circus@^29.0.2
Updatedjest-resolve@^29.0.2
Updatedjest-runner@^29.0.2
Updatedjest-util@^29.0.2
Updatedjest-validate@^29.0.2
Updatedpretty-format@^29.0.2