Fix buildProtocol to handle lib+noresolve

RyanCavanaugh · RyanCavanaugh · commit 73309c92828d · 2018-06-13T10:43:48.000-07:00
diff --git a/scripts/buildProtocol.ts b/scripts/buildProtocol.ts
@@ -55,7 +55,7 @@ class DeclarationsWalker {
             if (declarations) {
                 for (const decl of declarations) {
                     const sourceFile = decl.getSourceFile();
-                    if (sourceFile === this.protocolFile || /lib\.(.*)\.d.ts/.test(path.basename(sourceFile.fileName))) {
+                    if (sourceFile === this.protocolFile || /lib(\..+)?\.d.ts/.test(path.basename(sourceFile.fileName))) {
                         return;
                     }
                     if (decl.kind === ts.SyntaxKind.EnumDeclaration && !isStringEnum(decl as ts.EnumDeclaration)) {
@@ -121,14 +121,14 @@ class DeclarationsWalker {
 }
 
 function writeProtocolFile(outputFile: string, protocolTs: string, typeScriptServicesDts: string) {
-    const options = { target: ts.ScriptTarget.ES5, declaration: true, noResolve: true, types: <string[]>[], stripInternal: true };
+    const options = { target: ts.ScriptTarget.ES5, declaration: true, noResolve: false, types: <string[]>[], stripInternal: true };
 
     /**
      * 1st pass - generate a program from protocol.ts and typescriptservices.d.ts and emit core version of protocol.d.ts with all internal members stripped
      * @return text of protocol.d.t.s
      */
     function getInitialDtsFileForProtocol() {
-        const program = ts.createProgram([protocolTs, typeScriptServicesDts], options);
+        const program = ts.createProgram([protocolTs, typeScriptServicesDts, path.join(typeScriptServicesDts, "../lib.es5.d.ts")], options);
 
         let protocolDts: string | undefined;
         const emitResult = program.emit(program.getSourceFile(protocolTs), (file, content) => {
