From 10c0b0fd0445b42d34e538580dd80064847e5c6d Mon Sep 17 00:00:00 2001
From: guybedford <guybedford@gmail.com>
Date: Fri, 18 Sep 2015 16:57:43 +0200
Subject: [PATCH] 0.16.3

---
 cli.js          |  6 +++---
 docs/api.md     |  4 ++--
 lib/bundle.js   |  8 ++++----
 lib/core.js     | 10 +++++-----
 package.json    |  8 ++++----
 test/builder.js |  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/cli.js b/cli.js
index 0227fe449..22c823ede 100755
--- a/cli.js
+++ b/cli.js
@@ -430,12 +430,12 @@ process.on('uncaughtException', function(err) {
         options.sourceMaps = 'inline';
 
       if (options['global-name'])
-        options.sfxGlobalName = options['global-name'];
+        options.globalName = options['global-name'];
 
-      options.sfxFormat = options.format;
+      options.format = options.format;
 
       if (options.globals)
-        options.sfxGlobals = eval('(' + options.globals + ')');
+        options.globalDeps = eval('(' + options.globals + ')');
 
       var bArgs = options.args.splice(1);
 
diff --git a/docs/api.md b/docs/api.md
index e2aa11d76..1b6d87272 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -107,8 +107,8 @@ var builder = new jspm.Builder();
 
 builder.config({ custom: 'options' });
 
-// or builder.buildSFX
-builder.build('app/main.js', {
+// or builder.buildStatic
+builder.bundle('app/main.js', {
   minify: true,
   
   // inject the bundle config into the configuration file
diff --git a/lib/bundle.js b/lib/bundle.js
index 851faf124..14ec3b645 100644
--- a/lib/bundle.js
+++ b/lib/bundle.js
@@ -92,7 +92,7 @@ exports.bundle = function(moduleExpression, fileName, opts) {
     logTree(buildTree);
     if (!('lowResSourceMaps' in opts))
       opts.lowResSourceMaps = true;
-    return systemBuilder.buildTree(buildTree, fileName, opts);
+    return systemBuilder.bundle(buildTree, fileName, opts);
   })
   .then(function(output) {
     delete config.loader.depCache;
@@ -154,19 +154,19 @@ exports.bundleSFX = function(expression, fileName, opts) {
   .then(function() {
     ui.log('info', 'Building the single-file sfx bundle for `' + expression + '`...');
 
-    opts.sfxFormat = opts.sfxFormat || 'global';
+    opts.format = opts.format || 'global';
 
     if (!('lowResSourceMaps' in opts))
       opts.lowResSourceMaps = true;
 
-    return systemBuilder.buildSFX(expression, fileName, opts);
+    return systemBuilder.buildStatic(expression, fileName, opts);
   })
   .then(function() {
     logBuild(path.relative(process.cwd(), fileName), opts);
   })
   .catch(function(e) {
     // catch sfx globals error to give a better error message
-    if (e.toString().indexOf('sfxGlobals option') != -1) {
+    if (e.toString().indexOf('globalDeps option') != -1) {
       var module = e.toString().match(/dependency "([^"]+)" \(([^)]+)\)/);
       ui.log('err', 'SFX exclusion "' + module[1] + '" needs a reference.\nEither output an SFX module format like %--format amd% or map the module to an environment global via %--globals "{\'test.js\': \'test\'}"%.');
       throw 'SFX Bundle input error';
diff --git a/lib/core.js b/lib/core.js
index 5e9a5c093..014ee4086 100644
--- a/lib/core.js
+++ b/lib/core.js
@@ -37,15 +37,15 @@ var toFileURL = require('./common').toFileURL;
 var core = module.exports;
 
 // we always download the latest semver compatible version
-var systemVersion = '0.18.17';
+var systemVersion = '0.19.0';
 
 var tPackages = {
-  'babel':           'npm:babel-core@^5.8.22',
-  'babel-runtime':   'npm:babel-runtime@^5.8.20',
-  'core-js':         'npm:core-js@^1.1.0',
+  'babel':           'npm:babel-core@^5.8.24',
+  'babel-runtime':   'npm:babel-runtime@^5.8.24',
+  'core-js':         'npm:core-js@^1.1.4',
   'traceur':         'github:jmcriffey/bower-traceur@0.0.91',
   'traceur-runtime': 'github:jmcriffey/bower-traceur-runtime@0.0.91',
-  'typescript':      'npm:typescript@^1.6.0-dev.20150818'
+  'typescript':      'npm:typescript@^1.6.2'
 };
 
 exports.run = function(moduleName) {
diff --git a/package.json b/package.json
index 706e4580f..fb0b7f912 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jspm",
   "description": "Registry and format agnostic JavaScript package manager",
-  "version": "0.16.2",
+  "version": "0.16.3",
   "main": "./api.js",
   "author": "",
   "dependencies": {
@@ -10,7 +10,7 @@
     "glob": "^5.0.10",
     "graceful-fs": "^3.0.8",
     "jspm-github": "^0.13.3",
-    "jspm-npm": "^0.24.1",
+    "jspm-npm": "^0.25.0",
     "jspm-registry": "^0.4.0",
     "liftoff": "^2.1.0",
     "minimatch": "^2.0.8",
@@ -20,8 +20,8 @@
     "rimraf": "^2.4.0",
     "rsvp": "^3.0.18",
     "semver": "^5.0.1",
-    "systemjs": "0.18.17",
-    "systemjs-builder": "0.13.5",
+    "systemjs": "0.19.0",
+    "systemjs-builder": "0.14.0",
     "traceur": "0.0.91",
     "uglify-js": "~2.4.23"
   },
diff --git a/test/builder.js b/test/builder.js
index 5a6c83995..639a23804 100644
--- a/test/builder.js
+++ b/test/builder.js
@@ -6,7 +6,7 @@ var builder = new api.Builder();
 suite('Build API', function() {
 
   test('Simple build API call', function(done) {
-    builder.build('[unit/build/*]')
+    builder.bundle('[unit/build/*]')
     .then(function(output) {
       assert(output.source.match(/\s*System\.register/));
     })