From 712d6dbb614624c38cac7b3512acb48c01db85c3 Mon Sep 17 00:00:00 2001 From: Thomas Gish Date: Mon, 22 May 2017 12:51:09 -0700 Subject: [PATCH] Fix setupTests extension --- packages/react-scripts/config/paths.js | 6 +++--- packages/react-scripts/scripts/utils/createJestConfig.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/react-scripts/config/paths.js b/packages/react-scripts/config/paths.js index bfce574c8..cb125d207 100644 --- a/packages/react-scripts/config/paths.js +++ b/packages/react-scripts/config/paths.js @@ -58,7 +58,7 @@ module.exports = { appPackageJson: resolveApp('package.json'), appSrc: resolveApp('src'), yarnLockFile: resolveApp('yarn.lock'), - testsSetup: resolveApp('src/setupTests.js'), + testsSetup: resolveApp('src/setupTests.ts'), appNodeModules: resolveApp('node_modules'), publicUrl: getPublicUrl(resolveApp('package.json')), servedPath: getServedPath(resolveApp('package.json')), @@ -78,7 +78,7 @@ module.exports = { appPackageJson: resolveApp('package.json'), appSrc: resolveApp('src'), yarnLockFile: resolveApp('yarn.lock'), - testsSetup: resolveApp('src/setupTests.js'), + testsSetup: resolveApp('src/setupTests.ts'), appNodeModules: resolveApp('node_modules'), publicUrl: getPublicUrl(resolveApp('package.json')), servedPath: getServedPath(resolveApp('package.json')), @@ -107,7 +107,7 @@ if ( appPackageJson: resolveOwn('package.json'), appSrc: resolveOwn('template/src'), yarnLockFile: resolveOwn('template/yarn.lock'), - testsSetup: resolveOwn('template/src/setupTests.js'), + testsSetup: resolveOwn('template/src/setupTests.ts'), appNodeModules: resolveOwn('node_modules'), publicUrl: getPublicUrl(resolveOwn('package.json')), servedPath: getServedPath(resolveOwn('package.json')), diff --git a/packages/react-scripts/scripts/utils/createJestConfig.js b/packages/react-scripts/scripts/utils/createJestConfig.js index 1c22c10ad..6a7b62f94 100644 --- a/packages/react-scripts/scripts/utils/createJestConfig.js +++ b/packages/react-scripts/scripts/utils/createJestConfig.js @@ -17,7 +17,7 @@ module.exports = (resolve, rootDir) => { // Use this instead of `paths.testsSetup` to avoid putting // an absolute filename into configuration after ejecting. const setupTestsFile = fs.existsSync(paths.testsSetup) - ? '/src/setupTests.js' + ? '/src/setupTests.ts' : undefined; // TODO: I don't know if it's safe or not to just use / as path separator