Add tsconfig.test.json (instead of using deprecated TS_CONFIG)

kalekseev · Jul 25, 2017 · e1224ed · e1224ed
1 parent 5028178
commit e1224ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/packages/react-scripts/config/paths.js b/packages/react-scripts/config/paths.js
@@ -82,6 +82,7 @@ module.exports = {
   testsSetup: resolveApp('src/setupTests.ts'),
   appNodeModules: resolveApp('node_modules'),
   appTsConfig: resolveApp('tsconfig.json'),
+  appTsTestConfig: resolveApp('tsconfig.test.json'),
   publicUrl: getPublicUrl(resolveApp('package.json')),
   servedPath: getServedPath(resolveApp('package.json')),
   // These properties only exist before ejecting:
@@ -112,6 +113,7 @@ if (
     testsSetup: resolveOwn('template/src/setupTests.ts'),
     appNodeModules: resolveOwn('node_modules'),
     appTsConfig: resolveOwn('template/tsconfig.json'),
+    appTsTestConfig: resolveOwn('template/tsconfig.test.json'),
     publicUrl: getPublicUrl(resolveOwn('package.json')),
     servedPath: getServedPath(resolveOwn('package.json')),
     // These properties only exist before ejecting:

diff --git a/packages/react-scripts/scripts/utils/createJestConfig.js b/packages/react-scripts/scripts/utils/createJestConfig.js
@@ -46,11 +46,8 @@ module.exports = (resolve, rootDir) => {
       '^react-native$': 'react-native-web',
     },
     globals: {
-      __TS_CONFIG__: {
-        module: 'commonjs',
-      },
       'ts-jest': {
-        tsConfigFile: paths.appTsConfig,
+        tsConfigFile: paths.appTsTestConfig,
       },
     },
   };