Skip to content

Commit 68fd1a7

Browse files
committed
Hack things more to get perf on ESM working
1 parent 952f29b commit 68fd1a7

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

Gulpfile.js

+10-7
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,13 @@ const writeHackyCJSShim = (infile, outfile) => {
122122

123123
/** @type {(infile: string, outfile: string) => (done: () => void) => void} */
124124
const writeHackyMJSShim = (infile, outfile) => {
125-
return (done) => {
125+
const writeHackyMJSShim = (done) => {
126126
const inRelativeToOut = infile = path.relative(path.dirname(outfile), infile);
127127
fs.writeFileSync(path.join(path.dirname(outfile), "package.json"), JSON.stringify({ name: "local", private: true, type: "module" }));
128128
fs.writeFileSync(outfile, `import "./${inRelativeToOut}"`);
129129
done();
130130
};
131+
return writeHackyMJSShim;
131132
};
132133

133134
const preBundleFromSrc = parallel(generateLibs, series(buildScripts, generateDiagnostics, localize));
@@ -188,7 +189,7 @@ const buildTsc = () => buildProject("src/tsc");
188189
// task("tsc", series(preBundleFromSrc, bundleTscFromSrc)); // esbuild on ./src
189190
// task("tsc", series(preBundleFromEmit, bundleTscFromEmit)); // esbuild on emitted ./built/local
190191
// 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
192193
task("tsc").description = "Builds the command-line compiler";
193194

194195
const cleanTsc = () => cleanProject("src/tsc");
@@ -305,14 +306,20 @@ task("watch-services").flags = {
305306
const buildDynamicImportCompat = () => buildProject("src/dynamicImportCompat", cmdLineOptions);
306307
task("dynamicImportCompat", buildDynamicImportCompat);
307308

309+
310+
const buildTypingsInstaller = () => buildProject("src/typingsInstaller");
311+
const cleanTypingsInstaller = () => cleanProject("src/typingsInstaller");
312+
cleanTasks.push(cleanTypingsInstaller);
313+
314+
308315
const buildServerMain = () => buildProject("src/tsserver", cmdLineOptions);
309316
const buildServer = series(buildDynamicImportCompat, buildServerMain);
310317
buildServer.displayName = "buildServer";
311318

312319
// task("tsserver", series(preBundleFromSrc, bundleServerFromSrc)); // esbuild on ./src
313320
// task("tsserver", series(preBundleFromEmit, bundleServerFromEmit)); // esbuild on emitted ./built/local
314321
// 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
316323
task("tsserver").description = "Builds the language server";
317324
task("tsserver").flags = {
318325
" --built": "Compile using the built version of the compiler."
@@ -481,10 +488,6 @@ const buildCancellationToken = () => buildProject("src/cancellationToken");
481488
const cleanCancellationToken = () => cleanProject("src/cancellationToken");
482489
cleanTasks.push(cleanCancellationToken);
483490

484-
const buildTypingsInstaller = () => buildProject("src/typingsInstaller");
485-
const cleanTypingsInstaller = () => cleanProject("src/typingsInstaller");
486-
cleanTasks.push(cleanTypingsInstaller);
487-
488491
const buildWatchGuard = () => buildProject("src/watchGuard");
489492
const cleanWatchGuard = () => cleanProject("src/watchGuard");
490493
cleanTasks.push(cleanWatchGuard);

0 commit comments

Comments
 (0)