@@ -100,7 +100,8 @@ async function esbuild(entrypoint, outfile) {
100
100
"--bundle" ,
101
101
`--outfile=${ outfile } ` ,
102
102
"--platform=node" ,
103
- "--target=node10" , // Node 10; oldest benchmarker.
103
+ "--target=node12" ,
104
+ "--format=esm" ,
104
105
"--sourcemap" ,
105
106
"--external:./node_modules/*" ,
106
107
"--conditions=require" ,
@@ -120,11 +121,15 @@ const writeHackyCJSShim = (infile, outfile) => {
120
121
} ;
121
122
} ;
122
123
124
+ const writePackageJsonWithModuleType = ( done ) => {
125
+ fs . writeFileSync ( "./built/local/package.json" , JSON . stringify ( { name : "local" , private : true , type : "module" } ) ) ;
126
+ done ( ) ;
127
+ } ;
128
+
123
129
/** @type {(infile: string, outfile: string) => (done: () => void) => void } */
124
130
const writeHackyMJSShim = ( infile , outfile ) => {
125
131
const writeHackyMJSShim = ( done ) => {
126
132
const inRelativeToOut = infile = path . relative ( path . dirname ( outfile ) , infile ) ;
127
- fs . writeFileSync ( path . join ( path . dirname ( outfile ) , "package.json" ) , JSON . stringify ( { name : "local" , private : true , type : "module" } ) ) ;
128
133
fs . writeFileSync ( outfile , `import "./${ inRelativeToOut } "` ) ;
129
134
done ( ) ;
130
135
} ;
@@ -187,9 +192,9 @@ const lkgPreBuild = parallel(generateLibs, series(buildScripts, generateDiagnost
187
192
const buildTsc = ( ) => buildProject ( "src/tsc" ) ;
188
193
189
194
// task("tsc", series(preBundleFromSrc, bundleTscFromSrc)); // esbuild on ./src
190
- // task("tsc", series(preBundleFromEmit , bundleTscFromEmit)); // esbuild on emitted ./built/local
195
+ task ( "tsc" , series ( preBuildSrc , buildTsc , writePackageJsonWithModuleType , bundleTscFromEmit ) ) ; // esbuild on emitted ./built/local
191
196
// task("tsc", series(preBuildSrc, buildSrc, writeHackyCJSShim("./built/local/tsc/tsc.js", "./built/local/tsc.js"))); // CJS
192
- task ( "tsc" , series ( preBuildSrc , buildTsc , writeHackyMJSShim ( "./built/local/tsc/tsc.js" , "./built/local/tsc.js" ) ) ) ; // MJS
197
+ // task("tsc", series(preBuildSrc, buildTsc, writePackageJsonWithModuleType , writeHackyMJSShim("./built/local/tsc/tsc.js", "./built/local/tsc.js"))); // MJS
193
198
task ( "tsc" ) . description = "Builds the command-line compiler" ;
194
199
195
200
const cleanTsc = ( ) => cleanProject ( "src/tsc" ) ;
@@ -317,9 +322,9 @@ const buildServer = series(buildDynamicImportCompat, buildServerMain);
317
322
buildServer . displayName = "buildServer" ;
318
323
319
324
// task("tsserver", series(preBundleFromSrc, bundleServerFromSrc)); // esbuild on ./src
320
- // task("tsserver", series(preBundleFromEmit , bundleServerFromEmit)); // esbuild on emitted ./built/local
325
+ task ( "tsserver" , series ( preBuildSrc , buildTypingsInstaller , buildServer , writePackageJsonWithModuleType , bundleServerFromEmit ) ) ; // esbuild on emitted ./built/local
321
326
// task("tsserver", series(preBuildSrc, buildSrc, writeHackyCJSShim("./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
327
+ // task("tsserver", series(preBuildSrc, buildTypingsInstaller, buildServerMain, writePackageJsonWithModuleType , writeHackyMJSShim("./built/local/tsserver/server.js", "./built/local/tsserver.js"))); // CJS
323
328
task ( "tsserver" ) . description = "Builds the language server" ;
324
329
task ( "tsserver" ) . flags = {
325
330
" --built" : "Compile using the built version of the compiler."
0 commit comments