@@ -122,12 +122,13 @@ const writeHackyCJSShim = (infile, outfile) => {
122
122
123
123
/** @type {(infile: string, outfile: string) => (done: () => void) => void } */
124
124
const writeHackyMJSShim = ( infile , outfile ) => {
125
- return ( done ) => {
125
+ const writeHackyMJSShim = ( done ) => {
126
126
const inRelativeToOut = infile = path . relative ( path . dirname ( outfile ) , infile ) ;
127
127
fs . writeFileSync ( path . join ( path . dirname ( outfile ) , "package.json" ) , JSON . stringify ( { name : "local" , private : true , type : "module" } ) ) ;
128
128
fs . writeFileSync ( outfile , `import "./${ inRelativeToOut } "` ) ;
129
129
done ( ) ;
130
130
} ;
131
+ return writeHackyMJSShim ;
131
132
} ;
132
133
133
134
const preBundleFromSrc = parallel ( generateLibs , series ( buildScripts , generateDiagnostics , localize ) ) ;
@@ -188,7 +189,7 @@ const buildTsc = () => buildProject("src/tsc");
188
189
// task("tsc", series(preBundleFromSrc, bundleTscFromSrc)); // esbuild on ./src
189
190
// task("tsc", series(preBundleFromEmit, bundleTscFromEmit)); // esbuild on emitted ./built/local
190
191
// task("tsc", series(preBuildSrc, buildSrc, writeHackyCJSShim("./built/local/tsc/tsc.js", "./built/local/tsc.js"))); // CJS
191
- task ( "tsc" , series ( preBuildSrc , buildSrc , writeHackyMJSShim ( "./built/local/tsc/tsc.js" , "./built/local/tsc.js" ) ) ) ; // MJS
192
+ task ( "tsc" , series ( preBuildSrc , buildTsc , writeHackyMJSShim ( "./built/local/tsc/tsc.js" , "./built/local/tsc.js" ) ) ) ; // MJS
192
193
task ( "tsc" ) . description = "Builds the command-line compiler" ;
193
194
194
195
const cleanTsc = ( ) => cleanProject ( "src/tsc" ) ;
@@ -305,14 +306,20 @@ task("watch-services").flags = {
305
306
const buildDynamicImportCompat = ( ) => buildProject ( "src/dynamicImportCompat" , cmdLineOptions ) ;
306
307
task ( "dynamicImportCompat" , buildDynamicImportCompat ) ;
307
308
309
+
310
+ const buildTypingsInstaller = ( ) => buildProject ( "src/typingsInstaller" ) ;
311
+ const cleanTypingsInstaller = ( ) => cleanProject ( "src/typingsInstaller" ) ;
312
+ cleanTasks . push ( cleanTypingsInstaller ) ;
313
+
314
+
308
315
const buildServerMain = ( ) => buildProject ( "src/tsserver" , cmdLineOptions ) ;
309
316
const buildServer = series ( buildDynamicImportCompat , buildServerMain ) ;
310
317
buildServer . displayName = "buildServer" ;
311
318
312
319
// task("tsserver", series(preBundleFromSrc, bundleServerFromSrc)); // esbuild on ./src
313
320
// task("tsserver", series(preBundleFromEmit, bundleServerFromEmit)); // esbuild on emitted ./built/local
314
321
// task("tsserver", series(preBuildSrc, buildSrc, writeHackyCJSShim("./built/local/tsserver/server.js", "./built/local/tsserver.js"))); // CJS
315
- task ( "tsserver" , series ( preBuildSrc , buildSrc , writeHackyMJSShim ( "./built/local/tsserver/server.js" , "./built/local/tsserver.js" ) ) ) ; // CJS
322
+ task ( "tsserver" , series ( preBuildSrc , buildTypingsInstaller , buildServerMain , writeHackyMJSShim ( "./built/local/tsserver/server.js" , "./built/local/tsserver.js" ) ) ) ; // CJS
316
323
task ( "tsserver" ) . description = "Builds the language server" ;
317
324
task ( "tsserver" ) . flags = {
318
325
" --built" : "Compile using the built version of the compiler."
@@ -481,10 +488,6 @@ const buildCancellationToken = () => buildProject("src/cancellationToken");
481
488
const cleanCancellationToken = ( ) => cleanProject ( "src/cancellationToken" ) ;
482
489
cleanTasks . push ( cleanCancellationToken ) ;
483
490
484
- const buildTypingsInstaller = ( ) => buildProject ( "src/typingsInstaller" ) ;
485
- const cleanTypingsInstaller = ( ) => cleanProject ( "src/typingsInstaller" ) ;
486
- cleanTasks . push ( cleanTypingsInstaller ) ;
487
-
488
491
const buildWatchGuard = ( ) => buildProject ( "src/watchGuard" ) ;
489
492
const cleanWatchGuard = ( ) => cleanProject ( "src/watchGuard" ) ;
490
493
cleanTasks . push ( cleanWatchGuard ) ;
0 commit comments