Skip to content

Commit 12d86dc

Browse files
committed
Merge remote-tracking branch 'upstream/master'
* upstream/master: (58 commits) Variadic tuple types (microsoft#39094) chore: resolve suggestions Expand auto-import to all package.json dependencies (microsoft#38923) inline local functions Update bigint declaration file (microsoft#38526) Update user baselines (microsoft#39077) LEGO: check in for master to temporary branch. Add missing index.ts files to user projects (microsoft#39163) Add reason for a disabled code action (microsoft#37871) Minor fix for assertion predicates (microsoft#38710) Update LKG (microsoft#39173) Reparse top level 'await' in modules (microsoft#39084) change chore: more change chore: resolve review chore: save space fix: lint error test: add test for it chore: make isJsxAttr required chore: revert change in checker ... # Conflicts: # src/compiler/binder.ts # src/compiler/checker.ts # src/compiler/parser.ts # src/compiler/types.ts
2 parents 09801d4 + d479206 commit 12d86dc

File tree

790 files changed

+396141
-347999
lines changed

Some content is hidden

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

790 files changed

+396141
-347999
lines changed

.vscode/launch.template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
},
4444
"sourceMaps": true,
4545
"smartStep": true,
46-
"preLaunchTask": "tests",
46+
"preLaunchTask": "gulp: tests",
4747
"console": "integratedTerminal",
4848
"outFiles": [
4949
"${workspaceRoot}/built/local/run.js"

.vscode/tasks.json

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,42 @@
44
"version": "2.0.0",
55
"tasks": [
66
{
7-
"type": "shell",
8-
"identifier": "local",
7+
"type": "gulp",
98
"label": "gulp: local",
10-
"command": "gulp",
11-
"args": ["local"],
12-
"group": { "kind": "build", "isDefault": true },
13-
"problemMatcher": ["$gulp-tsc"]
9+
"task": "local",
10+
"group": {
11+
"kind": "build",
12+
"isDefault": true
13+
},
14+
"problemMatcher": [
15+
"$tsc"
16+
]
1417
},
1518
{
16-
"type": "shell",
17-
"identifier": "tsc",
19+
"type": "gulp",
1820
"label": "gulp: tsc",
19-
"command": "gulp",
20-
"args": ["tsc"],
21+
"task": "tsc",
2122
"group": "build",
22-
"problemMatcher": ["$gulp-tsc"]
23+
"problemMatcher": [
24+
"$tsc"
25+
]
2326
},
2427
{
25-
"type": "shell",
26-
"identifier": "tests",
28+
"type": "gulp",
2729
"label": "gulp: tests",
28-
"command": "gulp",
29-
"args": ["tests"],
30+
"task": "tests",
3031
"group": "build",
31-
"problemMatcher": ["$gulp-tsc"]
32+
"problemMatcher": [
33+
"$tsc"
34+
]
35+
},
36+
{
37+
"type": "gulp",
38+
"task": "services",
39+
"label": "gulp: services",
40+
"problemMatcher": [
41+
"$tsc"
42+
],
3243
}
3344
]
3445
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# TypeScript
33

44
[![Build Status](https://travis-ci.org/microsoft/TypeScript.svg?branch=master)](https://travis-ci.org/microsoft/TypeScript)
5-
[![VSTS Build Status](https://dev.azure.com/typescript/TypeScript/_apis/build/status/Typescript/node10)](https://dev.azure.com/typescript/TypeScript/_build/latest?definitionId=4&view=logs)
5+
[![Devops Build Status](https://dev.azure.com/typescript/TypeScript/_apis/build/status/Typescript/node10)](https://dev.azure.com/typescript/TypeScript/_build?definitionId=7)
66
[![npm version](https://badge.fury.io/js/typescript.svg)](https://www.npmjs.com/package/typescript)
77
[![Downloads](https://img.shields.io/npm/dm/typescript.svg)](https://www.npmjs.com/package/typescript)
88

lib/cs/diagnosticMessages.generated.json

Lines changed: 26 additions & 8 deletions
Large diffs are not rendered by default.

lib/de/diagnosticMessages.generated.json

Lines changed: 26 additions & 5 deletions
Large diffs are not rendered by default.

lib/es/diagnosticMessages.generated.json

Lines changed: 28 additions & 7 deletions
Large diffs are not rendered by default.

lib/fr/diagnosticMessages.generated.json

Lines changed: 28 additions & 7 deletions
Large diffs are not rendered by default.

lib/it/diagnosticMessages.generated.json

Lines changed: 27 additions & 6 deletions
Large diffs are not rendered by default.

lib/ja/diagnosticMessages.generated.json

Lines changed: 29 additions & 8 deletions
Large diffs are not rendered by default.

lib/ko/diagnosticMessages.generated.json

Lines changed: 29 additions & 8 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)