Skip to content

Commit 786e5a4

Browse files
weswighamweswigham
committed
Merge branch 'master' into conditional-both-branch-relation
2 parents acf6da7 + f17174c commit 786e5a4

File tree

7,608 files changed

+635837
-277150
lines changed

Some content is hidden

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

7,608 files changed

+635837
-277150
lines changed

Diff for: ‎.dockerignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ scripts/processDiagnosticMessages.js
2929
scripts/produceLKG.js
3030
scripts/importDefinitelyTypedTests/importDefinitelyTypedTests.js
3131
scripts/generateLocalizedDiagnosticMessages.js
32+
scripts/configureLanguageServiceBuild.js
3233
scripts/*.js.map
3334
scripts/typings/
3435
coverage/
@@ -45,4 +46,4 @@ TEST-results.xml
4546
package-lock.json
4647
tests
4748
.vscode
48-
.git
49+
.git

Diff for: ‎.eslintignore

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/built/local/**
2+
/tests/**
3+
/lib/**
4+
/src/lib/*.generated.d.ts

Diff for: ‎.eslintrc.json

+121
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
{
2+
"parser": "@typescript-eslint/parser",
3+
"parserOptions": {
4+
"warnOnUnsupportedTypeScriptVersion": false,
5+
"ecmaVersion": 6,
6+
"sourceType": "module"
7+
},
8+
"env": {
9+
"browser": false,
10+
"node": true,
11+
"es6": true
12+
},
13+
"plugins": [
14+
"@typescript-eslint", "jsdoc", "no-null", "import"
15+
],
16+
"rules": {
17+
"@typescript-eslint/adjacent-overload-signatures": "error",
18+
"@typescript-eslint/array-type": "error",
19+
20+
"camelcase": "off",
21+
"@typescript-eslint/camelcase": ["error", { "properties": "never", "allow": ["^[A-Za-z][a-zA-Za-z]+_[A-Za-z]+$"] }],
22+
23+
"@typescript-eslint/class-name-casing": "error",
24+
"@typescript-eslint/consistent-type-definitions": ["error", "interface"],
25+
"@typescript-eslint/interface-name-prefix": "error",
26+
"@typescript-eslint/no-inferrable-types": "error",
27+
"@typescript-eslint/no-misused-new": "error",
28+
"@typescript-eslint/no-this-alias": "error",
29+
30+
"no-unused-expressions": "off",
31+
"@typescript-eslint/no-unused-expressions": ["error", { "allowTernary": true }],
32+
33+
"@typescript-eslint/prefer-for-of": "error",
34+
"@typescript-eslint/prefer-function-type": "error",
35+
"@typescript-eslint/prefer-namespace-keyword": "error",
36+
37+
"quotes": "off",
38+
"@typescript-eslint/quotes": ["error", "double", { "avoidEscape": true, "allowTemplateLiterals": true }],
39+
40+
"semi": "off",
41+
"@typescript-eslint/semi": "error",
42+
43+
"space-before-function-paren": "off",
44+
"@typescript-eslint/space-before-function-paren": ["error", {
45+
"asyncArrow": "always",
46+
"anonymous": "always",
47+
"named": "never"
48+
}],
49+
50+
"@typescript-eslint/triple-slash-reference": "error",
51+
"@typescript-eslint/type-annotation-spacing": "error",
52+
"@typescript-eslint/unified-signatures": "error",
53+
54+
// scripts/eslint/rules
55+
"object-literal-surrounding-space": "error",
56+
"no-type-assertion-whitespace": "error",
57+
"type-operator-spacing": "error",
58+
"only-arrow-functions": ["error", {
59+
"allowNamedFunctions": true ,
60+
"allowDeclarations": true
61+
}],
62+
"no-double-space": "error",
63+
"boolean-trivia": "error",
64+
"no-in-operator": "error",
65+
"simple-indent": "error",
66+
"debug-assert": "error",
67+
"no-keywords": "error",
68+
"one-namespace-per-file": "error",
69+
70+
// eslint-plugin-import
71+
"import/no-extraneous-dependencies": ["error", { "optionalDependencies": false }],
72+
73+
// eslint-plugin-no-null
74+
"no-null/no-null": "error",
75+
76+
// eslint-plugin-jsdoc
77+
"jsdoc/check-alignment": "error",
78+
79+
// eslint
80+
"brace-style": ["error", "stroustrup", { "allowSingleLine": true }],
81+
"constructor-super": "error",
82+
"curly": ["error", "multi-line"],
83+
"dot-notation": "error",
84+
"eqeqeq": "error",
85+
"linebreak-style": ["error", "windows"],
86+
"new-parens": "error",
87+
"no-caller": "error",
88+
"no-duplicate-case": "error",
89+
"no-duplicate-imports": "error",
90+
"no-empty": "error",
91+
"no-eval": "error",
92+
"no-extra-bind": "error",
93+
"no-fallthrough": "error",
94+
"no-new-func": "error",
95+
"no-new-wrappers": "error",
96+
"no-return-await": "error",
97+
"no-restricted-globals": ["error",
98+
{ "name": "setTimeout" },
99+
{ "name": "clearTimeout" },
100+
{ "name": "setInterval" },
101+
{ "name": "clearInterval" },
102+
{ "name": "setImmediate" },
103+
{ "name": "clearImmediate" }
104+
],
105+
"no-sparse-arrays": "error",
106+
"no-template-curly-in-string": "error",
107+
"no-throw-literal": "error",
108+
"no-trailing-spaces": "error",
109+
"no-undef-init": "error",
110+
"no-unsafe-finally": "error",
111+
"no-unused-labels": "error",
112+
"no-var": "error",
113+
"object-shorthand": "error",
114+
"prefer-const": "error",
115+
"prefer-object-spread": "error",
116+
"quote-props": ["error", "consistent-as-needed"],
117+
"space-in-parens": "error",
118+
"unicode-bom": ["error", "never"],
119+
"use-isnan": "error"
120+
}
121+
}

Diff for: ‎.github/ISSUE_TEMPLATE/Bug_report.md

+44-37
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,44 @@
1-
---
2-
name: Bug report
3-
about: Create a report to help us improve
4-
5-
---
6-
7-
<!-- 🚨 STOP 🚨 𝗦𝗧𝗢𝗣 🚨 𝑺𝑻𝑶𝑷 🚨
8-
9-
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!
10-
11-
Please help us by doing the following steps before logging an issue:
12-
* Search: https://github.com/Microsoft/TypeScript/search?type=Issues
13-
* Read the FAQ: https://github.com/Microsoft/TypeScript/wiki/FAQ
14-
15-
Please fill in the *entire* template below.
16-
-->
17-
18-
<!-- Please try to reproduce the issue with `typescript@next`. It may have already been fixed. -->
19-
**TypeScript Version:** 3.4.0-dev.201xxxxx
20-
21-
<!-- Search terms you tried before logging this (so others can find this issue more easily) -->
22-
**Search Terms:**
23-
24-
**Code**
25-
26-
```ts
27-
// A *self-contained* demonstration of the problem follows...
28-
// Test this by running `tsc` on the command-line, rather than through another build tool such as Gulp, Webpack, etc.
29-
```
30-
31-
**Expected behavior:**
32-
33-
**Actual behavior:**
34-
35-
**Playground Link:** <!-- A link to a TypeScript Playground "Share" link which demonstrates this behavior -->
36-
37-
**Related Issues:** <!-- Did you find other bugs that looked similar? -->
1+
---
2+
name: Bug
3+
about: Create a report to help us improve TypeScript
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
<!-- 🚨 STOP 🚨 𝗦𝗧𝗢𝗣 🚨 𝑺𝑻𝑶𝑷 🚨
11+
12+
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!
13+
14+
Please help us by doing the following steps before logging an issue:
15+
* Search: https://github.com/Microsoft/TypeScript/search?type=Issues
16+
* Read the FAQ: https://github.com/Microsoft/TypeScript/wiki/FAQ
17+
18+
Please fill in the *entire* template below.
19+
-->
20+
21+
<!--
22+
Please try to reproduce the issue with the latest published version. It may have already been fixed.
23+
For npm: `typescript@next`
24+
This is also the 'Nightly' version in the playground: http://www.typescriptlang.org/play/?ts=Nightly
25+
-->
26+
**TypeScript Version:** 3.7.x-dev.201xxxxx
27+
28+
<!-- Search terms you tried before logging this (so others can find this issue more easily) -->
29+
**Search Terms:**
30+
31+
**Code**
32+
33+
```ts
34+
// A *self-contained* demonstration of the problem follows...
35+
// Test this by running `tsc` on the command-line, rather than through another build tool such as Gulp, Webpack, etc.
36+
```
37+
38+
**Expected behavior:**
39+
40+
**Actual behavior:**
41+
42+
**Playground Link:** <!-- A link to a TypeScript Playground "Share" link which demonstrates this behavior -->
43+
44+
**Related Issues:** <!-- Did you find other bugs that looked similar? -->

Diff for: ‎.github/ISSUE_TEMPLATE/Feature_request.md

+47-41
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,47 @@
1-
---
2-
name: Feature request
3-
about: Suggest an idea for this project
4-
5-
---
6-
7-
<!-- 🚨 STOP 🚨 𝗦𝗧𝗢𝗣 🚨 𝑺𝑻𝑶𝑷 🚨
8-
9-
Half of all issues filed here are duplicates, answered in the FAQ, or not appropriate for the bug tracker. Please read the FAQ first, especially the "Common Feature Requests" section.
10-
11-
-->
12-
13-
## Search Terms
14-
15-
<!-- List of keywords you searched for before creating this issue. Write them down here so that others can find this suggestion more easily -->
16-
17-
## Suggestion
18-
19-
<!-- A summary of what you'd like to see added or changed -->
20-
21-
## Use Cases
22-
23-
<!--
24-
What do you want to use this for?
25-
What shortcomings exist with current approaches?
26-
-->
27-
28-
## Examples
29-
30-
<!-- Show how this would be used and what the behavior would be -->
31-
32-
## Checklist
33-
34-
My suggestion meets these guidelines:
35-
36-
* [ ] This wouldn't be a breaking change in existing TypeScript/JavaScript code
37-
* [ ] This wouldn't change the runtime behavior of existing JavaScript code
38-
* [ ] This could be implemented without emitting different JS based on the types of the expressions
39-
* [ ] This isn't a runtime feature (e.g. library functionality, non-ECMAScript syntax with JavaScript output, etc.)
40-
* [ ] This feature would agree with the rest of [TypeScript's Design Goals](https://github.com/Microsoft/TypeScript/wiki/TypeScript-Design-Goals).
41-
1+
---
2+
name: Feature Request
3+
about: Suggest an idea
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
<!-- 🚨 STOP 🚨 𝗦𝗧𝗢𝗣 🚨 𝑺𝑻𝑶𝑷 🚨
11+
12+
Half of all issues filed here are duplicates, answered in the FAQ, or not appropriate for the bug tracker.
13+
14+
Please help us by doing the following steps before logging an issue:
15+
* Search: https://github.com/Microsoft/TypeScript/search?type=Issues
16+
* Read the FAQ, especially the "Common Feature Requests" section: https://github.com/Microsoft/TypeScript/wiki/FAQ
17+
18+
-->
19+
20+
## Search Terms
21+
22+
<!-- List of keywords you searched for before creating this issue. Write them down here so that others can find this suggestion more easily -->
23+
24+
## Suggestion
25+
26+
<!-- A summary of what you'd like to see added or changed -->
27+
28+
## Use Cases
29+
30+
<!--
31+
What do you want to use this for?
32+
What shortcomings exist with current approaches?
33+
-->
34+
35+
## Examples
36+
37+
<!-- Show how this would be used and what the behavior would be -->
38+
39+
## Checklist
40+
41+
My suggestion meets these guidelines:
42+
43+
* [ ] This wouldn't be a breaking change in existing TypeScript/JavaScript code
44+
* [ ] This wouldn't change the runtime behavior of existing JavaScript code
45+
* [ ] This could be implemented without emitting different JS based on the types of the expressions
46+
* [ ] This isn't a runtime feature (e.g. library functionality, non-ECMAScript syntax with JavaScript output, etc.)
47+
* [ ] This feature would agree with the rest of [TypeScript's Design Goals](https://github.com/Microsoft/TypeScript/wiki/TypeScript-Design-Goals).

Diff for: ‎.github/ISSUE_TEMPLATE/Question.md

-15
This file was deleted.

Diff for: ‎.github/ISSUE_TEMPLATE/config.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
blank_issues_enabled: false
3+
contact_links:
4+
-
5+
about: "Please ask and answer usage questions on Stack Overflow."
6+
name: Question
7+
url: "https://stackoverflow.com/questions/tagged/typescript"
8+
-
9+
about: "Alternatively, you can use the TypeScript Community Discord."
10+
name: Chat
11+
url: "https://discord.gg/typescript"
12+
-
13+
about: "Please check the FAQ before filing new issues"
14+
name: "TypeScript FAQ"
15+
url: "https://github.com/microsoft/TypeScript/wiki/FAQ"
16+
-
17+
about: "Please raise issues about the site on it's own repo."
18+
name: Website
19+
url: "https://github.com/microsoft/TypeScript-Website/issues/new"

Diff for: ‎.github/pr_owners.txt

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
sandersn
2+
elibarzilay
3+
weswigham
4+
andrewbranch
5+
RyanCavanaugh
6+
sheetalkamat
7+
orta
8+
rbuckton

Diff for: ‎.github/workflows/ci.yml

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- release-*
8+
pull_request:
9+
branches:
10+
- master
11+
- release-*
12+
13+
jobs:
14+
build:
15+
runs-on: ubuntu-latest
16+
17+
strategy:
18+
matrix:
19+
node-version: [8.x, 10.x, 12.x]
20+
21+
steps:
22+
- uses: actions/checkout@v1
23+
with:
24+
fetch-depth: 5
25+
- name: Use node version ${{ matrix.node-version }}
26+
uses: actions/setup-node@v1
27+
with:
28+
node-version: ${{ matrix.node-version }}
29+
- name: Remove existing TypeScript
30+
run: |
31+
npm uninstall typescript --no-save
32+
npm uninstall tslint --no-save
33+
- name: npm install and test
34+
run: |
35+
npm install
36+
npm update
37+
npm test
38+
- name: Validate the browser can import TypeScript
39+
run: gulp test-browser-integration
40+

0 commit comments

Comments
 (0)