Skip to content

Commit

Permalink
chore(all): prepare release 0.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
EisenbergEffect committed Mar 25, 2015
1 parent f3955d2 commit 10cc026
Show file tree
Hide file tree
Showing 14 changed files with 291 additions and 205 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This library is part of the [Aurelia](http://www.aurelia.io/) platform and contains the aurelia framework which brings together all the required core aurelia libraries into a ready-to-go application-building platform.

> To keep up to date on [Aurelia](http://www.aurelia.io/), please visit and subscribe to [the official blog](http://blog.durandal.io/). If you have questions, we invite you to join us on [our Gitter Channel](https://gitter.im/aurelia/discuss).
> To keep up to date on [Aurelia](http://www.aurelia.io/), please visit and subscribe to [the official blog](http://blog.durandal.io/). If you have questions, we invite you to join us on [![Join the chat at https://gitter.im/aurelia/discuss](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/aurelia/discuss?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge).
## Dependencies

Expand Down
19 changes: 10 additions & 9 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aurelia-framework",
"version": "0.8.8",
"version": "0.9.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,12 +17,13 @@
"url": "http://github.com/aurelia/framework"
},
"dependencies": {
"aurelia-binding": "^0.3.2",
"aurelia-dependency-injection": "^0.4.1",
"aurelia-loader": "^0.3.3",
"aurelia-logging": "^0.2.2",
"aurelia-metadata": "^0.3.0",
"aurelia-task-queue": "^0.2.2",
"aurelia-templating": "^0.8.4"
"aurelia-binding": "^0.4.0",
"aurelia-dependency-injection": "^0.5.0",
"aurelia-loader": "^0.4.0",
"aurelia-logging": "^0.2.6",
"aurelia-metadata": "^0.3.4",
"aurelia-path": "^0.4.6",
"aurelia-task-queue": "^0.2.5",
"aurelia-templating": "^0.9.0"
}
}
}
44 changes: 23 additions & 21 deletions config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,41 +9,43 @@ System.config({

System.config({
"map": {
"aurelia-binding": "github:aurelia/binding@0.3.7",
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.4.5",
"aurelia-loader": "github:aurelia/loader@0.3.5",
"aurelia-logging": "github:aurelia/logging@0.2.5",
"aurelia-metadata": "github:aurelia/metadata@0.3.3",
"aurelia-path": "github:aurelia/path@0.4.5",
"aurelia-binding": "github:aurelia/binding@0.4.0",
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.5.0",
"aurelia-loader": "github:aurelia/loader@0.4.0",
"aurelia-logging": "github:aurelia/logging@0.2.6",
"aurelia-metadata": "github:aurelia/metadata@0.3.4",
"aurelia-path": "github:aurelia/path@0.4.6",
"aurelia-task-queue": "github:aurelia/task-queue@0.2.5",
"aurelia-templating": "github:aurelia/templating@0.8.14",
"github:aurelia/binding@0.3.7": {
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.4.5",
"aurelia-metadata": "github:aurelia/metadata@0.3.3",
"aurelia-templating": "github:aurelia/templating@0.9.0",
"github:aurelia/binding@0.4.0": {
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.5.0",
"aurelia-metadata": "github:aurelia/metadata@0.3.4",
"aurelia-task-queue": "github:aurelia/task-queue@0.2.5"
},
"github:aurelia/dependency-injection@0.4.5": {
"aurelia-metadata": "github:aurelia/metadata@0.3.3",
"github:aurelia/dependency-injection@0.5.0": {
"aurelia-logging": "github:aurelia/logging@0.2.6",
"aurelia-metadata": "github:aurelia/metadata@0.3.4",
"core-js": "npm:core-js@0.4.10"
},
"github:aurelia/loader@0.3.5": {
"github:aurelia/loader@0.4.0": {
"aurelia-html-template-element": "github:aurelia/html-template-element@0.1.3",
"aurelia-path": "github:aurelia/path@0.4.6",
"core-js": "npm:core-js@0.4.10",
"webcomponentsjs": "github:webcomponents/webcomponentsjs@0.5.5"
},
"github:aurelia/templating@0.8.14": {
"aurelia-binding": "github:aurelia/binding@0.3.7",
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.4.5",
"github:aurelia/templating@0.9.0": {
"aurelia-binding": "github:aurelia/binding@0.4.0",
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.5.0",
"aurelia-html-template-element": "github:aurelia/html-template-element@0.1.3",
"aurelia-loader": "github:aurelia/loader@0.3.5",
"aurelia-logging": "github:aurelia/logging@0.2.5",
"aurelia-metadata": "github:aurelia/metadata@0.3.3",
"aurelia-path": "github:aurelia/path@0.4.5",
"aurelia-loader": "github:aurelia/loader@0.4.0",
"aurelia-logging": "github:aurelia/logging@0.2.6",
"aurelia-metadata": "github:aurelia/metadata@0.3.4",
"aurelia-path": "github:aurelia/path@0.4.6",
"aurelia-task-queue": "github:aurelia/task-queue@0.2.5",
"core-js": "npm:core-js@0.4.10"
},
"github:jspm/nodelibs-process@0.1.1": {
"process": "npm:process@0.10.0"
"process": "npm:process@0.10.1"
},
"npm:core-js@0.4.10": {
"process": "github:jspm/nodelibs-process@0.1.1"
Expand Down
96 changes: 57 additions & 39 deletions dist/amd/aurelia.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define(["exports", "aurelia-logging", "aurelia-dependency-injection", "aurelia-loader", "aurelia-templating", "./plugins"], function (exports, _aureliaLogging, _aureliaDependencyInjection, _aureliaLoader, _aureliaTemplating, _plugins) {
define(["exports", "aurelia-logging", "aurelia-dependency-injection", "aurelia-loader", "aurelia-path", "./plugins", "aurelia-templating"], function (exports, _aureliaLogging, _aureliaDependencyInjection, _aureliaLoader, _aureliaPath, _plugins, _aureliaTemplating) {
"use strict";

var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); };
Expand All @@ -8,13 +8,15 @@ define(["exports", "aurelia-logging", "aurelia-dependency-injection", "aurelia-l
var LogManager = _aureliaLogging;
var Container = _aureliaDependencyInjection.Container;
var Loader = _aureliaLoader.Loader;
var join = _aureliaPath.join;
var relativeToFile = _aureliaPath.relativeToFile;
var Plugins = _plugins.Plugins;
var BindingLanguage = _aureliaTemplating.BindingLanguage;
var ResourceCoordinator = _aureliaTemplating.ResourceCoordinator;
var ViewEngine = _aureliaTemplating.ViewEngine;
var ViewSlot = _aureliaTemplating.ViewSlot;
var ResourceRegistry = _aureliaTemplating.ResourceRegistry;
var CompositionEngine = _aureliaTemplating.CompositionEngine;
var Animator = _aureliaTemplating.Animator;
var Plugins = _plugins.Plugins;

var logger = LogManager.getLogger("aurelia"),
slice = Array.prototype.slice;
Expand Down Expand Up @@ -48,23 +50,17 @@ define(["exports", "aurelia-logging", "aurelia-dependency-injection", "aurelia-l
}

function loadResources(container, resourcesToLoad, appResources) {
var resourceCoordinator = container.get(ResourceCoordinator),
current;

function next() {
if (current = resourcesToLoad.shift()) {
return resourceCoordinator.importResources(current, current.resourceManifestUrl).then(function (resources) {
resources.forEach(function (x) {
return x.register(appResources);
});
return next();
});
}

return Promise.resolve();
var viewEngine = container.get(ViewEngine),
importIds = Object.keys(resourcesToLoad),
names = new Array(importIds.length),
i,
ii;

for (i = 0, ii = importIds.length; i < ii; ++i) {
names[i] = resourcesToLoad[importIds[i]];
}

return next();
return viewEngine.importViewResources(importIds, names, appResources);
}

/**
Expand All @@ -81,15 +77,11 @@ define(["exports", "aurelia-logging", "aurelia-dependency-injection", "aurelia-l
function Aurelia(loader, container, resources) {
_classCallCheck(this, Aurelia);

this.loader = loader || Loader.createDefaultLoader();
this.loader = loader || new window.AureliaLoader();
this.container = container || new Container();
this.resources = resources || new ResourceRegistry();
this.resourcesToLoad = [];
this.use = new Plugins(this);

if (!this.resources.baseResourcePath) {
this.resources.baseResourcePath = System.baseUrl || "";
}
this.resourcesToLoad = {};

this.withInstance(Aurelia, this);
this.withInstance(Loader, this.loader);
Expand Down Expand Up @@ -133,20 +125,48 @@ define(["exports", "aurelia-logging", "aurelia-dependency-injection", "aurelia-l
writable: true,
configurable: true
},
withResources: {
globalizeResources: {

/**
* Adds a resource to be imported into the Aurelia framework.
* Adds globally available view resources to be imported into the Aurelia framework.
*
* @method withResources
* @param {Object|Array} resources The constructor function(s) to use when the dependency needs to be instantiated.
* @method globalizeResources
* @param {Object|Array} resources The relative module id to the resource. (Relative to the plugin's installer.)
* @return {Aurelia} Returns the current Aurelia instance.
*/

value: function withResources(resources) {
var toAdd = Array.isArray(resources) ? resources : slice.call(arguments);
toAdd.resourceManifestUrl = this.currentPluginId;
this.resourcesToLoad.push(toAdd);
value: function globalizeResources(resources) {
var toAdd = Array.isArray(resources) ? resources : arguments,
i,
ii,
pluginPath = this.currentPluginId || "",
path,
internalPlugin = pluginPath.startsWith("./");

for (i = 0, ii = toAdd.length; i < ii; ++i) {
path = internalPlugin ? relativeToFile(toAdd[i], pluginPath) : join(pluginPath, toAdd[i]);

this.resourcesToLoad[path] = this.resourcesToLoad[path];
}

return this;
},
writable: true,
configurable: true
},
renameGlobalResource: {

/**
* Renames a global resource that was imported.
*
* @method renameGlobalResource
* @param {String} resourcePath The path to the resource.
* @param {String} newName The new name.
* @return {Aurelia} Returns the current Aurelia instance.
*/

value: function renameGlobalResource(resourcePath, newName) {
this.resourcesToLoad[resourcePath] = newName;
return this;
},
writable: true,
Expand All @@ -173,9 +193,6 @@ define(["exports", "aurelia-logging", "aurelia-dependency-injection", "aurelia-l

preventActionlessFormSubmit();

var resourcesToLoad = this.resourcesToLoad;
this.resourcesToLoad = [];

return this.use._process().then(function () {
if (!_this.container.hasHandler(BindingLanguage)) {
var message = "You must configure Aurelia with a BindingLanguage implementation.";
Expand All @@ -184,11 +201,9 @@ define(["exports", "aurelia-logging", "aurelia-dependency-injection", "aurelia-l
}

if (!_this.container.hasHandler(Animator)) {
_this.withInstance(Animator, new Animator());
Animator.configureDefault(_this.container);
}

_this.resourcesToLoad = _this.resourcesToLoad.concat(resourcesToLoad);

return loadResources(_this.container, _this.resourcesToLoad, _this.resources).then(function () {
logger.info("Aurelia Started");
var evt = new window.CustomEvent("aurelia-started", { bubbles: true, cancelable: true });
Expand All @@ -211,9 +226,12 @@ define(["exports", "aurelia-logging", "aurelia-dependency-injection", "aurelia-l
* @return {Aurelia} Returns the current Aurelia instance.
*/

value: function setRoot(root, applicationHost) {
value: function setRoot() {
var _this = this;

var root = arguments[0] === undefined ? "app" : arguments[0];
var applicationHost = arguments[1] === undefined ? null : arguments[1];

var compositionEngine,
instruction = {};

Expand Down
4 changes: 1 addition & 3 deletions dist/amd/plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ define(["exports", "aurelia-logging", "aurelia-metadata"], function (exports, _a

aurelia.currentPluginId = info.moduleId;

var baseUrl = info.moduleId.indexOf("./") === 0 ? undefined : "";

return loader.loadModule(info.moduleId, baseUrl).then(function (exportedValue) {
return loader.loadModule(info.moduleId).then(function (exportedValue) {
if ("install" in exportedValue) {
var result = exportedValue.install(aurelia, info.config || {});

Expand Down
Loading

0 comments on commit 10cc026

Please sign in to comment.