Skip to content

Commit

Permalink
0.16.3
Browse files Browse the repository at this point in the history
  • Loading branch information
guybedford committed Sep 18, 2015
1 parent 00faf00 commit 10c0b0f
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions docs/api.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions lib/bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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';
Expand Down
10 changes: 5 additions & 5 deletions lib/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]',
'traceur-runtime': 'github:jmcriffey/[email protected]',
'typescript': 'npm:typescript@^1.6.0-dev.20150818'
'typescript': 'npm:typescript@^1.6.2'
};

exports.run = function(moduleName) {
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -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",
Expand All @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion test/builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -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/));
})
Expand Down

0 comments on commit 10c0b0f

Please sign in to comment.