Skip to content

Commit

Permalink
builder constructor upgrade, test fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@guybedford
guybedford committed Sep 22, 2015
1 parent 3e7ec88 commit facf3a2
Show file tree
Hide file tree
Showing 2 changed files with 183 additions and 5 deletions.
12 changes: 7 additions & 5 deletions lib/bundle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,23 @@ var extend = require('./common').extend;
var alphabetize = require('./common').alphabetize;
var toFileURL = require('./common').toFileURL;

// jspm version of builder ignores config, baseURL arguments
// just allows cfg object
function Builder(_config) {
config.loadSync();
SystemJSBuilder.call(this, toFileURL(config.pjson.baseURL));

var cfg = config.loader.getConfig();
cfg.baseURL = toFileURL(config.pjson.baseURL);

if (_config)
extend(cfg, _config);

if (cfg.depCache)
delete cfg.depCache;
if (cfg.bundles)
delete cfg.bundles;

SystemJSBuilder.call(this, cfg);
this.config(cfg);

if (typeof _config == 'object')
this.config(_config);
}
Builder.prototype = Object.create(SystemJSBuilder.prototype);
exports.Builder = Builder;
Expand Down
176 changes: 176 additions & 0 deletions testlibs/config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,182 @@ System.config({
"github:*": "jspm_packages/github/*",
"npm:*": "jspm_packages/npm/*"
},
bundles: {
"build.js": [
"npm:[email protected]",
"npm:[email protected]/shader",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]/index",
"npm:[email protected]/tilemap",
"npm:[email protected]/buffer",
"npm:[email protected]/vao",
"npm:[email protected]/dist/gl-matrix",
"npm:[email protected]/ndarray",
"npm:[email protected]/index",
"npm:[email protected]/ndarray-ops",
"npm:[email protected]/mesh",
"npm:[email protected]/aoshader",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]/lib/vao-native",
"npm:[email protected]/lib/vao-emulated",
"npm:[email protected]",
"github:jspm/[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"github:jspm/[email protected]",
"npm:[email protected]",
"npm:[email protected]/mipmap",
"npm:[email protected]/webglew",
"npm:[email protected]/shell",
"npm:[email protected]/pool",
"npm:[email protected]/lib/do-bind",
"npm:[email protected]/texture",
"npm:[email protected]/iota",
"github:jspm/[email protected]/index",
"npm:[email protected]/cwise",
"npm:[email protected]/compiler",
"npm:[email protected]/compiler",
"npm:[email protected]/greedy",
"github:jspm/[email protected]/index",
"npm:[email protected]/index",
"npm:[email protected]",
"github:jspm/[email protected]",
"github:jspm/[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]/lib/raf-polyfill",
"npm:[email protected]/lib/mousewheel-polyfill",
"npm:[email protected]/lib/hrtime-polyfill",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]/lib/thunk",
"npm:[email protected]/lib/thunk",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]/downsample",
"github:jspm/[email protected]/index",
"github:jspm/[email protected]/index",
"npm:[email protected]/ready",
"npm:[email protected]/index",
"npm:[email protected]/invert",
"npm:[email protected]/lb",
"npm:[email protected]/uniq",
"npm:[email protected]/dup",
"npm:[email protected]/iota",
"npm:[email protected]/twiddle",
"npm:[email protected]/pool",
"npm:[email protected]/index",
"npm:[email protected]/index",
"npm:[email protected]/lib/compile",
"npm:[email protected]/lib/compile",
"npm:[email protected]/uniq",
"npm:[email protected]/index",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"github:jspm/[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]/util",
"npm:[email protected]/fft",
"npm:[email protected]/scratch",
"npm:[email protected]/events",
"github:jspm/[email protected]/index",
"npm:[email protected]/twiddle",
"npm:[email protected]/lib/b64",
"npm:[email protected]/dup",
"npm:[email protected]/index",
"npm:[email protected]/index",
"npm:[email protected]/esprima",
"npm:[email protected]/index",
"npm:[email protected]/index",
"npm:[email protected]/index",
"npm:[email protected]",
"npm:[email protected]/lib/fft-matrix",
"npm:[email protected]/support/isBufferBrowser",
"npm:[email protected]",
"npm:[email protected]/lib/operators",
"npm:[email protected]/lib/literals",
"npm:[email protected]/lib/builtins",
"github:jspm/[email protected]",
"npm:[email protected]/lib/index",
"npm:[email protected]/browser",
"github:jspm/[email protected]/index",
"npm:[email protected]/inherits_browser",
"npm:[email protected]",
"npm:[email protected]/lib/scope",
"npm:[email protected]/lib/expr",
"npm:[email protected]",
"npm:[email protected]/index",
"npm:[email protected]/index",
"npm:[email protected]/writable",
"npm:[email protected]/readable",
"npm:[email protected]/duplex",
"npm:[email protected]/transform",
"npm:[email protected]/passthrough",
"npm:[email protected]/lib/_stream_writable",
"npm:[email protected]/lib/_stream_readable",
"npm:[email protected]/lib/_stream_duplex",
"npm:[email protected]/lib/_stream_transform",
"npm:[email protected]/lib/_stream_passthrough",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]/lib/util",
"npm:[email protected]/index",
"npm:[email protected]/index",
"main.js",
"npm:[email protected]",
"tests/tests.js",
"tests/bootstrap.js",
"tests/angular.js",
"tests/jquery.js",
"tests/d3.js",
"tests/voxel-demo.js",
"npm:[email protected]/mocha",
"github:twbs/[email protected]",
"github:angular/[email protected]",
"github:components/[email protected]",
"github:mbostock/[email protected]",
"github:twbs/[email protected]/js/bootstrap",
"github:twbs/[email protected]/css/bootstrap.css!github:systemjs/plugin-css@master",
"npm:[email protected]/mocha.css!github:systemjs/plugin-css@master",
"github:components/[email protected]/jquery",
"github:mbostock/[email protected]/d3",
"github:angular/[email protected]/angular",
"tests/bootstrap.html!github:systemjs/[email protected]"
]
},

map: {
"angular": "github:angular/[email protected]",
Expand Down

0 comments on commit facf3a2

Please sign in to comment.