@@ -533,7 +533,6 @@ var tscFile = path.join(builtLocalDirectory, compilerFilename);
533
533
compileFile ( tscFile , compilerSources , [ builtLocalDirectory , copyright ] . concat ( compilerSources ) , [ copyright ] , /*useBuiltCompiler:*/ false ) ;
534
534
535
535
var servicesFile = path . join ( builtLocalDirectory , "typescriptServices.js" ) ;
536
- var servicesFileInBrowserTest = path . join ( builtLocalDirectory , "typescriptServicesInBrowserTest.js" ) ;
537
536
var standaloneDefinitionsFile = path . join ( builtLocalDirectory , "typescriptServices.d.ts" ) ;
538
537
var nodePackageFile = path . join ( builtLocalDirectory , "typescript.js" ) ;
539
538
var nodeDefinitionsFile = path . join ( builtLocalDirectory , "typescript.d.ts" ) ;
@@ -572,22 +571,6 @@ compileFile(servicesFile, servicesSources, [builtLocalDirectory, copyright].conc
572
571
fs . writeFileSync ( nodeStandaloneDefinitionsFile , nodeStandaloneDefinitionsFileContents ) ;
573
572
} ) ;
574
573
575
- compileFile (
576
- servicesFileInBrowserTest ,
577
- servicesSources ,
578
- [ builtLocalDirectory , copyright ] . concat ( servicesSources ) ,
579
- /*prefixes*/ [ copyright ] ,
580
- /*useBuiltCompiler*/ true ,
581
- {
582
- noOutFile : false ,
583
- generateDeclarations : true ,
584
- preserveConstEnums : true ,
585
- keepComments : true ,
586
- noResolve : false ,
587
- stripInternal : true ,
588
- inlineSourceMap : true
589
- } ) ;
590
-
591
574
file ( typescriptServicesDts , [ servicesFile ] ) ;
592
575
593
576
var cancellationTokenFile = path . join ( builtLocalDirectory , "cancellationToken.js" ) ;
@@ -725,7 +708,7 @@ compileFile(
725
708
/*prereqs*/ [ builtLocalDirectory , tscFile ] . concat ( libraryTargets ) . concat ( servicesSources ) . concat ( harnessSources ) ,
726
709
/*prefixes*/ [ ] ,
727
710
/*useBuiltCompiler:*/ true ,
728
- /*opts*/ { inlineSourceMap : true , types : [ "node" , "mocha" , "chai" ] , lib : "es6" } ) ;
711
+ /*opts*/ { types : [ "node" , "mocha" , "chai" ] , lib : "es6" } ) ;
729
712
730
713
var internalTests = "internal/" ;
731
714
@@ -961,13 +944,14 @@ var nodeServerInFile = "tests/webTestServer.ts";
961
944
compileFile ( nodeServerOutFile , [ nodeServerInFile ] , [ builtLocalDirectory , tscFile ] , [ ] , /*useBuiltCompiler:*/ true , { noOutFile : true , lib : "es6" } ) ;
962
945
963
946
desc ( "Runs browserify on run.js to produce a file suitable for running tests in the browser" ) ;
964
- task ( "browserify" , [ "tests" , run , builtLocalDirectory , nodeServerOutFile ] , function ( ) {
965
- var cmd = 'browserify built/local/run.js -t ./scripts/browserify-optional -d -o built/local/bundle.js' ;
947
+ task ( "browserify" , [ ] , function ( ) {
948
+ // Shell out to `gulp`, since we do the work to handle sourcemaps correctly w/o inline maps there
949
+ var cmd = 'gulp browserify --silent' ;
966
950
exec ( cmd ) ;
967
951
} , { async : true } ) ;
968
952
969
953
desc ( "Runs the tests using the built run.js file like 'jake runtests'. Syntax is jake runtests-browser. Additional optional parameters tests=[regex], browser=[chrome|IE]" ) ;
970
- task ( "runtests-browser" , [ "tests" , " browserify", builtLocalDirectory , servicesFileInBrowserTest ] , function ( ) {
954
+ task ( "runtests-browser" , [ "browserify" , nodeServerOutFile ] , function ( ) {
971
955
cleanTestDirs ( ) ;
972
956
host = "node" ;
973
957
browser = process . env . browser || process . env . b || ( os . platform ( ) === "linux" ? "chrome" : "IE" ) ;
0 commit comments