From 2133270916f4155b0150a604456fc02b539a2cbe Mon Sep 17 00:00:00 2001 From: nicolaserny Date: Mon, 24 Jul 2017 13:07:24 +0200 Subject: [PATCH 1/4] update tsconfig to support dynamic import --- packages/react-scripts/template/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/template/tsconfig.json b/packages/react-scripts/template/tsconfig.json index d4627d98a..da796482d 100644 --- a/packages/react-scripts/template/tsconfig.json +++ b/packages/react-scripts/template/tsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { "outDir": "build/dist", - "module": "commonjs", + "module": "esnext", "target": "es5", "lib": ["es6", "dom"], "sourceMap": true, From 50281786834efb7b4bb3b42799cf6d27727b2911 Mon Sep 17 00:00:00 2001 From: nicolaserny Date: Mon, 24 Jul 2017 15:44:14 +0200 Subject: [PATCH 2/4] Fix tests --- packages/react-scripts/scripts/utils/createJestConfig.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/react-scripts/scripts/utils/createJestConfig.js b/packages/react-scripts/scripts/utils/createJestConfig.js index 9063be329..f30ad2627 100644 --- a/packages/react-scripts/scripts/utils/createJestConfig.js +++ b/packages/react-scripts/scripts/utils/createJestConfig.js @@ -46,6 +46,9 @@ module.exports = (resolve, rootDir) => { '^react-native$': 'react-native-web', }, globals: { + __TS_CONFIG__: { + module: 'commonjs', + }, 'ts-jest': { tsConfigFile: paths.appTsConfig, }, From e1224ed94b5e2b0d73b3a12e311d4912293ebf0c Mon Sep 17 00:00:00 2001 From: nicolaserny Date: Tue, 25 Jul 2017 09:24:44 +0200 Subject: [PATCH 3/4] Add tsconfig.test.json (instead of using deprecated TS_CONFIG) --- packages/react-scripts/config/paths.js | 2 ++ packages/react-scripts/scripts/utils/createJestConfig.js | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/react-scripts/config/paths.js b/packages/react-scripts/config/paths.js index b52ea6b82..c680d87b9 100644 --- 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 index f30ad2627..019767d7e 100644 --- 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, }, }, }; From 0880881d5bd31ae76b6fa819d61cb58ec713f936 Mon Sep 17 00:00:00 2001 From: nicolaserny Date: Tue, 25 Jul 2017 09:29:07 +0200 Subject: [PATCH 4/4] Add missing tsconfig.test.json file --- packages/react-scripts/template/tsconfig.test.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 packages/react-scripts/template/tsconfig.test.json diff --git a/packages/react-scripts/template/tsconfig.test.json b/packages/react-scripts/template/tsconfig.test.json new file mode 100644 index 000000000..65ffdd493 --- /dev/null +++ b/packages/react-scripts/template/tsconfig.test.json @@ -0,0 +1,6 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "module": "commonjs" + } +} \ No newline at end of file