Rename tsserverWeb to dynamicImportCompat

rbuckton · rbuckton · commit 9bc39d17b9ac · 2022-06-10T19:52:52.000-07:00
diff --git a/Gulpfile.js b/Gulpfile.js
@@ -214,29 +214,29 @@ task("watch-services").flags = {
     "   --built": "Compile using the built version of the compiler."
 };
 
-const buildServerWeb = () => buildProject("src/tsserverWeb", cmdLineOptions);
-task("tsserverWeb", buildServerWeb);
+const buildDynamicImportCompat = () => buildProject("src/dynamicImportCompat", cmdLineOptions);
+task("dynamicImportCompat", buildDynamicImportCompat);
 
 const buildServerMain = () => buildProject("src/tsserver", cmdLineOptions);
-const buildServer = series(buildServerWeb, buildServerMain);
+const buildServer = series(buildDynamicImportCompat, buildServerMain);
 buildServer.displayName = "buildServer";
 task("tsserver", series(preBuild, buildServer));
 task("tsserver").description = "Builds the language server";
 task("tsserver").flags = {
     "   --built": "Compile using the built version of the compiler."
 };
 
-const cleanServerWeb = () => cleanProject("src/tsserverWeb");
+const cleanDynamicImportCompat = () => cleanProject("src/dynamicImportCompat");
 const cleanServerMain = () => cleanProject("src/tsserver");
-const cleanServer = series(cleanServerWeb, cleanServerMain);
+const cleanServer = series(cleanDynamicImportCompat, cleanServerMain);
 cleanServer.displayName = "cleanServer";
 cleanTasks.push(cleanServer);
 task("clean-tsserver", cleanServer);
 task("clean-tsserver").description = "Cleans outputs for the language server";
 
-const watchServerWeb = () => watchProject("src/tsserverWeb", cmdLineOptions);
+const watchDynamicImportCompat = () => watchProject("src/dynamicImportCompat", cmdLineOptions);
 const watchServer = () => watchProject("src/tsserver", cmdLineOptions);
-task("watch-tsserver", series(preBuild, parallel(watchLib, watchDiagnostics, watchServerWeb, watchServer)));
+task("watch-tsserver", series(preBuild, parallel(watchLib, watchDiagnostics, watchDynamicImportCompat, watchServer)));
 task("watch-tsserver").description = "Watch for changes and rebuild the language server only";
 task("watch-tsserver").flags = {
     "   --built": "Compile using the built version of the compiler."
@@ -558,7 +558,7 @@ const produceLKG = async () => {
         "built/local/typescriptServices.js",
         "built/local/typescriptServices.d.ts",
         "built/local/tsserver.js",
-        "built/local/tsserverWeb.js",
+        "built/local/dynamicImportCompat.js",
         "built/local/typescript.js",
         "built/local/typescript.d.ts",
         "built/local/tsserverlibrary.js",
diff --git a/scripts/produceLKG.ts b/scripts/produceLKG.ts
@@ -62,7 +62,7 @@ async function copyScriptOutputs() {
     await copyWithCopyright("cancellationToken.js");
     await copyWithCopyright("tsc.release.js", "tsc.js");
     await copyWithCopyright("tsserver.js");
-    await copyWithCopyright("tsserverWeb.js");
+    await copyWithCopyright("dynamicImportCompat.js");
     await copyFromBuiltLocal("tsserverlibrary.js"); // copyright added by build
     await copyFromBuiltLocal("typescript.js"); // copyright added by build
     await copyFromBuiltLocal("typescriptServices.js"); // copyright added by build
diff --git a/src/dynamicImportCompat/dynamicImportCompat.ts b/src/dynamicImportCompat/dynamicImportCompat.ts
diff --git a/src/dynamicImportCompat/tsconfig.json b/src/dynamicImportCompat/tsconfig.json
@@ -8,9 +8,9 @@
         "lib": ["esnext"],
         "declaration": false,
         "sourceMap": true,
-        "tsBuildInfoFile": "../../built/local/tsserverWeb.tsbuildinfo"
+        "tsBuildInfoFile": "../../built/local/dynamicImportCompat.tsbuildinfo"
     },
     "files": [
-        "tsserverWeb.ts",
+        "dynamicImportCompat.ts",
     ]
 }
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -4082,7 +4082,7 @@ namespace ts.server {
                 return;
             }
 
-            // Otherwise, load the plugin using `resolve`
+            // Otherwise, load the plugin using `require`
             project.endEnablePlugin(project.beginEnablePluginSync(pluginConfigEntry, searchPaths, pluginConfigOverrides));
         }
 
diff --git a/src/tsconfig.json b/src/tsconfig.json
@@ -9,7 +9,7 @@
         { "path": "./watchGuard" },
         { "path": "./debug" },
         { "path": "./cancellationToken" },
-        { "path": "./tsserverWeb" },
+        { "path": "./dynamicImportCompat" },
         { "path": "./testRunner" }
     ]
 }
diff --git a/src/webServer/webServer.ts b/src/webServer/webServer.ts
@@ -118,7 +118,7 @@ namespace ts.server {
     if (typeof importScripts === "function") {
         try {
             // NOTE: importScripts is synchronous
-            importScripts("tsserverWeb.js");
+            importScripts("dynamicImportCompat.js");
         }
         catch {
             // ignored

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@`
`8`	`8`	`"lib": ["esnext"],`
`9`	`9`	`"declaration": false,`
`10`	`10`	`"sourceMap": true,`
`11`		`- "tsBuildInfoFile": "../../built/local/tsserverWeb.tsbuildinfo"`
	`11`	`+ "tsBuildInfoFile": "../../built/local/dynamicImportCompat.tsbuildinfo"`
`12`	`12`	`},`
`13`	`13`	`"files": [`
`14`		`- "tsserverWeb.ts",`
	`14`	`+ "dynamicImportCompat.ts",`
`15`	`15`	`]`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4082,7 +4082,7 @@ namespace ts.server {`
`4082`	`4082`	`return;`
`4083`	`4083`	`}`
`4084`	`4084`
`4085`		- // Otherwise, load the plugin using `resolve`
	`4085`	+ // Otherwise, load the plugin using `require`
`4086`	`4086`	`project.endEnablePlugin(project.beginEnablePluginSync(pluginConfigEntry, searchPaths, pluginConfigOverrides));`
`4087`	`4087`	`}`
`4088`	`4088`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`{ "path": "./watchGuard" },`
`10`	`10`	`{ "path": "./debug" },`
`11`	`11`	`{ "path": "./cancellationToken" },`
`12`		`- { "path": "./tsserverWeb" },`
	`12`	`+ { "path": "./dynamicImportCompat" },`
`13`	`13`	`{ "path": "./testRunner" }`
`14`	`14`	`]`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ namespace ts.server {`
`118`	`118`	`if (typeof importScripts === "function") {`
`119`	`119`	`try {`
`120`	`120`	`// NOTE: importScripts is synchronous`
`121`		`- importScripts("tsserverWeb.js");`
	`121`	`+ importScripts("dynamicImportCompat.js");`
`122`	`122`	`}`
`123`	`123`	`catch {`
`124`	`124`	`// ignored`