Skip to content

Commit 3fdd234

Browse files
committed
Merge branch 'master' into fix/helpers/use-hasownproperty-call
# Conflicts: # tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-esModuleInterop-option-changes.js # tests/baselines/reference/tsc/declarationEmit/initial-build/when-pkg-references-sibling-package-through-indirect-symlink.js
2 parents e2ece04 + b397d1f commit 3fdd234

File tree

6,566 files changed

+700815
-442320
lines changed

Some content is hidden

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

6,566 files changed

+700815
-442320
lines changed

.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/built/local/**
22
/tests/**
33
/lib/**
4-
/src/lib/*.generated.d.ts
4+
/src/lib/*.generated.d.ts

.eslintrc.json

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,20 @@
1818
"@typescript-eslint/array-type": "error",
1919

2020
"camelcase": "off",
21-
"@typescript-eslint/camelcase": ["error", { "properties": "never", "allow": ["^[A-Za-z][a-zA-Za-z]+_[A-Za-z]+$"] }],
21+
"@typescript-eslint/naming-convention": [
22+
"error",
23+
{ "selector": "typeLike", "format": ["PascalCase"], "filter": { "regex": "^(__String|[A-Za-z]+_[A-Za-z]+)$", "match": false } },
24+
{ "selector": "interface", "format": ["PascalCase"], "custom": { "regex": "^I[A-Z]", "match": false }, "filter": { "regex": "^I(Arguments|TextWriter|O([A-Z][a-z]+[A-Za-z]*)?)$", "match": false } },
25+
{ "selector": "variable", "format": ["camelCase", "PascalCase", "UPPER_CASE"], "leadingUnderscore": "allow", "filter": { "regex": "^(_{1,2}filename|_{1,2}dirname|_+|[A-Za-z]+_[A-Za-z]+)$", "match": false } },
26+
{ "selector": "function", "format": ["camelCase", "PascalCase"], "leadingUnderscore": "allow", "filter": { "regex": "^[A-Za-z]+_[A-Za-z]+$", "match": false } },
27+
{ "selector": "parameter", "format": ["camelCase"], "leadingUnderscore": "allow", "filter": { "regex": "^(_+|[A-Za-z]+_[A-Z][a-z]+)$", "match": false } },
28+
{ "selector": "method", "format": ["camelCase", "PascalCase"], "leadingUnderscore": "allow", "filter": { "regex": "^[A-Za-z]+_[A-Za-z]+$", "match": false } },
29+
{ "selector": "memberLike", "format": ["camelCase"], "leadingUnderscore": "allow", "filter": { "regex": "^[A-Za-z]+_[A-Za-z]+$", "match": false } },
30+
{ "selector": "enumMember", "format": ["camelCase", "PascalCase"], "leadingUnderscore": "allow", "filter": { "regex": "^[A-Za-z]+_[A-Za-z]+$", "match": false } },
31+
{ "selector": "property", "format": null }
32+
],
2233

23-
"@typescript-eslint/class-name-casing": "error",
2434
"@typescript-eslint/consistent-type-definitions": ["error", "interface"],
25-
"@typescript-eslint/interface-name-prefix": "error",
2635
"@typescript-eslint/no-inferrable-types": "error",
2736
"@typescript-eslint/no-misused-new": "error",
2837
"@typescript-eslint/no-this-alias": "error",

.github/ISSUE_TEMPLATE/Bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ assignees: ''
77

88
---
99

10-
<!-- 🚨 STOP 🚨 𝗦𝗧𝗢𝗣 🚨 𝑺𝑻𝑶𝑷 🚨
10+
<!-- 🚨 STOP 🚨 STOP 🚨 STOP 🚨
1111
1212
Half of all issues filed here are duplicates, answered in the FAQ, or not appropriate for the bug tracker. Even if you think you've found a *bug*, please read the FAQ first, especially the Common "Bugs" That Aren't Bugs section!
1313

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ contact_links:
1414
name: "TypeScript FAQ"
1515
url: "https://github.com/microsoft/TypeScript/wiki/FAQ"
1616
-
17-
about: "Please raise issues about the site on it's own repo."
17+
about: "Please raise issues about the site on its own repo."
1818
name: Website
1919
url: "https://github.com/microsoft/TypeScript-Website/issues/new"

.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: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
node-version: [8.x, 10.x, 12.x]
19+
node-version: [10.x, 12.x, 13.x]
2020

2121
steps:
2222
- uses: actions/checkout@v1
@@ -30,11 +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
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+
3846
- name: Validate the browser can import TypeScript
3947
run: gulp test-browser-integration
4048

.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

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ scripts/processDiagnosticMessages.js
5353
scripts/produceLKG.js
5454
scripts/importDefinitelyTypedTests/importDefinitelyTypedTests.js
5555
scripts/generateLocalizedDiagnosticMessages.js
56+
scripts/request-pr-review.js
5657
scripts/*.js.map
5758
scripts/typings/
5859
coverage/

.gitmodules

Whitespace-only changes.

.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
}

0 commit comments

Comments
 (0)