Skip to content

Commit 6bc5ef3

Browse files
committed
Merge branch 'master' into avoid-quickfix-for-declaration-file
2 parents bf42f5b + 307bf39 commit 6bc5ef3

File tree

1,357 files changed

+357041
-39234
lines changed

Some content is hidden

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

1,357 files changed

+357041
-39234
lines changed

.github/ISSUE_TEMPLATE/Bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Please fill in the *entire* template below.
1616
-->
1717

1818
<!-- Please try to reproduce the issue with `typescript@next`. It may have already been fixed. -->
19-
**TypeScript Version:** 3.3.0-dev.201xxxxx
19+
**TypeScript Version:** 3.4.0-dev.201xxxxx
2020

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

.github/pull_request_template.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22
Thank you for submitting a pull request!
33
44
Here's a checklist you might find useful.
5-
* [ ] There is an associated issue that is labeled
6-
'Bug' or 'help wanted' or is in the Community milestone
5+
* [ ] There is an associated issue that is labeled 'Bug' or 'help wanted'
76
* [ ] Code is up-to-date with the `master` branch
8-
* [ ] You've successfully run `jake runtests` locally
9-
* [ ] You've signed the CLA
7+
* [ ] You've successfully run `gulp runtests` locally
108
* [ ] There are new or updated unit tests validating the change
119
1210
Refer to CONTRIBUTING.MD for more details.

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ Ken Howard <[email protected]>
121121
Kevin Lang <[email protected]>
122122
kimamula <[email protected]> # Kenji Imamula
123123
Kitson Kelly <[email protected]>
124+
Krishnadas Babu <[email protected]>
124125
Klaus Meinhardt <[email protected]>
125126
Kyle Kelley <[email protected]>
126127
Lorant Pinter <[email protected]>

.npmignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ tests
1212
tslint.json
1313
Jakefile.js
1414
.editorconfig
15+
.failed-tests
16+
.git
17+
.git/
1518
.gitattributes
19+
.github/
1620
.gitmodules
1721
.settings/
1822
.travis.yml
@@ -23,6 +27,5 @@ Jakefile.js
2327
test.config
2428
package-lock.json
2529
yarn.lock
26-
.github/
2730
CONTRIBUTING.md
2831
TEST-results.xml

.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ language: node_js
33
node_js:
44
- 'node'
55
- '10'
6-
- '6'
7-
8-
sudo: false
6+
- '8'
97

108
env:
119
- workerCount=3 timeout=600000

CONTRIBUTING.md

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,16 @@ In general, things we find useful when reviewing suggestions are:
4747

4848
# Instructions for Contributing Code
4949

50+
## Tips
51+
52+
### Faster clones
53+
54+
The TypeScript repository is relatively large. To save some time, you might want to clone it without the repo's full history using `git clone --depth=1`.
55+
56+
### Using local builds
57+
58+
Run `gulp` to build a version of the compiler/language service that reflects changes you've made. You can then run `node <repo-root>/built/local/tsc.js` in place of `tsc` in your project. For example, to run `tsc --watch` from within the root of the repository on a file called `test.ts`, you can run `node ./built/local/tsc.js --watch test.ts`.
59+
5060
## Contributing bug fixes
5161

5262
TypeScript is currently accepting contributions in the form of bug fixes. A bug must have an issue tracking it in the issue tracker that has been approved ("Milestone == Community") by the TypeScript team. Your pull request should include a link to the bug that you are fixing. If you've submitted a PR for a bug, please post a comment in the bug to avoid duplication of effort.
@@ -94,7 +104,7 @@ Any changes should be made to [src/lib](https://github.com/Microsoft/TypeScript/
94104
Library files in `built/local/` are updated automatically by running the standard build task:
95105

96106
```sh
97-
jake
107+
gulp
98108
```
99109

100110
The files in `lib/` are used to bootstrap compilation and usually **should not** be updated unless publishing a new version or updating the LKG.
@@ -105,49 +115,49 @@ The files `src/lib/dom.generated.d.ts` and `src/lib/webworker.generated.d.ts` bo
105115

106116
## Running the Tests
107117

108-
To run all tests, invoke the `runtests-parallel` target using jake:
118+
To run all tests, invoke the `runtests-parallel` target using gulp:
109119

110120
```Shell
111-
jake runtests-parallel
121+
gulp runtests-parallel
112122
```
113123

114124
This will run all tests; to run only a specific subset of tests, use:
115125

116126
```Shell
117-
jake runtests tests=<regex>
127+
gulp runtests --tests=<regex>
118128
```
119129

120130
e.g. to run all compiler baseline tests:
121131

122132
```Shell
123-
jake runtests tests=compiler
133+
gulp runtests --tests=compiler
124134
```
125135

126136
or to run a specific test: `tests\cases\compiler\2dArrays.ts`
127137

128138
```Shell
129-
jake runtests tests=2dArrays
139+
gulp runtests --tests=2dArrays
130140
```
131141

132142
## Debugging the tests
133143

134-
To debug the tests, invoke the `runtests-browser` task from jake.
144+
To debug the tests, invoke the `runtests-browser` task from gulp.
135145
You will probably only want to debug one test at a time:
136146

137147
```Shell
138-
jake runtests-browser tests=2dArrays
148+
gulp runtests-browser --tests=2dArrays
139149
```
140150

141151
You can specify which browser to use for debugging. Currently Chrome and IE are supported:
142152

143153
```Shell
144-
jake runtests-browser tests=2dArrays browser=chrome
154+
gulp runtests-browser --tests=2dArrays --browser=chrome
145155
```
146156

147-
You can debug with VS Code or Node instead with `jake runtests inspect=true`:
157+
You can debug with VS Code or Node instead with `gulp runtests --inspect=true`:
148158

149159
```Shell
150-
jake runtests tests=2dArrays inspect=true
160+
gulp runtests --tests=2dArrays --inspect=true
151161
```
152162

153163
## Adding a Test
@@ -187,20 +197,20 @@ Compiler testcases generate baselines that track the emitted `.js`, the errors p
187197
When a change in the baselines is detected, the test will fail. To inspect changes vs the expected baselines, use
188198

189199
```Shell
190-
jake diff
200+
gulp diff
191201
```
192202

193203
After verifying that the changes in the baselines are correct, run
194204

195205
```Shell
196-
jake baseline-accept
206+
gulp baseline-accept
197207
```
198208

199209
to establish the new baselines as the desired behavior. This will change the files in `tests\baselines\reference`, which should be included as part of your commit. It's important to carefully validate changes in the baselines.
200210

201211
## Localization
202212

203213
All strings the user may see are stored in [`diagnosticMessages.json`](./src/compiler/diagnosticMessages.json).
204-
If you make changes to it, run `jake generate-diagnostics` to push them to the `Diagnostic` interface in `diagnosticInformationMap.generated.ts`.
214+
If you make changes to it, run `gulp generate-diagnostics` to push them to the `Diagnostic` interface in `diagnosticInformationMap.generated.ts`.
205215

206216
See [coding guidelines on diagnostic messages](https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines#diagnostic-messages).

0 commit comments

Comments
 (0)