From 1abe1d7e03147bf53496754a96c5fe58295855e3 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Mon, 17 Nov 2014 12:47:45 -0800 Subject: [PATCH] Add dom to es6 lib --- Jakefile | 3 ++- src/harness/harness.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Jakefile b/Jakefile index 156e656a977..7341a025e11 100644 --- a/Jakefile +++ b/Jakefile @@ -96,7 +96,8 @@ var librarySourceMap = [ { target: "lib.webworker.d.ts", sources: ["importcore.d.ts", "extensions.d.ts", "intl.d.ts", "webworker.generated.d.ts"], }, { target: "lib.scriptHost.d.ts", sources: ["importcore.d.ts", "scriptHost.d.ts"], }, { target: "lib.d.ts", sources: ["core.d.ts", "extensions.d.ts", "intl.d.ts", "dom.generated.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"], }, - { target: "lib.es6.d.ts", sources: ["core.d.ts", "es6.d.ts", "intl.d.ts"]}, + { target: "lib.core.es6.d.ts", sources: ["core.d.ts", "es6.d.ts"]}, + { target: "lib.es6.d.ts", sources: ["core.d.ts", "es6.d.ts", "intl.d.ts", "dom.generated.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"]}, ]; var libraryTargets = librarySourceMap.map(function (f) { diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 267fccd7d20..a2cc84b2a48 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -539,7 +539,7 @@ module Harness { export var defaultLibFileName = 'lib.d.ts'; export var defaultLibSourceFile = ts.createSourceFile(defaultLibFileName, IO.readFile(libFolder + 'lib.core.d.ts'), /*languageVersion*/ ts.ScriptTarget.Latest, /*version:*/ "0"); - export var defaultES6LibSourceFile = ts.createSourceFile(defaultLibFileName, IO.readFile(libFolder + 'lib.es6.d.ts'), /*languageVersion*/ ts.ScriptTarget.Latest, /*version:*/ "0"); + export var defaultES6LibSourceFile = ts.createSourceFile(defaultLibFileName, IO.readFile(libFolder + 'lib.core.es6.d.ts'), /*languageVersion*/ ts.ScriptTarget.Latest, /*version:*/ "0"); // Cache these between executions so we don't have to re-parse them for every test