Skip to content

Commit bf8812e

Browse files
committed
Merge pull request #1 from Microsoft/master
update
2 parents cbe2f3d + b4f4dad commit bf8812e

File tree

5,997 files changed

+216056
-120901
lines changed

Some content is hidden

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

5,997 files changed

+216056
-120901
lines changed

Diff for: .gitignore

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
node_modules/
22
built/*
3-
tests/cases/*.js
4-
tests/cases/*/*.js
5-
tests/cases/*/*/*.js
6-
tests/cases/*/*/*/*.js
7-
tests/cases/*/*/*/*/*.js
8-
tests/cases/*.js.map
9-
tests/cases/*/*.js.map
10-
tests/cases/*/*/*.js.map
11-
tests/cases/*/*/*/*.js.map
12-
tests/cases/*/*/*/*/*.js.map
133
tests/cases/rwc/*
144
tests/cases/test262/*
155
tests/cases/perf/*
@@ -31,6 +21,7 @@ scripts/processDiagnosticMessages.js
3121
scripts/importDefinitelyTypedTests/importDefinitelyTypedTests.js
3222
src/harness/*.js
3323
src/compiler/diagnosticInformationMap.generated.ts
24+
src/compiler/diagnosticMessages.generated.json
3425
rwc-report.html
3526
*.swp
3627
build.json

Diff for: .npmignore

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
built
22
doc
3+
lib/README.md
34
scripts
45
src
56
tests
7+
internal
8+
tslint.json
69
Jakefile.js
7-
.travis.yml
10+
.editorconfig
11+
.gitattributes
812
.settings/
13+
.travis.yml
914
.vscode/

Diff for: .travis.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
language: node_js
22

33
node_js:
4+
- 'stable'
5+
- '4'
46
- '0.10'
57

6-
sudo: false
8+
sudo: false

Diff for: AUTHORS.md

+19-4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ TypeScript is authored by:
88
* Basarat Ali Syed
99
* Ben Duffield
1010
* Bill Ticehurst
11+
* Brett Mayen
1112
* Bryan Forbes
1213
* Caitlin Potter
1314
* Chris Bubernak
@@ -17,11 +18,14 @@ TypeScript is authored by:
1718
* Dan Quirk
1819
* Daniel Rosenwasser
1920
* David Li
20-
* Dick van den Brink
21-
* Dirk Bäumer
21+
* Denis Nedelyaev
22+
* Dick van den Brink
23+
* Dirk Bäumer
24+
* Eyas Sharaiha
2225
* Frank Wallis
2326
* Gabriel Isenberg
2427
* Gilad Peleg
28+
* Graeme Wicksted
2529
* Guillaume Salles
2630
* Harald Niesche
2731
* Ingvar Stepanyan
@@ -31,30 +35,39 @@ TypeScript is authored by:
3135
* Jason Ramsay
3236
* Jed Mao
3337
* Johannes Rieken
38+
* John Vilk
3439
* Jonathan Bond-Caron
3540
* Jonathan Park
3641
* Jonathan Turner
3742
* Josh Kalderimis
43+
* Julian Williams
3844
* Kagami Sascha Rosylight
3945
* Keith Mashinter
46+
* Ken Howard
4047
* Kenji Imamula
4148
* Lorant Pinter
49+
* Martin Všetička
4250
* Masahiro Wakame
4351
* Max Deepfield
4452
* Micah Zoltu
4553
* Mohamed Hegazy
54+
* Nathan Shively-Sanders
4655
* Oleg Mihailik
4756
* Oleksandr Chekhovskyi
4857
* Paul van Brenk
4958
* Pedro Maltez
5059
* Philip Bulley
5160
* piloopin
61+
* @progre
62+
* Punya Biswal
5263
* Ron Buckton
5364
* Ryan Cavanaugh
65+
* Ryohei Ikegami
66+
* Sébastien Arod
5467
* Sheetal Nandi
5568
* Shengping Zhong
5669
* Shyyko Serhiy
57-
* Simon Hürlimann
70+
* Simon Hürlimann
5871
* Solal Pirelli
5972
* Stan Thomas
6073
* Steve Lucco
@@ -63,8 +76,10 @@ TypeScript is authored by:
6376
* togru
6477
* Tomas Grubliauskas
6578
* TruongSinh Tran-Nguyen
79+
* Viliv Vane
6680
* Vladimir Matveev
6781
* Wesley Wigham
82+
* York Yao
6883
* Yui Tanglertsampan
6984
* Zev Spitz
70-
* Zhengbo Li
85+
* Zhengbo Li

Diff for: CONTRIBUTING.md

+51-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
## Contributing bug fixes
2+
23
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.
34

45
## Contributing features
6+
57
Features (things that add new or improved functionality to TypeScript) may be accepted, but will need to first be approved (marked as "Milestone == Community" by a TypeScript coordinator with the message "Approved") in the suggestion issue. Features with language design impact, or that are adequately satisfied with external tools, will not be accepted.
68

79
Design changes will not be accepted at this time. If you have a design change proposal, please log a suggestion issue.
810

911
## Legal
12+
1013
You will need to complete a Contributor License Agreement (CLA). Briefly, this agreement testifies that you are granting us permission to use the submitted change according to the terms of the project's license, and that the work being submitted is under appropriate copyright.
1114

1215
Please submit a Contributor License Agreement (CLA) before submitting a pull request. You may visit https://cla.microsoft.com to sign digitally. Alternatively, download the agreement ([Microsoft Contribution License Agreement.docx](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=822190) or [Microsoft Contribution License Agreement.pdf](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=921298)), sign, scan, and email it back to <[email protected]>. Be sure to include your github user name along with the agreement. Once we have received the signed CLA, we'll review the request.
1316

1417
## Housekeeping
18+
1519
Your pull request should:
1620

1721
* Include a description of what your change intends to do
@@ -28,8 +32,24 @@ Your pull request should:
2832
* Follow the code conventions descriped in [Coding guidelines](https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines)
2933
* To avoid line ending issues, set `autocrlf = input` and `whitespace = cr-at-eol` in your git configuration
3034

35+
## Contributing `lib.d.ts` fixes
36+
37+
The library sources are in: [src/lib](https://github.com/Microsoft/TypeScript/tree/master/src/lib)
38+
39+
Library files in `built/local/` are updated by running
40+
```Shell
41+
jake
42+
```
43+
44+
The files in `lib/` are used to bootstrap compilation and usually do not need to be updated.
45+
46+
#### `src/lib/dom.generated.d.ts` and `src/lib/webworker.generated.d.ts`
47+
48+
These two files represent the DOM typings and are auto-generated. To make any modifications to them, please submit a PR to https://github.com/Microsoft/TSJS-lib-generator
49+
3150
## Running the Tests
32-
To run all tests, invoke the runtests target using jake:
51+
52+
To run all tests, invoke the `runtests` target using jake:
3353

3454
```Shell
3555
jake runtests
@@ -47,23 +67,42 @@ e.g. to run all compiler baseline tests:
4767
jake runtests tests=compiler
4868
```
4969

50-
or to run specifc test: `tests\cases\compiler\2dArrays.ts`
70+
or to run a specific test: `tests\cases\compiler\2dArrays.ts`
5171

5272
```Shell
5373
jake runtests tests=2dArrays
5474
```
5575

76+
## Debugging the tests
77+
78+
To debug the tests, invoke the `runtests-browser` task from jake.
79+
You will probably only want to debug one test at a time:
80+
81+
```Shell
82+
jake runtests-browser tests=2dArrays
83+
```
84+
85+
You can specify which browser to use for debugging. Currently Chrome and IE are supported:
86+
87+
```Shell
88+
jake runtests-browser tests=2dArrays browser=chrome
89+
```
90+
91+
You can debug with VS Code or Node instead with `jake runtests debug=true`:
92+
93+
```Shell
94+
jake runtests tests=2dArrays debug=true
95+
```
96+
5697
## Adding a Test
57-
To add a new testcase, simply place a `.ts` file in `tests\cases\compiler` containing code that exemplifies the bugfix or change you are making.
5898

59-
These files support metadata tags in the format `// @metaDataName: value`. The supported names and values are:
99+
To add a new test case, simply place a `.ts` file in `tests\cases\compiler` containing code that exemplifies the bugfix or change you are making.
60100

61-
* `comments`, `sourcemap`, `noimplicitany`, `declaration`: true or false (corresponds to the compiler command-line options of the same name)
62-
* `target`: ES3 or ES5 (same as compiler)
63-
* `out`, outDir: path (same as compiler)
64-
* `module`: local, commonjs, or amd (local corresponds to not passing any compiler --module flag)
65-
* `fileName`: path
66-
* These tags delimit sections of a file to be used as separate compilation units. They are useful for tests relating to modules. See below for examples.
101+
These files support metadata tags in the format `// @metaDataName: value`.
102+
The supported names and values are the same as those supported in the compiler itself, with the addition of the `fileName` flag.
103+
`fileName` tags delimit sections of a file to be used as separate compilation units.
104+
They are useful for tests relating to modules.
105+
See below for examples.
67106

68107
**Note** that if you have a test corresponding to a specific spec compliance item, you can place it in `tests\cases\conformance` in an appropriately-named subfolder.
69108
**Note** that filenames here must be distinct from all other compiler testcase names, so you may have to work a bit to find a unique name if it's something common.
@@ -86,6 +125,7 @@ var x = g();
86125
One can also write a project test, but it is slightly more involved.
87126

88127
## Managing the Baselines
128+
89129
Compiler testcases generate baselines that track the emitted `.js`, the errors produced by the compiler, and the type of each expression in the file. Additionally, some testcases opt in to baselining the source map output.
90130

91131
When a change in the baselines is detected, the test will fail. To inspect changes vs the expected baselines, use
@@ -102,4 +142,4 @@ jake baseline-accept
102142

103143
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.
104144

105-
**Note** that baseline-accept should only be run after a full test run! Accepting baselines after running a subset of tests will delete baseline files for the tests that didn't run.
145+
**Note** that `baseline-accept` should only be run after a full test run! Accepting baselines after running a subset of tests will delete baseline files for the tests that didn't run.

0 commit comments

Comments
 (0)