0.9.4

Author: guybedford

README.md

@@ -23,7 +23,7 @@ _Note the ES6 module specification is still in draft, and subject to change._
 
 ### Basic Use
 
-Download both [es6-module-loader.js](https://raw.githubusercontent.com/ModuleLoader/es6-module-loader/v0.9.3/dist/es6-module-loader.js) and traceur.js into the same folder.
+Download both [es6-module-loader.js](https://raw.githubusercontent.com/ModuleLoader/es6-module-loader/v0.9.4/dist/es6-module-loader.js) and traceur.js into the same folder.
 
 If using ES6 syntax (optional), include [`traceur.js`](https://raw.githubusercontent.com/jmcriffey/bower-traceur/0.0.72/traceur.js) in the page first then include `es6-module-loader.js`:
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "es6-module-loader",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "An ES6 Module Loader polyfill based on the latest spec.",
   "homepage": "https://github.com/ModuleLoader/es6-module-loader",
   "main": "dist/es6-module-loader-sans-promises.js",

dist/es6-module-loader-sans-promises.js

@@ -1167,7 +1167,7 @@ function logloads(loads) {
 
   var fetchTextFromURL;
 
-  if (isBrowser || isWorker) {
+  if (typeof XMLHttpRequest != 'undefined') {
     fetchTextFromURL = function(url, fulfill, reject) {
       var xhr = new XMLHttpRequest();
       var sameDomain = true;
@@ -1180,7 +1180,7 @@ function logloads(loads) {
             sameDomain &= domainCheck[1] === window.location.protocol;
         }
       }
-      if (!sameDomain) {
+      if (!sameDomain && typeof XDomainRequest != 'undefined') {
         xhr = new XDomainRequest();
         xhr.onload = load;
         xhr.onerror = error;
@@ -1210,7 +1210,7 @@ function logloads(loads) {
       xhr.send(null);
     }
   }
-  else {
+  else if (typeof require != 'undefined') {
     var fs;
     fetchTextFromURL = function(url, fulfill, reject) {
       fs = fs || require('fs');
@@ -1222,19 +1222,25 @@ function logloads(loads) {
       });
     }
   }
+  else {
+    throw new TypeError('No environment fetch API available.');
+  }
 
   var SystemLoader = function($__super) {
     function SystemLoader(options) {
       $__Object$getPrototypeOf(SystemLoader.prototype).constructor.call(this, options || {});
 
       // Set default baseURL and paths
-      if (isBrowser || isWorker) {
+      if (typeof location != 'undefined' && location.href) {
         var href = __global.location.href.split('#')[0].split('?')[0];
         this.baseURL = href.substring(0, href.lastIndexOf('/') + 1);
       }
-      else {
+      else if (typeof process != 'undefined' && process.cwd) {
         this.baseURL = process.cwd() + '/';
       }
+      else {
+        throw new TypeError('No environment baseURL');
+      }
       this.paths = { '*': '*.js' };
     }
 
@@ -1392,7 +1398,7 @@ function logloads(loads) {
 
   // <script type="module"> support
   // allow a data-init function callback once loaded
-  if (isBrowser) {
+  if (isBrowser && typeof document.getElementsByTagName != 'undefined') {
     var curScript = document.getElementsByTagName('script');
     curScript = curScript[curScript.length - 1];
 

dist/es6-module-loader-sans-promises.js.map

@@ -2391,7 +2391,7 @@ function logloads(loads) {
 
   var fetchTextFromURL;
 
-  if (isBrowser || isWorker) {
+  if (typeof XMLHttpRequest != 'undefined') {
     fetchTextFromURL = function(url, fulfill, reject) {
       var xhr = new XMLHttpRequest();
       var sameDomain = true;
@@ -2404,7 +2404,7 @@ function logloads(loads) {
             sameDomain &= domainCheck[1] === window.location.protocol;
         }
       }
-      if (!sameDomain) {
+      if (!sameDomain && typeof XDomainRequest != 'undefined') {
         xhr = new XDomainRequest();
         xhr.onload = load;
         xhr.onerror = error;
@@ -2434,7 +2434,7 @@ function logloads(loads) {
       xhr.send(null);
     }
   }
-  else {
+  else if (typeof require != 'undefined') {
     var fs;
     fetchTextFromURL = function(url, fulfill, reject) {
       fs = fs || require('fs');
@@ -2446,19 +2446,25 @@ function logloads(loads) {
       });
     }
   }
+  else {
+    throw new TypeError('No environment fetch API available.');
+  }
 
   var SystemLoader = function($__super) {
     function SystemLoader(options) {
       $__Object$getPrototypeOf(SystemLoader.prototype).constructor.call(this, options || {});
 
       // Set default baseURL and paths
-      if (isBrowser || isWorker) {
+      if (typeof location != 'undefined' && location.href) {
         var href = __global.location.href.split('#')[0].split('?')[0];
         this.baseURL = href.substring(0, href.lastIndexOf('/') + 1);
       }
-      else {
+      else if (typeof process != 'undefined' && process.cwd) {
         this.baseURL = process.cwd() + '/';
       }
+      else {
+        throw new TypeError('No environment baseURL');
+      }
       this.paths = { '*': '*.js' };
     }
 
@@ -2616,7 +2622,7 @@ function logloads(loads) {
 
   // <script type="module"> support
   // allow a data-init function callback once loaded
-  if (isBrowser) {
+  if (isBrowser && typeof document.getElementsByTagName != 'undefined') {
     var curScript = document.getElementsByTagName('script');
     curScript = curScript[curScript.length - 1];
 

dist/es6-module-loader-sans-promises.src.js

@@ -1,7 +1,7 @@
 {
   "name": "es6-module-loader",
   "description": "An ES6 Module Loader shim",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "homepage": "https://github.com/ModuleLoader/es6-module-loader",
   "author": {
     "name": "Guy Bedford, Luke Hoban, Addy Osmani",