Merge pull request #29 from wyattjoh/fix-28

schickling · web-flow · commit 63eb7e32da70 · 2017-08-10T11:17:34.000+02:00
Fix rootDir handling
diff --git a/src/typescript.ts b/src/typescript.ts
@@ -93,7 +93,7 @@ export function getTypescriptConfig(
     }
 
     // disallow overrriding rootDir
-    if (path.resolve(configParseResult.options.rootDir) !== path.resolve(cwd) && logger) {
+    if (configParseResult.options.rootDir && path.resolve(configParseResult.options.rootDir) !== path.resolve(cwd) && logger) {
       logger.log('Warning: "rootDir" from local tsconfig.json is overriden')
     }
     configParseResult.options.rootDir = cwd

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ export function getTypescriptConfig(`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`// disallow overrriding rootDir`
`96`		`- if (path.resolve(configParseResult.options.rootDir) !== path.resolve(cwd) && logger) {`
	`96`	`+ if (configParseResult.options.rootDir && path.resolve(configParseResult.options.rootDir) !== path.resolve(cwd) && logger) {`
`97`	`97`	`logger.log('Warning: "rootDir" from local tsconfig.json is overriden')`
`98`	`98`	`}`
`99`	`99`	`configParseResult.options.rootDir = cwd`