Skip to content

Commit

Permalink
feat(es2015-promise): Remove dep to es6-promise (#189)
Browse files Browse the repository at this point in the history
  • Loading branch information
nicojs authored and simondel committed Dec 14, 2016
1 parent 9c397f7 commit 3a34fe1
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 9 deletions.
4 changes: 3 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,9 @@ module.exports = function (grunt) {
failOnTypeErrors: true
},
build: {
tsconfig: true,
tsconfig: {
passThrough: true
}
},
},

Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
"devDependencies": {
"@types/chai-as-promised": "0.0.28",
"@types/chalk": "^0.4.28",
"@types/es6-promise": "0.0.31",
"@types/escodegen": "0.0.5",
"@types/esprima": "^2.1.31",
"@types/estree": "0.0.32",
Expand Down Expand Up @@ -95,9 +94,9 @@
"sinon": "^1.17.2",
"sinon-as-promised": "^4.0.2",
"sinon-chai": "^2.8.0",
"stryker-api": "^0.4.0",
"stryker-api": "^0.4.1",
"tslint": "^3.15.1",
"typescript": "^2.0.2"
"typescript": "~2.0.2"
},
"peerDependencies": {
"stryker-api": "^0.4.0"
Expand Down
2 changes: 1 addition & 1 deletion src/Stryker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export default class Stryker {
if (isPromise(maybePromise)) {
return maybePromise;
} else {
return Promise.resolve<void>();
return Promise.resolve();
}
}

Expand Down
4 changes: 2 additions & 2 deletions testResources/module/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"karma-jasmine": "^1.0.2",
"karma-phantomjs-launcher": "^1.0.1",
"stryker": "file:../../",
"stryker-api": "^0.4.0",
"stryker-api": "^0.4.1",
"stryker-jasmine": "^0.1.0",
"stryker-karma-runner": "^0.3.1",
"stryker-karma-runner": "^0.3.2",
"typescript": "~2.0.2"
}
}
6 changes: 5 additions & 1 deletion testResources/module/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
"moduleResolution": "node",
"target": "es5",
"noImplicitAny": true,
"sourceMap": false
"sourceMap": false,
"lib": [
"es5",
"es2015.promise"
]
},
"exclude": [
"node_modules",
Expand Down
6 changes: 5 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
"sourceMap": true,
"declaration": true,
"forceConsistentCasingInFileNames": true,
"allowJs": false
"allowJs": false,
"lib": [
"es5",
"es2015.promise"
]
},
"exclude": [
"node_modules",
Expand Down

0 comments on commit 3a34fe1

Please sign in to comment.