Skip to content

Commit

Permalink
0.16.0-beta.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@guybedford
guybedford committed Aug 9, 2015
1 parent aeb7ec6 commit 6dc438c
Show file tree
Hide file tree
Showing 4 changed files with 204 additions and 29 deletions.
13 changes: 7 additions & 6 deletions lib/core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected].90',
'traceur-runtime': 'github:jmcriffey/[email protected].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/[email protected].91',
'traceur-runtime': 'github:jmcriffey/[email protected].91',
'typescript': 'npm:[email protected]'
};

Expand Down Expand Up @@ -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;
});
Expand Down
12 changes: 6 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"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": {
"chalk": "^1.0.0",
"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",
Expand All @@ -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",
Expand Down
202 changes: 188 additions & 14 deletions testlibs/config.js
View file
Original file line number Diff line number Diff line change
@@ -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:[email protected]",
"npm:[email protected]/shader.js",
"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]/tilemap.js",
"npm:[email protected]/index.js",
"npm:[email protected]/buffer.js",
"npm:[email protected]/vao.js",
"npm:[email protected]/index.js",
"npm:[email protected]/ndarray.js",
"npm:[email protected]/ndarray-ops.js",
"npm:[email protected]/dist/gl-matrix.js",
"npm:[email protected]/aoshader.js",
"npm:[email protected]/mesh.js",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]/lib/vao-native.js",
"npm:[email protected]",
"github:jspm/[email protected]",
"github:jspm/[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]/lib/vao-emulated.js",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]/texture.js",
"npm:[email protected]/pool.js",
"npm:[email protected]/webglew.js",
"npm:[email protected]/cwise.js",
"npm:[email protected]/mipmap.js",
"github:jspm/[email protected]/index.js",
"npm:[email protected]/shell.js",
"npm:[email protected]/lib/do-bind.js",
"github:jspm/[email protected]/index.js",
"npm:[email protected]/iota.js",
"npm:[email protected]/compiler.js",
"npm:[email protected]/greedy.js",
"npm:[email protected]/index.js",
"npm:[email protected]/compiler.js",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"github:jspm/[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"github:jspm/[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]/lib/raf-polyfill.js",
"npm:[email protected]",
"npm:[email protected]/lib/mousewheel-polyfill.js",
"npm:[email protected]",
"npm:[email protected]/lib/hrtime-polyfill.js",
"npm:[email protected]",
"npm:[email protected]/lib/thunk.js",
"npm:[email protected]",
"npm:[email protected]/lib/thunk.js",
"npm:[email protected]/twiddle.js",
"npm:[email protected]/index.js",
"npm:[email protected]/index.js",
"github:jspm/[email protected]/index.js",
"npm:[email protected]/downsample.js",
"npm:[email protected]/ready.js",
"npm:[email protected]/index.js",
"github:jspm/[email protected]/index.js",
"npm:[email protected]/dup.js",
"npm:[email protected]/pool.js",
"npm:[email protected]/invert.js",
"npm:[email protected]/uniq.js",
"npm:[email protected]/lb.js",
"npm:[email protected]/iota.js",
"npm:[email protected]/index.js",
"npm:[email protected]/uniq.js",
"npm:[email protected]/lib/compile.js",
"npm:[email protected]/lib/compile.js",
"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]/lib/b64.js",
"npm:[email protected]/index.js",
"github:jspm/[email protected]/index.js",
"npm:[email protected]/index.js",
"npm:[email protected]/events.js",
"npm:[email protected]/util.js",
"npm:[email protected]/esprima.js",
"npm:[email protected]/dup.js",
"npm:[email protected]/fft.js",
"npm:[email protected]/twiddle.js",
"npm:[email protected]/scratch.js",
"npm:[email protected]/index.js",
"npm:[email protected]/index.js",
"npm:[email protected]/index.js",
"npm:[email protected]",
"npm:[email protected]/lib/fft-matrix.js",
"npm:[email protected]",
"npm:[email protected]/support/isBufferBrowser.js",
"npm:[email protected]/lib/literals.js",
"npm:[email protected]/lib/index.js",
"npm:[email protected]/lib/operators.js",
"github:jspm/[email protected]",
"npm:[email protected]/lib/builtins.js",
"npm:[email protected]/browser.js",
"npm:[email protected]",
"npm:[email protected]/lib/expr.js",
"npm:[email protected]/inherits_browser.js",
"npm:[email protected]/lib/scope.js",
"github:jspm/[email protected]/index.js",
"npm:[email protected]/index.js",
"npm:[email protected]",
"npm:[email protected]/index.js",
"npm:[email protected]/readable.js",
"npm:[email protected]/duplex.js",
"npm:[email protected]/writable.js",
"npm:[email protected]/passthrough.js",
"npm:[email protected]/transform.js",
"npm:[email protected]/lib/_stream_writable.js",
"npm:[email protected]/lib/_stream_readable.js",
"npm:[email protected]/lib/_stream_passthrough.js",
"npm:[email protected]/lib/_stream_transform.js",
"npm:[email protected]/lib/_stream_duplex.js",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]",
"npm:[email protected]/lib/util.js",
"npm:[email protected]/index.js",
"npm:[email protected]/index.js",
"main.js",
"npm:[email protected]",
"tests/tests.js",
"tests/bootstrap.js",
"tests/jquery.js",
"tests/angular.js",
"npm:[email protected]/mocha.js",
"tests/voxel-demo.js",
"tests/d3.js",
"github:twbs/[email protected]",
"github:components/[email protected]",
"github:angular/[email protected]",
"github:mbostock/[email protected]",
"github:twbs/[email protected]/js/bootstrap.js",
"github:twbs/[email protected]/css/bootstrap.css!github:systemjs/[email protected]",
"npm:[email protected]/mocha.css!github:systemjs/[email protected]",
"github:components/[email protected]/jquery.js",
"github:angular/[email protected]/angular.js",
"github:mbostock/[email protected]/d3.js",
"tests/bootstrap.html!github:systemjs/[email protected]"
]
},

System.config({
"map": {
map: {
"angular": "github:angular/[email protected]",
"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/[email protected]",
"clean-css": "npm:[email protected]",
"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/[email protected]",
"ember": "github:components/[email protected]",
Expand Down Expand Up @@ -94,7 +268,7 @@ System.config({
"npm:[email protected]": {
"util": "npm:[email protected]"
},
"npm:babel-runtime@5.6.4": {
"npm:babel-runtime@5.8.20": {
"process": "github:jspm/[email protected]"
},
"npm:[email protected]": {
Expand Down Expand Up @@ -132,7 +306,7 @@ System.config({
"path": "github:jspm/[email protected]",
"process": "github:jspm/[email protected]"
},
"npm:core-js@0.9.18": {
"npm:core-js@1.0.1": {
"fs": "github:jspm/[email protected]",
"process": "github:jspm/[email protected]",
"systemjs-json": "github:systemjs/[email protected]"
Expand Down Expand Up @@ -354,4 +528,4 @@ System.config({
"ndarray-ops": "npm:[email protected]"
}
}
});
});
6 changes: 3 additions & 3 deletions testlibs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]",
"traceur-runtime": "jmcriffey/[email protected]"
},
Expand Down

0 comments on commit 6dc438c

Please sign in to comment.