Skip to content

Commit c5bf532

Browse files
committed
One last test for esbuilding emitted output
1 parent 68fd1a7 commit c5bf532

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

Gulpfile.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ async function esbuild(entrypoint, outfile) {
100100
"--bundle",
101101
`--outfile=${outfile}`,
102102
"--platform=node",
103-
"--target=node10", // Node 10; oldest benchmarker.
103+
"--target=node12",
104+
"--format=esm",
104105
"--sourcemap",
105106
"--external:./node_modules/*",
106107
"--conditions=require",
@@ -120,11 +121,15 @@ const writeHackyCJSShim = (infile, outfile) => {
120121
};
121122
};
122123

124+
const writePackageJsonWithModuleType = (done) => {
125+
fs.writeFileSync("./built/local/package.json", JSON.stringify({ name: "local", private: true, type: "module" }));
126+
done();
127+
};
128+
123129
/** @type {(infile: string, outfile: string) => (done: () => void) => void} */
124130
const writeHackyMJSShim = (infile, outfile) => {
125131
const writeHackyMJSShim = (done) => {
126132
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" }));
128133
fs.writeFileSync(outfile, `import "./${inRelativeToOut}"`);
129134
done();
130135
};
@@ -187,9 +192,9 @@ const lkgPreBuild = parallel(generateLibs, series(buildScripts, generateDiagnost
187192
const buildTsc = () => buildProject("src/tsc");
188193

189194
// 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
191196
// 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
193198
task("tsc").description = "Builds the command-line compiler";
194199

195200
const cleanTsc = () => cleanProject("src/tsc");
@@ -317,9 +322,9 @@ const buildServer = series(buildDynamicImportCompat, buildServerMain);
317322
buildServer.displayName = "buildServer";
318323

319324
// 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
321326
// 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
323328
task("tsserver").description = "Builds the language server";
324329
task("tsserver").flags = {
325330
" --built": "Compile using the built version of the compiler."

src/tsserver/nodeServer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ function startNodeSession(options: StartSessionOptions, logger: Logger, cancella
533533
}
534534

535535
// TODO(jakebailey): fix this for module transform
536-
this.installer = childProcess.fork(combinePaths(__dirname, "..", "typingsInstaller", "nodeTypingsInstaller.js"), args, { execArgv });
536+
this.installer = childProcess.fork(combinePaths(__dirname, "typingsInstaller", "nodeTypingsInstaller.js"), args, { execArgv });
537537
this.installer.on("message", m => this.handleMessage(m));
538538

539539
// We have to schedule this event to the next tick

0 commit comments

Comments
 (0)