chore(all): prepare release 0.6.0

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "aurelia-framework",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "The aurelia framework brings together all the required core aurelia libraries into a ready-to-go application-building platform.",
   "keywords": [
     "aurelia",

dist/amd/aurelia.js

@@ -8,6 +8,7 @@ define(["exports", "aurelia-logging", "aurelia-dependency-injection", "aurelia-l
   var ResourceCoordinator = _aureliaTemplating.ResourceCoordinator;
   var ViewSlot = _aureliaTemplating.ViewSlot;
   var ResourceRegistry = _aureliaTemplating.ResourceRegistry;
+  var CompositionEngine = _aureliaTemplating.CompositionEngine;
   var Plugins = _plugins.Plugins;
 
 
@@ -71,19 +72,25 @@ define(["exports", "aurelia-logging", "aurelia-dependency-injection", "aurelia-l
 
   Aurelia.prototype.setRoot = function (root, applicationHost) {
     var _this2 = this;
+    var compositionEngine, instruction = {};
+
     if (!applicationHost || typeof applicationHost == "string") {
       this.host = document.getElementById(applicationHost || "applicationHost") || document.body;
     } else {
       this.host = applicationHost;
     }
 
     this.host.aurelia = this;
+    this.container.registerInstance(Element, this.host);
+
+    compositionEngine = this.container.get(CompositionEngine);
+    instruction.viewModel = root;
+    instruction.viewSlot = new ViewSlot(this.host, true);
+    instruction.container = instruction.childContainer = this.container;
 
-    return this.container.get(ResourceCoordinator).loadElement(root).then(function (type) {
-      _this2.root = type.create(_this2.container);
-      var slot = new ViewSlot(_this2.host, true);
-      slot.swap(_this2.root.view);
-      slot.attached();
+    return compositionEngine.compose(instruction).then(function (root) {
+      _this2.root = root;
+      instruction.viewSlot.attached();
       return _this2;
     });
   };

dist/commonjs/aurelia.js

@@ -14,6 +14,7 @@ var BindingLanguage = require("aurelia-templating").BindingLanguage;
 var ResourceCoordinator = require("aurelia-templating").ResourceCoordinator;
 var ViewSlot = require("aurelia-templating").ViewSlot;
 var ResourceRegistry = require("aurelia-templating").ResourceRegistry;
+var CompositionEngine = require("aurelia-templating").CompositionEngine;
 var Plugins = require("./plugins").Plugins;
 
 
@@ -77,19 +78,25 @@ Aurelia.prototype.start = function () {
 
 Aurelia.prototype.setRoot = function (root, applicationHost) {
   var _this2 = this;
+  var compositionEngine, instruction = {};
+
   if (!applicationHost || typeof applicationHost == "string") {
     this.host = document.getElementById(applicationHost || "applicationHost") || document.body;
   } else {
     this.host = applicationHost;
   }
 
   this.host.aurelia = this;
+  this.container.registerInstance(Element, this.host);
+
+  compositionEngine = this.container.get(CompositionEngine);
+  instruction.viewModel = root;
+  instruction.viewSlot = new ViewSlot(this.host, true);
+  instruction.container = instruction.childContainer = this.container;
 
-  return this.container.get(ResourceCoordinator).loadElement(root).then(function (type) {
-    _this2.root = type.create(_this2.container);
-    var slot = new ViewSlot(_this2.host, true);
-    slot.swap(_this2.root.view);
-    slot.attached();
+  return compositionEngine.compose(instruction).then(function (root) {
+    _this2.root = root;
+    instruction.viewSlot.attached();
     return _this2;
   });
 };

dist/es6/aurelia.js

@@ -1,7 +1,13 @@
 import * as LogManager from 'aurelia-logging';
 import {Container} from 'aurelia-dependency-injection';
 import {Loader} from 'aurelia-loader';
-import {BindingLanguage, ResourceCoordinator, ViewSlot, ResourceRegistry} from 'aurelia-templating';
+import {
+  BindingLanguage, 
+  ResourceCoordinator, 
+  ViewSlot, 
+  ResourceRegistry,
+  CompositionEngine
+} from 'aurelia-templating';
 import {Plugins} from './plugins';
 
 var logger = LogManager.getLogger('aurelia');
@@ -62,21 +68,26 @@ export class Aurelia {
   }
 
   setRoot(root, applicationHost){
+    var compositionEngine, instruction = {};
+
     if (!applicationHost || typeof applicationHost == 'string') {
       this.host = document.getElementById(applicationHost || 'applicationHost') || document.body;
     } else {
       this.host = applicationHost;
     }
 
     this.host.aurelia = this;
+    this.container.registerInstance(Element, this.host);
+
+    compositionEngine = this.container.get(CompositionEngine);
+    instruction.viewModel = root;
+    instruction.viewSlot = new ViewSlot(this.host, true);
+    instruction.container = instruction.childContainer = this.container;
 
-    return this.container.get(ResourceCoordinator)
-      .loadElement(root).then(type => {
-        this.root = type.create(this.container);
-        var slot = new ViewSlot(this.host, true);
-        slot.swap(this.root.view);
-        slot.attached();
-        return this;
-      });
+    return compositionEngine.compose(instruction).then(root => {
+      this.root = root;
+      instruction.viewSlot.attached();
+      return this;
+    });
   }
 }

dist/system/aurelia.js

@@ -1,7 +1,7 @@
 System.register(["aurelia-logging", "aurelia-dependency-injection", "aurelia-loader", "aurelia-templating", "./plugins"], function (_export) {
   "use strict";
 
-  var LogManager, Container, Loader, BindingLanguage, ResourceCoordinator, ViewSlot, ResourceRegistry, Plugins, logger, Aurelia;
+  var LogManager, Container, Loader, BindingLanguage, ResourceCoordinator, ViewSlot, ResourceRegistry, CompositionEngine, Plugins, logger, Aurelia;
   return {
     setters: [function (_aureliaLogging) {
       LogManager = _aureliaLogging;
@@ -14,6 +14,7 @@ System.register(["aurelia-logging", "aurelia-dependency-injection", "aurelia-loa
       ResourceCoordinator = _aureliaTemplating.ResourceCoordinator;
       ViewSlot = _aureliaTemplating.ViewSlot;
       ResourceRegistry = _aureliaTemplating.ResourceRegistry;
+      CompositionEngine = _aureliaTemplating.CompositionEngine;
     }, function (_plugins) {
       Plugins = _plugins.Plugins;
     }],
@@ -77,19 +78,25 @@ System.register(["aurelia-logging", "aurelia-dependency-injection", "aurelia-loa
 
       Aurelia.prototype.setRoot = function (root, applicationHost) {
         var _this2 = this;
+        var compositionEngine, instruction = {};
+
         if (!applicationHost || typeof applicationHost == "string") {
           this.host = document.getElementById(applicationHost || "applicationHost") || document.body;
         } else {
           this.host = applicationHost;
         }
 
         this.host.aurelia = this;
+        this.container.registerInstance(Element, this.host);
+
+        compositionEngine = this.container.get(CompositionEngine);
+        instruction.viewModel = root;
+        instruction.viewSlot = new ViewSlot(this.host, true);
+        instruction.container = instruction.childContainer = this.container;
 
-        return this.container.get(ResourceCoordinator).loadElement(root).then(function (type) {
-          _this2.root = type.create(_this2.container);
-          var slot = new ViewSlot(_this2.host, true);
-          slot.swap(_this2.root.view);
-          slot.attached();
+        return compositionEngine.compose(instruction).then(function (root) {
+          _this2.root = root;
+          instruction.viewSlot.attached();
           return _this2;
         });
       };

doc/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.6.0 (2015-01-07)
+
+
+#### Bug Fixes
+
+* **aurelia:** directly use app container to create root view model ([d86665b3](http://github.com/aurelia/framework/commit/d86665b390dbfa65f8c53c148adfc740d7e8ebb2))
+* **package:** update dependencies to latest ([bfcd292e](http://github.com/aurelia/framework/commit/bfcd292e5c26bde6b7064e866db566201f280b4f))
+
+
+#### Features
+
+* **aurelia:** set root sets element in container and uses composition engine ([9f6fa60d](http://github.com/aurelia/framework/commit/9f6fa60d27dc7e9d418970925df2fc23514c1422))
+
+
 ## 0.5.0 (2015-01-06)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aurelia-framework",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "The aurelia framework brings together all the required core aurelia libraries into a ready-to-go application-building platform.",
   "keywords": [
     "aurelia",