chore(all): prepare release 0.18.0

aurelia · Nov 10, 2015 · 9f0743a · 9f0743a
1 parent 5eeaef0
commit 9f0743a
Show file tree

Hide file tree

Showing 14 changed files with 51 additions and 75 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-framework",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "The aurelia framework brings together all the required core aurelia libraries into a ready-to-go application-building platform.",
   "keywords": [
     "aurelia",

diff --git a/dist/amd/aurelia-framework.d.ts b/dist/amd/aurelia-framework.d.ts
@@ -1,7 +1,7 @@
 declare module 'aurelia-framework' {
   import 'core-js';
   import * as TheLogManager from 'aurelia-logging';
-  import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, CompositionEngine, Animator, templatingEngine }  from 'aurelia-templating';
+  import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine }  from 'aurelia-templating';
   import { join }  from 'aurelia-path';
   import { Container }  from 'aurelia-dependency-injection';
   import { Loader }  from 'aurelia-loader';

diff --git a/dist/amd/aurelia-framework.js b/dist/amd/aurelia-framework.js
@@ -286,12 +286,6 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-
           throw new Error(message);
         }
 
-        if (!_this5.container.hasResolver(_aureliaTemplating.Animator)) {
-          _aureliaTemplating.Animator.configureDefault(_this5.container);
-        }
-
-        _aureliaTemplating.templatingEngine.initialize(_this5.container);
-
         _this5.logger.info('Aurelia Started');
         var evt = _aureliaPal.DOM.createCustomEvent('aurelia-started', { bubbles: true, cancelable: true });
         _aureliaPal.DOM.dispatchEvent(evt);
@@ -308,8 +302,8 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-
       this._configureHost(applicationHost);
 
       return new Promise(function (resolve) {
-        var viewEngine = _this6.container.get(_aureliaTemplating.ViewEngine);
-        _this6.root = viewEngine.enhance(_this6.container, _this6.host, _this6.resources, bindingContext);
+        var engine = _this6.container.get(_aureliaTemplating.TemplatingEngine);
+        _this6.root = engine.enhance({ container: _this6.container, element: _this6.host, resources: _this6.resources, bindingContext: bindingContext });
         _this6.root.attached();
         _this6._onAureliaComposed();
         return _this6;
@@ -322,18 +316,18 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-
       var root = arguments.length <= 0 || arguments[0] === undefined ? 'app' : arguments[0];
       var applicationHost = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
 
-      var compositionEngine = undefined;
+      var engine = undefined;
       var instruction = {};
 
       this._configureHost(applicationHost);
 
-      compositionEngine = this.container.get(_aureliaTemplating.CompositionEngine);
+      engine = this.container.get(_aureliaTemplating.TemplatingEngine);
       instruction.viewModel = root;
       instruction.container = instruction.childContainer = this.container;
       instruction.viewSlot = this.hostSlot;
       instruction.host = this.host;
 
-      return compositionEngine.compose(instruction).then(function (r) {
+      return engine.compose(instruction).then(function (r) {
         _this7.root = r;
         instruction.viewSlot.attached();
         _this7._onAureliaComposed();

diff --git a/dist/aurelia-framework.d.ts b/dist/aurelia-framework.d.ts
@@ -1,7 +1,7 @@
 declare module 'aurelia-framework' {
   import 'core-js';
   import * as TheLogManager from 'aurelia-logging';
-  import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, CompositionEngine, Animator, templatingEngine }  from 'aurelia-templating';
+  import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine }  from 'aurelia-templating';
   import { join }  from 'aurelia-path';
   import { Container }  from 'aurelia-dependency-injection';
   import { Loader }  from 'aurelia-loader';

diff --git a/dist/aurelia-framework.js b/dist/aurelia-framework.js
@@ -1,6 +1,6 @@
 import 'core-js';
 import * as TheLogManager from 'aurelia-logging';
-import {ViewEngine,BindingLanguage,ViewSlot,ViewResources,CompositionEngine,Animator,templatingEngine} from 'aurelia-templating';
+import {ViewEngine,BindingLanguage,ViewSlot,ViewResources,TemplatingEngine} from 'aurelia-templating';
 import {join} from 'aurelia-path';
 import {Container} from 'aurelia-dependency-injection';
 import {Loader} from 'aurelia-loader';
@@ -393,12 +393,6 @@ export class Aurelia {
         throw new Error(message);
       }
 
-      if (!this.container.hasResolver(Animator)) {
-        Animator.configureDefault(this.container);
-      }
-
-      templatingEngine.initialize(this.container);
-
       this.logger.info('Aurelia Started');
       let evt = DOM.createCustomEvent('aurelia-started', { bubbles: true, cancelable: true });
       DOM.dispatchEvent(evt);
@@ -416,8 +410,8 @@ export class Aurelia {
     this._configureHost(applicationHost);
 
     return new Promise(resolve => {
-      let viewEngine = this.container.get(ViewEngine);
-      this.root = viewEngine.enhance(this.container, this.host, this.resources, bindingContext);
+      let engine = this.container.get(TemplatingEngine);
+      this.root = engine.enhance({container: this.container, element: this.host, resources: this.resources, bindingContext: bindingContext});
       this.root.attached();
       this._onAureliaComposed();
       return this;
@@ -431,18 +425,18 @@ export class Aurelia {
    * @return Returns a Promise of the current Aurelia instance.
    */
   setRoot(root: string = 'app', applicationHost: string | Element = null): Promise<Aurelia> {
-    let compositionEngine;
+    let engine;
     let instruction = {};
 
     this._configureHost(applicationHost);
 
-    compositionEngine = this.container.get(CompositionEngine);
+    engine = this.container.get(TemplatingEngine);
     instruction.viewModel = root;
     instruction.container = instruction.childContainer = this.container;
     instruction.viewSlot = this.hostSlot;
     instruction.host = this.host;
 
-    return compositionEngine.compose(instruction).then(r => {
+    return engine.compose(instruction).then(r => {
       this.root = r;
       instruction.viewSlot.attached();
       this._onAureliaComposed();

diff --git a/dist/commonjs/aurelia-framework.d.ts b/dist/commonjs/aurelia-framework.d.ts
@@ -1,7 +1,7 @@
 declare module 'aurelia-framework' {
   import 'core-js';
   import * as TheLogManager from 'aurelia-logging';
-  import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, CompositionEngine, Animator, templatingEngine }  from 'aurelia-templating';
+  import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine }  from 'aurelia-templating';
   import { join }  from 'aurelia-path';
   import { Container }  from 'aurelia-dependency-injection';
   import { Loader }  from 'aurelia-loader';

diff --git a/dist/commonjs/aurelia-framework.js b/dist/commonjs/aurelia-framework.js
@@ -303,12 +303,6 @@ var Aurelia = (function () {
         throw new Error(message);
       }
 
-      if (!_this5.container.hasResolver(_aureliaTemplating.Animator)) {
-        _aureliaTemplating.Animator.configureDefault(_this5.container);
-      }
-
-      _aureliaTemplating.templatingEngine.initialize(_this5.container);
-
       _this5.logger.info('Aurelia Started');
       var evt = _aureliaPal.DOM.createCustomEvent('aurelia-started', { bubbles: true, cancelable: true });
       _aureliaPal.DOM.dispatchEvent(evt);
@@ -325,8 +319,8 @@ var Aurelia = (function () {
     this._configureHost(applicationHost);
 
     return new Promise(function (resolve) {
-      var viewEngine = _this6.container.get(_aureliaTemplating.ViewEngine);
-      _this6.root = viewEngine.enhance(_this6.container, _this6.host, _this6.resources, bindingContext);
+      var engine = _this6.container.get(_aureliaTemplating.TemplatingEngine);
+      _this6.root = engine.enhance({ container: _this6.container, element: _this6.host, resources: _this6.resources, bindingContext: bindingContext });
       _this6.root.attached();
       _this6._onAureliaComposed();
       return _this6;
@@ -339,18 +333,18 @@ var Aurelia = (function () {
     var root = arguments.length <= 0 || arguments[0] === undefined ? 'app' : arguments[0];
     var applicationHost = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
 
-    var compositionEngine = undefined;
+    var engine = undefined;
     var instruction = {};
 
     this._configureHost(applicationHost);
 
-    compositionEngine = this.container.get(_aureliaTemplating.CompositionEngine);
+    engine = this.container.get(_aureliaTemplating.TemplatingEngine);
     instruction.viewModel = root;
     instruction.container = instruction.childContainer = this.container;
     instruction.viewSlot = this.hostSlot;
     instruction.host = this.host;
 
-    return compositionEngine.compose(instruction).then(function (r) {
+    return engine.compose(instruction).then(function (r) {
       _this7.root = r;
       instruction.viewSlot.attached();
       _this7._onAureliaComposed();

diff --git a/dist/es6/aurelia-framework.d.ts b/dist/es6/aurelia-framework.d.ts
@@ -1,7 +1,7 @@
 declare module 'aurelia-framework' {
   import 'core-js';
   import * as TheLogManager from 'aurelia-logging';
-  import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, CompositionEngine, Animator, templatingEngine }  from 'aurelia-templating';
+  import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine }  from 'aurelia-templating';
   import { join }  from 'aurelia-path';
   import { Container }  from 'aurelia-dependency-injection';
   import { Loader }  from 'aurelia-loader';

diff --git a/dist/es6/aurelia-framework.js b/dist/es6/aurelia-framework.js
@@ -1,6 +1,6 @@
 import 'core-js';
 import * as TheLogManager from 'aurelia-logging';
-import {ViewEngine,BindingLanguage,ViewSlot,ViewResources,CompositionEngine,Animator,templatingEngine} from 'aurelia-templating';
+import {ViewEngine,BindingLanguage,ViewSlot,ViewResources,TemplatingEngine} from 'aurelia-templating';
 import {join} from 'aurelia-path';
 import {Container} from 'aurelia-dependency-injection';
 import {Loader} from 'aurelia-loader';
@@ -393,12 +393,6 @@ export class Aurelia {
         throw new Error(message);
       }
 
-      if (!this.container.hasResolver(Animator)) {
-        Animator.configureDefault(this.container);
-      }
-
-      templatingEngine.initialize(this.container);
-
       this.logger.info('Aurelia Started');
       let evt = DOM.createCustomEvent('aurelia-started', { bubbles: true, cancelable: true });
       DOM.dispatchEvent(evt);
@@ -416,8 +410,8 @@ export class Aurelia {
     this._configureHost(applicationHost);
 
     return new Promise(resolve => {
-      let viewEngine = this.container.get(ViewEngine);
-      this.root = viewEngine.enhance(this.container, this.host, this.resources, bindingContext);
+      let engine = this.container.get(TemplatingEngine);
+      this.root = engine.enhance({container: this.container, element: this.host, resources: this.resources, bindingContext: bindingContext});
       this.root.attached();
       this._onAureliaComposed();
       return this;
@@ -431,18 +425,18 @@ export class Aurelia {
    * @return Returns a Promise of the current Aurelia instance.
    */
   setRoot(root: string = 'app', applicationHost: string | Element = null): Promise<Aurelia> {
-    let compositionEngine;
+    let engine;
     let instruction = {};
 
     this._configureHost(applicationHost);
 
-    compositionEngine = this.container.get(CompositionEngine);
+    engine = this.container.get(TemplatingEngine);
     instruction.viewModel = root;
     instruction.container = instruction.childContainer = this.container;
     instruction.viewSlot = this.hostSlot;
     instruction.host = this.host;
 
-    return compositionEngine.compose(instruction).then(r => {
+    return engine.compose(instruction).then(r => {
       this.root = r;
       instruction.viewSlot.attached();
       this._onAureliaComposed();

diff --git a/dist/system/aurelia-framework.d.ts b/dist/system/aurelia-framework.d.ts
@@ -1,7 +1,7 @@
 declare module 'aurelia-framework' {
   import 'core-js';
   import * as TheLogManager from 'aurelia-logging';
-  import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, CompositionEngine, Animator, templatingEngine }  from 'aurelia-templating';
+  import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine }  from 'aurelia-templating';
   import { join }  from 'aurelia-path';
   import { Container }  from 'aurelia-dependency-injection';
   import { Loader }  from 'aurelia-loader';

diff --git a/dist/system/aurelia-framework.js b/dist/system/aurelia-framework.js
@@ -1,7 +1,7 @@
 System.register(['core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-path', 'aurelia-dependency-injection', 'aurelia-loader', 'aurelia-pal', 'aurelia-binding', 'aurelia-metadata', 'aurelia-task-queue'], function (_export) {
   'use strict';
 
-  var TheLogManager, ViewEngine, BindingLanguage, ViewSlot, ViewResources, CompositionEngine, Animator, templatingEngine, join, Container, Loader, DOM, PLATFORM, logger, FrameworkConfiguration, Aurelia, LogManager;
+  var TheLogManager, ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine, join, Container, Loader, DOM, PLATFORM, logger, FrameworkConfiguration, Aurelia, LogManager;
 
   function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
 
@@ -72,9 +72,7 @@ System.register(['core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-pa
       BindingLanguage = _aureliaTemplating.BindingLanguage;
       ViewSlot = _aureliaTemplating.ViewSlot;
       ViewResources = _aureliaTemplating.ViewResources;
-      CompositionEngine = _aureliaTemplating.CompositionEngine;
-      Animator = _aureliaTemplating.Animator;
-      templatingEngine = _aureliaTemplating.templatingEngine;
+      TemplatingEngine = _aureliaTemplating.TemplatingEngine;
 
       for (var _key4 in _aureliaTemplating) {
         if (_key4 !== 'default') _export(_key4, _aureliaTemplating[_key4]);
@@ -336,12 +334,6 @@ System.register(['core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-pa
               throw new Error(message);
             }
 
-            if (!_this5.container.hasResolver(Animator)) {
-              Animator.configureDefault(_this5.container);
-            }
-
-            templatingEngine.initialize(_this5.container);
-
             _this5.logger.info('Aurelia Started');
             var evt = DOM.createCustomEvent('aurelia-started', { bubbles: true, cancelable: true });
             DOM.dispatchEvent(evt);
@@ -358,8 +350,8 @@ System.register(['core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-pa
           this._configureHost(applicationHost);
 
           return new Promise(function (resolve) {
-            var viewEngine = _this6.container.get(ViewEngine);
-            _this6.root = viewEngine.enhance(_this6.container, _this6.host, _this6.resources, bindingContext);
+            var engine = _this6.container.get(TemplatingEngine);
+            _this6.root = engine.enhance({ container: _this6.container, element: _this6.host, resources: _this6.resources, bindingContext: bindingContext });
             _this6.root.attached();
             _this6._onAureliaComposed();
             return _this6;
@@ -372,18 +364,18 @@ System.register(['core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-pa
           var root = arguments.length <= 0 || arguments[0] === undefined ? 'app' : arguments[0];
           var applicationHost = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
 
-          var compositionEngine = undefined;
+          var engine = undefined;
           var instruction = {};
 
           this._configureHost(applicationHost);
 
-          compositionEngine = this.container.get(CompositionEngine);
+          engine = this.container.get(TemplatingEngine);
           instruction.viewModel = root;
           instruction.container = instruction.childContainer = this.container;
           instruction.viewSlot = this.hostSlot;
           instruction.host = this.host;
 
-          return compositionEngine.compose(instruction).then(function (r) {
+          return engine.compose(instruction).then(function (r) {
             _this7.root = r;
             instruction.viewSlot.attached();
             _this7._onAureliaComposed();

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.18.0 (2015-11-10)
+
+
+#### Bug Fixes
+
+* **all:** update to work with latest TemplatingEngine ([edf2b5f8](http://github.com/aurelia/framework/commit/edf2b5f8e5a47984219e2be26d7b762b9d7eab7c))
+
+
 ## 0.17.0 (2015-10-13)
 
 

diff --git a/doc/api.json b/doc/api.json
@@ -53,7 +53,7 @@
                   "type": {
                     "type": "reference",
                     "name": "Loader",
-                    "id": 1506,
+                    "id": 1714,
                     "moduleName": "\"aurelia-loader\""
                   }
                 },
@@ -71,7 +71,7 @@
                   "type": {
                     "type": "reference",
                     "name": "Container",
-                    "id": 1386,
+                    "id": 1593,
                     "moduleName": "\"aurelia-dependency-injection\""
                   }
                 },
@@ -89,7 +89,7 @@
                   "type": {
                     "type": "reference",
                     "name": "ViewResources",
-                    "id": 2074,
+                    "id": 2261,
                     "moduleName": "\"aurelia-templating\""
                   }
                 }
@@ -117,7 +117,7 @@
           "type": {
             "type": "reference",
             "name": "Container",
-            "id": 1386,
+            "id": 1593,
             "moduleName": "\"aurelia-dependency-injection\""
           }
         },
@@ -135,7 +135,7 @@
           "type": {
             "type": "reference",
             "name": "Loader",
-            "id": 1506,
+            "id": 1714,
             "moduleName": "\"aurelia-loader\""
           }
         },
@@ -153,7 +153,7 @@
           "type": {
             "type": "reference",
             "name": "ViewResources",
-            "id": 2074,
+            "id": 2261,
             "moduleName": "\"aurelia-templating\""
           }
         },
@@ -482,7 +482,7 @@
           "type": {
             "type": "reference",
             "name": "Container",
-            "id": 1386,
+            "id": 1593,
             "moduleName": "\"aurelia-dependency-injection\""
           }
         },