Switched to custom universal module definition. closes #998 closes #847 closes #998

.jshintrc

@@ -18,7 +18,10 @@
         "goog",
         "console",
 
-        "require",        
+        "require",
+        "define",
+        "module",
+        "exports",
 
         "PlayerTest",
         "asyncTest",

Gruntfile.js

@@ -159,6 +159,18 @@ module.exports = function(grunt) {
         dest: 'dist/video-js-' + version.full + '.zip'
       }
     }
+    usebanner: {
+      dist: {
+        options: {
+          position: 'top',
+          banner: '/*! Video.js v' + version.full + ' <%= pkg.copyright %> */ ',
+          linebreak: true
+        },
+        files: {
+          src: [ 'build/files/minified.video.js']
+        }
+      }
+    }
   });
 
   grunt.loadNpmTasks('grunt-contrib-jshint');
@@ -173,15 +185,16 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-karma');
   grunt.loadNpmTasks('videojs-doc-generator');
   grunt.loadNpmTasks('grunt-zip');
+  grunt.loadNpmTasks('grunt-banner');
 
   // grunt.loadTasks('./docs/tasks/');
   // grunt.loadTasks('../videojs-doc-generator/tasks/');
 
   // Default task.
-  grunt.registerTask('default', ['jshint', 'less', 'build', 'minify', 'dist']);
+  grunt.registerTask('default', ['jshint', 'less', 'build', 'minify', 'usebanner', 'dist']);
   // Development watch task
   grunt.registerTask('dev', ['jshint', 'less', 'build', 'qunit:source']);
-  grunt.registerTask('test', ['jshint', 'less', 'build', 'minify', 'qunit']);
+  grunt.registerTask('test', ['default', 'less', 'build', 'minify', 'usebanner', 'qunit']);
 
   var fs = require('fs'),
       gzip = require('zlib').gzip;
@@ -248,7 +261,7 @@ module.exports = function(grunt) {
                 + ' --js_output_file=' + dest
                 + ' --create_source_map ' + dest + '.map --source_map_format=V3'
                 + ' --jscomp_warning=checkTypes --warning_level=VERBOSE'
-                + ' --output_wrapper "/*! Video.js v' + version.full + ' ' + pkg.copyright + ' */ (function() {%output%})();"';
+                + ' --output_wrapper "(function() {%output%})();"';
                 //@ sourceMappingURL=video.js.map
 
     // Add each js file

package.json

@@ -2,7 +2,7 @@
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
   "version": "4.3.0",
-  "copyright": "Copyright 2013 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE",
+  "copyright": "Copyright 2014 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE",
   "keywords": ["html5", "flash", "video", "player"],
   "homepage": "http://videojs.com",
   "author": "Steve Heffernan",
@@ -13,6 +13,7 @@
     "type": "git",
     "url": "https://github.com/zencoder/video-js.git"
   },
+  "main": "./dist/video-js/video.js",
   "dependencies": {
     "videojs-swf": "4.3.4"
   },
@@ -44,18 +45,6 @@
     "videojs-doc-generator": "0.0.1",
     "qunitjs": "~1.12.0",
     "grunt-zip": "0.10.2",
-    "browserify-shim": "~3.2.2"
-  },
-  "main": "./dist/video-js/video.dev.js",
-  "browser": {
-    "videojs": "./dist/video-js/video.js"
-  },
-  "browserify-shim": {
-    "videojs": "window.videojs"
-  },
-  "browserify": {
-    "transform": [
-      "browserify-shim"
-    ]
+    "grunt-banner": "~0.2.0"
   }
 }

src/js/core.js

@@ -116,3 +116,18 @@ if (vjs.CDN_VERSION !== 'GENERATED'+'_CDN_VSN') {
  * @type {Object}
  */
 vjs.players = {};
+
+/*!
+ * Custom Universal Module Definition (UMD)
+ *
+ * Video.js will never be a non-browser lib so we can simplify UMD a bunch and
+ * still support requirejs and browserify. This also needs to be closure
+ * compiler compatible, so string keys are used.
+ */
+if (typeof define === 'function' && define['amd']) {
+  define([], function(){ return videojs; });
+
+// checking that module is an object too because of umdjs/umd#35
+} else if (typeof exports === 'object' && typeof module === 'object') {
+  module.exports = videojs;
+}

test/minified-api.html

@@ -14,6 +14,18 @@
     Check publicly available APIs against compiled lib
   -->
   <script type="text/javascript">
+
+    // Test AMD Support
+    // window.define = function(a, b){
+    //   console.log(a, b);
+    // };
+    // define.amd = true;
+
+    // Test CJS Support
+    // Have to remove qunit and tests to because module becomes a function
+    // window.module = window.exports = {};
+    // window.module.exports = {};
+
     (function(){
 
       // ADD NEW TEST FILES HERE