chore(*): prepare release 0.4.0

EisenbergEffect · EisenbergEffect · commit 07de898cb69e · 2014-12-22T01:39:15.000-05:00
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-framework",
-  "version": "0.3.2",
+  "version": "0.4.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.js b/dist/amd/aurelia.js
@@ -14,12 +14,33 @@ define(["exports", "aurelia-logging", "aurelia-dependency-injection", "aurelia-l
 
   var logger = LogManager.getLogger("aurelia");
 
+  function loadPlugins(loader, plugins) {
+    var toLoad = [], i, ii, current;
+
+    for (i = 0, ii = plugins.length; i < ii; ++i) {
+      current = plugins[i];
+      logger.debug("Loading plugin " + current.moduleId + ".");
+      toLoad.push(loader.loadModule(current.moduleId).then(function (exportedValue) {
+        if ("install" in exportedValue) {
+          return exportedValue.install(current.config || {}).then(function () {
+            logger.debug("Installed plugin " + current.moduleId + ".");
+          });
+        } else {
+          logger.debug("Loaded plugin " + current.moduleId + ".");
+        }
+      }));
+    }
+
+    return Promise.all(toLoad);
+  }
+
   var Aurelia = (function () {
     var Aurelia = function Aurelia(loader, container, resources) {
       this.loader = loader || Loader.createDefaultLoader();
       this.container = container || new Container();
       this.resources = resources || new ResourceRegistry();
       this.resourcesToLoad = [];
+      this.plugins = [];
 
       this.withInstance(Aurelia, this);
       this.withInstance(Loader, this.loader);
@@ -42,8 +63,8 @@ define(["exports", "aurelia-logging", "aurelia-dependency-injection", "aurelia-l
       return this;
     };
 
-    Aurelia.prototype.withPlugins = function (config, baseUrl) {
-      logger.error("withPlugins is not yet implemented");
+    Aurelia.prototype.withPlugin = function (moduleId, config) {
+      this.plugins.push({ moduleId: moduleId, config: config });
       return this;
     };
 
@@ -70,16 +91,18 @@ define(["exports", "aurelia-logging", "aurelia-dependency-injection", "aurelia-l
         logger.error("You must configure Aurelia with a BindingLanguage implementation.");
       }
 
-      return this.container.get(ResourceCoordinator).importResources(this.resourcesToLoad).then(function (resources) {
-        resources.forEach(function (x) {
-          return x.register(_this.resources);
+      return loadPlugins(this.loader, this.plugins).then(function () {
+        return _this.container.get(ResourceCoordinator).importResources(_this.resourcesToLoad).then(function (resources) {
+          resources.forEach(function (x) {
+            return x.register(_this.resources);
+          });
+          logger.info("Aurelia Started");
+          return _this;
         });
-        logger.info("Aurelia Started");
-        return _this;
       });
     };
 
-    Aurelia.prototype.setRoot = function (root, transition, applicationHost) {
+    Aurelia.prototype.setRoot = function (root, applicationHost) {
       var _this2 = this;
       if (!applicationHost || typeof applicationHost == "string") {
         this.host = document.getElementById(applicationHost || "applicationHost") || document.body;
diff --git a/dist/commonjs/aurelia.js b/dist/commonjs/aurelia.js
@@ -14,12 +14,33 @@ var includeEventsIn = require('aurelia-event-aggregator').includeEventsIn;
 
 var logger = LogManager.getLogger("aurelia");
 
+function loadPlugins(loader, plugins) {
+  var toLoad = [], i, ii, current;
+
+  for (i = 0, ii = plugins.length; i < ii; ++i) {
+    current = plugins[i];
+    logger.debug("Loading plugin " + current.moduleId + ".");
+    toLoad.push(loader.loadModule(current.moduleId).then(function (exportedValue) {
+      if ("install" in exportedValue) {
+        return exportedValue.install(current.config || {}).then(function () {
+          logger.debug("Installed plugin " + current.moduleId + ".");
+        });
+      } else {
+        logger.debug("Loaded plugin " + current.moduleId + ".");
+      }
+    }));
+  }
+
+  return Promise.all(toLoad);
+}
+
 var Aurelia = (function () {
   var Aurelia = function Aurelia(loader, container, resources) {
     this.loader = loader || Loader.createDefaultLoader();
     this.container = container || new Container();
     this.resources = resources || new ResourceRegistry();
     this.resourcesToLoad = [];
+    this.plugins = [];
 
     this.withInstance(Aurelia, this);
     this.withInstance(Loader, this.loader);
@@ -42,8 +63,8 @@ var Aurelia = (function () {
     return this;
   };
 
-  Aurelia.prototype.withPlugins = function (config, baseUrl) {
-    logger.error("withPlugins is not yet implemented");
+  Aurelia.prototype.withPlugin = function (moduleId, config) {
+    this.plugins.push({ moduleId: moduleId, config: config });
     return this;
   };
 
@@ -70,16 +91,18 @@ var Aurelia = (function () {
       logger.error("You must configure Aurelia with a BindingLanguage implementation.");
     }
 
-    return this.container.get(ResourceCoordinator).importResources(this.resourcesToLoad).then(function (resources) {
-      resources.forEach(function (x) {
-        return x.register(_this.resources);
+    return loadPlugins(this.loader, this.plugins).then(function () {
+      return _this.container.get(ResourceCoordinator).importResources(_this.resourcesToLoad).then(function (resources) {
+        resources.forEach(function (x) {
+          return x.register(_this.resources);
+        });
+        logger.info("Aurelia Started");
+        return _this;
       });
-      logger.info("Aurelia Started");
-      return _this;
     });
   };
 
-  Aurelia.prototype.setRoot = function (root, transition, applicationHost) {
+  Aurelia.prototype.setRoot = function (root, applicationHost) {
     var _this2 = this;
     if (!applicationHost || typeof applicationHost == "string") {
       this.host = document.getElementById(applicationHost || "applicationHost") || document.body;
diff --git a/dist/es6/aurelia.js b/dist/es6/aurelia.js
@@ -6,12 +6,33 @@ import {EventAggregator, includeEventsIn} from 'aurelia-event-aggregator';
 
 var logger = LogManager.getLogger('aurelia');
 
+function loadPlugins(loader, plugins){
+  var toLoad = [], i, ii, current;
+
+  for(i = 0, ii = plugins.length; i < ii; ++i){
+    current = plugins[i];
+    logger.debug(`Loading plugin ${current.moduleId}.`);
+    toLoad.push(loader.loadModule(current.moduleId).then(exportedValue => {
+      if('install' in exportedValue){
+        return exportedValue.install(current.config || {}).then(() =>{
+          logger.debug(`Installed plugin ${current.moduleId}.`);
+        });
+      }else{
+        logger.debug(`Loaded plugin ${current.moduleId}.`);
+      }
+    }));
+  }
+
+  return Promise.all(toLoad);
+}
+
 export class Aurelia {
   constructor(loader, container, resources){
     this.loader = loader || Loader.createDefaultLoader();
     this.container = container || new Container();
     this.resources = resources || new ResourceRegistry();
     this.resourcesToLoad = [];
+    this.plugins = [];
 
     this.withInstance(Aurelia, this);
     this.withInstance(Loader, this.loader);
@@ -34,8 +55,8 @@ export class Aurelia {
     return this;
   }
 
-  withPlugins(config, baseUrl){
-    logger.error('withPlugins is not yet implemented');
+  withPlugin(moduleId, config){
+    this.plugins.push({moduleId:moduleId, config:config});
     return this;
   }
 
@@ -61,17 +82,17 @@ export class Aurelia {
       logger.error('You must configure Aurelia with a BindingLanguage implementation.');
     }
 
-    //TODO: configure plugins
-
-    return this.container.get(ResourceCoordinator)
-      .importResources(this.resourcesToLoad).then(resources => {
-        resources.forEach(x => x.register(this.resources));
-        logger.info('Aurelia Started');
-        return this;
-      });
+    return loadPlugins(this.loader, this.plugins).then(() => {
+      return this.container.get(ResourceCoordinator)
+        .importResources(this.resourcesToLoad).then(resources => {
+          resources.forEach(x => x.register(this.resources));
+          logger.info('Aurelia Started');
+          return this;
+        });
+    });
   }
 
-  setRoot(root, transition, applicationHost){
+  setRoot(root, applicationHost){
     if (!applicationHost || typeof applicationHost == 'string') {
       this.host = document.getElementById(applicationHost || 'applicationHost') || document.body;
     } else {
diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 0.4.0 (2014-12-22)
+
+
+#### Bug Fixes
+
+* **package:** update templating to latest version ([63d4c5f6](http://github.com/aurelia/framework/commit/63d4c5f6db58a50f6e1776b2b4939ca81ce4edf5))
+
+
+#### Features
+
+* **framework:** enable plugin loading and config ([f3b02ea9](http://github.com/aurelia/framework/commit/f3b02ea96c0a607b77bb7fbc7e0389748fb07c12))
+
+
 ### 0.3.2 (2014-12-18)
 
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-framework",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "The aurelia framework brings together all the required core aurelia libraries into a ready-to-go application-building platform.",
   "keywords": [
     "aurelia",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "aurelia-framework",`
`3`		`- "version": "0.3.2",`
	`3`	`+ "version": "0.4.0",`
`4`	`4`	`"description": "The aurelia framework brings together all the required core aurelia libraries into a ready-to-go application-building platform.",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"aurelia",`