Skip to content

Commit 371a634

Browse files
committed
Merge remote-tracking branch 'upstream/master' into es3
2 parents f90b59c + ff95909 commit 371a634

File tree

1,178 files changed

+283307
-33827
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,178 files changed

+283307
-33827
lines changed

.github/pull_request_template.md

+2-4
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.

.npmignore

+4-1
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

+1-3
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

+15-15
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ The TypeScript repository is relatively large. To save some time, you might want
5555

5656
### Using local builds
5757

58-
Run `gulp build` 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`.
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`.
5959

6060
## Contributing bug fixes
6161

@@ -104,7 +104,7 @@ Any changes should be made to [src/lib](https://github.com./Microsoft/TypeScript/
104104
Library files in `built/local/` are updated automatically by running the standard build task:
105105

106106
```sh
107-
jake
107+
gulp
108108
```
109109

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

116116
## Running the Tests
117117

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

120120
```Shell
121-
jake runtests-parallel
121+
gulp runtests-parallel
122122
```
123123

124124
This will run all tests; to run only a specific subset of tests, use:
125125

126126
```Shell
127-
jake runtests tests=<regex>
127+
gulp runtests --tests=<regex>
128128
```
129129

130130
e.g. to run all compiler baseline tests:
131131

132132
```Shell
133-
jake runtests tests=compiler
133+
gulp runtests --tests=compiler
134134
```
135135

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

138138
```Shell
139-
jake runtests tests=2dArrays
139+
gulp runtests --tests=2dArrays
140140
```
141141

142142
## Debugging the tests
143143

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

147147
```Shell
148-
jake runtests-browser tests=2dArrays
148+
gulp runtests-browser --tests=2dArrays
149149
```
150150

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

153153
```Shell
154-
jake runtests-browser tests=2dArrays browser=chrome
154+
gulp runtests-browser --tests=2dArrays --browser=chrome
155155
```
156156

157-
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`:
158158

159159
```Shell
160-
jake runtests tests=2dArrays inspect=true
160+
gulp runtests --tests=2dArrays --inspect=true
161161
```
162162

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

199199
```Shell
200-
jake diff
200+
gulp diff
201201
```
202202

203203
After verifying that the changes in the baselines are correct, run
204204

205205
```Shell
206-
jake baseline-accept
206+
gulp baseline-accept
207207
```
208208

209209
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.
210210

211211
## Localization
212212

213213
All strings the user may see are stored in [`diagnosticMessages.json`](./src/compiler/diagnosticMessages.json).
214-
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`.
215215

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

0 commit comments

Comments
 (0)