@@ -71,6 +71,7 @@ var compilerSources = [
7171 "transformers/destructuring.ts" ,
7272 "transformers/ts.ts" ,
7373 "transformers/jsx.ts" ,
74+ "transformers/esnext.ts" ,
7475 "transformers/es2017.ts" ,
7576 "transformers/es2016.ts" ,
7677 "transformers/es2015.ts" ,
@@ -107,6 +108,7 @@ var servicesSources = [
107108 "transformers/destructuring.ts" ,
108109 "transformers/ts.ts" ,
109110 "transformers/jsx.ts" ,
111+ "transformers/esnext.ts" ,
110112 "transformers/es2017.ts" ,
111113 "transformers/es2016.ts" ,
112114 "transformers/es2015.ts" ,
@@ -248,13 +250,14 @@ var harnessSources = harnessCoreSources.concat([
248250 "convertToBase64.ts" ,
249251 "transpile.ts" ,
250252 "reuseProgramStructure.ts" ,
253+ "textStorage.ts" ,
251254 "cachingInServerLSHost.ts" ,
252255 "moduleResolution.ts" ,
253256 "tsconfigParsing.ts" ,
254257 "commandLineParsing.ts" ,
255258 "configurationExtension.ts" ,
256259 "convertCompilerOptionsFromJson.ts" ,
257- "convertTypingOptionsFromJson .ts" ,
260+ "convertTypeAcquisitionFromJson .ts" ,
258261 "tsserverProjectSystem.ts" ,
259262 "compileOnSave.ts" ,
260263 "typingsInstaller.ts" ,
@@ -301,7 +304,8 @@ var es2016LibrarySourceMap = es2016LibrarySource.map(function (source) {
301304
302305var es2017LibrarySource = [
303306 "es2017.object.d.ts" ,
304- "es2017.sharedmemory.d.ts"
307+ "es2017.sharedmemory.d.ts" ,
308+ "es2017.string.d.ts" ,
305309] ;
306310
307311var es2017LibrarySourceMap = es2017LibrarySource . map ( function ( source ) {
@@ -349,19 +353,16 @@ function prependFile(prefixFile, destinationFile) {
349353// concatenate a list of sourceFiles to a destinationFile
350354function concatenateFiles ( destinationFile , sourceFiles ) {
351355 var temp = "temptemp" ;
352- // Copy the first file to temp
353- if ( ! fs . existsSync ( sourceFiles [ 0 ] ) ) {
354- fail ( sourceFiles [ 0 ] + " does not exist!" ) ;
355- }
356- jake . cpR ( sourceFiles [ 0 ] , temp , { silent : true } ) ;
357356 // append all files in sequence
358- for ( var i = 1 ; i < sourceFiles . length ; i ++ ) {
357+ var text = "" ;
358+ for ( var i = 0 ; i < sourceFiles . length ; i ++ ) {
359359 if ( ! fs . existsSync ( sourceFiles [ i ] ) ) {
360360 fail ( sourceFiles [ i ] + " does not exist!" ) ;
361361 }
362- fs . appendFileSync ( temp , "\n\n" ) ;
363- fs . appendFileSync ( temp , fs . readFileSync ( sourceFiles [ i ] ) ) ;
362+ if ( i > 0 ) { text += "\n\n" ; }
363+ text += fs . readFileSync ( sourceFiles [ i ] ) . toString ( ) . replace ( / \r ? \n / g , "\n" ) ;
364364 }
365+ fs . writeFileSync ( temp , text ) ;
365366 // Move the file to the final destination
366367 fs . renameSync ( temp , destinationFile ) ;
367368}
@@ -590,7 +591,7 @@ task("generate-diagnostics", [diagnosticInfoMapTs]);
590591var configureNightlyJs = path . join ( scriptsDirectory , "configureNightly.js" ) ;
591592var configureNightlyTs = path . join ( scriptsDirectory , "configureNightly.ts" ) ;
592593var packageJson = "package.json" ;
593- var programTs = path . join ( compilerDirectory , "program .ts" ) ;
594+ var versionFile = path . join ( compilerDirectory , "core .ts" ) ;
594595
595596file ( configureNightlyTs ) ;
596597
@@ -606,7 +607,7 @@ task("setDebugMode", function () {
606607} ) ;
607608
608609task ( "configure-nightly" , [ configureNightlyJs ] , function ( ) {
609- var cmd = host + " " + configureNightlyJs + " " + packageJson + " " + programTs ;
610+ var cmd = host + " " + configureNightlyJs + " " + packageJson + " " + versionFile ;
610611 console . log ( cmd ) ;
611612 exec ( cmd ) ;
612613} , { async : true } ) ;
@@ -637,7 +638,7 @@ task("importDefinitelyTypedTests", [importDefinitelyTypedTestsJs], function () {
637638
638639// Local target to build the compiler and services
639640var tscFile = path . join ( builtLocalDirectory , compilerFilename ) ;
640- compileFile ( tscFile , compilerSources , [ builtLocalDirectory , copyright ] . concat ( compilerSources ) , [ copyright ] , /*useBuiltCompiler:*/ false ) ;
641+ compileFile ( tscFile , compilerSources , [ builtLocalDirectory , copyright ] . concat ( compilerSources ) , [ copyright ] , /*useBuiltCompiler:*/ false , { noMapRoot : true } ) ;
641642
642643var servicesFile = path . join ( builtLocalDirectory , "typescriptServices.js" ) ;
643644var servicesFileInBrowserTest = path . join ( builtLocalDirectory , "typescriptServicesInBrowserTest.js" ) ;
@@ -927,7 +928,7 @@ function runConsoleTests(defaultReporter, runInParallel) {
927928 }
928929
929930 if ( tests && tests . toLocaleLowerCase ( ) === "rwc" ) {
930- testTimeout = 400000 ;
931+ testTimeout = 800000 ;
931932 }
932933
933934 colors = process . env . colors || process . env . color ;
@@ -1083,12 +1084,10 @@ task("tests-debug", ["setDebugMode", "tests"]);
10831084// Makes the test results the new baseline
10841085desc ( "Makes the most recent test results the new baseline, overwriting the old baseline" ) ;
10851086task ( "baseline-accept" , function ( ) {
1086- acceptBaseline ( "" ) ;
1087+ acceptBaseline ( localBaseline , refBaseline ) ;
10871088} ) ;
10881089
1089- function acceptBaseline ( containerFolder ) {
1090- var sourceFolder = path . join ( localBaseline , containerFolder ) ;
1091- var targetFolder = path . join ( refBaseline , containerFolder ) ;
1090+ function acceptBaseline ( sourceFolder , targetFolder ) {
10921091 console . log ( 'Accept baselines from ' + sourceFolder + ' to ' + targetFolder ) ;
10931092 var files = fs . readdirSync ( sourceFolder ) ;
10941093 var deleteEnding = '.delete' ;
@@ -1112,12 +1111,12 @@ function acceptBaseline(containerFolder) {
11121111
11131112desc ( "Makes the most recent rwc test results the new baseline, overwriting the old baseline" ) ;
11141113task ( "baseline-accept-rwc" , function ( ) {
1115- acceptBaseline ( "rwc" ) ;
1114+ acceptBaseline ( localRwcBaseline , refRwcBaseline ) ;
11161115} ) ;
11171116
11181117desc ( "Makes the most recent test262 test results the new baseline, overwriting the old baseline" ) ;
11191118task ( "baseline-accept-test262" , function ( ) {
1120- acceptBaseline ( "test262" ) ;
1119+ acceptBaseline ( localTest262Baseline , refTest262Baseline ) ;
11211120} ) ;
11221121
11231122
0 commit comments