Skip to content

Commit 92d0873

Browse files
sheetalkamatsheetalkamat
committed
Merge branch 'master' into configFileWithIncorrectProjectRoot
2 parents 99d4cca + 0d7d75e commit 92d0873

File tree

4,619 files changed

+421665
-314062
lines changed

Some content is hidden

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

4,619 files changed

+421665
-314062
lines changed

‎.circleci/config.yml

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

‎.github/ISSUE_TEMPLATE/Bug_report.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
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:** 2.9.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? -->

‎.github/ISSUE_TEMPLATE/Feature_request.md

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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+
[ ] This wouldn't be a breaking change in existing TypeScript / JavaScript code
36+
[ ] This wouldn't change the runtime behavior of existing JavaScript code
37+
[ ] This could be implemented without emitting different JS based on the types of the expressions
38+
[ ] This isn't a runtime feature (e.g. new expression-level syntax)
39+

‎.github/ISSUE_TEMPLATE/Question.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
name: Question
3+
about: The issue tracker is not for questions. Please use Stack Overflow or other resources for help writing TypeScript code.
4+
5+
---
6+
7+
THE ISSUE TRACKER IS NOT FOR QUESTIONS.
8+
9+
DO NOT CREATE A NEW ISSUE TO ASK A QUESTION.
10+
11+
IF YOU ARE HAVING PROBLEMS WITH YOUR TYPESCRIPT CODE, DO NOT ASK A QUESTION HERE.
12+
13+
Tens of thousands of TypeScript questions have been asked and answered on StackOverflow; see https://stackoverflow.com/questions/tagged/typescript . You can ask questions there or on other websites.
14+
15+
The only exception is if you have a question about *the TypeScript compiler API itself*. Please post a complete example of what you're trying to do and precisely describe what your question is.

‎issue_template.md renamed to ‎.github/issue_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Please help us by doing the following steps before logging an issue:
2424
-->
2525

2626
<!-- Please try to reproduce the issue with `typescript@next`. It may have already been fixed. -->
27-
**TypeScript Version:** 2.7.0-dev.201xxxxx
27+
**TypeScript Version:** 2.9.0-dev.201xxxxx
2828

2929
<!-- Search terms you tried before logging this (so others can find this issue more easily) -->
3030
**Search Terms:**

‎pull_request_template.md renamed to ‎.github/pull_request_template.md

File renamed without changes.

‎.gitmodules

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,23 @@
1818
path = tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter
1919
url = https://github.com/Microsoft/TypeScript-WeChat-Starter.git
2020
ignore = all
21+
[submodule "tests/cases/user/create-react-app/create-react-app"]
22+
path = tests/cases/user/create-react-app/create-react-app
23+
url = https://github.com/facebook/create-react-app.git
24+
ignore = all
25+
[submodule "tests/cases/user/webpack/webpack"]
26+
path = tests/cases/user/webpack/webpack
27+
url = https://github.com/webpack/webpack.git
28+
ignore = all
29+
[submodule "tests/cases/user/puppeteer/puppeteer"]
30+
path = tests/cases/user/puppeteer/puppeteer
31+
url = https://github.com/GoogleChrome/puppeteer.git
32+
ignore = all
33+
[submodule "tests/cases/user/axios-src/axios-src"]
34+
path = tests/cases/user/axios-src/axios-src
35+
url = https://github.com/axios/axios.git
36+
ignore = all
37+
[submodule "tests/cases/user/prettier/prettier"]
38+
path = tests/cases/user/prettier/prettier
39+
url = https://github.com/prettier/prettier.git
40+
ignore = all

‎.mailmap

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,4 +316,9 @@ Adnan Chowdhury <bttf@users.noreply.github.com>
316316
Esakki Raj <esakkiraj.tce@gmail.com>
317317
Jack Williams <jw@jackw.io>
318318
Philippe Voinov <philippevoinov@gmail.com>
319-
Stephan Ginthör <26004708+Lazarus535@users.noreply.github.com>
319+
Stephan Ginthör <26004708+Lazarus535@users.noreply.github.com>
320+
AdityaDaflapurkar <adaflapurkar@gmail.com> # Aditya Daflapurkar
321+
Eric Grube <grubee79@gmail.com>
322+
Martyn Janes <martyn@obany.com>
323+
Ricardo N Feliciano <FelicianoTech@gmail.com>
324+
Sergii Bezliudnyi <serg.bezludny@gmail.com>

‎.npmignore

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,24 @@ built
22
doc
33
Gulpfile.ts
44
internal
5-
issue_template.md
65
jenkins.sh
76
lib/README.md
87
lib/enu
98
netci.groovy
10-
pull_request_template.md
119
scripts
1210
src
1311
tests
1412
tslint.json
1513
Jakefile.js
1614
.editorconfig
1715
.gitattributes
16+
.gitmodules
1817
.settings/
1918
.travis.yml
19+
.circleci
2020
.vscode/
21+
.parallelperf.json
2122
test.config
2223
package-lock.json
24+
yarn.lock
25+
.github/

‎.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,16 @@ node_js:
88
sudo: false
99

1010
env:
11-
- workerCount=3
11+
- workerCount=3 timeout=600000
1212

1313
matrix:
1414
fast_finish: true
1515

1616
branches:
1717
only:
1818
- master
19-
- release-2.5
20-
- release-2.6
2119
- release-2.7
20+
- release-2.8
2221

2322
install:
2423
- npm uninstall typescript --no-save

0 commit comments

Comments
 (0)