Merge pull request aurelia#710 from jods4/feature

feat(config): .feature() accepts explicit /index.
an0o0nym · Feb 5, 2017 · ee31a6c · ee31a6c
2 parents d650b01 + 890f8d5
commit ee31a6c
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/framework-configuration.js b/src/framework-configuration.js
@@ -202,12 +202,15 @@ 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 });
   }
 
   /**