Skip to content

Commit

Permalink
chore(all): prepare release 0.12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
EisenbergEffect committed Jun 9, 2015
1 parent 40ca0c4 commit 81d85bf
Show file tree
Hide file tree
Showing 15 changed files with 164 additions and 197 deletions.
18 changes: 9 additions & 9 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aurelia-framework",
"version": "0.11.0",
"version": "0.12.0",
"description": "The aurelia framework brings together all the required core aurelia libraries into a ready-to-go application-building platform.",
"keywords": [
"aurelia",
Expand All @@ -17,14 +17,14 @@
"url": "http://github.com/aurelia/framework"
},
"dependencies": {
"aurelia-binding": "^0.6.0",
"aurelia-dependency-injection": "^0.7.0",
"aurelia-loader": "^0.6.0",
"aurelia-logging": "^0.4.0",
"aurelia-metadata": "^0.5.0",
"aurelia-path": "^0.6.0",
"aurelia-task-queue": "^0.4.0",
"aurelia-templating": "^0.11.0",
"aurelia-binding": "^0.7.0",
"aurelia-dependency-injection": "^0.8.1",
"aurelia-loader": "^0.7.0",
"aurelia-logging": "^0.5.0",
"aurelia-metadata": "^0.6.0",
"aurelia-path": "^0.7.0",
"aurelia-task-queue": "^0.5.0",
"aurelia-templating": "^0.12.0",
"core-js": "zloirock/core-js"
}
}
72 changes: 37 additions & 35 deletions config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,53 +16,55 @@ System.config({

System.config({
"map": {
"aurelia-binding": "github:aurelia/binding@0.6.0",
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.7.0",
"aurelia-loader": "github:aurelia/loader@0.6.0",
"aurelia-logging": "github:aurelia/logging@0.4.0",
"aurelia-metadata": "github:aurelia/metadata@0.5.0",
"aurelia-path": "github:aurelia/path@0.6.0",
"aurelia-task-queue": "github:aurelia/task-queue@0.4.0",
"aurelia-templating": "github:aurelia/templating@0.11.0",
"aurelia-binding": "github:aurelia/binding@0.7.0",
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.8.1",
"aurelia-loader": "github:aurelia/loader@0.7.0",
"aurelia-logging": "github:aurelia/logging@0.5.0",
"aurelia-metadata": "github:aurelia/metadata@0.6.0",
"aurelia-path": "github:aurelia/path@0.7.0",
"aurelia-task-queue": "github:aurelia/task-queue@0.5.0",
"aurelia-templating": "github:aurelia/templating@0.12.0",
"babel": "npm:[email protected]",
"babel-runtime": "npm:[email protected]",
"core-js": "npm:[email protected].5",
"github:aurelia/binding@0.6.0": {
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.7.0",
"aurelia-metadata": "github:aurelia/metadata@0.5.0",
"aurelia-task-queue": "github:aurelia/task-queue@0.4.0",
"core-js": "npm:[email protected].5"
"core-js": "npm:[email protected].15",
"github:aurelia/binding@0.7.0": {
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.8.1",
"aurelia-metadata": "github:aurelia/metadata@0.6.0",
"aurelia-task-queue": "github:aurelia/task-queue@0.5.0",
"core-js": "npm:[email protected].15"
},
"github:aurelia/dependency-injection@0.7.0": {
"aurelia-logging": "github:aurelia/logging@0.4.0",
"aurelia-metadata": "github:aurelia/metadata@0.5.0",
"core-js": "npm:[email protected].5"
"github:aurelia/dependency-injection@0.8.1": {
"aurelia-logging": "github:aurelia/logging@0.5.0",
"aurelia-metadata": "github:aurelia/metadata@0.6.0",
"core-js": "npm:[email protected].15"
},
"github:aurelia/loader@0.6.0": {
"github:aurelia/loader@0.7.0": {
"aurelia-html-template-element": "github:aurelia/[email protected]",
"aurelia-path": "github:aurelia/path@0.6.0",
"core-js": "npm:[email protected].5",
"webcomponentsjs": "github:webcomponents/[email protected].1"
"aurelia-path": "github:aurelia/path@0.7.0",
"core-js": "npm:[email protected].15",
"webcomponentsjs": "github:webcomponents/[email protected].3"
},
"github:aurelia/metadata@0.5.0": {
"core-js": "npm:[email protected].5"
"github:aurelia/metadata@0.6.0": {
"core-js": "npm:[email protected].15"
},
"github:aurelia/templating@0.11.0": {
"aurelia-binding": "github:aurelia/binding@0.6.0",
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.7.0",
"github:aurelia/templating@0.12.0": {
"aurelia-binding": "github:aurelia/binding@0.7.0",
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.8.1",
"aurelia-html-template-element": "github:aurelia/[email protected]",
"aurelia-loader": "github:aurelia/loader@0.6.0",
"aurelia-logging": "github:aurelia/logging@0.4.0",
"aurelia-metadata": "github:aurelia/metadata@0.5.0",
"aurelia-path": "github:aurelia/path@0.6.0",
"aurelia-task-queue": "github:aurelia/task-queue@0.4.0",
"core-js": "npm:[email protected].5"
"aurelia-loader": "github:aurelia/loader@0.7.0",
"aurelia-logging": "github:aurelia/logging@0.5.0",
"aurelia-metadata": "github:aurelia/metadata@0.6.0",
"aurelia-path": "github:aurelia/path@0.7.0",
"aurelia-task-queue": "github:aurelia/task-queue@0.5.0",
"core-js": "npm:[email protected].15"
},
"github:jspm/[email protected]": {
"process": "npm:[email protected]"
},
"npm:[email protected]": {
"process": "github:jspm/[email protected]"
"npm:[email protected]": {
"fs": "github:jspm/[email protected]",
"process": "github:jspm/[email protected]",
"systemjs-json": "github:systemjs/[email protected]"
}
}
});
Expand Down
12 changes: 6 additions & 6 deletions dist/amd/aurelia.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
define(['exports', 'core-js', 'aurelia-logging', 'aurelia-dependency-injection', 'aurelia-loader', 'aurelia-path', './plugins', 'aurelia-templating'], function (exports, _coreJs, _aureliaLogging, _aureliaDependencyInjection, _aureliaLoader, _aureliaPath, _plugins, _aureliaTemplating) {
'use strict';

var _interopRequire = function (obj) { return obj && obj.__esModule ? obj['default'] : obj; };
exports.__esModule = true;

var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } };
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }

exports.__esModule = true;
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }

var _core = _interopRequire(_coreJs);
var _core = _interopRequireDefault(_coreJs);

var logger = _aureliaLogging.getLogger('aurelia'),
slice = Array.prototype.slice;
Expand Down Expand Up @@ -94,7 +94,7 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-dependency-injection',
throw new Error('Invalid resource path [' + resource + ']. Resources must be specified as relative module IDs.');
}

path = internalPlugin ? _aureliaPath.relativeToFile(resource, pluginPath) : _aureliaPath.join(pluginPath, resource);
path = internalPlugin ? (0, _aureliaPath.relativeToFile)(resource, pluginPath) : (0, _aureliaPath.join)(pluginPath, resource);

this.resourcesToLoad[path] = this.resourcesToLoad[path];
}
Expand Down Expand Up @@ -157,13 +157,13 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-dependency-injection',
}

this.host.aurelia = this;
this.container.registerInstance(Element, this.host);

compositionEngine = this.container.get(_aureliaTemplating.CompositionEngine);
instruction.viewModel = root;
instruction.container = instruction.childContainer = this.container;
instruction.viewSlot = new _aureliaTemplating.ViewSlot(this.host, true);
instruction.viewSlot.transformChildNodesIntoView();
instruction.host = this.host;

return compositionEngine.compose(instruction).then(function (root) {
_this2.root = root;
Expand Down
11 changes: 7 additions & 4 deletions dist/amd/index.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
define(['exports', 'aurelia-logging', './aurelia', 'aurelia-dependency-injection', 'aurelia-binding', 'aurelia-metadata', 'aurelia-templating', 'aurelia-loader', 'aurelia-task-queue'], function (exports, _aureliaLogging, _aurelia, _aureliaDependencyInjection, _aureliaBinding, _aureliaMetadata, _aureliaTemplating, _aureliaLoader, _aureliaTaskQueue) {
define(['exports', 'aurelia-logging', './aurelia', 'aurelia-dependency-injection', 'aurelia-binding', 'aurelia-metadata', 'aurelia-templating', 'aurelia-loader', 'aurelia-task-queue', 'aurelia-path'], function (exports, _aureliaLogging, _aurelia, _aureliaDependencyInjection, _aureliaBinding, _aureliaMetadata, _aureliaTemplating, _aureliaLoader, _aureliaTaskQueue, _aureliaPath) {
'use strict';

var _interopRequireWildcard = function (obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (typeof obj === 'object' && obj !== null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj['default'] = obj; return newObj; } };
exports.__esModule = true;

var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; };
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj['default'] = obj; return newObj; } }

function _defaults(obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }

exports.__esModule = true;
exports.Aurelia = _aurelia.Aurelia;

_defaults(exports, _interopRequireWildcard(_aureliaDependencyInjection));
Expand All @@ -20,6 +21,8 @@ define(['exports', 'aurelia-logging', './aurelia', 'aurelia-dependency-injection

_defaults(exports, _interopRequireWildcard(_aureliaTaskQueue));

_defaults(exports, _interopRequireWildcard(_aureliaPath));

var LogManager = _aureliaLogging;
exports.LogManager = LogManager;
});
36 changes: 8 additions & 28 deletions dist/amd/plugins.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
define(['exports', 'core-js', 'aurelia-logging', 'aurelia-metadata'], function (exports, _coreJs, _aureliaLogging, _aureliaMetadata) {
'use strict';

var _interopRequire = function (obj) { return obj && obj.__esModule ? obj['default'] : obj; };
exports.__esModule = true;

var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } };
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }

exports.__esModule = true;
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }

var _core = _interopRequire(_coreJs);
var _core = _interopRequireDefault(_coreJs);

var logger = _aureliaLogging.getLogger('aurelia');

Expand Down Expand Up @@ -37,17 +37,7 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-metadata'], function (
this.processed = false;
}

Plugins.prototype.plugin = (function (_plugin) {
function plugin(_x, _x2) {
return _plugin.apply(this, arguments);
}

plugin.toString = function () {
return _plugin.toString();
};

return plugin;
})(function (moduleId, config) {
Plugins.prototype.plugin = function plugin(moduleId, config) {
var plugin = { moduleId: moduleId, config: config || {} };

if (this.processed) {
Expand All @@ -57,7 +47,7 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-metadata'], function (
}

return this;
});
};

Plugins.prototype._process = function _process() {
var _this = this;
Expand All @@ -71,24 +61,14 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-metadata'], function (
return;
}

var next = (function (_next) {
function next() {
return _next.apply(this, arguments);
}

next.toString = function () {
return _next.toString();
};

return next;
})(function () {
var next = function next() {
if (current = info.shift()) {
return loadPlugin(aurelia, loader, current).then(next);
}

_this.processed = true;
return Promise.resolve();
});
};

return next();
};
Expand Down
52 changes: 26 additions & 26 deletions dist/commonjs/aurelia.js
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
'use strict';

var _interopRequireWildcard = function (obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (typeof obj === 'object' && obj !== null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj['default'] = obj; return newObj; } };
exports.__esModule = true;

var _interopRequireDefault = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj['default'] = obj; return newObj; } }

var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } };
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }

exports.__esModule = true;
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }

var _core = require('core-js');
var _coreJs = require('core-js');

var _core2 = _interopRequireDefault(_core);
var _coreJs2 = _interopRequireDefault(_coreJs);

var _import = require('aurelia-logging');
var _aureliaLogging = require('aurelia-logging');

var LogManager = _interopRequireWildcard(_import);
var LogManager = _interopRequireWildcard(_aureliaLogging);

var _Container = require('aurelia-dependency-injection');
var _aureliaDependencyInjection = require('aurelia-dependency-injection');

var _Loader = require('aurelia-loader');
var _aureliaLoader = require('aurelia-loader');

var _join$relativeToFile = require('aurelia-path');
var _aureliaPath = require('aurelia-path');

var _Plugins = require('./plugins');
var _plugins = require('./plugins');

var _BindingLanguage$ViewEngine$ViewSlot$ResourceRegistry$CompositionEngine$Animator = require('aurelia-templating');
var _aureliaTemplating = require('aurelia-templating');

var logger = LogManager.getLogger('aurelia'),
slice = Array.prototype.slice;
Expand Down Expand Up @@ -58,7 +58,7 @@ function preventActionlessFormSubmit() {
}

function loadResources(container, resourcesToLoad, appResources) {
var viewEngine = container.get(_BindingLanguage$ViewEngine$ViewSlot$ResourceRegistry$CompositionEngine$Animator.ViewEngine),
var viewEngine = container.get(_aureliaTemplating.ViewEngine),
importIds = Object.keys(resourcesToLoad),
names = new Array(importIds.length),
i,
Expand All @@ -76,14 +76,14 @@ var Aurelia = (function () {
_classCallCheck(this, Aurelia);

this.loader = loader || new window.AureliaLoader();
this.container = container || new _Container.Container();
this.resources = resources || new _BindingLanguage$ViewEngine$ViewSlot$ResourceRegistry$CompositionEngine$Animator.ResourceRegistry();
this.use = new _Plugins.Plugins(this);
this.container = container || new _aureliaDependencyInjection.Container();
this.resources = resources || new _aureliaTemplating.ResourceRegistry();
this.use = new _plugins.Plugins(this);
this.resourcesToLoad = {};

this.withInstance(Aurelia, this);
this.withInstance(_Loader.Loader, this.loader);
this.withInstance(_BindingLanguage$ViewEngine$ViewSlot$ResourceRegistry$CompositionEngine$Animator.ResourceRegistry, this.resources);
this.withInstance(_aureliaLoader.Loader, this.loader);
this.withInstance(_aureliaTemplating.ResourceRegistry, this.resources);
}

Aurelia.prototype.withInstance = function withInstance(type, instance) {
Expand Down Expand Up @@ -111,7 +111,7 @@ var Aurelia = (function () {
throw new Error('Invalid resource path [' + resource + ']. Resources must be specified as relative module IDs.');
}

path = internalPlugin ? _join$relativeToFile.relativeToFile(resource, pluginPath) : _join$relativeToFile.join(pluginPath, resource);
path = internalPlugin ? (0, _aureliaPath.relativeToFile)(resource, pluginPath) : (0, _aureliaPath.join)(pluginPath, resource);

this.resourcesToLoad[path] = this.resourcesToLoad[path];
}
Expand All @@ -137,14 +137,14 @@ var Aurelia = (function () {
preventActionlessFormSubmit();

return this.use._process().then(function () {
if (!_this.container.hasHandler(_BindingLanguage$ViewEngine$ViewSlot$ResourceRegistry$CompositionEngine$Animator.BindingLanguage)) {
if (!_this.container.hasHandler(_aureliaTemplating.BindingLanguage)) {
var message = 'You must configure Aurelia with a BindingLanguage implementation.';
logger.error(message);
throw new Error(message);
}

if (!_this.container.hasHandler(_BindingLanguage$ViewEngine$ViewSlot$ResourceRegistry$CompositionEngine$Animator.Animator)) {
_BindingLanguage$ViewEngine$ViewSlot$ResourceRegistry$CompositionEngine$Animator.Animator.configureDefault(_this.container);
if (!_this.container.hasHandler(_aureliaTemplating.Animator)) {
_aureliaTemplating.Animator.configureDefault(_this.container);
}

return loadResources(_this.container, _this.resourcesToLoad, _this.resources).then(function () {
Expand Down Expand Up @@ -174,13 +174,13 @@ var Aurelia = (function () {
}

this.host.aurelia = this;
this.container.registerInstance(Element, this.host);

compositionEngine = this.container.get(_BindingLanguage$ViewEngine$ViewSlot$ResourceRegistry$CompositionEngine$Animator.CompositionEngine);
compositionEngine = this.container.get(_aureliaTemplating.CompositionEngine);
instruction.viewModel = root;
instruction.container = instruction.childContainer = this.container;
instruction.viewSlot = new _BindingLanguage$ViewEngine$ViewSlot$ResourceRegistry$CompositionEngine$Animator.ViewSlot(this.host, true);
instruction.viewSlot = new _aureliaTemplating.ViewSlot(this.host, true);
instruction.viewSlot.transformChildNodesIntoView();
instruction.host = this.host;

return compositionEngine.compose(instruction).then(function (root) {
_this2.root = root;
Expand Down
Loading

0 comments on commit 81d85bf

Please sign in to comment.