Skip to content

brainfood / videojs-contrib-hls

Go to a project
Toggle navigation
Toggle navigation pinning
f726e987 by Tom Johnson
Options

Merge pull request #17 from videojs/update/package 

Package.JSON Update
2 parents 7e3049cc 39f7051b
Inline Side-by-side
Showing 2 changed files with 31 additions and 8 deletions
...@@ -73,8 +73,16 @@ module.exports = function(grunt) { ...@@ -73,8 +73,16 @@ module.exports = function(grunt) {
73 }, 73 },
74 connect: { 74 connect: {
75 dev: { 75 dev: {
76 port: 8000, 76 options: {
77 base: '.' 77 port: 9999,
78 keepalive: true
79 }
80 }
81 },
82 open : {
83 dev : {
84 path: 'http://127.0.0.1:<%= connect.dev.options.port %>/example.html',
85 app: 'Google Chrome'
78 } 86 }
79 }, 87 },
80 watch: { 88 watch: {
...@@ -90,6 +98,14 @@ module.exports = function(grunt) { ...@@ -90,6 +98,14 @@ module.exports = function(grunt) {
90 files: '<%= jshint.test.src %>', 98 files: '<%= jshint.test.src %>',
91 tasks: ['jshint:test', 'qunit'] 99 tasks: ['jshint:test', 'qunit']
92 } 100 }
101 },
102 concurrent: {
103 dev: {
104 tasks: ['connect', 'open', 'watch'],
105 options: {
106 logConcurrentOutput: true
107 }
108 }
93 } 109 }
94 }); 110 });
95 111
...@@ -101,6 +117,8 @@ module.exports = function(grunt) { ...@@ -101,6 +117,8 @@ module.exports = function(grunt) {
101 grunt.loadNpmTasks('grunt-contrib-jshint'); 117 grunt.loadNpmTasks('grunt-contrib-jshint');
102 grunt.loadNpmTasks('grunt-contrib-watch'); 118 grunt.loadNpmTasks('grunt-contrib-watch');
103 grunt.loadNpmTasks('grunt-contrib-connect'); 119 grunt.loadNpmTasks('grunt-contrib-connect');
120 grunt.loadNpmTasks('grunt-open');
121 grunt.loadNpmTasks('grunt-concurrent');
104 122
105 grunt.registerTask('manifests-to-js', 'Wrap the test fixtures and output' + 123 grunt.registerTask('manifests-to-js', 'Wrap the test fixtures and output' +
106 ' so they can be loaded in a browser', 124 ' so they can be loaded in a browser',
...@@ -146,6 +164,9 @@ module.exports = function(grunt) { ...@@ -146,6 +164,9 @@ module.exports = function(grunt) {
146 grunt.file.write('tmp/expected.js', jsExpected); 164 grunt.file.write('tmp/expected.js', jsExpected);
147 }); 165 });
148 166
167 // Launch a Development Environment
168 grunt.registerTask('dev', 'Launching Dev Environment', 'concurrent:dev');
169
149 // Default task. 170 // Default task.
150 grunt.registerTask('default', 171 grunt.registerTask('default',
151 ['clean', 172 ['clean',
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 "name": "videojs-contrib-hls", 2 "name": "videojs-contrib-hls",
3 "version": "0.3.1", 3 "version": "0.3.1",
4 "engines": { 4 "engines": {
5 "node": ">= 0.8.0" 5 "node": ">= 0.10.12"
6 }, 6 },
7 "repository": { 7 "repository": {
8 "type": "git", 8 "type": "git",
...@@ -10,8 +10,7 @@ ...@@ -10,8 +10,7 @@
10 }, 10 },
11 "license": "Apache 2", 11 "license": "Apache 2",
12 "scripts": { 12 "scripts": {
13 "test": "grunt", 13 "test": "grunt"
14 "postinstall": "echo 'fire post install' && cd node_modules/video.js/ && npm install && grunt"
15 }, 14 },
16 "devDependencies": { 15 "devDependencies": {
17 "grunt-contrib-jshint": "~0.6.0", 16 "grunt-contrib-jshint": "~0.6.0",
...@@ -21,11 +20,14 @@ ...@@ -21,11 +20,14 @@
21 "grunt-contrib-watch": "~0.4.0", 20 "grunt-contrib-watch": "~0.4.0",
22 "grunt-contrib-clean": "~0.4.0", 21 "grunt-contrib-clean": "~0.4.0",
23 "grunt-contrib-connect": "~0.6.0", 22 "grunt-contrib-connect": "~0.6.0",
23 "grunt-concurrent": "0.4.3",
24 "grunt-open": "0.2.3",
25 "grunt-shell": "0.6.1",
24 "grunt": "~0.4.1" 26 "grunt": "~0.4.1"
25 }, 27 },
26 "dependencies": { 28 "dependencies": {
27 "video.js": "git+https://github.com/videojs/video.js.git", 29 "video.js": "git+https://github.com/videojs/video.js.git#v4.4.1",
28 "videojs-swf": "git+https://github.com/seniorflexdeveloper/video-js-swf.git", 30 "videojs-swf": "git+https://github.com/videojs/video-js-swf.git#v4.4.0",
29 "videojs-contrib-media-sources": "git+https://github.com/dmlap/videojs-contrib-media-sources.git#hotfix/misc-fixes" 31 "videojs-contrib-media-sources": "git+https://github.com/videojs/videojs-contrib-media-sources.git"
30 } 32 }
31 } 33 }
......