Skip to content

Commit a74e54e

Browse files
committed
Merge branch 'master' into watchOptions
2 parents 56d754c + cc6d18e commit a74e54e

File tree

261 files changed

+22658
-7693
lines changed

Some content is hidden

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

261 files changed

+22658
-7693
lines changed

.npmignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ Jakefile.js
1818
.settings/
1919
.travis.yml
2020
.vscode/
21-
test.config
21+
test.config
22+
package-lock.json

Jakefile.js

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,23 +1199,12 @@ task("update-sublime", ["local", serverFile], function () {
11991199
});
12001200

12011201
var tslintRuleDir = "scripts/tslint/rules";
1202-
var tslintRules = [
1203-
"booleanTriviaRule",
1204-
"debugAssertRule",
1205-
"nextLineRule",
1206-
"noBomRule",
1207-
"noDoubleSpaceRule",
1208-
"noIncrementDecrementRule",
1209-
"noInOperatorRule",
1210-
"noTypeAssertionWhitespaceRule",
1211-
"objectLiteralSurroundingSpaceRule",
1212-
"typeOperatorSpacingRule",
1213-
];
1202+
var tslintRules = fs.readdirSync(tslintRuleDir);
12141203
var tslintRulesFiles = tslintRules.map(function (p) {
1215-
return path.join(tslintRuleDir, p + ".ts");
1204+
return path.join(tslintRuleDir, p);
12161205
});
12171206
var tslintRulesOutFiles = tslintRules.map(function (p) {
1218-
return path.join(builtLocalDirectory, "tslint/rules", p + ".js");
1207+
return path.join(builtLocalDirectory, "tslint/rules", p.replace(".ts", ".js"));
12191208
});
12201209
var tslintFormattersDir = "scripts/tslint/formatters";
12211210
var tslintFormatters = [

issue_template.md

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,34 @@
1-
<!-- BUGS: Please use this template. -->
2-
<!-- QUESTIONS: This is not a general support forum! Ask Qs at http://stackoverflow.com/questions/tagged/typescript -->
3-
<!-- SUGGESTIONS: See https://github.com/Microsoft/TypeScript-wiki/blob/master/Writing-Good-Design-Proposals.md -->
1+
<!-- 🚨 STOP 🚨 𝗦𝗧𝗢𝗣 🚨 𝑺𝑻𝑶𝑷 🚨 -->
2+
<!--
3+
Half of all issues filed here are duplicates, answered in the FAQ, or not appropriate for the bug tracker.
4+
5+
Please help us by doing the following steps before logging an issue:
6+
* Search: https://github.com/Microsoft/TypeScript/search?type=Issues
7+
* Read the CONTRIBUTING guidelines: https://github.com/Microsoft/TypeScript/blob/master/CONTRIBUTING.md
8+
* Read the FAQ: https://github.com/Microsoft/TypeScript/wiki/FAQ
9+
-->
10+
11+
<!-- If you have a QUESTION:
12+
THIS IS NOT A FORUM FOR QUESTIONS.
13+
Ask questions at http://stackoverflow.com/questions/tagged/typescript
14+
or https://gitter.im/Microsoft/TypeScript
15+
-->
16+
17+
<!-- If you have a SUGGESTION:
18+
Most suggestion reports are duplicates, please search extra hard before logging a new suggestion.
19+
See https://github.com/Microsoft/TypeScript-wiki/blob/master/Writing-Good-Design-Proposals.md
20+
-->
21+
22+
<!-- If you have a BUG:
23+
Please fill in the *entire* template below.
24+
-->
425

526
<!-- Please try to reproduce the issue with `typescript@next`. It may have already been fixed. -->
627
**TypeScript Version:** 2.7.0-dev.201xxxxx
728

29+
<!-- Search terms you tried before logging this (so others can find this issue more easily) -->
30+
**Search Terms:**
31+
832
**Code**
933

1034
```ts
@@ -16,4 +40,6 @@
1640

1741
**Actual behavior:**
1842

19-
**Related:**
43+
**Playground Link:** <!-- A link to a TypeScript Playground "Share" link which demonstrates this behavior -->
44+
45+
**Related Issues:**

src/compiler/builder.ts

Lines changed: 492 additions & 422 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)