From 17a01dcc0427f1dd8c8d0f3688ed706f8c63e4ff Mon Sep 17 00:00:00 2001 From: Christian Tinauer Date: Fri, 18 Aug 2017 12:12:44 +0200 Subject: [PATCH 1/2] Do not use "context" as configFilePath, when parsing config from "configFileContent" setting. * Removed "context" as optional paramtere "configFilePath" of tsImpl.parseJsonConfigFileContent(...) * Fixes problems with finding types. --- src/instance.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/instance.ts b/src/instance.ts index 769331e..8bfe1cd 100644 --- a/src/instance.ts +++ b/src/instance.ts @@ -313,8 +313,7 @@ export function readConfigFile( query.configFileContent || {}, tsImpl.sys, context, - _.extend({}, tsImpl.getDefaultCompilerOptions(), existingOptions.options) as ts.CompilerOptions, - context + _.extend({}, tsImpl.getDefaultCompilerOptions(), existingOptions.options) as ts.CompilerOptions ), loaderConfig: query as LoaderConfig }; From 2dde1e10a1fffcb7cf06afc5708b7d2bd71ba017 Mon Sep 17 00:00:00 2001 From: Christian Tinauer Date: Tue, 22 Aug 2017 08:29:44 +0200 Subject: [PATCH 2/2] Fix "existingOptions" with "configFileContent". --- src/instance.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/instance.ts b/src/instance.ts index 8bfe1cd..44f1282 100644 --- a/src/instance.ts +++ b/src/instance.ts @@ -313,7 +313,7 @@ export function readConfigFile( query.configFileContent || {}, tsImpl.sys, context, - _.extend({}, tsImpl.getDefaultCompilerOptions(), existingOptions.options) as ts.CompilerOptions + existingOptions.options ), loaderConfig: query as LoaderConfig };