diff --git a/lib/core.js b/lib/core.js index ca9d88439..494fe3107 100644 --- a/lib/core.js +++ b/lib/core.js @@ -37,14 +37,14 @@ var toFileURL = require('./common').toFileURL; var core = module.exports; // we always download the latest semver compatible version -var systemVersion = '0.18.2'; +var systemVersion = '0.18.9'; var tPackages = { - 'babel': 'npm:babel-core@^5.6.4', - 'babel-runtime': 'npm:babel-runtime@^5.6.4', - 'core-js': 'npm:core-js@^0.9.17', - 'traceur': 'github:jmcriffey/bower-traceur@0.0.90', - 'traceur-runtime': 'github:jmcriffey/bower-traceur-runtime@0.0.90', + 'babel': 'npm:babel-core@^5.8.21', + 'babel-runtime': 'npm:babel-runtime@^5.8.20', + 'core-js': 'npm:core-js@^1.0.0', + 'traceur': 'github:jmcriffey/bower-traceur@0.0.91', + 'traceur-runtime': 'github:jmcriffey/bower-traceur-runtime@0.0.91', 'typescript': 'npm:typescript@1.5.3' }; @@ -358,6 +358,7 @@ exports.dlLoader = function(transpilerName, unminified, edge, latest, updateTran .then(function() { ui.log('ok', 'Loader files downloaded successfully'); }, function(err) { + ui.log('err', err); ui.log('err', 'Error downloading loader files.'); throw err; }); diff --git a/package.json b/package.json index fab8de04b..003da077b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "jspm", "description": "Registry and format agnostic JavaScript package manager", - "version": "0.16.0-beta.3", + "version": "0.16.0-beta.4", "main": "./api.js", "author": "", "dependencies": { @@ -9,8 +9,8 @@ "core-js": "^0.9.17", "glob": "^5.0.10", "graceful-fs": "^3.0.8", - "jspm-github": "^0.12.2", - "jspm-npm": "^0.23.2", + "jspm-github": "^0.13.0", + "jspm-npm": "^0.24.0", "jspm-registry": "^0.4.0", "liftoff": "^2.1.0", "minimatch": "^2.0.8", @@ -20,9 +20,9 @@ "rimraf": "^2.4.0", "rsvp": "^3.0.18", "semver": "^5.0.1", - "systemjs": "^0.18.2", - "systemjs-builder": "git://github.com/systemjs/builder#master", - "traceur": "0.0.90", + "systemjs": "0.18.9", + "systemjs-builder": "^0.13.1", + "traceur": "0.0.91", "uglify-js": "~2.4.23" }, "registry": "npm", diff --git a/testlibs/config.js b/testlibs/config.js index d28cba0fd..17cc207b4 100644 --- a/testlibs/config.js +++ b/testlibs/config.js @@ -1,25 +1,199 @@ System.config({ - "defaultJSExtensions": true, - "transpiler": "babel", - "babelOptions": { + defaultJSExtensions: true, + transpiler: "babel", + babelOptions: { "optional": [ "runtime" ] }, - "paths": { + paths: { "github:*": "jspm_packages/github/*", "npm:*": "jspm_packages/npm/*" - } -}); + }, + bundles: { + "build.js": [ + "npm:voxel-demo@0.0.1.js", + "npm:voxel-demo@0.0.1/shader.js", + "npm:gl-now@0.0.4.js", + "npm:gl-tile-map@0.3.0.js", + "npm:gl-buffer@0.1.2.js", + "npm:gl-vao@0.0.3.js", + "npm:gl-matrix@2.0.0.js", + "npm:ndarray@1.0.16.js", + "npm:ndarray-ops@1.1.1.js", + "npm:ndarray-fill@0.1.0.js", + "npm:ao-mesher@0.2.10.js", + "npm:ao-shader@0.2.3.js", + "npm:gl-tile-map@0.3.0/tilemap.js", + "npm:gl-now@0.0.4/index.js", + "npm:gl-buffer@0.1.2/buffer.js", + "npm:gl-vao@0.0.3/vao.js", + "npm:ndarray-fill@0.1.0/index.js", + "npm:ndarray@1.0.16/ndarray.js", + "npm:ndarray-ops@1.1.1/ndarray-ops.js", + "npm:gl-matrix@2.0.0/dist/gl-matrix.js", + "npm:ao-shader@0.2.3/aoshader.js", + "npm:ao-mesher@0.2.10/mesh.js", + "npm:gl-texture2d@0.1.12.js", + "npm:typedarray-pool@0.1.2.js", + "npm:tile-mip-map@0.2.1.js", + "npm:game-shell@0.1.4.js", + "npm:webglew@0.0.0.js", + "npm:gl-vao@0.0.3/lib/vao-native.js", + "npm:cwise@0.3.4.js", + "github:jspm/nodelibs-buffer@0.1.0.js", + "github:jspm/nodelibs-fs@0.1.2.js", + "npm:iota-array@1.0.0.js", + "npm:cwise-compiler@0.0.0.js", + "npm:gl-shader@0.0.6.js", + "npm:gl-vao@0.0.3/lib/vao-emulated.js", + "npm:cwise-compiler@0.1.0.js", + "npm:greedy-mesher@1.0.2.js", + "npm:gl-texture2d@0.1.12/texture.js", + "npm:typedarray-pool@0.1.2/pool.js", + "npm:webglew@0.0.0/webglew.js", + "npm:cwise@0.3.4/cwise.js", + "npm:tile-mip-map@0.2.1/mipmap.js", + "github:jspm/nodelibs-buffer@0.1.0/index.js", + "npm:game-shell@0.1.4/shell.js", + "npm:gl-vao@0.0.3/lib/do-bind.js", + "github:jspm/nodelibs-fs@0.1.2/index.js", + "npm:iota-array@1.0.0/iota.js", + "npm:cwise-compiler@0.0.0/compiler.js", + "npm:greedy-mesher@1.0.2/greedy.js", + "npm:gl-shader@0.0.6/index.js", + "npm:cwise-compiler@0.1.0/compiler.js", + "npm:bit-twiddle@0.0.2.js", + "npm:dup@0.0.0.js", + "npm:cwise-parser@0.0.1.js", + "npm:buffer@3.2.2.js", + "npm:ndarray-downsample2x@0.1.1.js", + "github:jspm/nodelibs-events@0.1.1.js", + "npm:domready@0.2.13.js", + "npm:vkey@0.0.3.js", + "github:jspm/nodelibs-util@0.1.0.js", + "npm:invert-hash@0.0.0.js", + "npm:typedarray-pool@1.1.0.js", + "npm:uniq@0.0.2.js", + "npm:game-shell@0.1.4/lib/raf-polyfill.js", + "npm:lower-bound@0.0.3.js", + "npm:game-shell@0.1.4/lib/mousewheel-polyfill.js", + "npm:iota-array@0.0.1.js", + "npm:game-shell@0.1.4/lib/hrtime-polyfill.js", + "npm:uniq@1.0.1.js", + "npm:cwise-compiler@0.0.0/lib/thunk.js", + "npm:glsl-exports@0.0.0.js", + "npm:cwise-compiler@0.1.0/lib/thunk.js", + "npm:bit-twiddle@0.0.2/twiddle.js", + "npm:cwise-parser@0.0.1/index.js", + "npm:buffer@3.2.2/index.js", + "github:jspm/nodelibs-events@0.1.1/index.js", + "npm:ndarray-downsample2x@0.1.1/downsample.js", + "npm:domready@0.2.13/ready.js", + "npm:vkey@0.0.3/index.js", + "github:jspm/nodelibs-util@0.1.0/index.js", + "npm:dup@0.0.0/dup.js", + "npm:typedarray-pool@1.1.0/pool.js", + "npm:invert-hash@0.0.0/invert.js", + "npm:uniq@0.0.2/uniq.js", + "npm:lower-bound@0.0.3/lb.js", + "npm:iota-array@0.0.1/iota.js", + "npm:glsl-exports@0.0.0/index.js", + "npm:uniq@1.0.1/uniq.js", + "npm:cwise-compiler@0.0.0/lib/compile.js", + "npm:cwise-compiler@0.1.0/lib/compile.js", + "npm:esprima@1.0.4.js", + "npm:base64-js@0.0.8.js", + "npm:ieee754@1.1.6.js", + "npm:is-array@1.0.1.js", + "github:jspm/nodelibs-process@0.1.1.js", + "npm:events@1.0.2.js", + "npm:util@0.10.3.js", + "npm:ndarray-fft@0.1.0.js", + "npm:dup@1.0.0.js", + "npm:bit-twiddle@1.0.2.js", + "npm:ndarray-scratch@0.0.1.js", + "npm:glsl-parser@0.0.9.js", + "npm:glsl-tokenizer@0.0.9.js", + "npm:through@2.3.7.js", + "npm:base64-js@0.0.8/lib/b64.js", + "npm:is-array@1.0.1/index.js", + "github:jspm/nodelibs-process@0.1.1/index.js", + "npm:ieee754@1.1.6/index.js", + "npm:events@1.0.2/events.js", + "npm:util@0.10.3/util.js", + "npm:esprima@1.0.4/esprima.js", + "npm:dup@1.0.0/dup.js", + "npm:ndarray-fft@0.1.0/fft.js", + "npm:bit-twiddle@1.0.2/twiddle.js", + "npm:ndarray-scratch@0.0.1/scratch.js", + "npm:through@2.3.7/index.js", + "npm:glsl-parser@0.0.9/index.js", + "npm:glsl-tokenizer@0.0.9/index.js", + "npm:process@0.10.1.js", + "npm:ndarray-fft@0.1.0/lib/fft-matrix.js", + "npm:inherits@2.0.1.js", + "npm:util@0.10.3/support/isBufferBrowser.js", + "npm:glsl-tokenizer@0.0.9/lib/literals.js", + "npm:glsl-parser@0.0.9/lib/index.js", + "npm:glsl-tokenizer@0.0.9/lib/operators.js", + "github:jspm/nodelibs-stream@0.1.0.js", + "npm:glsl-tokenizer@0.0.9/lib/builtins.js", + "npm:process@0.10.1/browser.js", + "npm:through@1.1.2.js", + "npm:glsl-parser@0.0.9/lib/expr.js", + "npm:inherits@2.0.1/inherits_browser.js", + "npm:glsl-parser@0.0.9/lib/scope.js", + "github:jspm/nodelibs-stream@0.1.0/index.js", + "npm:through@1.1.2/index.js", + "npm:stream-browserify@1.0.0.js", + "npm:stream-browserify@1.0.0/index.js", + "npm:readable-stream@1.1.13/readable.js", + "npm:readable-stream@1.1.13/duplex.js", + "npm:readable-stream@1.1.13/writable.js", + "npm:readable-stream@1.1.13/passthrough.js", + "npm:readable-stream@1.1.13/transform.js", + "npm:readable-stream@1.1.13/lib/_stream_writable.js", + "npm:readable-stream@1.1.13/lib/_stream_readable.js", + "npm:readable-stream@1.1.13/lib/_stream_passthrough.js", + "npm:readable-stream@1.1.13/lib/_stream_transform.js", + "npm:readable-stream@1.1.13/lib/_stream_duplex.js", + "npm:core-util-is@1.0.1.js", + "npm:string_decoder@0.10.31.js", + "npm:isarray@0.0.1.js", + "npm:core-util-is@1.0.1/lib/util.js", + "npm:string_decoder@0.10.31/index.js", + "npm:isarray@0.0.1/index.js", + "main.js", + "npm:mocha@1.21.5.js", + "tests/tests.js", + "tests/bootstrap.js", + "tests/jquery.js", + "tests/angular.js", + "npm:mocha@1.21.5/mocha.js", + "tests/voxel-demo.js", + "tests/d3.js", + "github:twbs/bootstrap@3.3.4.js", + "github:components/jquery@2.1.4.js", + "github:angular/bower-angular@1.3.15.js", + "github:mbostock/d3@3.5.5.js", + "github:twbs/bootstrap@3.3.4/js/bootstrap.js", + "github:twbs/bootstrap@3.3.4/css/bootstrap.css!github:systemjs/plugin-css@master.js", + "npm:mocha@1.21.5/mocha.css!github:systemjs/plugin-css@master.js", + "github:components/jquery@2.1.4/jquery.js", + "github:angular/bower-angular@1.3.15/angular.js", + "github:mbostock/d3@3.5.5/d3.js", + "tests/bootstrap.html!github:systemjs/plugin-text@0.0.2.js" + ] + }, -System.config({ - "map": { + map: { "angular": "github:angular/bower-angular@1.3.15", - "babel": "npm:babel-core@5.6.4", - "babel-runtime": "npm:babel-runtime@5.6.4", + "babel": "npm:babel-core@5.8.21", + "babel-runtime": "npm:babel-runtime@5.8.20", "bootstrap": "github:twbs/bootstrap@3.3.4", "clean-css": "npm:clean-css@3.3.3", - "core-js": "npm:core-js@0.9.18", + "core-js": "npm:core-js@1.0.1", "css": "github:systemjs/plugin-css@master", "d3": "github:mbostock/d3@3.5.5", "ember": "github:components/ember@1.13.2", @@ -94,7 +268,7 @@ System.config({ "npm:assert@1.3.0": { "util": "npm:util@0.10.3" }, - "npm:babel-runtime@5.6.4": { + "npm:babel-runtime@5.8.20": { "process": "github:jspm/nodelibs-process@0.1.1" }, "npm:brfs@0.0.9": { @@ -132,7 +306,7 @@ System.config({ "path": "github:jspm/nodelibs-path@0.1.0", "process": "github:jspm/nodelibs-process@0.1.1" }, - "npm:core-js@0.9.18": { + "npm:core-js@1.0.1": { "fs": "github:jspm/nodelibs-fs@0.1.2", "process": "github:jspm/nodelibs-process@0.1.1", "systemjs-json": "github:systemjs/plugin-json@0.1.0" @@ -354,4 +528,4 @@ System.config({ "ndarray-ops": "npm:ndarray-ops@1.1.1" } } -}); \ No newline at end of file +}); diff --git a/testlibs/package.json b/testlibs/package.json index 6c6749500..8f069542c 100644 --- a/testlibs/package.json +++ b/testlibs/package.json @@ -13,9 +13,9 @@ "voxel-demo": "npm:voxel-demo@^0.0.1" }, "devDependencies": { - "babel": "npm:babel-core@^5.5.8", - "babel-runtime": "npm:babel-runtime@^5.5.8", - "core-js": "npm:core-js@^0.9.17", + "babel": "npm:babel-core@^5.8.21", + "babel-runtime": "npm:babel-runtime@^5.8.20", + "core-js": "npm:core-js@^1.0.0", "traceur": "jmcriffey/bower-traceur@0.0.87", "traceur-runtime": "jmcriffey/bower-traceur-runtime@0.0.87" },