Merge remote-tracking branch 'original-ts-origin/master'

# Conflicts:
#	packages/react-scripts/config/jest/typescriptTransform.js
#	packages/react-scripts/package.json
#	packages/react-scripts/scripts/utils/createJestConfig.js

Author: zinserjan

ISSUE_TEMPLATE.md

@@ -36,7 +36,7 @@ Tell us what actually happens.
 
 Run these commands in the project folder and fill in their results:
 
-1. `npm ls react-scripts` (if you haven’t ejected): 
+1. `npm ls react-scripts-ts` (if you haven’t ejected): 
 2. `node -v`: 
 3. `npm -v`:
 

README.md

@@ -31,6 +31,20 @@ When you run `npm run build` the terminal will output the error, including the h
 
 ## Changelog
 
+### 2.3.2
+* Fix `typescript` version to 2.3.x until 2.4 @types are fixed
+
+### 2.3.1
+* Fix issue with new @types/react
+
+### 2.3.0
+* All tsc to parse config (for `extend`) - Thanks to @DorianGrey
+* Fix various jest issues - thanks to @zinserjan
+* Fix code coverage - thanks to @zinserjan
+
+### 2.2.0
+* Upgrade to [`[email protected]`](https://github.com/facebookincubator/create-react-app/)
+
 ### 2.1.0
 * Update to `[email protected]` - thanks to @mindjuice
 * Fix test setup issue - thanks to @jonmpqts

packages/react-scripts/config/jest/typescriptTransform.js

@@ -15,7 +15,7 @@ let compilerConfig = {
 
 if (fs.existsSync(tsconfigPath)) {
   try {
-    const tsconfig = require(tsconfigPath);
+    const tsconfig = tsc.readConfigFile(tsconfigPath).config;
 
     if (tsconfig && tsconfig.compilerOptions) {
       compilerConfig = tsconfig.compilerOptions;
@@ -29,14 +29,13 @@ module.exports = {
   process(src, path, config, options) {
     if (path.endsWith('.ts') || path.endsWith('.tsx')) {
       let compilerOptions = compilerConfig;
-      // inline source with source map for remapping coverage
       if (options.instrument) {
+        // inline source with source map for remapping coverage
         compilerOptions = Object.assign({}, compilerConfig);
         delete compilerOptions.sourceMap;
         compilerOptions.inlineSourceMap = true;
         compilerOptions.inlineSources = true;
         // fix broken paths in coverage report if `.outDir` is set
-        // e.g. src/file:/Users/zinserjan/Projects/Github/react-typescript-starter/src
         delete compilerOptions.outDir;
       }
 

packages/react-scripts/package.json

@@ -51,7 +51,7 @@
     "tslint": "^5.2.0",
     "tslint-loader": "^3.5.3",
     "tslint-react": "^3.0.0",
-    "typescript": "^2.3.3",
+    "typescript": "~2.3.3",
     "source-map-loader": "^0.2.1",
     "sw-precache-webpack-plugin": "0.9.1",
     "typings-for-css-modules-loader": "1.5.0",

packages/react-scripts/template/src/App.tsx

@@ -3,7 +3,7 @@ import "./App.css";
 
 const logo = require("./logo.svg");
 
-class App extends React.Component<{}, null> {
+class App extends React.Component<{}, {}> {
   render() {
     return (
       <div className="App">