From 799b87954c8a452c8ef773b7dddaad933919a190 Mon Sep 17 00:00:00 2001
From: guybedford <guybedford@gmail.com>
Date: Tue, 18 Nov 2014 17:10:57 +0200
Subject: [PATCH] 0.8.5

---
 cli.js        |  9 +++++++++
 lib/bundle.js | 11 +++++++++++
 lib/core.js   |  2 +-
 package.json  | 10 +++++-----
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/cli.js b/cli.js
index 32f0e4eac..576787cde 100755
--- a/cli.js
+++ b/cli.js
@@ -78,6 +78,7 @@ process.on('uncaughtException', function(err) {
       + '\n'
       + 'jspm depcache [moduleName]         Stores dep cache in config for flat pipelining\n'
       + 'jspm bundle A + B - C [file] [-i]  Bundle an input module or module arithmetic\n'
+      + 'jspm unbundle                      Remove injected bundle configuration\n'
       + '\n'
       + 'jspm endpoint <command>            Manage endpoints\n'
       + '  endpoint config <endpoint-name>  Configure an endpoint\n'
@@ -303,6 +304,14 @@ process.on('uncaughtException', function(err) {
       }
     break;
 
+    case 'unbundle':
+      bundle.unbundle()
+      .catch(function(e) {
+        ui.log('err', e.stack || e);
+        process.exit(1);
+      });
+    break;
+
     case 'bundle-sfx':
       var options = readOptions(args, ['--yes']);
       if (options.yes)
diff --git a/lib/bundle.js b/lib/bundle.js
index 7a7e5640c..f08c7eb89 100644
--- a/lib/bundle.js
+++ b/lib/bundle.js
@@ -142,6 +142,17 @@ exports.bundle = function(moduleExpression, fileName, inject) {
   });
 }
 
+exports.unbundle = function() {
+  return config.load()
+  .then(function() {
+    delete config.loader.bundles;
+    return config.save();
+  })
+  .then(function() {
+    ui.log('ok', 'Bundle configuration removed.');
+  });
+}
+
 exports.bundleSFX = function(moduleName, fileName) {
   fileName = fileName || 'build.js';
 
diff --git a/lib/core.js b/lib/core.js
index d1f20ad24..f5dc35484 100644
--- a/lib/core.js
+++ b/lib/core.js
@@ -764,7 +764,7 @@ exports.checkDlLoader = function() {
 }
 
 var ghh = 'https://raw.githubusercontent.com';
-var loaderVersions = ['0.9', '0.9', '0.0.72'];
+var loaderVersions = ['0.10', '0.10', '0.0.74'];
 
 function doLoaderDownload(files) {
   return Promise.all(Object.keys(files).map(function(url) {
diff --git a/package.json b/package.json
index 7bcd55850..7900d2af9 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,14 @@
 {
   "name": "jspm",
   "description": "",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "main": "./api.js",
   "author": "",
   "dependencies": {
     "glob": "~3.2.6",
     "graceful-fs": "~2.0.1",
     "jspm-github": "~0.8.0",
-    "jspm-npm": "~0.8.4",
+    "jspm-npm": "~0.10.0",
     "jspm-registry": "~0.3.0",
     "liftoff": "^0.13.2",
     "minimatch": "^0.2.14",
@@ -18,9 +18,9 @@
     "rimraf": "~2.2.2",
     "rsvp": "~3.0.3",
     "semver": "~4.0.3",
-    "systemjs-builder": "~0.2.8",
-    "systemjs": "^0.9.3",
-    "traceur": "0.0.72",
+    "systemjs-builder": "~0.3.0",
+    "systemjs": "^0.10.0",
+    "traceur": "0.0.74",
     "uglify-js": "~2.4.10"
   },
   "devDependencies": {