Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge @macklinu's tslint changes #206

Merged
merged 1 commit into from
Mar 30, 2017
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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,15 @@
"babel-plugin-transform-regenerator": "^6.22.0",
"babel-preset-es2015": "^6.24.0",
"babel-preset-stage-3": "^6.22.0",
"husky": "^0.12.0",
"husky": "^0.13.3",
"in-publish": "^2.0.0",
"jest": "^19.0.2",
"lint-staged": "^3.2.5",
"madge": "^1.4.4",
"shx": "^0.2.1",
"ts-jest": "^19.0.2",
"ts-node": "^3.0.0",
"tslint": "^4.5.1",
"tslint": "^5.0.0",
"typescript": "2.2.1"
},
"dependencies": {
Expand Down
27 changes: 12 additions & 15 deletions source/ambient.d.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
declare module "parse-diff";
declare module "lodash.includes";
declare module "lodash.find";
declare module "lodash.isobject";
declare module "lodash.keys";
declare module "jest-runtime";
declare module "jest-environment-node";
declare module "jest-config";
declare module "voca";
declare module "jsome";
declare module "jsonpointer";
declare module "parse-diff"
declare module "lodash.includes"
declare module "lodash.find"
declare module "lodash.isobject"
declare module "lodash.keys"
declare module "jest-runtime"
declare module "jest-environment-node"
declare module "jest-config"
declare module "voca"
declare module "jsome"
declare module "jsonpointer"

// This must exist...
declare module "chalk";

declare module "*/package.json";
declare module "*/package.json"
2 changes: 1 addition & 1 deletion source/ci_source/providers/Circle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export class Circle implements CISource {
const reponame = splitSlug[4]
const id = splitSlug[6]
return {owner, reponame, id}
};
}
return {}
}

Expand Down
2 changes: 1 addition & 1 deletion source/ci_source/providers/DockerCloud.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export class DockerCloud implements CISource {
const reponame = splitSlug[4]
const id = splitSlug[6]
return {owner, reponame, id}
};
}
return {}
}

Expand Down
2 changes: 1 addition & 1 deletion source/ci_source/providers/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ const realProviders = [Travis, Circle, Semaphore, Jenkins, Surf, DockerCloud, Co
export {
providers,
realProviders
};
}
1 change: 0 additions & 1 deletion tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"no-var-keyword": true,
"no-empty": true,
"no-unused-expression": true,
"no-use-before-declare": true,
"no-var-requires": true,
"no-require-imports": true,
"one-line": [true,
Expand Down
Loading