@misteroneill Add browserify:dist Target. Fix vtt.js URL.. closes #2741

videojs · Oct 28, 2015 · e6f5d6b · e6f5d6b
1 parent 42e33ca
commit e6f5d6b
Show file tree

Hide file tree

Showing 2 changed files with 94 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ CHANGELOG
 * @Soviut Fixed argument names in some API docs ([view](https://github.com/videojs/video.js/pull/2714))
 * @forbesjo Added Microsoft Caption Maker link ([view](https://github.com/videojs/video.js/pull/2618))
 * @misteroneill updated modal dialog CSS ([view](https://github.com/videojs/video.js/pull/2756))
+* @misteroneill Add browserify
 
 --------------------
 

diff --git a/build/grunt.js b/build/grunt.js
@@ -13,21 +13,85 @@ module.exports = function(grunt) {
     patch: verParts[2]
   };
 
+  const browserifyGruntDefaults = {
+    browserifyOptions: {
+      debug: true,
+      standalone: 'videojs'
+    },
+    plugin: [
+      ['browserify-derequire']
+    ],
+    transform: [
+      require('babelify').configure({
+        sourceMapRelative: './',
+        loose: ['all']
+      }),
+      ['browserify-versionify', {
+        placeholder: '__VERSION__',
+        version: pkg.version
+      }],
+      ['browserify-versionify', {
+        placeholder: '__VERSION_NO_PATCH__',
+        version: version.majorMinor
+      }],
+      ['browserify-versionify', {
+        placeholder: '__SWF_VERSION__',
+        version: pkg.dependencies['videojs-swf']
+      }]
+    ]
+  };
+
+  /**
+   * Customizes _.merge behavior in `browserifyGruntOptions` to concatenate
+   * arrays. This can be overridden on a per-call basis to
+   *
+   * @see https://lodash.com/docs#merge
+   * @function browserifyGruntCustomizer
+   * @private
+   * @param  {Mixed} objectValue
+   * @param  {Mixed} sourceValue
+   * @return {Object}
+   */
+  function browserifyGruntCustomizer(objectValue, sourceValue) {
+    if (Array.isArray(objectValue)) {
+      return objectValue.concat(sourceValue);
+    }
+  }
+
+  /**
+   * Creates a unique object of Browserify Grunt task options.
+   *
+   * @function browserifyGruntOptions
+   * @private
+   * @param  {Object} [options]
+   * @param  {Function} [customizer=browserifyGruntCustomizer]
+   *         If the default array-concatenation behavior is not desireable,
+   *         pass _.noop or a unique customizer (https://lodash.com/docs#merge).
+   *
+   * @return {Object}
+   */
+  function browserifyGruntOptions(options = null, customizer = browserifyGruntCustomizer) {
+    return _.merge({}, browserifyGruntDefaults, options, customizer);
+  }
+
   /**
    * Creates processor functions for license banners.
    *
+   * @function createLicenseProcessor
    * @private
    * @param  {Object} data Custom data overriding `bannerCommonData`. Will
    *                       not be mutated.
    * @return {Function}    A function which returns a processed grunt template
    *                       using an object constructed from `bannerCommonData`
    *                       and the `data` argument.
    */
-  let createLicenseProcessor = (data) => function () {
-    return grunt.template.process(license, {
-      data: _.merge({}, bannerCommonData, data)
-    });
-  };
+  function createLicenseProcessor(data) {
+    return () => {
+      return grunt.template.process(license, {
+        data: _.merge({}, bannerCommonData, data)
+      });
+    };
+  }
 
   version.majorMinor = `${version.major}.${version.minor}`;
   grunt.vjsVersion = version;
@@ -242,38 +306,25 @@ module.exports = function(grunt) {
       }
     },
     browserify: {
-      options: {
-        browserifyOptions: {
-          debug: true,
-          standalone: 'videojs'
-        },
-        plugin: [
-          ['browserify-derequire']
-        ],
-        transform: [
-          require('babelify').configure({
-            sourceMapRelative: './',
-            loose: ['all']
-          }),
-          ['browserify-versionify', {
-            placeholder: '__VERSION__',
-            version: pkg.version
-          }],
-          ['browserify-versionify', {
-            placeholder: '__VERSION_NO_PATCH__',
-            version: version.majorMinor
-          }],
-          ['browserify-versionify', {
-            placeholder: '__SWF_VERSION__',
-            version: pkg.dependencies['videojs-swf']
-          }]
-        ]
-      },
+      options: browserifyGruntOptions(),
       build: {
         files: {
           'build/temp/video.js': ['src/js/video.js']
         }
       },
+      dist: {
+        options: browserifyGruntOptions({
+          transform: [
+            ['browserify-versionify', {
+              placeholder: '../node_modules/vtt.js/dist/vtt.js',
+              version: 'https://cdn.rawgit.com/gkatsev/vtt.js/vjs-v0.12.1/dist/vtt.min.js'
+            }],
+          ]
+        }),
+        files: {
+          'build/temp/video.js': ['src/js/video.js']
+        }
+      },
       watch: {
         options: {
           watch: true,
@@ -380,7 +431,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('videojs-doc-generator');
   grunt.loadNpmTasks('chg');
 
-  grunt.registerTask('build', [
+  const buildDependents = [
     'clean:build',
 
     'jshint',
@@ -400,11 +451,18 @@ module.exports = function(grunt) {
     'copy:swf',
     'copy:ie8',
     'vjslanguages'
-  ]);
+  ];
+
+  grunt.registerTask('build', buildDependents);
+
+  grunt.registerTask(
+    'build:dist',
+    buildDependents.map(task => task === 'browserify:build' ? 'browserify:dist' : task)
+  );
 
   grunt.registerTask('dist', [
     'clean:dist',
-    'build',
+    'build:dist',
     'copy:dist',
     'copy:examples',
     'zip:dist'