chore(all): prepare release 0.13.1

aurelia · Jun 9, 2015 · 75d8a1b · 75d8a1b
1 parent 2fa4d3e
commit 75d8a1b
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 19 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-bootstrapper",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "description": "Sets up the default configuration for the aurelia framework and gets you up and running quick and easy.",
   "keywords": [
     "aurelia",

diff --git a/dist/amd/index.js b/dist/amd/index.js
@@ -59,11 +59,19 @@ define(['exports', 'core-js', 'aurelia-framework', 'aurelia-logging-console'], f
 
   function ensureLoader() {
     if (!window.AureliaLoader) {
-      return System.normalize('aurelia-bootstrapper').then(function (bootstrapperName) {
-        return System.normalize('aurelia-loader-default', bootstrapperName).then(function (loaderName) {
-          return System['import'](loaderName);
+      if (window.System) {
+        return System.normalize('aurelia-bootstrapper').then(function (bootstrapperName) {
+          return System.normalize('aurelia-loader-default', bootstrapperName).then(function (loaderName) {
+            return System['import'](loaderName);
+          });
         });
-      });
+      } else if (window.require) {
+        return new Promise(function (resolve, reject) {
+          require(['aurelia-loader-default'], resolve, reject);
+        });
+      } else {
+        throw new Error('No window.AureliaLoader is defined and there is neither a System API (ES6) or a Require API (AMD) available to load your app.');
+      }
     }
 
     return Promise.resolve();

diff --git a/dist/commonjs/index.js b/dist/commonjs/index.js
@@ -64,11 +64,19 @@ function ready(global) {
 
 function ensureLoader() {
   if (!window.AureliaLoader) {
-    return System.normalize('aurelia-bootstrapper').then(function (bootstrapperName) {
-      return System.normalize('aurelia-loader-default', bootstrapperName).then(function (loaderName) {
-        return System['import'](loaderName);
+    if (window.System) {
+      return System.normalize('aurelia-bootstrapper').then(function (bootstrapperName) {
+        return System.normalize('aurelia-loader-default', bootstrapperName).then(function (loaderName) {
+          return System['import'](loaderName);
+        });
       });
-    });
+    } else if (window.require) {
+      return new Promise(function (resolve, reject) {
+        require(['aurelia-loader-default'], resolve, reject);
+      });
+    } else {
+      throw new Error('No window.AureliaLoader is defined and there is neither a System API (ES6) or a Require API (AMD) available to load your app.');
+    }
   }
 
   return Promise.resolve();

diff --git a/dist/es6/index.js b/dist/es6/index.js
@@ -51,11 +51,19 @@ function ready(global) {
 
 function ensureLoader(){
   if(!window.AureliaLoader){
-    return System.normalize('aurelia-bootstrapper').then(function(bootstrapperName){
-      return System.normalize('aurelia-loader-default', bootstrapperName).then(function(loaderName){
-        return System.import(loaderName);
-      })
-    });
+    if(window.System){
+      return System.normalize('aurelia-bootstrapper').then(bootstrapperName => {
+        return System.normalize('aurelia-loader-default', bootstrapperName).then(loaderName => {
+          return System.import(loaderName);
+        })
+      });
+    } else if(window.require){
+      return new Promise((resolve, reject) => {
+        require(['aurelia-loader-default'], resolve, reject);
+      });
+    }else{
+      throw new Error('No window.AureliaLoader is defined and there is neither a System API (ES6) or a Require API (AMD) available to load your app.')
+    }
   }
 
   return Promise.resolve();

diff --git a/dist/system/index.js b/dist/system/index.js
@@ -51,11 +51,19 @@ System.register(['core-js', 'aurelia-framework', 'aurelia-logging-console'], fun
 
   function ensureLoader() {
     if (!window.AureliaLoader) {
-      return System.normalize('aurelia-bootstrapper').then(function (bootstrapperName) {
-        return System.normalize('aurelia-loader-default', bootstrapperName).then(function (loaderName) {
-          return System['import'](loaderName);
+      if (window.System) {
+        return System.normalize('aurelia-bootstrapper').then(function (bootstrapperName) {
+          return System.normalize('aurelia-loader-default', bootstrapperName).then(function (loaderName) {
+            return System['import'](loaderName);
+          });
         });
-      });
+      } else if (window.require) {
+        return new Promise(function (resolve, reject) {
+          require(['aurelia-loader-default'], resolve, reject);
+        });
+      } else {
+        throw new Error('No window.AureliaLoader is defined and there is neither a System API (ES6) or a Require API (AMD) available to load your app.');
+      }
     }
 
     return Promise.resolve();

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,3 +1,11 @@
+### 0.13.1 (2015-06-09)
+
+
+#### Bug Fixes
+
+* **index:** detect System or require api and load appropriately ([2fa4d3e7](http://github.com/aurelia/bootstrapper/commit/2fa4d3e7a6f525912ed1384c6eab33ff34960eb0), closes [#110](http://github.com/aurelia/bootstrapper/issues/110))
+
+
 ## 0.13.0 (2015-06-08)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-bootstrapper",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "description": "Sets up the default configuration for the aurelia framework and gets you up and running quick and easy.",
   "keywords": [
     "aurelia",