Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/lib/compilation.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function createCompile(build, emitError) {
function compileTask(out, build) {
var compile = createCompile(build, true);
return function () {
var src = es.merge(gulp.src('src/**', { base: 'src' }), gulp.src('node_modules/typescript/lib/lib.d.ts'));
var src = es.merge(gulp.src('src/**', { base: 'src' }), gulp.src('node_modules/typescript/lib/lib.d.ts'), gulp.src('node_modules/@types/**/index.d.ts'));
return src
.pipe(compile())
.pipe(gulp.dest(out))
Expand All @@ -67,7 +67,7 @@ exports.compileTask = compileTask;
function watchTask(out, build) {
var compile = createCompile(build);
return function () {
var src = es.merge(gulp.src('src/**', { base: 'src' }), gulp.src('node_modules/typescript/lib/lib.d.ts'));
var src = es.merge(gulp.src('src/**', { base: 'src' }), gulp.src('node_modules/typescript/lib/lib.d.ts'), gulp.src('node_modules/@types/**/index.d.ts'));
var watchSrc = watch('src/**', { base: 'src' });
return watchSrc
.pipe(util.incremental(compile, src, true))
Expand Down
6 changes: 4 additions & 2 deletions build/lib/compilation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ export function compileTask(out: string, build: boolean): () => NodeJS.ReadWrite
return function () {
const src = es.merge(
gulp.src('src/**', { base: 'src' }),
gulp.src('node_modules/typescript/lib/lib.d.ts')
gulp.src('node_modules/typescript/lib/lib.d.ts'),
gulp.src('node_modules/@types/**/index.d.ts')
);

return src
Expand All @@ -85,7 +86,8 @@ export function watchTask(out: string, build: boolean): () => NodeJS.ReadWriteSt
return function () {
const src = es.merge(
gulp.src('src/**', { base: 'src' }),
gulp.src('node_modules/typescript/lib/lib.d.ts')
gulp.src('node_modules/typescript/lib/lib.d.ts'),
gulp.src('node_modules/@types/**/index.d.ts')
);
const watchSrc = watch('src/**', { base: 'src' });

Expand Down
2 changes: 1 addition & 1 deletion build/lib/tslint/duplicateImportsRule.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ var Lint = require("tslint");
var Rule = (function (_super) {
__extends(Rule, _super);
function Rule() {
return _super.apply(this, arguments) || this;
return _super !== null && _super.apply(this, arguments) || this;
}
Rule.prototype.apply = function (sourceFile) {
return this.applyWithWalker(new ImportPatterns(sourceFile, this.getOptions()));
Expand Down
2 changes: 1 addition & 1 deletion build/lib/tslint/importPatternsRule.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ var minimatch = require("minimatch");
var Rule = (function (_super) {
__extends(Rule, _super);
function Rule() {
return _super.apply(this, arguments) || this;
return _super !== null && _super.apply(this, arguments) || this;
}
Rule.prototype.apply = function (sourceFile) {
var configs = this.getOptions().ruleArguments;
Expand Down
2 changes: 1 addition & 1 deletion build/lib/tslint/layeringRule.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ var path_1 = require("path");
var Rule = (function (_super) {
__extends(Rule, _super);
function Rule() {
return _super.apply(this, arguments) || this;
return _super !== null && _super.apply(this, arguments) || this;
}
Rule.prototype.apply = function (sourceFile) {
var parts = path_1.dirname(sourceFile.fileName).split(/\\|\//);
Expand Down
6 changes: 3 additions & 3 deletions build/lib/tslint/noUnexternalizedStringsRule.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var Lint = require("tslint");
var Rule = (function (_super) {
__extends(Rule, _super);
function Rule() {
return _super.apply(this, arguments) || this;
return _super !== null && _super.apply(this, arguments) || this;
}
Rule.prototype.apply = function (sourceFile) {
return this.applyWithWalker(new NoUnexternalizedStringsRuleWalker(sourceFile, this.getOptions()));
Expand Down Expand Up @@ -90,8 +90,8 @@ var NoUnexternalizedStringsRuleWalker = (function (_super) {
return;
}
if (doubleQuoted && (!callInfo || callInfo.argIndex === -1 || !this.signatures[functionName])) {
var s_1 = node.getText();
var replacement = new Lint.Replacement(node.getStart(), node.getWidth(), "nls.localize('KEY-" + s_1.substring(1, s_1.length - 1) + "', " + s_1 + ")");
var s = node.getText();
var replacement = new Lint.Replacement(node.getStart(), node.getWidth(), "nls.localize('KEY-" + s.substring(1, s.length - 1) + "', " + s + ")");
var fix = new Lint.Fix("Unexternalitzed string", [replacement]);
this.addFailure(this.createFailure(node.getStart(), node.getWidth(), "Unexternalized string found: " + node.getText(), fix));
return;
Expand Down
4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@
"yauzl": "2.3.1"
},
"devDependencies": {
"@types/minimist": "^1.2.0",
"@types/mocha": "^2.2.39",
"@types/semver": "^5.3.30",
"@types/sinon": "^1.16.34",
"azure-storage": "^0.3.1",
"clean-css": "3.4.6",
"coveralls": "^2.11.11",
Expand Down
6 changes: 5 additions & 1 deletion src/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
"sourceMap": false,
"experimentalDecorators": true,
"declaration": true,
"noImplicitReturns": true
"noImplicitReturns": true,
"typeRoots": [
"typings",
"../node_modules/@types"
]
}
}
35 changes: 0 additions & 35 deletions src/typings/minimist.d.ts

This file was deleted.

14 changes: 0 additions & 14 deletions src/typings/mocha.d.ts

This file was deleted.

125 changes: 0 additions & 125 deletions src/typings/semver.d.ts

This file was deleted.

Loading