Skip to content

Commit 7e8af62

Browse files
mhegazymhegazy
committed
Merge branch 'master' into release-2.1
2 parents 6389a0d + 2d16b19 commit 7e8af62

File tree

153 files changed

+1164
-888
lines changed

Some content is hidden

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

153 files changed

+1164
-888
lines changed

‎Jakefile.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,7 @@ function runConsoleTests(defaultReporter, runInParallel) {
930930
}
931931

932932
if (tests && tests.toLocaleLowerCase() === "rwc") {
933-
testTimeout = 400000;
933+
testTimeout = 800000;
934934
}
935935

936936
colors = process.env.colors || process.env.color;
@@ -1086,12 +1086,10 @@ task("tests-debug", ["setDebugMode", "tests"]);
10861086
// Makes the test results the new baseline
10871087
desc("Makes the most recent test results the new baseline, overwriting the old baseline");
10881088
task("baseline-accept", function () {
1089-
acceptBaseline("");
1089+
acceptBaseline(localBaseline, refBaseline);
10901090
});
10911091

1092-
function acceptBaseline(containerFolder) {
1093-
var sourceFolder = path.join(localBaseline, containerFolder);
1094-
var targetFolder = path.join(refBaseline, containerFolder);
1092+
function acceptBaseline(sourceFolder, targetFolder) {
10951093
console.log('Accept baselines from ' + sourceFolder + ' to ' + targetFolder);
10961094
var files = fs.readdirSync(sourceFolder);
10971095
var deleteEnding = '.delete';
@@ -1115,12 +1113,12 @@ function acceptBaseline(containerFolder) {
11151113

11161114
desc("Makes the most recent rwc test results the new baseline, overwriting the old baseline");
11171115
task("baseline-accept-rwc", function () {
1118-
acceptBaseline("rwc");
1116+
acceptBaseline(localRwcBaseline, refRwcBaseline);
11191117
});
11201118

11211119
desc("Makes the most recent test262 test results the new baseline, overwriting the old baseline");
11221120
task("baseline-accept-test262", function () {
1123-
acceptBaseline("test262");
1121+
acceptBaseline(localTest262Baseline, refTest262Baseline);
11241122
});
11251123

11261124

‎package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@
7575
"through2": "latest",
7676
"travis-fold": "latest",
7777
"ts-node": "latest",
78-
"tsd": "latest",
79-
"tslint": "4.0.0-dev.0",
78+
"tslint": "4.0.0-dev.2",
8079
"typescript": "^2.1"
8180
},
8281
"scripts": {

‎scripts/parallel-lint.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
1-
var Linter = require("tslint");
1+
var tslint = require("tslint");
22
var fs = require("fs");
33

44
function getLinterOptions() {
55
return {
6-
configuration: require("../tslint.json"),
76
formatter: "prose",
87
formattersDirectory: undefined,
98
rulesDirectory: "built/local/tslint"
109
};
1110
}
11+
function getLinterConfiguration() {
12+
return require("../tslint.json");
13+
}
1214

13-
function lintFileContents(options, path, contents) {
14-
var ll = new Linter(path, contents, options);
15-
return ll.lint();
15+
function lintFileContents(options, configuration, path, contents) {
16+
var ll = new tslint.Linter(options);
17+
ll.lint(path, contents, configuration);
18+
return ll.getResult();
1619
}
1720

18-
function lintFileAsync(options, path, cb) {
21+
function lintFileAsync(options, configuration, path, cb) {
1922
fs.readFile(path, "utf8", function (err, contents) {
2023
if (err) {
2124
return cb(err);
2225
}
23-
var result = lintFileContents(options, path, contents);
26+
var result = lintFileContents(options, configuration, path, contents);
2427
cb(undefined, result);
2528
});
2629
}
@@ -30,7 +33,8 @@ process.on("message", function (data) {
3033
case "file":
3134
var target = data.name;
3235
var lintOptions = getLinterOptions();
33-
lintFileAsync(lintOptions, target, function (err, result) {
36+
var lintConfiguration = getLinterConfiguration();
37+
lintFileAsync(lintOptions, lintConfiguration, target, function (err, result) {
3438
if (err) {
3539
process.send({ kind: "error", error: err.toString() });
3640
return;

‎scripts/tslint/booleanTriviaRule.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as Lint from "tslint/lib/lint";
1+
import * as Lint from "tslint/lib";
22
import * as ts from "typescript";
33

44
export class Rule extends Lint.Rules.AbstractRule {

‎scripts/tslint/nextLineRule.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as Lint from "tslint/lib/lint";
1+
import * as Lint from "tslint/lib";
22
import * as ts from "typescript";
33

44
const OPTION_CATCH = "check-catch";

‎scripts/tslint/noInOperatorRule.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as Lint from "tslint/lib/lint";
1+
import * as Lint from "tslint/lib";
22
import * as ts from "typescript";
33

44

‎scripts/tslint/noIncrementDecrementRule.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as Lint from "tslint/lib/lint";
1+
import * as Lint from "tslint/lib";
22
import * as ts from "typescript";
33

44

‎scripts/tslint/noTypeAssertionWhitespaceRule.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as Lint from "tslint/lib/lint";
1+
import * as Lint from "tslint/lib";
22
import * as ts from "typescript";
33

44

‎scripts/tslint/objectLiteralSurroundingSpaceRule.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as Lint from "tslint/lib/lint";
1+
import * as Lint from "tslint/lib";
22
import * as ts from "typescript";
33

44

‎scripts/tslint/preferConstRule.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as Lint from "tslint/lib/lint";
1+
import * as Lint from "tslint/lib";
22
import * as ts from "typescript";
33

44
export class Rule extends Lint.Rules.AbstractRule {

0 commit comments

Comments
 (0)