Rename typescriptServices, protocol.d.ts, typescript_standalone.d.ts

microsoft · Oct 4, 2022 · 8a2a92c · 8a2a92c
1 parent 8af9a93
commit 8a2a92c
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 270 deletions.
diff --git a/Gulpfile.js b/Gulpfile.js
@@ -119,55 +119,31 @@ const localPreBuild = parallel(generateLibs, series(buildScripts, generateDiagno
 const preBuild = cmdLineOptions.lkg ? lkgPreBuild : localPreBuild;
 
 const buildServices = (() => {
-    // build typescriptServices.out.js
-    const buildTypescriptServicesOut = () => buildProject("src/typescriptServices/tsconfig.json", cmdLineOptions);
-
-    // create typescriptServices.js
-    const createTypescriptServicesJs = () => src("built/local/typescriptServices.out.js")
-        .pipe(newer("built/local/typescriptServices.js"))
-        .pipe(sourcemaps.init({ loadMaps: true }))
-        .pipe(prependFile(copyright))
-        .pipe(rename("typescriptServices.js"))
-        .pipe(sourcemaps.write(".", { includeContent: false, destPath: "built/local" }))
-        .pipe(dest("built/local"));
-
-    // create typescriptServices.d.ts
-    const createTypescriptServicesDts = () => src("built/local/typescriptServices.out.d.ts")
-        .pipe(newer("built/local/typescriptServices.d.ts"))
-        .pipe(prependFile(copyright))
-        .pipe(transform(content => content.replace(/^(\s*)(export )?const enum (\S+) {(\s*)$/gm, "$1$2enum $3 {$4")))
-        .pipe(rename("typescriptServices.d.ts"))
-        .pipe(dest("built/local"));
+    // build typescript.out.js
+    const buildTypescriptOut = () => buildProject("src/typescript/tsconfig.json", cmdLineOptions);
 
     // create typescript.js
-    const createTypescriptJs = () => src("built/local/typescriptServices.js")
+    const createTypescriptJs = () => src("built/local/typescript.out.js")
         .pipe(newer("built/local/typescript.js"))
         .pipe(sourcemaps.init({ loadMaps: true }))
+        .pipe(prependFile(copyright))
         .pipe(rename("typescript.js"))
         .pipe(sourcemaps.write(".", { includeContent: false, destPath: "built/local" }))
         .pipe(dest("built/local"));
 
     // create typescript.d.ts
-    const createTypescriptDts = () => src("built/local/typescriptServices.d.ts")
+    const createTypescriptDts = () => src("built/local/typescript.out.d.ts")
         .pipe(newer("built/local/typescript.d.ts"))
+        .pipe(prependFile(copyright))
+        .pipe(transform(content => content.replace(/^(\s*)(export )?const enum (\S+) {(\s*)$/gm, "$1$2enum $3 {$4")))
         .pipe(append("\nexport = ts;"))
         .pipe(rename("typescript.d.ts"))
         .pipe(dest("built/local"));
 
-    // create typescript_standalone.d.ts
-    const createTypescriptStandaloneDts = () => src("built/local/typescriptServices.d.ts")
-        .pipe(newer("built/local/typescript_standalone.d.ts"))
-        .pipe(transform(content => content.replace(/declare (namespace|module) ts/g, 'declare module "typescript"')))
-        .pipe(rename("typescript_standalone.d.ts"))
-        .pipe(dest("built/local"));
-
     return series(
-        buildTypescriptServicesOut,
-        createTypescriptServicesJs,
-        createTypescriptServicesDts,
+        buildTypescriptOut,
         createTypescriptJs,
         createTypescriptDts,
-        createTypescriptStandaloneDts,
     );
 })();
 task("services", series(preBuild, buildServices));
@@ -177,17 +153,15 @@ task("services").flags = {
 };
 
 const cleanServices = async () => {
-    if (fs.existsSync("built/local/typescriptServices.tsconfig.json")) {
-        await cleanProject("built/local/typescriptServices.tsconfig.json");
+    if (fs.existsSync("built/local/typescript.tsconfig.json")) {
+        await cleanProject("built/local/typescript.tsconfig.json");
     }
     await del([
-        "built/local/typescriptServices.out.js",
-        "built/local/typescriptServices.out.d.ts",
-        "built/local/typescriptServices.out.tsbuildinfo",
-        "built/local/typescriptServices.js",
+        "built/local/typescript.out.js",
+        "built/local/typescript.out.d.ts",
+        "built/local/typescript.out.tsbuildinfo",
         "built/local/typescript.js",
         "built/local/typescript.d.ts",
-        "built/local/typescript_standalone.d.ts"
     ]);
 };
 cleanTasks.push(cleanServices);
@@ -511,8 +485,6 @@ const cleanBuilt = () => del("built");
 const produceLKG = async () => {
     const expectedFiles = [
         "built/local/tsc.release.js",
-        "built/local/typescriptServices.js",
-        "built/local/typescriptServices.d.ts",
         "built/local/tsserver.js",
         "built/local/dynamicImportCompat.js",
         "built/local/typescript.js",

diff --git a/scripts/VSDevMode.ps1 b/scripts/VSDevMode.ps1
@@ -37,7 +37,7 @@ if(!(Test-Path $tsRegKey)){
 }
 
 if($tsScript -ne ""){
-    $tsScriptServices =  "${tsScript}\typescriptServices.js"
+    $tsScriptServices =  "${tsScript}\typescript.js"
     $tsScriptlib = "${tsScript}\lib.d.ts"
     $tsES6Scriptlib = "${tsScript}\lib.es6.d.ts"
 

diff --git a/scripts/buildProtocol.ts b/scripts/buildProtocol.ts
diff --git a/scripts/createPlaygroundBuild.js b/scripts/createPlaygroundBuild.js
@@ -7,7 +7,7 @@
 
 // This script does two things: 
 //  
-//  - Listens to changes to the built version of TypeScript (via a filewatcher on `built/local/typescriptServices.js`)
+//  - Listens to changes to the built version of TypeScript (via a filewatcher on `built/local/typescript.js`)
 //    these trigger creating monaco-typescript compatible builds of TypeScript at `internal/lib/typescriptServices.js§
 //
 //  - Creates a HTTP server which the playground uses. The webserver almost exclusively re-directs requests to 
@@ -60,7 +60,7 @@ function updateTSDist() {
     );
 
     let tsServices = fs
-      .readFileSync(path.join(TYPESCRIPT_LIB_SOURCE, 'typescriptServices.js'))
+      .readFileSync(path.join(TYPESCRIPT_LIB_SOURCE, 'typescript.js'))
       .toString();
 
     // Ensure we never run into the node system...
@@ -155,13 +155,8 @@ function updateTSDist() {
     );
 
     let dtsServices = fs
-      .readFileSync(path.join(TYPESCRIPT_LIB_SOURCE, 'typescriptServices.d.ts'))
+      .readFileSync(path.join(TYPESCRIPT_LIB_SOURCE, 'typescript.d.ts'))
       .toString();
-    dtsServices += `
-  // MONACOCHANGE
-  export = ts;
-  // END MONACOCHANGE
-  `;
     fs.writeFileSync(
       path.join(TYPESCRIPT_LIB_DESTINATION, 'typescriptServices.d.ts'),
       generatedNote + dtsServices
@@ -271,7 +266,7 @@ function updateTSDist() {
   /// End of import
 }
 
-const services = path.join(__dirname, '../built/local/typescriptServices.js');
+const services = path.join(__dirname, '../built/local/typescript.js');
 fs.watchFile(services, () =>{
   console.log("Updating the monaco build")
   updateTSDist()