Skip to content

Commit 5bc78af

Browse files
sheetalkamatsheetalkamat
committed
Merge branch 'master' into builderApi
2 parents cb26366 + fef7ad4 commit 5bc78af

594 files changed

Lines changed: 24757 additions & 6458 deletions

File tree

Some content is hidden

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

‎.gitmodules‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,19 @@
22
path = tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter
33
url = https://github.com/Microsoft/TypeScript-React-Starter
44
ignore = all
5-
shallow = true
65
[submodule "tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter"]
76
path = tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
87
url = https://github.com/Microsoft/TypeScript-Node-Starter.git
98
ignore = all
10-
shallow = true
119
[submodule "tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter"]
1210
path = tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter
1311
url = https://github.com/Microsoft/TypeScript-React-Native-Starter.git
1412
ignore = all
15-
shallow = true
1613
[submodule "tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter"]
1714
path = tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter
1815
url = https://github.com/Microsoft/TypeScript-Vue-Starter.git
1916
ignore = all
20-
shallow = true
2117
[submodule "tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter"]
2218
path = tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter
2319
url = https://github.com/Microsoft/TypeScript-WeChat-Starter.git
2420
ignore = all
25-
shallow = true

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ branches:
1818
- master
1919
- release-2.5
2020
- release-2.6
21+
- release-2.7
2122

2223
install:
2324
- npm uninstall typescript --no-save

‎CONTRIBUTING.md‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,14 @@ Issues that ask questions answered in the FAQ will be closed without elaboration
88

99
## 2. Search for Duplicates
1010

11-
[Search the existing issues](https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=is%3Aissue) before logging a new one.
11+
[Search the existing issues](https://github.com/Microsoft/TypeScript/search?type=Issues) before logging a new one.
12+
13+
Some search tips:
14+
* *Don't* restrict your search to only open issues. An issue with a title similar to yours may have been closed as a duplicate of one with a less-findable title.
15+
* Check for synonyms. For example, if your bug involves an interface, it likely also occurs with type aliases or classes.
16+
* Search for the title of the issue you're about to log. This sounds obvious but 80% of the time this is sufficient to find a duplicate when one exists.
17+
* Read more than the first page of results. Many bugs here use the same words so relevancy sorting is not particularly strong.
18+
* If you have a crash, search for the first few topmost function names shown in the call stack.
1219

1320
## 3. Do you have a question?
1421

@@ -183,3 +190,10 @@ jake baseline-accept
183190
```
184191

185192
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.
193+
194+
## Localization
195+
196+
All strings the user may see are stored in [`diagnosticMessages.json`](./src/compiler/diagnosticMessages.json).
197+
If you make changes to it, run `jake generate-diagnostics` to push them to the `Diagnostic` interface in [`diagnosticInformationMap.generated.ts`](./src/compiler/diagnosticInformationMap.generated.ts).
198+
199+
See [coding guidelines on diagnostic messages](https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines#diagnostic-messages).

‎Gulpfile.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ const es2018LibrarySourceMap = es2018LibrarySource.map(source =>
150150
({ target: "lib." + source, sources: ["header.d.ts", source] }));
151151

152152
const esnextLibrarySource = [
153-
"esnext.asynciterable.d.ts"
153+
"esnext.asynciterable.d.ts",
154+
"esnext.promise.d.ts"
154155
];
155156

156157
const esnextLibrarySourceMap = esnextLibrarySource.map(source =>

‎Jakefile.js‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ var harnessSources = harnessCoreSources.concat([
130130
"textStorage.ts",
131131
"moduleResolution.ts",
132132
"tsconfigParsing.ts",
133+
"asserts.ts",
133134
"builder.ts",
134135
"commandLineParsing.ts",
135136
"configurationExtension.ts",
@@ -212,7 +213,8 @@ var es2018LibrarySourceMap = es2018LibrarySource.map(function (source) {
212213
});
213214

214215
var esnextLibrarySource = [
215-
"esnext.asynciterable.d.ts"
216+
"esnext.asynciterable.d.ts",
217+
"esnext.promise.d.ts"
216218
];
217219

218220
var esnextLibrarySourceMap = esnextLibrarySource.map(function (source) {
@@ -795,7 +797,7 @@ compileFile(
795797
/*prereqs*/[builtLocalDirectory, tscFile, tsserverLibraryFile].concat(libraryTargets).concat(servicesSources).concat(harnessSources),
796798
/*prefixes*/[],
797799
/*useBuiltCompiler:*/ true,
798-
/*opts*/ { types: ["node", "mocha"], lib: "es6" });
800+
/*opts*/ { types: ["node", "mocha", "chai"], lib: "es6" });
799801

800802
var internalTests = "internal/";
801803

@@ -1195,22 +1197,12 @@ task("update-sublime", ["local", serverFile], function () {
11951197
});
11961198

11971199
var tslintRuleDir = "scripts/tslint/rules";
1198-
var tslintRules = [
1199-
"booleanTriviaRule",
1200-
"debugAssertRule",
1201-
"nextLineRule",
1202-
"noBomRule",
1203-
"noIncrementDecrementRule",
1204-
"noInOperatorRule",
1205-
"noTypeAssertionWhitespaceRule",
1206-
"objectLiteralSurroundingSpaceRule",
1207-
"typeOperatorSpacingRule",
1208-
];
1200+
var tslintRules = fs.readdirSync(tslintRuleDir);
12091201
var tslintRulesFiles = tslintRules.map(function (p) {
1210-
return path.join(tslintRuleDir, p + ".ts");
1202+
return path.join(tslintRuleDir, p);
12111203
});
12121204
var tslintRulesOutFiles = tslintRules.map(function (p) {
1213-
return path.join(builtLocalDirectory, "tslint/rules", p + ".js");
1205+
return path.join(builtLocalDirectory, "tslint/rules", p.replace(".ts", ".js"));
12141206
});
12151207
var tslintFormattersDir = "scripts/tslint/formatters";
12161208
var tslintFormatters = [

0 commit comments

Comments
 (0)