mirror of
https://github.com/microsoft/TypeScript.git
synced 2025-11-18 17:21:48 +00:00
Merge branch 'master' of https://github.com/Microsoft/TypeScript into feature/eslint
This commit is contained in:
@@ -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,
|
||||
}
|
||||
|
||||
Vendored
+1
-1
@@ -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
@@ -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
@@ -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,
|
||||
|
||||
+1
-1
@@ -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": {},
|
||||
|
||||
Reference in New Issue
Block a user