mirror of
https://github.com/microsoft/TypeScript.git
synced 2026-05-30 11:24:49 -05:00
Merge branch 'master' into restTuples
# Conflicts: # tests/baselines/reference/APISample_Watch.errors.txt # tests/baselines/reference/APISample_WatchWithDefaults.errors.txt # tests/baselines/reference/APISample_WatchWithOwnWatchHost.errors.txt # tests/baselines/reference/APISample_compile.errors.txt # tests/baselines/reference/APISample_jsdoc.errors.txt # tests/baselines/reference/APISample_linter.errors.txt # tests/baselines/reference/APISample_parseConfig.errors.txt # tests/baselines/reference/APISample_transform.errors.txt # tests/baselines/reference/APISample_watcher.errors.txt # tests/baselines/reference/api/tsserverlibrary.d.ts # tests/baselines/reference/api/typescript.d.ts
This commit is contained in:
@@ -58,7 +58,14 @@ namespace ts {
|
||||
message: report,
|
||||
errorDiagnostic: d => reportDiag(d)
|
||||
};
|
||||
return performBuild(args.slice(1), createCompilerHost({}), buildHost, sys);
|
||||
const result = performBuild(args.slice(1), createCompilerHost({}), buildHost, sys);
|
||||
// undefined = in watch mode, do not exit
|
||||
if (result !== undefined) {
|
||||
return sys.exit(result);
|
||||
}
|
||||
else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
const commandLine = parseCommandLine(args);
|
||||
|
||||
@@ -7,8 +7,6 @@
|
||||
"tsc.ts"
|
||||
],
|
||||
"references": [
|
||||
{ "path": "../core", "prepend": true },
|
||||
{ "path": "../parser", "prepend": true },
|
||||
{ "path": "../compiler", "prepend": true }
|
||||
]
|
||||
}
|
||||
|
||||
18
src/tsc/tsconfig.release.json
Normal file
18
src/tsc/tsconfig.release.json
Normal file
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"extends": "../tsconfig-base",
|
||||
"compilerOptions": {
|
||||
"outFile": "../../lib/tsc.js",
|
||||
"stripInternal": true,
|
||||
"preserveConstEnums": false,
|
||||
"declaration": false,
|
||||
"declarationMap": false,
|
||||
"sourceMap": false,
|
||||
"composite": false
|
||||
},
|
||||
"files": [
|
||||
"tsc.ts"
|
||||
],
|
||||
"references": [
|
||||
{ "path": "../compiler/tsconfig.release.json", "prepend": true }
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user