Merge branch 'master' of https://github.com/Microsoft/TypeScript into feature/eslint

This commit is contained in:
Alexander T
2019-07-19 10:16:10 +03:00
5 changed files with 10 additions and 10 deletions
+2 -2
View File
@@ -4782,7 +4782,7 @@ namespace ts {
UMD = 3,
System = 4,
ES2015 = 5,
ESNext = 6
ESNext = 99
}
export const enum JsxEmit {
@@ -4830,7 +4830,7 @@ namespace ts {
ES2018 = 5,
ES2019 = 6,
ES2020 = 7,
ESNext = 8,
ESNext = 99,
JSON = 100,
Latest = ESNext,
}
+1 -1
View File
@@ -12,7 +12,7 @@ declare var Infinity: number;
declare function eval(x: string): any;
/**
* Converts A string to an integer.
* Converts a string to an integer.
* @param s A string to convert into a number.
* @param radix A value between 2 and 36 that specifies the base of the number in numString.
* If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal.
+3 -3
View File
@@ -2600,7 +2600,7 @@ declare namespace ts {
UMD = 3,
System = 4,
ES2015 = 5,
ESNext = 6
ESNext = 99
}
enum JsxEmit {
None = 0,
@@ -2640,9 +2640,9 @@ declare namespace ts {
ES2018 = 5,
ES2019 = 6,
ES2020 = 7,
ESNext = 8,
ESNext = 99,
JSON = 100,
Latest = 8
Latest = 99
}
enum LanguageVariant {
Standard = 0,
+3 -3
View File
@@ -2600,7 +2600,7 @@ declare namespace ts {
UMD = 3,
System = 4,
ES2015 = 5,
ESNext = 6
ESNext = 99
}
enum JsxEmit {
None = 0,
@@ -2640,9 +2640,9 @@ declare namespace ts {
ES2018 = 5,
ES2019 = 6,
ES2020 = 7,
ESNext = 8,
ESNext = 99,
JSON = 100,
Latest = 8
Latest = 99
}
enum LanguageVariant {
Standard = 0,
@@ -70,7 +70,7 @@ export function multiply(a, b) { return a * b; }
"incremental": true,
"listFiles": true,
"listEmittedFiles": true,
"target": 8,
"target": 99,
"configFilePath": "./tsconfig.json"
},
"referencedMap": {},