Skip to content

Commit 633b45e

Browse files
Support for graceful extension of Jest config
1 parent 1a61db5 commit 633b45e

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

packages/react-scripts/scripts/utils/createJestConfig.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,25 @@ module.exports = (resolve, rootDir, isEjecting) => {
7373
'extraGlobals',
7474
'globalSetup',
7575
'globalTeardown',
76+
'moduleNameMapper',
7677
'resetMocks',
7778
'resetModules',
7879
'snapshotSerializers',
80+
'transform',
81+
'transformIgnorePatterns',
7982
'watchPathIgnorePatterns',
8083
];
8184
if (overrides) {
8285
supportedKeys.forEach(key => {
8386
if (overrides.hasOwnProperty(key)) {
84-
config[key] = overrides[key];
87+
if (Array.isArray(config[key]) || typeof config[key] !== 'object') {
88+
// for arrays or primitive types, directly override the config key
89+
config[key] = overrides[key];
90+
} else {
91+
// for object types, extend gracefully
92+
config[key] = Object.assign({}, config[key], overrides[key]);
93+
}
94+
8595
delete overrides[key];
8696
}
8797
});

0 commit comments

Comments
 (0)