Skip to content

Commit 0309fd1

Browse files
mhegazymhegazy
committed
Merge branch 'master' into release-2.1
2 parents ee145ec + c90a40c commit 0309fd1

445 files changed

Lines changed: 33003 additions & 24253 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.

‎Gulpfile.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ for (const i in libraryTargets) {
177177
const configureNightlyJs = path.join(scriptsDirectory, "configureNightly.js");
178178
const configureNightlyTs = path.join(scriptsDirectory, "configureNightly.ts");
179179
const packageJson = "package.json";
180-
const programTs = path.join(compilerDirectory, "program.ts");
180+
const versionFile = path.join(compilerDirectory, "core.ts");
181181

182182
function needsUpdate(source: string | string[], dest: string | string[]): boolean {
183183
if (typeof source === "string" && typeof dest === "string") {
@@ -285,7 +285,7 @@ gulp.task(configureNightlyJs, false, [], () => {
285285

286286
// Nightly management tasks
287287
gulp.task("configure-nightly", "Runs scripts/configureNightly.ts to prepare a build for nightly publishing", [configureNightlyJs], (done) => {
288-
exec(host, [configureNightlyJs, packageJson, programTs], done, done);
288+
exec(host, [configureNightlyJs, packageJson, versionFile], done, done);
289289
});
290290
gulp.task("publish-nightly", "Runs `npm publish --tag next` to create a new nightly build on npm", ["LKG"], () => {
291291
return runSequence("clean", "useDebugMode", "runtests", (done) => {

‎Jakefile.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ task("generate-diagnostics", [diagnosticInfoMapTs]);
593593
var configureNightlyJs = path.join(scriptsDirectory, "configureNightly.js");
594594
var configureNightlyTs = path.join(scriptsDirectory, "configureNightly.ts");
595595
var packageJson = "package.json";
596-
var programTs = path.join(compilerDirectory, "program.ts");
596+
var versionFile = path.join(compilerDirectory, "core.ts");
597597

598598
file(configureNightlyTs);
599599

@@ -609,7 +609,7 @@ task("setDebugMode", function () {
609609
});
610610

611611
task("configure-nightly", [configureNightlyJs], function () {
612-
var cmd = host + " " + configureNightlyJs + " " + packageJson + " " + programTs;
612+
var cmd = host + " " + configureNightlyJs + " " + packageJson + " " + versionFile;
613613
console.log(cmd);
614614
exec(cmd);
615615
}, { async: true });
@@ -640,7 +640,7 @@ task("importDefinitelyTypedTests", [importDefinitelyTypedTestsJs], function () {
640640

641641
// Local target to build the compiler and services
642642
var tscFile = path.join(builtLocalDirectory, compilerFilename);
643-
compileFile(tscFile, compilerSources, [builtLocalDirectory, copyright].concat(compilerSources), [copyright], /*useBuiltCompiler:*/ false);
643+
compileFile(tscFile, compilerSources, [builtLocalDirectory, copyright].concat(compilerSources), [copyright], /*useBuiltCompiler:*/ false, { noMapRoot: true });
644644

645645
var servicesFile = path.join(builtLocalDirectory, "typescriptServices.js");
646646
var servicesFileInBrowserTest = path.join(builtLocalDirectory, "typescriptServicesInBrowserTest.js");

‎issue_template.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- QUESTIONS: This is not a general support forum! Ask Qs at http://stackoverflow.com/questions/tagged/typescript -->
33
<!-- SUGGESTIONS: See https://github.com/Microsoft/TypeScript-wiki/blob/master/Writing-Good-Design-Proposals.md -->
44

5-
**TypeScript Version:** 2.0.3 / nightly (2.1.0-dev.201xxxxx)
5+
**TypeScript Version:** 2.1.1 / nightly (2.2.0-dev.201xxxxx)
66

77
**Code**
88

@@ -13,4 +13,4 @@
1313

1414
**Expected behavior:**
1515

16-
**Actual behavior:**
16+
**Actual behavior:**

‎lib/lib.es2015.proxy.d.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ and limitations under the License.
1919

2020

2121
interface ProxyHandler<T> {
22-
getPrototypeOf? (target: T): any;
22+
getPrototypeOf? (target: T): {} | null;
2323
setPrototypeOf? (target: T, v: any): boolean;
2424
isExtensible? (target: T): boolean;
2525
preventExtensions? (target: T): boolean;
@@ -32,11 +32,11 @@ interface ProxyHandler<T> {
3232
enumerate? (target: T): PropertyKey[];
3333
ownKeys? (target: T): PropertyKey[];
3434
apply? (target: T, thisArg: any, argArray?: any): any;
35-
construct? (target: T, thisArg: any, argArray?: any): any;
35+
construct? (target: T, argArray: any, newTarget?: any): {};
3636
}
3737

3838
interface ProxyConstructor {
3939
revocable<T>(target: T, handler: ProxyHandler<T>): { proxy: T; revoke: () => void; };
4040
new <T>(target: T, handler: ProxyHandler<T>): T
4141
}
42-
declare var Proxy: ProxyConstructor;
42+
declare var Proxy: ProxyConstructor;

‎lib/lib.es2017.object.d.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ interface ObjectConstructor {
2929
* Returns an array of key/values of the enumerable properties of an object
3030
* @param o Object that contains the properties and methods. This can be an object that you created or an existing Document Object Model (DOM) object.
3131
*/
32-
entries<T>(o: { [s: string]: T }): [string, T][];
32+
entries<T extends { [key: string]: any }, K extends keyof T>(o: T): [keyof T, T[K]][];
3333
entries(o: any): [string, any][];
34-
}
34+
}

‎lib/lib.es6.d.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5471,7 +5471,7 @@ interface PromiseConstructor {
54715471
declare var Promise: PromiseConstructor;
54725472

54735473
interface ProxyHandler<T> {
5474-
getPrototypeOf? (target: T): any;
5474+
getPrototypeOf? (target: T): {} | null;
54755475
setPrototypeOf? (target: T, v: any): boolean;
54765476
isExtensible? (target: T): boolean;
54775477
preventExtensions? (target: T): boolean;
@@ -5484,14 +5484,15 @@ interface ProxyHandler<T> {
54845484
enumerate? (target: T): PropertyKey[];
54855485
ownKeys? (target: T): PropertyKey[];
54865486
apply? (target: T, thisArg: any, argArray?: any): any;
5487-
construct? (target: T, thisArg: any, argArray?: any): any;
5487+
construct? (target: T, argArray: any, newTarget?: any): {};
54885488
}
54895489

54905490
interface ProxyConstructor {
54915491
revocable<T>(target: T, handler: ProxyHandler<T>): { proxy: T; revoke: () => void; };
54925492
new <T>(target: T, handler: ProxyHandler<T>): T
54935493
}
5494-
declare var Proxy: ProxyConstructor;
5494+
declare var Proxy: ProxyConstructor;
5495+
54955496

54965497
declare namespace Reflect {
54975498
function apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;

‎lib/protocol.d.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1630,6 +1630,10 @@ declare namespace ts.server.protocol {
16301630
* Comma separated list of installed typing packages
16311631
*/
16321632
installedPackages: string;
1633+
/**
1634+
* true if install request succeeded, otherwise - false
1635+
*/
1636+
installSuccess: boolean;
16331637
}
16341638
interface NavBarResponse extends Response {
16351639
body?: NavigationBarItem[];

0 commit comments

Comments
 (0)