Skip to content
This repository was archived by the owner on Jan 26, 2019. It is now read-only.

Update tsconfig to support dynamic import #115

Merged
merged 4 commits into from
Jul 27, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add tsconfig.test.json (instead of using deprecated TS_CONFIG)
  • Loading branch information
nicolaserny committed Jul 25, 2017
commit e1224ed94b5e2b0d73b3a12e311d4912293ebf0c
2 changes: 2 additions & 0 deletions packages/react-scripts/config/paths.js
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
5 changes: 1 addition & 4 deletions packages/react-scripts/scripts/utils/createJestConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
},
};
Expand Down