Skip to content

Commit 42942a5

Browse files
zhengblizhengbli
committed
Merge branch 'master' into addTsConfigWatcher
1 parent 58ac077 commit 42942a5

File tree

986 files changed

+26147
-10716
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

986 files changed

+26147
-10716
lines changed

‎Jakefile.js‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var docDirectory = "doc/";
1717

1818
var builtDirectory = "built/";
1919
var builtLocalDirectory = "built/local/";
20-
var LKGDirectory = "bin/";
20+
var LKGDirectory = "lib/";
2121

2222
var copyright = "CopyrightNotice.txt";
2323
var thirdParty = "ThirdPartyNoticeText.txt";
@@ -141,7 +141,9 @@ var harnessSources = harnessCoreSources.concat([
141141
"session.ts",
142142
"versionCache.ts",
143143
"convertToBase64.ts",
144-
"transpile.ts"
144+
"transpile.ts",
145+
"reuseProgramStructure.ts",
146+
"cachingInServerLSHost.ts"
145147
].map(function (f) {
146148
return path.join(unittestsDirectory, f);
147149
})).concat([
@@ -218,7 +220,7 @@ var compilerFilename = "tsc.js";
218220
function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOutFile, generateDeclarations, outDir, preserveConstEnums, keepComments, noResolve, stripInternal, callback) {
219221
file(outFile, prereqs, function() {
220222
var dir = useBuiltCompiler ? builtLocalDirectory : LKGDirectory;
221-
var options = "--module commonjs -noImplicitAny";
223+
var options = "--module commonjs --noImplicitAny --noEmitOnError";
222224

223225
// Keep comments when specifically requested
224226
// or when in debug mode.
@@ -339,10 +341,10 @@ file(diagnosticInfoMapTs, [processDiagnosticMessagesJs, diagnosticMessagesJson],
339341
complete();
340342
});
341343
ex.run();
342-
}, {async: true});
344+
}, {async: true});
343345

344346
desc("Generates a diagnostic file in TypeScript based on an input JSON file");
345-
task("generate-diagnostics", [diagnosticInfoMapTs]);
347+
task("generate-diagnostics", [diagnosticInfoMapTs]);
346348

347349

348350
// Publish nightly
@@ -479,11 +481,11 @@ file(specMd, [word2mdJs, specWord], function () {
479481
child_process.exec(cmd, function () {
480482
complete();
481483
});
482-
}, {async: true});
484+
}, {async: true});
483485

484486

485487
desc("Generates a Markdown version of the Language Specification");
486-
task("generate-spec", [specMd]);
488+
task("generate-spec", [specMd]);
487489

488490

489491
// Makes a new LKG. This target does not build anything, but errors if not all the outputs are present in the built/local directory
@@ -615,7 +617,7 @@ task("runtests", ["tests", builtLocalDirectory], function() {
615617
exec(cmd, deleteTemporaryProjectOutput);
616618
}, {async: true});
617619

618-
desc("Generates code coverage data via instanbul");
620+
desc("Generates code coverage data via instanbul");
619621
task("generate-code-coverage", ["tests", builtLocalDirectory], function () {
620622
var cmd = 'istanbul cover node_modules/mocha/bin/_mocha -- -R min -t ' + testTimeout + ' ' + run;
621623
console.log(cmd);
@@ -658,7 +660,7 @@ task("runtests-browser", ["tests", "browserify", builtLocalDirectory], function(
658660
function getDiffTool() {
659661
var program = process.env['DIFF']
660662
if (!program) {
661-
fail("Add the 'DIFF' environment variable to the path of the program you want to use.");
663+
fail("Add the 'DIFF' environment variable to the path of the program you want to use.");
662664
}
663665
return program;
664666
}
@@ -667,14 +669,14 @@ function getDiffTool() {
667669
desc("Diffs the compiler baselines using the diff tool specified by the 'DIFF' environment variable");
668670
task('diff', function () {
669671
var cmd = '"' + getDiffTool() + '" ' + refBaseline + ' ' + localBaseline;
670-
console.log(cmd);
672+
console.log(cmd);
671673
exec(cmd);
672674
}, {async: true});
673675

674676
desc("Diffs the RWC baselines using the diff tool specified by the 'DIFF' environment variable");
675677
task('diff-rwc', function () {
676678
var cmd = '"' + getDiffTool() + '" ' + refRwcBaseline + ' ' + localRwcBaseline;
677-
console.log(cmd);
679+
console.log(cmd);
678680
exec(cmd);
679681
}, {async: true});
680682

‎bin/tsc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/usr/bin/env node
2-
require('./tsc.js')
2+
require('../lib/tsc.js')

‎bin/tsserver‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/usr/bin/env node
2-
require('./tsserver.js')
2+
require('../lib/tsserver.js')

‎doc/TypeScript Language Specification (Change Markup).docx‎

12.7 KB
Binary file not shown.

‎doc/TypeScript Language Specification (Change Markup).pdf‎

91.9 KB
Binary file not shown.

‎doc/TypeScript Language Specification.docx‎

19 KB
Binary file not shown.

‎doc/TypeScript Language Specification.pdf‎

211 KB
Binary file not shown.

0 commit comments

Comments
 (0)