@@ -87,93 +87,10 @@ var typingsInstallerSources = filesFromConfig(path.join(serverDirectory, "typing
87
87
var watchGuardSources = filesFromConfig ( path . join ( serverDirectory , "watchGuard/tsconfig.json" ) ) ;
88
88
var serverSources = filesFromConfig ( path . join ( serverDirectory , "tsconfig.json" ) ) ;
89
89
var languageServiceLibrarySources = filesFromConfig ( path . join ( serverDirectory , "tsconfig.library.json" ) ) ;
90
+ var harnessSources = filesFromConfig ( "./src/harness/tsconfig.json" ) ;
90
91
91
92
var typesMapOutputPath = path . join ( builtLocalDirectory , 'typesMap.json' ) ;
92
93
93
- var harnessCoreSources = [
94
- "harness.ts" ,
95
- "virtualFileSystem.ts" ,
96
- "virtualFileSystemWithWatch.ts" ,
97
- "sourceMapRecorder.ts" ,
98
- "harnessLanguageService.ts" ,
99
- "fourslash.ts" ,
100
- "runnerbase.ts" ,
101
- "compilerRunner.ts" ,
102
- "typeWriter.ts" ,
103
- "fourslashRunner.ts" ,
104
- "projectsRunner.ts" ,
105
- "loggedIO.ts" ,
106
- "rwcRunner.ts" ,
107
- "externalCompileRunner.ts" ,
108
- "test262Runner.ts" ,
109
- "./parallel/shared.ts" ,
110
- "./parallel/host.ts" ,
111
- "./parallel/worker.ts" ,
112
- "runner.ts"
113
- ] . map ( function ( f ) {
114
- return path . join ( harnessDirectory , f ) ;
115
- } ) ;
116
-
117
- var harnessSources = harnessCoreSources . concat ( [
118
- "base64.ts" ,
119
- "incrementalParser.ts" ,
120
- "jsDocParsing.ts" ,
121
- "services/colorization.ts" ,
122
- "services/documentRegistry.ts" ,
123
- "services/preProcessFile.ts" ,
124
- "services/patternMatcher.ts" ,
125
- "session.ts" ,
126
- "versionCache.ts" ,
127
- "convertToBase64.ts" ,
128
- "transpile.ts" ,
129
- "reuseProgramStructure.ts" ,
130
- "textStorage.ts" ,
131
- "moduleResolution.ts" ,
132
- "tsconfigParsing.ts" ,
133
- "asserts.ts" ,
134
- "builder.ts" ,
135
- "commandLineParsing.ts" ,
136
- "configurationExtension.ts" ,
137
- "convertCompilerOptionsFromJson.ts" ,
138
- "convertTypeAcquisitionFromJson.ts" ,
139
- "tsserverProjectSystem.ts" ,
140
- "tscWatchMode.ts" ,
141
- "compileOnSave.ts" ,
142
- "typingsInstaller.ts" ,
143
- "projectErrors.ts" ,
144
- "matchFiles.ts" ,
145
- "organizeImports.ts" ,
146
- "initializeTSConfig.ts" ,
147
- "extractConstants.ts" ,
148
- "extractFunctions.ts" ,
149
- "extractRanges.ts" ,
150
- "extractTestHelpers.ts" ,
151
- "printer.ts" ,
152
- "textChanges.ts" ,
153
- "telemetry.ts" ,
154
- "transform.ts" ,
155
- "customTransforms.ts" ,
156
- "programMissingFiles.ts" ,
157
- "programNoParseFalsyFileNames.ts" ,
158
- "symbolWalker.ts" ,
159
- "languageService.ts" ,
160
- "publicApi.ts" ,
161
- "hostNewLineSupport.ts" ,
162
- ] . map ( function ( f ) {
163
- return path . join ( unittestsDirectory , f ) ;
164
- } ) ) . concat ( [
165
- "protocol.ts" ,
166
- "utilities.ts" ,
167
- "scriptVersionCache.ts" ,
168
- "scriptInfo.ts" ,
169
- "project.ts" ,
170
- "typingsCache.ts" ,
171
- "editorServices.ts" ,
172
- "session.ts" ,
173
- ] . map ( function ( f ) {
174
- return path . join ( serverDirectory , f ) ;
175
- } ) ) ;
176
-
177
94
var es2015LibrarySources = [
178
95
"es2015.core.d.ts" ,
179
96
"es2015.collection.d.ts" ,
@@ -451,6 +368,8 @@ task("lib", libraryTargets);
451
368
// Generate diagnostics
452
369
var processDiagnosticMessagesJs = path . join ( scriptsDirectory , "processDiagnosticMessages.js" ) ;
453
370
var processDiagnosticMessagesTs = path . join ( scriptsDirectory , "processDiagnosticMessages.ts" ) ;
371
+ var processDiagnosticMessagesSources = filesFromConfig ( "./scripts/processDiagnosticMessages.tsconfig.json" ) ;
372
+
454
373
var diagnosticMessagesJson = path . join ( compilerDirectory , "diagnosticMessages.json" ) ;
455
374
var diagnosticInfoMapTs = path . join ( compilerDirectory , "diagnosticInformationMap.generated.ts" ) ;
456
375
var generatedDiagnosticMessagesJSON = path . join ( compilerDirectory , "diagnosticMessages.generated.json" ) ;
@@ -460,8 +379,8 @@ file(processDiagnosticMessagesTs);
460
379
461
380
// processDiagnosticMessages script
462
381
compileFile ( processDiagnosticMessagesJs ,
463
- [ processDiagnosticMessagesTs ] ,
464
- [ processDiagnosticMessagesTs ] ,
382
+ processDiagnosticMessagesSources ,
383
+ processDiagnosticMessagesSources ,
465
384
[ ] ,
466
385
/*useBuiltCompiler*/ false ) ;
467
386
@@ -572,7 +491,7 @@ compileFile(/*outfile*/configurePrereleaseJs,
572
491
/*prereqs*/ [ configurePrereleaseTs ] ,
573
492
/*prefixes*/ [ ] ,
574
493
/*useBuiltCompiler*/ false ,
575
- { noOutFile : false , generateDeclarations : false , keepComments : false , noResolve : false , stripInternal : false } ) ;
494
+ { noOutFile : true , generateDeclarations : false , keepComments : false , noResolve : false , stripInternal : false } ) ;
576
495
577
496
task ( "setDebugMode" , function ( ) {
578
497
useDebugMode = true ;
0 commit comments