Skip to content

Commit 1a97904

Browse files
committed
Fully remove dynamicImportCompat
1 parent 99a9841 commit 1a97904

File tree

5 files changed

+3
-33
lines changed

5 files changed

+3
-33
lines changed

Gulpfile.js

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,6 @@ function esbuildTask(entrypoint, outfile, exportIsTsObject = false) {
218218
};
219219
}
220220

221-
// TODO(jakebailey): Add this function to the non-bundle paths which
222-
// don't output to the correct location. (e.g., not dynamicImportCompat).
223-
224221
/**
225222
* Creates a function that writes a CJS module that reexports another CJS file via
226223
* `module.exports = require("...")`.
@@ -293,33 +290,25 @@ task("watch-services").flags = {
293290
" --built": "Compile using the built version of the compiler."
294291
};
295292

296-
const buildDynamicImportCompat = () => buildProject("src/dynamicImportCompat");
297-
task("dynamicImportCompat", buildDynamicImportCompat);
298-
299-
const cleanDynamicImportCompat = () => cleanProject("src/dynamicImportCompat");
300-
const watchDynamicImportCompat = () => watchProject("src/dynamicImportCompat");
301-
302293

303294
const esbuildServer = esbuildTask("./src/tsserver/server.ts", "./built/local/tsserver.js", /* exportIsTsObject */ true);
304295

305-
const buildServerMain = () => cmdLineOptions.bundle ? esbuildServer.build() : buildProject("src/tsserver");
306-
const buildServer = series(buildDynamicImportCompat, buildServerMain);
296+
const buildServer = () => cmdLineOptions.bundle ? esbuildServer.build() : buildProject("src/tsserver");
307297
buildServer.displayName = "buildServer";
308298
task("tsserver", series(preBuild, buildServer));
309299
task("tsserver").description = "Builds the language server";
310300
task("tsserver").flags = {
311301
" --built": "Compile using the built version of the compiler."
312302
};
313303

314-
const cleanServerMain = () => cmdLineOptions.bundle ? esbuildServer.clean() : cleanProject("src/tsserver");
315-
const cleanServer = series(cleanDynamicImportCompat, cleanServerMain);
304+
const cleanServer = () => cmdLineOptions.bundle ? esbuildServer.clean() : cleanProject("src/tsserver");
316305
cleanServer.displayName = "cleanServer";
317306
cleanTasks.push(cleanServer);
318307
task("clean-tsserver", cleanServer);
319308
task("clean-tsserver").description = "Cleans outputs for the language server";
320309

321310
const watchServer = () => cmdLineOptions.bundle ? esbuildServer.watch() : watchProject("src/tsserver");
322-
task("watch-tsserver", series(preBuild, parallel(watchLib, watchDiagnostics, watchDynamicImportCompat, watchServer)));
311+
task("watch-tsserver", series(preBuild, parallel(watchLib, watchDiagnostics, watchServer)));
323312
task("watch-tsserver").description = "Watch for changes and rebuild the language server only";
324313
task("watch-tsserver").flags = {
325314
" --built": "Compile using the built version of the compiler."
@@ -591,7 +580,6 @@ const produceLKG = async () => {
591580
"built/local/typescriptServices.js",
592581
"built/local/typescriptServices.d.ts",
593582
"built/local/tsserver.js",
594-
"built/local/dynamicImportCompat.js",
595583
"built/local/typescript.js",
596584
"built/local/typescript.d.ts",
597585
"built/local/tsserverlibrary.js",

scripts/produceLKG.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ async function copyScriptOutputs() {
6262
await copyWithCopyright("cancellationToken.js");
6363
await copyWithCopyright("tsc.release.js", "tsc.js");
6464
await copyWithCopyright("tsserver.js");
65-
await copyWithCopyright("dynamicImportCompat.js");
6665
await copyFromBuiltLocal("tsserverlibrary.js"); // copyright added by build
6766
await copyFromBuiltLocal("typescript.js"); // copyright added by build
6867
await copyFromBuiltLocal("typescriptServices.js"); // copyright added by build

src/dynamicImportCompat/dynamicImportCompat.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/dynamicImportCompat/tsconfig.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
{ "path": "./watchGuard" },
1111
{ "path": "./debug" },
1212
{ "path": "./cancellationToken" },
13-
{ "path": "./dynamicImportCompat" },
1413
{ "path": "./testRunner" },
1514
]
1615
}

0 commit comments

Comments
 (0)