Fixed issue #13, prep for v0.1.11 release

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.1.11
+
+* Fixed issue #13
+* Updated all dependencies to current latest
+* Added ```packagePath``` and ```configFile``` options
+
 ## v0.1.10
 
 * Added ```jspm.setPackagePath(_system.baseURL);```

README.md

@@ -34,7 +34,9 @@ var Bundler = require('jspm-bundler');
 
 var bundler = new Bundler({
 
-    baseURL: '.',               // Must be the same baseURL as SystemJS.
+    baseURL: '',                // Must be the same baseURL as SystemJS.
+    configFile: '',             // System config (defaults to config.js)
+    packagePath: '',            // Path to package.json (defaults to root)
 
     // Paths are relative to your baseURL.
     dest: 'bundles',            // Path to folder where bundles are saved.

bundler.js

@@ -28,13 +28,17 @@ function JSPMBundler(opts) {
 
     var _system = {
         config: {},
-        baseURL: ''
+        baseURL: opts.baseURL || '',
+        packagePath: opts.packagePath || '',
+        configFile: opts.configFile || 'config.js'
     };
 
-    if (path.isAbsolute(opts.baseURL)) {
-        _system.baseURL = opts.baseURL;
-    } else {
-        _system.baseURL = path.join(root, opts.baseURL, '/') || root;
+    if (!path.isAbsolute(_system.baseURL)) {
+        _system.baseURL = path.join(root, _system.baseURL, '/') || root;
+    }
+
+    if (!path.isAbsolute(_system.packagePath)) {
+        _system.packagePath = path.join(root, _system.packagePath, '/') || root;
     }
 
     _system.config = _getSystemJSConfig();
@@ -520,8 +524,8 @@ function JSPMBundler(opts) {
      */
     function _getSystemJSConfig() {
         var jspm = require('jspm');
-        jspm.setPackagePath(_system.baseURL);
-        var file = path.join(_system.baseURL, 'config.js');
+        jspm.setPackagePath(_system.packagePath);
+        var file = path.join(_system.baseURL, _system.configFile);
         require(file);
         return System.config;
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jspm-bundler",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "more configurable bundler for jspm",
   "main": "bundler.js",
   "scripts": {