Use require() and browserify to organize dependencies and compilation.

Author: joseph-onsip

Gruntfile.js

@@ -2,42 +2,8 @@
 
 module.exports = function(grunt) {
 
-  var srcFiles = [
-    'src/SIP.js',
-    'src/Utils.js',
-    'src/LoggerFactory.js',
-    'src/EventEmitter.js',
-    'src/Constants.js',
-    'src/Exceptions.js',
-    'src/Timers.js',
-    'src/Transport.js',
-    'src/Parser.js',
-    'src/SIPMessage.js',
-    'src/URI.js',
-    'src/NameAddrHeader.js',
-    'src/Transactions.js',
-    'src/Dialogs.js',
-    'src/RequestSender.js',
-    'src/RegisterContext.js',
-    'src/MediaHandler.js',
-    'src/ClientContext.js',
-    'src/ServerContext.js',
-    'src/Session.js',
-    'src/Subscription.js',
-    'src/WebRTC.js',
-    'src/UA.js',
-    'src/Hacks.js',
-    'src/SanityCheck.js',
-    'src/DigestAuthentication.js',
-    'src/Grammar/dist/Grammar.js',
-    'src/tail.js'
-  ];
-
-  // Project configuration.
-  grunt.initConfig({
-    pkg: grunt.file.readJSON('package.json'),
-    meta: {
-      banner: '\
+  var pkg = grunt.file.readJSON('package.json');
+  var banner = '\
 /*\n\
  * SIP version <%= pkg.version %>\n\
  * Copyright (c) 2014-<%= grunt.template.today("yyyy") %> Junction Networks, Inc <http://www.onsip.com>\n\
@@ -69,45 +35,40 @@ module.exports = function(grunt) {
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\
  *\n\
  * ~~~ end JsSIP license ~~~\n\
- */\n\n\n'
+ */\n\n\n';
+
+  // Project configuration.
+  grunt.initConfig({
+    pkg: pkg,
+    meta: {
+      banner: banner
     },
-    concat: {
-      dist: {
-        src: srcFiles,
-        dest: 'dist/<%= pkg.name %>.js',
-        options: {
-          banner: '<%= meta.banner %>',
-          separator: '\n\n',
-          process: true
-        },
-        nonull: true
-      },
+    browserify: {
       devel: {
-        src: srcFiles,
-        dest: 'dist/<%= pkg.name %>-<%= pkg.version %>.js',
-        options: {
-          banner: '<%= meta.banner %>',
-          separator: '\n\n',
-          process: true
+        src: 'src/SIP.js',
+        dest: 'dist/<%= pkg.name %>-<%= pkg.version %>.js'
+      },
+      options: {
+        bundleOptions: {
+          standalone: 'SIP'
         },
-        nonull: true
+        postBundleCB: function (err, src, next) {
+          // prepend the banner and fill in placeholders
+          src = (banner + src).replace(/<%=(.*)%>/g, function (match, expr) {
+            return eval(expr)
+          });
+          next(err, src);
+        }
       }
     },
-    includereplace: {
+    copy: {
       dist: {
-        files: {
-          'dist': 'dist/<%= pkg.name %>.js'
-        }
-      },
-      devel: {
-        files: {
-          'dist': 'dist/<%= pkg.name %>-<%= pkg.version %>.js'
-        }
+        src: 'dist/<%= pkg.name %>-<%= pkg.version %>.js',
+        dest: 'dist/<%= pkg.name %>.js'
       }
     },
     jshint: {
-      dist: 'dist/<%= pkg.name %>.js',
-      devel: 'dist/<%= pkg.name %>-<%= pkg.version %>.js',
+      src: 'src/**/*.js',
       options: {
         browser: true,
         curly: true,
@@ -125,7 +86,7 @@ module.exports = function(grunt) {
         supernew: true,
         globals: {
           module: true,
-          define: true,
+          require: true,
           global: true
         }
       }
@@ -162,7 +123,6 @@ module.exports = function(grunt) {
         src: 'src/Grammar/src/Grammar.pegjs',
         dest: 'src/Grammar/dist/Grammar.js',
         options: {
-          exportVar: 'SIP.Grammar',
           optimize: 'size',
           allowedStartRules: [
              'Contact',
@@ -199,8 +159,8 @@ module.exports = function(grunt) {
 
 
   // Load Grunt plugins.
-  grunt.loadNpmTasks('grunt-contrib-concat');
-  grunt.loadNpmTasks('grunt-include-replace');
+  grunt.loadNpmTasks('grunt-browserify');
+  grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-jasmine');
@@ -232,12 +192,12 @@ module.exports = function(grunt) {
   // Task for building sip-devel.js (uncompressed), sip-X.Y.Z.js (uncompressed)
   // and sip-X.Y.Z.min.js (minified).
   // Both sip-devel.js and sip-X.Y.Z.js are the same file with different name.
-  grunt.registerTask('build', ['concat:devel', 'includereplace:devel', 'jshint:devel', 'concat:dist', 'includereplace:dist', 'jshint:dist', 'uglify:dist', 'uglify:devel']);
+  grunt.registerTask('build', ['devel', 'copy', 'uglify']);
 
   // Task for building sip-devel.js (uncompressed).
-  grunt.registerTask('devel', ['concat:devel', 'includereplace:devel', 'jshint:devel']);
+  grunt.registerTask('devel', ['jshint', 'browserify']);
 
-  grunt.registerTask('quick', ['concat:dist', 'includereplace:dist']);
+  grunt.registerTask('quick', ['browserify']);
 
   // Test tasks.
   grunt.registerTask('test',['jasmine']);

package.json

@@ -24,16 +24,14 @@
   "devDependencies": {
     "grunt": "~0.4.0",
     "grunt-cli": "~0.1.6",
-    "grunt-contrib-concat": "~0.1.3",
-    "grunt-include-replace": "~0.1.0",
+    "grunt-contrib-copy": "^0.5.0",
     "grunt-contrib-uglify": "~0.2.0",
     "grunt-contrib-jshint": ">0.5.0",
     "grunt-contrib-jasmine": "~0.5.0",
+    "browserify": "^4.1.8",
     "pegjs": "0.8.0",
-    "node-minify": "~0.7.2",
-    "browserify": "~2.36.0",
-    "sdp-transform": "~0.4.0",
-    "grunt-peg": "~1.3.1"
+    "grunt-peg": "~1.3.1",
+    "grunt-browserify": "^2.1.0"
   },
   "engines": {
     "node": ">=0.8"

src/ClientContext.js

@@ -1,4 +1,4 @@
-(function (SIP) {
+module.exports = function (SIP) {
 var ClientContext;
 
 ClientContext = function (ua, method, target, options) {
@@ -111,4 +111,4 @@ ClientContext.prototype.onTransportError = function () {
 };
 
 SIP.ClientContext = ClientContext;
-}(SIP));
+};

src/Constants.js

@@ -7,6 +7,7 @@
  * @augments SIP
  */
 
+module.exports = function (SIP) {
 SIP.C= {
   USER_AGENT: SIP.name +'/'+ SIP.version,
 
@@ -156,3 +157,4 @@ SIP.C= {
     606: 'Not Acceptable'
   }
 };
+};

src/Dialog/RequestSender.js

@@ -14,7 +14,7 @@
  * @fileoverview in-Dialog Request Sender
  */
 
-(function(SIP) {
+module.exports = function (SIP) {
 var RequestSender;
 
 RequestSender = function(dialog, applicant, request) {
@@ -90,4 +90,4 @@ RequestSender.prototype = {
 };
 
 return RequestSender;
-}(SIP));
+};

src/Dialogs.js

@@ -10,10 +10,7 @@
  * @param {Enum} type UAC / UAS
  * @param {Enum} state SIP.Dialog.C.STATUS_EARLY / SIP.Dialog.C.STATUS_CONFIRMED
  */
-(function(SIP) {
-
-// Load dependencies
-var RequestSender   = @@include('../src/Dialog/RequestSender.js')
+module.exports = function (SIP, RequestSender) {
 
 var Dialog,
   C = {
@@ -252,4 +249,4 @@ Dialog.prototype = {
 
 Dialog.C = C;
 SIP.Dialog = Dialog;
-}(SIP));
+};

src/DigestAuthentication.js

@@ -9,7 +9,7 @@
  * @function Digest Authentication
  * @param {SIP.UA} ua
  */
-(function(SIP) {
+module.exports = function (SIP) {
 var DigestAuthentication;
 
 DigestAuthentication = function(ua) {
@@ -165,4 +165,4 @@ DigestAuthentication.prototype.updateNcHex = function() {
 };
 
 SIP.DigestAuthentication = DigestAuthentication;
-}(SIP));
+};

src/EventEmitter.js

@@ -6,7 +6,7 @@
  * @augments SIP
  * @class Class creating an event emitter.
  */
-(function(SIP) {
+module.exports = function (SIP) {
 var
   EventEmitter,
   Event,
@@ -209,4 +209,4 @@ EventEmitter.C = C;
 
 SIP.EventEmitter = EventEmitter;
 SIP.Event = Event;
-}(SIP));
+};

src/Exceptions.js

@@ -6,7 +6,7 @@
  * SIP Exceptions.
  * @augments SIP
  */
-(function(SIP) {
+module.exports = function (SIP) {
 var Exceptions;
 
 Exceptions= {
@@ -55,4 +55,4 @@ Exceptions= {
 };
 
 SIP.Exceptions = Exceptions;
-}(SIP));
+};

src/Grammar/dist/Grammar.js

@@ -1,5 +1,5 @@
 /* jshint ignore:start */
-SIP.Grammar = (function() {
+module.exports = (function() {
   /*
    * Generated by PEG.js 0.8.0.
    *