Skip to content

Commit c49c68d

Browse files
saschanazsaschanaz
committed
Manual merge
2 parents 92e3b3b + 9e0949b commit c49c68d

443 files changed

Lines changed: 45700 additions & 37044 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Jakefile.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@ var harnessSources = harnessCoreSources.concat([
143143
"convertToBase64.ts",
144144
"transpile.ts",
145145
"reuseProgramStructure.ts",
146-
"cachingInServerLSHost.ts"
146+
"cachingInServerLSHost.ts",
147+
"moduleResolution.ts"
147148
].map(function (f) {
148149
return path.join(unittestsDirectory, f);
149150
})).concat([
@@ -157,10 +158,10 @@ var harnessSources = harnessCoreSources.concat([
157158

158159
var librarySourceMap = [
159160
{ target: "lib.core.d.ts", sources: ["core.d.ts"] },
160-
{ target: "lib.dom.d.ts", sources: ["importcore.d.ts", "extensions.d.ts", "intl.d.ts", "dom.generated.d.ts"], },
161-
{ target: "lib.webworker.d.ts", sources: ["importcore.d.ts", "extensions.d.ts", "intl.d.ts", "webworker.generated.d.ts"], },
161+
{ target: "lib.dom.d.ts", sources: ["importcore.d.ts", "intl.d.ts", "dom.generated.d.ts"], },
162+
{ target: "lib.webworker.d.ts", sources: ["importcore.d.ts", "intl.d.ts", "webworker.generated.d.ts"], },
162163
{ target: "lib.scriptHost.d.ts", sources: ["importcore.d.ts", "scriptHost.d.ts"], },
163-
{ 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"], },
164+
{ target: "lib.d.ts", sources: ["core.d.ts", "intl.d.ts", "dom.generated.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"], },
164165
{ target: "lib.core.es6.d.ts", sources: ["core.d.ts", "es6.d.ts"]},
165166
{ target: "lib.es6.d.ts", sources: ["core.d.ts", "es6.d.ts", "intl.d.ts", "dom.generated.d.ts", "dom.es6.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"] },
166167
];

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
[![Join the chat at https://gitter.im/Microsoft/TypeScript](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Microsoft/TypeScript?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
88

9-
[TypeScript](http://www.typescriptlang.org/) is a language for application-scale JavaScript. TypeScript adds optional types, classes, and modules to JavaScript. TypeScript supports tools for large-scale JavaScript applications for any browser, for any host, on any OS. TypeScript compiles to readable, standards-based JavaScript. Try it out at the [playground](http://www.typescriptlang.org/Playground), and stay up to date via [our blog](http://blogs.msdn.com/typescript) and [twitter account](https://twitter.com/typescriptlang).
9+
[TypeScript](http://www.typescriptlang.org/) is a language for application-scale JavaScript. TypeScript adds optional types, classes, and modules to JavaScript. TypeScript supports tools for large-scale JavaScript applications for any browser, for any host, on any OS. TypeScript compiles to readable, standards-based JavaScript. Try it out at the [playground](http://www.typescriptlang.org/Playground), and stay up to date via [our blog](http://blogs.msdn.com/typescript) and [Twitter account](https://twitter.com/typescriptlang).
1010

1111
## Installing
1212

‎lib/lib.core.d.ts‎

Lines changed: 2653 additions & 12 deletions
Large diffs are not rendered by default.

‎lib/lib.core.es6.d.ts‎

Lines changed: 1696 additions & 1444 deletions
Large diffs are not rendered by default.

‎lib/lib.d.ts‎

Lines changed: 426 additions & 66 deletions
Large diffs are not rendered by default.

‎lib/lib.dom.d.ts‎

Lines changed: 38 additions & 2319 deletions
Large diffs are not rendered by default.

‎lib/lib.es6.d.ts‎

Lines changed: 1754 additions & 1477 deletions
Large diffs are not rendered by default.

‎lib/lib.webworker.d.ts‎

Lines changed: 143 additions & 2326 deletions
Large diffs are not rendered by default.

‎lib/tsc.js‎

Lines changed: 5009 additions & 3849 deletions
Large diffs are not rendered by default.

‎lib/tsserver.js‎

Lines changed: 6800 additions & 5126 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)