From cf5508732a520cd8ef26a071c9aab51e58a49087 Mon Sep 17 00:00:00 2001
From: Joel Day <joelday@gmail.com>
Date: Sun, 1 Jan 2017 17:58:33 -0800
Subject: [PATCH] Fix Gulp build of tsserverlibrary to match Jake.

---
 Gulpfile.ts                      |  2 +-
 Jakefile.js                      | 14 +++++++-------
 src/server/tsconfig.library.json | 26 +++++++++++++-------------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Gulpfile.ts b/Gulpfile.ts
index 2eec5c22045..22bf020a435 100644
--- a/Gulpfile.ts
+++ b/Gulpfile.ts
@@ -471,7 +471,7 @@ gulp.task(tsserverLibraryFile, false, [servicesFile], (done) => {
         js.pipe(prependCopyright())
             .pipe(sourcemaps.write("."))
             .pipe(gulp.dest(".")),
-        dts.pipe(prependCopyright())
+        dts.pipe(prependCopyright(/*outputCopyright*/true))
             .pipe(insert.transform((content) => {
                 return content + "\r\nexport = ts;";
             }))
diff --git a/Jakefile.js b/Jakefile.js
index 801ac924027..b810477d861 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -184,17 +184,17 @@ var servicesSources = [
 }));
 
 var baseServerCoreSources = [
-    "types.ts",
-    "shared.ts",
-    "utilities.ts",
-    "scriptVersionCache.ts",
-    "typingsCache.ts",
-    "scriptInfo.ts",
+    "editorServices.ts",
     "lsHost.ts",
     "project.ts",
-    "editorServices.ts",
     "protocol.ts",
+    "scriptInfo.ts",
+    "scriptVersionCache.ts",
     "session.ts",
+    "shared.ts",
+    "types.ts",
+    "typingsCache.ts",
+    "utilities.ts",
 ].map(function (f) {
     return path.join(serverDirectory, f);
 });
diff --git a/src/server/tsconfig.library.json b/src/server/tsconfig.library.json
index c589d875c3a..397211e6ff4 100644
--- a/src/server/tsconfig.library.json
+++ b/src/server/tsconfig.library.json
@@ -2,12 +2,11 @@
     "compilerOptions": {
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "removeComments": true,
+        "removeComments": false,
         "preserveConstEnums": true,
         "pretty": true,
         "outFile": "../../built/local/tsserverlibrary.js",
         "sourceMap": true,
-        "stripInternal": true,
         "types": [
             "node"
         ],
@@ -17,17 +16,18 @@
         "declaration": true
     },
     "files": [
-        "../services/shims.ts",
-        "../services/utilities.ts",
-        "shared.ts",
-        "utilities.ts",
-        "scriptVersionCache.ts",
-        "scriptInfo.ts",
-        "lsHost.ts",
-        "typingsCache.ts",
-        "project.ts",
         "editorServices.ts",
-        "protocol.ts",
-        "session.ts"
+        "lsHost.ts",
+        "project.ts",
+        "protocol.d.ts",
+        "scriptInfo.ts",
+        "scriptVersionCache.ts",
+        "session.ts",
+        "shared.ts",
+        "types.ts",
+        "typingsCache.ts",
+        "utilities.ts",
+        "../services/shims.ts",
+        "../services/utilities.ts"
     ]
 }