f726e987 by Tom Johnson

Merge pull request #17 from videojs/update/package

Package.JSON Update
2 parents 7e3049cc 39f7051b
......@@ -72,10 +72,18 @@ module.exports = function(grunt) {
}
},
connect: {
dev: {
port: 8000,
base: '.'
dev: {
options: {
port: 9999,
keepalive: true
}
}
},
open : {
dev : {
path: 'http://127.0.0.1:<%= connect.dev.options.port %>/example.html',
app: 'Google Chrome'
}
},
watch: {
gruntfile: {
......@@ -90,6 +98,14 @@ module.exports = function(grunt) {
files: '<%= jshint.test.src %>',
tasks: ['jshint:test', 'qunit']
}
},
concurrent: {
dev: {
tasks: ['connect', 'open', 'watch'],
options: {
logConcurrentOutput: true
}
}
}
});
......@@ -101,6 +117,8 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-open');
grunt.loadNpmTasks('grunt-concurrent');
grunt.registerTask('manifests-to-js', 'Wrap the test fixtures and output' +
' so they can be loaded in a browser',
......@@ -146,6 +164,9 @@ module.exports = function(grunt) {
grunt.file.write('tmp/expected.js', jsExpected);
});
// Launch a Development Environment
grunt.registerTask('dev', 'Launching Dev Environment', 'concurrent:dev');
// Default task.
grunt.registerTask('default',
['clean',
......
......@@ -2,7 +2,7 @@
"name": "videojs-contrib-hls",
"version": "0.3.1",
"engines": {
"node": ">= 0.8.0"
"node": ">= 0.10.12"
},
"repository": {
"type": "git",
......@@ -10,8 +10,7 @@
},
"license": "Apache 2",
"scripts": {
"test": "grunt",
"postinstall": "echo 'fire post install' && cd node_modules/video.js/ && npm install && grunt"
"test": "grunt"
},
"devDependencies": {
"grunt-contrib-jshint": "~0.6.0",
......@@ -21,11 +20,14 @@
"grunt-contrib-watch": "~0.4.0",
"grunt-contrib-clean": "~0.4.0",
"grunt-contrib-connect": "~0.6.0",
"grunt-concurrent": "0.4.3",
"grunt-open": "0.2.3",
"grunt-shell": "0.6.1",
"grunt": "~0.4.1"
},
"dependencies": {
"video.js": "git+https://github.com/videojs/video.js.git",
"videojs-swf": "git+https://github.com/seniorflexdeveloper/video-js-swf.git",
"videojs-contrib-media-sources": "git+https://github.com/dmlap/videojs-contrib-media-sources.git#hotfix/misc-fixes"
"video.js": "git+https://github.com/videojs/video.js.git#v4.4.1",
"videojs-swf": "git+https://github.com/videojs/video-js-swf.git#v4.4.0",
"videojs-contrib-media-sources": "git+https://github.com/videojs/videojs-contrib-media-sources.git"
}
}
......