Skip to content

Commit 84b6358

Browse files
committed
Merge remote-tracking branch 'upstream/master'
* upstream/master: (75 commits) Insert auto-imports in sorted order (microsoft#39394) LEGO: check in for master to temporary branch. Better checking of @param/@Property tags (microsoft#39487) fix(25155): add space before optional parameters/properties (microsoft#38798) Add regression test for microsoft#38834 (microsoft#39479) Fixes searches for symbols exported using export * as (microsoft#39507) fix(39421): omit prefix text for rest binding element (microsoft#39433) fix(39440): show QF for abstract classes with methods which include 'this' parameter (microsoft#39465) Remove unnecessary assert (microsoft#39483) LEGO: check in for master to temporary branch. Update user baselines (microsoft#39220) Type `this` in more constructor functions (microsoft#39447) LEGO: check in for master to temporary branch. LEGO: check in for master to temporary branch. Properly handle rest parameters in function declarations with @type annotations (microsoft#39473) Ensure type/namespaceish statics are included in the list of namespace merge members (microsoft#38920) Fix getTypeAtLocation for dotted implements clauses (microsoft#39363) Add workflow_dispatch to our nightly publish script. (microsoft#39485) Fix crash in decorator metadata calculation when serializing template literal type nodes (microsoft#39481) Fix test semantic merge conflict between microsoft#39348 and microsoft#39130 (microsoft#39478) ... # Conflicts: # src/compiler/scanner.ts
2 parents 34fb1d2 + 03c79d7 commit 84b6358

File tree

417 files changed

+7531
-3727
lines changed

Some content is hidden

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

417 files changed

+7531
-3727
lines changed

.github/tsc.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"problemMatcher": [
3+
{
4+
"owner": "tsc",
5+
"pattern": [
6+
{
7+
"regexp": "^(?:\\s+\\d+\\>)?([^\\s].*)\\((\\d+),(\\d+)\\)\\s*:\\s+(error|warning|info)\\s+(\\w{1,2}\\d+)\\s*:\\s*(.*)$",
8+
"file": 1,
9+
"line": 2,
10+
"column": 3,
11+
"severity": 4,
12+
"code": 5,
13+
"message": 6
14+
}
15+
]
16+
}
17+
]
18+
}

.github/workflows/ci.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,19 @@ jobs:
3030
run: |
3131
npm uninstall typescript --no-save
3232
npm uninstall tslint --no-save
33-
- name: npm install and test
34-
run: |
35-
npm install
36-
npm update
37-
npm test
38-
33+
- run: npm install
34+
- run: npm update
35+
36+
# Re: https://github.com/actions/setup-node/pull/125
37+
- name: Register Problem Matcher for TSC
38+
run: echo "##[add-matcher].github/tsc.json"
39+
40+
- name: Tests
41+
run: npm test -- --no-lint
42+
43+
- name: Linter
44+
run: npm run lint:ci
45+
3946
- name: Validate the browser can import TypeScript
4047
run: gulp test-browser-integration
4148

.github/workflows/nightly.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: Publish Nightly
33
on:
44
schedule:
55
- cron: '0 7 * * *'
6+
# enable users to manually trigger with workflow_dispatch
7+
workflow_dispatch: {}
68
repository_dispatch:
79
types: publish-nightly
810

Gulpfile.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,11 +350,12 @@ const lintFoldEnd = async () => { if (fold.isTravis()) console.log(fold.end("lin
350350
/** @type { (folder: string) => { (): Promise<any>; displayName?: string } } */
351351
const eslint = (folder) => async () => {
352352

353+
const formatter = cmdLineOptions.ci ? "stylish" : "autolinkable-stylish";
353354
const args = [
354355
"node_modules/eslint/bin/eslint",
355356
"--cache",
356357
"--cache-location", `${folder}/.eslintcache`,
357-
"--format", "autolinkable-stylish",
358+
"--format", formatter,
358359
"--rulesdir", "scripts/eslint/built/rules",
359360
"--ext", ".ts",
360361
];
@@ -367,7 +368,7 @@ const eslint = (folder) => async () => {
367368

368369
log(`Linting: ${args.join(" ")}`);
369370
return exec(process.execPath, args);
370-
}
371+
};
371372

372373
const lintScripts = eslint("scripts");
373374
lintScripts.displayName = "lint-scripts";

lib/diagnosticMessages.generated.json

Lines changed: 0 additions & 1047 deletions
This file was deleted.

lib/lib.esnext.array.d.ts

Lines changed: 0 additions & 223 deletions
This file was deleted.

lib/lib.esnext.asynciterable.d.ts

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)