Merge pull request #416 from xogeny/patch-1

kulshekhar · web-flow · commit f6eeef7ac43d · 2018-01-20T18:48:03.000+05:30
Clarify warning
diff --git a/AUTHORS b/AUTHORS
@@ -35,6 +35,7 @@ Marshall Bowers <elliott.codes@gmail.com>
 Martijn The <post@martijnthe.nl>
 Matheus Gambati <matheusgambati@gmail.com>
 Maxim Samoilov <samoilowmaxim@gmail.com>
+Michael Tiller <michael.tiller@xogeny.com>
 Mohammad Rajabifard <mo.rajbi@gmail.com>
 OJ Kwon <kwon.ohjoong@gmail.com>
 Oliver Joseph Ash <oliverjash@gmail.com>
diff --git a/README.md b/README.md
@@ -137,7 +137,7 @@ custom configuration file (relative to the project's root directory)
   }
 }
 ```
-**Warning: Using \_\_TS_CONFIG__ option in globals is deprecated and soon will be removed.**
+**Warning: In the past, a `__TS_CONFIG__` section could be used to provide an inline TypeScript configuration. Going forward, all custom configurations should be in a different file and the `tsConfigFile` key in the `ts-jest` section (under `globals`) should point to this file (as shown above). You can ignore this if the configuration you want is identical to the main `tsconfig.json`.**
 
 For all available `tsc` options see [TypeScript docs](https://www.typescriptlang.org/docs/handbook/compiler-options.html).
 

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ custom configuration file (relative to the project's root directory)`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`	```
`140`		`-Warning: Using \_\_TS_CONFIG__ option in globals is deprecated and soon will be removed.`
	`140`	+Warning: In the past, a `__TS_CONFIG__` section could be used to provide an inline TypeScript configuration. Going forward, all custom configurations should be in a different file and the `tsConfigFile` key in the `ts-jest` section (under `globals`) should point to this file (as shown above). You can ignore this if the configuration you want is identical to the main `tsconfig.json`.
`141`	`141`
`142`	`142`	For all available `tsc` options see [TypeScript docs](https://www.typescriptlang.org/docs/handbook/compiler-options.html).
`143`	`143`