chore(all): prepare release 1.1.0

aurelia · Feb 27, 2017 · b0252e7 · b0252e7
1 parent bde8ffc
commit b0252e7
Show file tree

Hide file tree

Showing 10 changed files with 78 additions and 65 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-framework",
-  "version": "1.0.8",
+  "version": "1.1.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.js b/dist/amd/aurelia-framework.js
@@ -130,14 +130,12 @@ define(['exports', 'aurelia-dependency-injection', 'aurelia-binding', 'aurelia-m
     Aurelia.prototype.start = function start() {
       var _this = this;
 
-      if (this.started) {
-        return Promise.resolve(this);
+      if (this._started) {
+        return this._started;
       }
 
-      this.started = true;
       this.logger.info('Aurelia Starting');
-
-      return this.use.apply().then(function () {
+      return this._started = this.use.apply().then(function () {
         preventActionlessFormSubmit();
 
         if (!_this.container.hasResolver(_aureliaTemplating.BindingLanguage)) {
@@ -402,12 +400,13 @@ define(['exports', 'aurelia-dependency-injection', 'aurelia-binding', 'aurelia-m
       return this;
     };
 
-    FrameworkConfiguration.prototype.feature = function feature(plugin, config) {
-      if (getExt(plugin)) {
-        return this.plugin({ moduleId: plugin, resourcesRelativeTo: [plugin, ''], config: config || {} });
-      }
+    FrameworkConfiguration.prototype.feature = function feature(plugin) {
+      var config = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
 
-      return this.plugin({ moduleId: plugin + '/index', resourcesRelativeTo: [plugin, ''], config: config || {} });
+      var hasIndex = /\/index$/i.test(plugin);
+      var moduleId = hasIndex || getExt(plugin) ? plugin : plugin + '/index';
+      var root = hasIndex ? plugin.substr(0, plugin.length - 6) : plugin;
+      return this.plugin({ moduleId: moduleId, resourcesRelativeTo: [root, ''], config: config });
     };
 
     FrameworkConfiguration.prototype.globalResources = function globalResources(resources) {

diff --git a/dist/aurelia-framework.js b/dist/aurelia-framework.js
@@ -68,14 +68,12 @@ export class Aurelia {
    * @return Returns a Promise with the started Aurelia instance.
    */
   start(): Promise<Aurelia> {
-    if (this.started) {
-      return Promise.resolve(this);
+    if (this._started) {
+      return this._started;
     }
 
-    this.started = true;
     this.logger.info('Aurelia Starting');
-
-    return this.use.apply().then(() => {
+    return this._started = this.use.apply().then(() => {
       preventActionlessFormSubmit();
 
       if (!this.container.hasResolver(BindingLanguage)) {
@@ -378,12 +376,11 @@ export class FrameworkConfiguration {
    * @param config The configuration for the specified plugin.
    * @return Returns the current FrameworkConfiguration instance.
    */
-  feature(plugin: string, config?: any): FrameworkConfiguration {
-    if (getExt(plugin)) {
-      return this.plugin({ moduleId: plugin, resourcesRelativeTo: [plugin, ''], config: config || {} });
-    }
-
-    return this.plugin({ moduleId: plugin + '/index', resourcesRelativeTo: [plugin, ''], config: config || {} });
+  feature(plugin: string, config?: any = {}): FrameworkConfiguration {
+    let hasIndex = /\/index$/i.test(plugin);
+    let moduleId = hasIndex || getExt(plugin) ? plugin : plugin + '/index';
+    let root = hasIndex ? plugin.substr(0, plugin.length - 6) : plugin;
+    return this.plugin({ moduleId, resourcesRelativeTo: [root, ''], config });
   }
 
   /**
@@ -461,6 +458,14 @@ export class FrameworkConfiguration {
     return this;
   }
 
+  // Default configuration helpers
+  // Note: Please do NOT add PLATFORM.moduleName() around those module names.
+  //       Those functions are not guaranteed to be called, they are here to faciliate
+  //       common configurations. If they are not called, we don't want to include a
+  //       static dependency on those modules.
+  //       Including those modules in the bundle or not is a decision that must be
+  //       taken by the bundling tool, at build time.
+
   /**
    * Plugs in the default binding language from aurelia-templating-binding.
    * @return Returns the current FrameworkConfiguration instance.

diff --git a/dist/commonjs/aurelia-framework.js b/dist/commonjs/aurelia-framework.js
@@ -140,14 +140,12 @@ var Aurelia = exports.Aurelia = function () {
   Aurelia.prototype.start = function start() {
     var _this = this;
 
-    if (this.started) {
-      return Promise.resolve(this);
+    if (this._started) {
+      return this._started;
     }
 
-    this.started = true;
     this.logger.info('Aurelia Starting');
-
-    return this.use.apply().then(function () {
+    return this._started = this.use.apply().then(function () {
       preventActionlessFormSubmit();
 
       if (!_this.container.hasResolver(_aureliaTemplating.BindingLanguage)) {
@@ -412,12 +410,13 @@ var FrameworkConfiguration = function () {
     return this;
   };
 
-  FrameworkConfiguration.prototype.feature = function feature(plugin, config) {
-    if (getExt(plugin)) {
-      return this.plugin({ moduleId: plugin, resourcesRelativeTo: [plugin, ''], config: config || {} });
-    }
+  FrameworkConfiguration.prototype.feature = function feature(plugin) {
+    var config = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
 
-    return this.plugin({ moduleId: plugin + '/index', resourcesRelativeTo: [plugin, ''], config: config || {} });
+    var hasIndex = /\/index$/i.test(plugin);
+    var moduleId = hasIndex || getExt(plugin) ? plugin : plugin + '/index';
+    var root = hasIndex ? plugin.substr(0, plugin.length - 6) : plugin;
+    return this.plugin({ moduleId: moduleId, resourcesRelativeTo: [root, ''], config: config });
   };
 
   FrameworkConfiguration.prototype.globalResources = function globalResources(resources) {

diff --git a/dist/es2015/aurelia-framework.js b/dist/es2015/aurelia-framework.js
@@ -32,14 +32,12 @@ export let Aurelia = class Aurelia {
   }
 
   start() {
-    if (this.started) {
-      return Promise.resolve(this);
+    if (this._started) {
+      return this._started;
     }
 
-    this.started = true;
     this.logger.info('Aurelia Starting');
-
-    return this.use.apply().then(() => {
+    return this._started = this.use.apply().then(() => {
       preventActionlessFormSubmit();
 
       if (!this.container.hasResolver(BindingLanguage)) {
@@ -276,12 +274,11 @@ export let FrameworkConfiguration = class FrameworkConfiguration {
     return this;
   }
 
-  feature(plugin, config) {
-    if (getExt(plugin)) {
-      return this.plugin({ moduleId: plugin, resourcesRelativeTo: [plugin, ''], config: config || {} });
-    }
-
-    return this.plugin({ moduleId: plugin + '/index', resourcesRelativeTo: [plugin, ''], config: config || {} });
+  feature(plugin, config = {}) {
+    let hasIndex = /\/index$/i.test(plugin);
+    let moduleId = hasIndex || getExt(plugin) ? plugin : plugin + '/index';
+    let root = hasIndex ? plugin.substr(0, plugin.length - 6) : plugin;
+    return this.plugin({ moduleId, resourcesRelativeTo: [root, ''], config });
   }
 
   globalResources(resources) {

diff --git a/dist/native-modules/aurelia-framework.js b/dist/native-modules/aurelia-framework.js
@@ -38,14 +38,12 @@ export var Aurelia = function () {
   Aurelia.prototype.start = function start() {
     var _this = this;
 
-    if (this.started) {
-      return Promise.resolve(this);
+    if (this._started) {
+      return this._started;
     }
 
-    this.started = true;
     this.logger.info('Aurelia Starting');
-
-    return this.use.apply().then(function () {
+    return this._started = this.use.apply().then(function () {
       preventActionlessFormSubmit();
 
       if (!_this.container.hasResolver(BindingLanguage)) {
@@ -310,12 +308,13 @@ var FrameworkConfiguration = function () {
     return this;
   };
 
-  FrameworkConfiguration.prototype.feature = function feature(plugin, config) {
-    if (getExt(plugin)) {
-      return this.plugin({ moduleId: plugin, resourcesRelativeTo: [plugin, ''], config: config || {} });
-    }
+  FrameworkConfiguration.prototype.feature = function feature(plugin) {
+    var config = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
 
-    return this.plugin({ moduleId: plugin + '/index', resourcesRelativeTo: [plugin, ''], config: config || {} });
+    var hasIndex = /\/index$/i.test(plugin);
+    var moduleId = hasIndex || getExt(plugin) ? plugin : plugin + '/index';
+    var root = hasIndex ? plugin.substr(0, plugin.length - 6) : plugin;
+    return this.plugin({ moduleId: moduleId, resourcesRelativeTo: [root, ''], config: config });
   };
 
   FrameworkConfiguration.prototype.globalResources = function globalResources(resources) {

diff --git a/dist/system/aurelia-framework.js b/dist/system/aurelia-framework.js
@@ -225,14 +225,12 @@ System.register(['aurelia-logging', 'aurelia-dependency-injection', 'aurelia-loa
         Aurelia.prototype.start = function start() {
           var _this = this;
 
-          if (this.started) {
-            return Promise.resolve(this);
+          if (this._started) {
+            return this._started;
           }
 
-          this.started = true;
           this.logger.info('Aurelia Starting');
-
-          return this.use.apply().then(function () {
+          return this._started = this.use.apply().then(function () {
             preventActionlessFormSubmit();
 
             if (!_this.container.hasResolver(BindingLanguage)) {
@@ -393,12 +391,13 @@ System.register(['aurelia-logging', 'aurelia-dependency-injection', 'aurelia-loa
           return this;
         };
 
-        FrameworkConfiguration.prototype.feature = function feature(plugin, config) {
-          if (getExt(plugin)) {
-            return this.plugin({ moduleId: plugin, resourcesRelativeTo: [plugin, ''], config: config || {} });
-          }
+        FrameworkConfiguration.prototype.feature = function feature(plugin) {
+          var config = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
 
-          return this.plugin({ moduleId: plugin + '/index', resourcesRelativeTo: [plugin, ''], config: config || {} });
+          var hasIndex = /\/index$/i.test(plugin);
+          var moduleId = hasIndex || getExt(plugin) ? plugin : plugin + '/index';
+          var root = hasIndex ? plugin.substr(0, plugin.length - 6) : plugin;
+          return this.plugin({ moduleId: moduleId, resourcesRelativeTo: [root, ''], config: config });
         };
 
         FrameworkConfiguration.prototype.globalResources = function globalResources(resources) {

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,3 +1,18 @@
+<a name="1.1.0"></a>
+# [1.1.0](https://github.com/aurelia/framework/compare/1.0.8...v1.1.0) (2017-02-27)
+
+
+### Bug Fixes
+
+* **startup:** start() incorrectly returns a resolved promise ([4ef49e6](https://github.com/aurelia/framework/commit/4ef49e6))
+
+
+### Features
+
+* **config:** .feature() accepts explicit /index. ([890f8d5](https://github.com/aurelia/framework/commit/890f8d5))
+
+
+
 <a name="1.0.2"></a>
 ## [1.0.2](https://github.com/aurelia/framework/compare/1.0.1...v1.0.2) (2016-08-26)
 

diff --git a/doc/api.json b/doc/api.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-framework",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "description": "The aurelia framework brings together all the required core aurelia libraries into a ready-to-go application-building platform.",
   "keywords": [
     "aurelia",