Skip to content

Commit

Permalink
fix(package) Install typings using grunt instead of post-install
Browse files Browse the repository at this point in the history
  • Loading branch information
nicojs authored and simondel committed Apr 7, 2016
1 parent ef687cc commit 5da847e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
11 changes: 8 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

module.exports = function (grunt) {
module.exports = function(grunt) {

grunt.initConfig({

Expand All @@ -16,6 +16,10 @@ module.exports = function (grunt) {
}
},

typings: {
install: {}
},

jshint: {
files: ['Gruntfile.js', 'dist/src/**/*.js', 'dist/test/**/*.js'],
options: {
Expand Down Expand Up @@ -87,16 +91,17 @@ module.exports = function (grunt) {
});

grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-typings');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-mocha-test');
grunt.loadNpmTasks('grunt-mocha-istanbul');
grunt.loadNpmTasks('grunt-ts');

grunt.registerTask('default', ['test']);
grunt.registerTask('watch-test', ['test', 'watch']);
grunt.registerTask('test', ['build', 'coverage']);
grunt.registerTask('build', ['clean', 'ts']);
grunt.registerTask('build', ['typings', 'clean', 'ts']);
grunt.registerTask('integration', ['mochaTest:integration']);
grunt.registerTask('coverage', ['mocha_istanbul:coverage']);
grunt.registerTask('serve', ['watch']);
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"scripts": {
"test": "grunt test",
"start": "concurrently \"npm run tsc:w\" \"grunt serve\"",
"tsc:w": "tsc -w",
"postinstall": "typings install"
"tsc:w": "tsc -w"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -57,6 +56,7 @@
"grunt-mocha-istanbul": "^3.0.1",
"grunt-mocha-test": "^0.12.7",
"grunt-ts": "5.4.0",
"grunt-typings": "^0.1.4",
"istanbul": "^0.4.0",
"mocha": "^2.3.3",
"mocha-sinon": "^1.1.4",
Expand Down

0 comments on commit 5da847e

Please sign in to comment.