maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use defaults for transpileModule (#31563)

Browse source
This commit is contained in:
Ron Buckton 2019-08-09 14:04:01 -07:00 committed by GitHub
parent 05af8faac6
commit 9133e7ad0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/services/transpile.ts
View file

@ -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;

5
src/testRunner/unittests/services/transpile.ts
View file

@ -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) {