From f83aee02e66214853a008ebe4b5141405ac3a950 Mon Sep 17 00:00:00 2001 From: Kitson Kelly Date: Sat, 1 Sep 2018 07:45:26 -0700 Subject: Bundle most types into globals.d.ts (#642) --- js/compiler.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'js/compiler.ts') diff --git a/js/compiler.ts b/js/compiler.ts index 2e8c525b8..28fe8be8f 100644 --- a/js/compiler.ts +++ b/js/compiler.ts @@ -1,4 +1,5 @@ // Copyright 2018 the Deno authors. All rights reserved. MIT license. +/// import * as ts from "typescript"; import { assetSourceCode } from "./assets"; import * as deno from "./deno"; @@ -669,10 +670,9 @@ export class DenoCompiler implements ts.LanguageServiceHost { this._log("resolveModuleNames()", { moduleNames, containingFile }); return moduleNames.map(name => { let resolvedFileName; - if (name === "deno") { - resolvedFileName = this.resolveModuleName("deno.d.ts", ASSETS); - } else if (name === "compiler") { - resolvedFileName = this.resolveModuleName("compiler.d.ts", ASSETS); + if (name === "deno" || name === "compiler") { + // builtin modules are part of `globals.d.ts` + resolvedFileName = this.resolveModuleName("globals.d.ts", ASSETS); } else if (name === "typescript") { resolvedFileName = this.resolveModuleName("typescript.d.ts", ASSETS); } else { -- cgit v1.2.3