From 9133e7ad0efbe362a77ae2db496189d0bb7496b0 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Fri, 9 Aug 2019 14:04:01 -0700 Subject: [PATCH] Use defaults for transpileModule (#31563) --- src/services/transpile.ts | 10 +++++++++- src/testRunner/unittests/services/transpile.ts | 5 ++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/services/transpile.ts b/src/services/transpile.ts index 030d2273b62..bdc27ac5e22 100644 --- a/src/services/transpile.ts +++ b/src/services/transpile.ts @@ -26,7 +26,15 @@ namespace ts { export function transpileModule(input: string, transpileOptions: TranspileOptions): TranspileOutput { const diagnostics: Diagnostic[] = []; - const options: CompilerOptions = transpileOptions.compilerOptions ? fixupCompilerOptions(transpileOptions.compilerOptions, diagnostics) : getDefaultCompilerOptions(); + const options: CompilerOptions = transpileOptions.compilerOptions ? fixupCompilerOptions(transpileOptions.compilerOptions, diagnostics) : {}; + + // mix in default options + const defaultOptions = getDefaultCompilerOptions(); + for (const key in defaultOptions) { + if (hasProperty(defaultOptions, key) && options[key] === undefined) { + options[key] = defaultOptions[key]; + } + } options.isolatedModules = true; diff --git a/src/testRunner/unittests/services/transpile.ts b/src/testRunner/unittests/services/transpile.ts index 8429179ffa3..6e8f3bcac9c 100644 --- a/src/testRunner/unittests/services/transpile.ts +++ b/src/testRunner/unittests/services/transpile.ts @@ -17,7 +17,10 @@ namespace ts { transpileOptions = testSettings.options || {}; if (!transpileOptions.compilerOptions) { - transpileOptions.compilerOptions = {}; + transpileOptions.compilerOptions = { }; + } + if (transpileOptions.compilerOptions.target === undefined) { + transpileOptions.compilerOptions.target = ScriptTarget.ES3; } if (transpileOptions.compilerOptions.newLine === undefined) {