v0.17.3

ModuleLoader · Jun 24, 2015 · cba9bd2 · cba9bd2
1 parent 3e7432f
commit cba9bd2
Show file tree

Hide file tree

Showing 7 changed files with 149 additions and 157 deletions.
diff --git a/dist/es6-module-loader-dev.js b/dist/es6-module-loader-dev.js
diff --git a/dist/es6-module-loader-dev.js.map b/dist/es6-module-loader-dev.js.map
diff --git a/dist/es6-module-loader-dev.src.js b/dist/es6-module-loader-dev.src.js
@@ -1,3 +1,73 @@
+// from https://gist.github.com/Yaffle/1088850
+(function(global) {
+function URLPolyfill(url, baseURL) {
+  if (typeof url != 'string')
+    throw new TypeError('URL must be a string');
+  var m = String(url).replace(/^\s+|\s+$/g, "").match(/^([^:\/?#]+:)?(?:\/\/(?:([^:@\/?#]*)(?::([^:@\/?#]*))?@)?(([^:\/?#]*)(?::(\d*))?))?([^?#]*)(\?[^#]*)?(#[\s\S]*)?/);
+  if (!m) {
+    throw new RangeError();
+  }
+  var protocol = m[1] || "";
+  var username = m[2] || "";
+  var password = m[3] || "";
+  var host = m[4] || "";
+  var hostname = m[5] || "";
+  var port = m[6] || "";
+  var pathname = m[7] || "";
+  var search = m[8] || "";
+  var hash = m[9] || "";
+  if (baseURL !== undefined) {
+    var base = baseURL instanceof URLPolyfill ? baseURL : new URLPolyfill(baseURL);
+    var flag = protocol === "" && host === "" && username === "";
+    if (flag && pathname === "" && search === "") {
+      search = base.search;
+    }
+    if (flag && pathname.charAt(0) !== "/") {
+      pathname = (pathname !== "" ? (((base.host !== "" || base.username !== "") && base.pathname === "" ? "/" : "") + base.pathname.slice(0, base.pathname.lastIndexOf("/") + 1) + pathname) : base.pathname);
+    }
+    // dot segments removal
+    var output = [];
+    pathname.replace(/^(\.\.?(\/|$))+/, "")
+      .replace(/\/(\.(\/|$))+/g, "/")
+      .replace(/\/\.\.$/, "/../")
+      .replace(/\/?[^\/]*/g, function (p) {
+        if (p === "/..") {
+          output.pop();
+        } else {
+          output.push(p);
+        }
+      });
+    pathname = output.join("").replace(/^\//, pathname.charAt(0) === "/" ? "/" : "");
+    if (flag) {
+      port = base.port;
+      hostname = base.hostname;
+      host = base.host;
+      password = base.password;
+      username = base.username;
+    }
+    if (protocol === "") {
+      protocol = base.protocol;
+    }
+  }
+
+  // convert windows file URLs to use /
+  if (protocol == 'file:')
+    pathname = pathname.replace(/\\/g, '/');
+
+  this.origin = protocol + (protocol !== "" || host !== "" ? "//" : "") + host;
+  this.href = protocol + (protocol !== "" || host !== "" ? "//" : "") + (username !== "" ? username + (password !== "" ? ":" + password : "") + "@" : "") + host + pathname + search + hash;
+  this.protocol = protocol;
+  this.username = username;
+  this.password = password;
+  this.host = host;
+  this.hostname = hostname;
+  this.port = port;
+  this.pathname = pathname;
+  this.search = search;
+  this.hash = hash;
+}
+global.URLPolyfill = URLPolyfill;
+})(typeof self != 'undefined' ? self : global);
 (function(__global) {
 
   var isWorker = typeof window == 'undefined' && typeof self != 'undefined' && typeof importScripts != 'undefined';
@@ -89,13 +159,7 @@
     throw new TypeError('No environment baseURI');
   }
 
-  var URL = __global.URL;
-  try {
-    new URL('test:///').protocol == 'test:';
-  }
-  catch(e) {
-    URL = URLPolyfill;
-  }
+  var URL = __global.URLPolyfill || __global.URL;
 
 /*
 *********************************************************************************************
@@ -1246,74 +1310,6 @@ var transpile = (function() {
   return transpile;
 })();
 
-// from https://gist.github.com/Yaffle/1088850
-function URLPolyfill(url, baseURL) {
-  if (typeof url != 'string')
-    throw new TypeError('URL must be a string');
-  var m = String(url).replace(/^\s+|\s+$/g, "").match(/^([^:\/?#]+:)?(?:\/\/(?:([^:@\/?#]*)(?::([^:@\/?#]*))?@)?(([^:\/?#]*)(?::(\d*))?))?([^?#]*)(\?[^#]*)?(#[\s\S]*)?/);
-  if (!m) {
-    throw new RangeError();
-  }
-  var protocol = m[1] || "";
-  var username = m[2] || "";
-  var password = m[3] || "";
-  var host = m[4] || "";
-  var hostname = m[5] || "";
-  var port = m[6] || "";
-  var pathname = m[7] || "";
-  var search = m[8] || "";
-  var hash = m[9] || "";
-  if (baseURL !== undefined) {
-    var base = baseURL instanceof URLPolyfill ? baseURL : new URLPolyfill(baseURL);
-    var flag = protocol === "" && host === "" && username === "";
-    if (flag && pathname === "" && search === "") {
-      search = base.search;
-    }
-    if (flag && pathname.charAt(0) !== "/") {
-      pathname = (pathname !== "" ? (((base.host !== "" || base.username !== "") && base.pathname === "" ? "/" : "") + base.pathname.slice(0, base.pathname.lastIndexOf("/") + 1) + pathname) : base.pathname);
-    }
-    // dot segments removal
-    var output = [];
-    pathname.replace(/^(\.\.?(\/|$))+/, "")
-      .replace(/\/(\.(\/|$))+/g, "/")
-      .replace(/\/\.\.$/, "/../")
-      .replace(/\/?[^\/]*/g, function (p) {
-        if (p === "/..") {
-          output.pop();
-        } else {
-          output.push(p);
-        }
-      });
-    pathname = output.join("").replace(/^\//, pathname.charAt(0) === "/" ? "/" : "");
-    if (flag) {
-      port = base.port;
-      hostname = base.hostname;
-      host = base.host;
-      password = base.password;
-      username = base.username;
-    }
-    if (protocol === "") {
-      protocol = base.protocol;
-    }
-  }
-
-  // convert windows file URLs to use /
-  if (protocol == 'file:')
-    pathname = pathname.replace(/\\/g, '/');
-
-  this.origin = protocol + (protocol !== "" || host !== "" ? "//" : "") + host;
-  this.href = protocol + (protocol !== "" || host !== "" ? "//" : "") + (username !== "" ? username + (password !== "" ? ":" + password : "") + "@" : "") + host + pathname + search + hash;
-  this.protocol = protocol;
-  this.username = username;
-  this.password = password;
-  this.host = host;
-  this.hostname = hostname;
-  this.port = port;
-  this.pathname = pathname;
-  this.search = search;
-  this.hash = hash;
-}
-(typeof self != 'undefined' ? self : global).URLPolyfill = URLPolyfill;
 /*
 *********************************************************************************************
 

diff --git a/dist/es6-module-loader.js b/dist/es6-module-loader.js
diff --git a/dist/es6-module-loader.js.map b/dist/es6-module-loader.js.map
diff --git a/dist/es6-module-loader.src.js b/dist/es6-module-loader.src.js
@@ -1,3 +1,73 @@
+// from https://gist.github.com/Yaffle/1088850
+(function(global) {
+function URLPolyfill(url, baseURL) {
+  if (typeof url != 'string')
+    throw new TypeError('URL must be a string');
+  var m = String(url).replace(/^\s+|\s+$/g, "").match(/^([^:\/?#]+:)?(?:\/\/(?:([^:@\/?#]*)(?::([^:@\/?#]*))?@)?(([^:\/?#]*)(?::(\d*))?))?([^?#]*)(\?[^#]*)?(#[\s\S]*)?/);
+  if (!m) {
+    throw new RangeError();
+  }
+  var protocol = m[1] || "";
+  var username = m[2] || "";
+  var password = m[3] || "";
+  var host = m[4] || "";
+  var hostname = m[5] || "";
+  var port = m[6] || "";
+  var pathname = m[7] || "";
+  var search = m[8] || "";
+  var hash = m[9] || "";
+  if (baseURL !== undefined) {
+    var base = baseURL instanceof URLPolyfill ? baseURL : new URLPolyfill(baseURL);
+    var flag = protocol === "" && host === "" && username === "";
+    if (flag && pathname === "" && search === "") {
+      search = base.search;
+    }
+    if (flag && pathname.charAt(0) !== "/") {
+      pathname = (pathname !== "" ? (((base.host !== "" || base.username !== "") && base.pathname === "" ? "/" : "") + base.pathname.slice(0, base.pathname.lastIndexOf("/") + 1) + pathname) : base.pathname);
+    }
+    // dot segments removal
+    var output = [];
+    pathname.replace(/^(\.\.?(\/|$))+/, "")
+      .replace(/\/(\.(\/|$))+/g, "/")
+      .replace(/\/\.\.$/, "/../")
+      .replace(/\/?[^\/]*/g, function (p) {
+        if (p === "/..") {
+          output.pop();
+        } else {
+          output.push(p);
+        }
+      });
+    pathname = output.join("").replace(/^\//, pathname.charAt(0) === "/" ? "/" : "");
+    if (flag) {
+      port = base.port;
+      hostname = base.hostname;
+      host = base.host;
+      password = base.password;
+      username = base.username;
+    }
+    if (protocol === "") {
+      protocol = base.protocol;
+    }
+  }
+
+  // convert windows file URLs to use /
+  if (protocol == 'file:')
+    pathname = pathname.replace(/\\/g, '/');
+
+  this.origin = protocol + (protocol !== "" || host !== "" ? "//" : "") + host;
+  this.href = protocol + (protocol !== "" || host !== "" ? "//" : "") + (username !== "" ? username + (password !== "" ? ":" + password : "") + "@" : "") + host + pathname + search + hash;
+  this.protocol = protocol;
+  this.username = username;
+  this.password = password;
+  this.host = host;
+  this.hostname = hostname;
+  this.port = port;
+  this.pathname = pathname;
+  this.search = search;
+  this.hash = hash;
+}
+global.URLPolyfill = URLPolyfill;
+})(typeof self != 'undefined' ? self : global);
 (function(__global) {
 
   var isWorker = typeof window == 'undefined' && typeof self != 'undefined' && typeof importScripts != 'undefined';
@@ -89,13 +159,7 @@
     throw new TypeError('No environment baseURI');
   }
 
-  var URL = __global.URL;
-  try {
-    new URL('test:///').protocol == 'test:';
-  }
-  catch(e) {
-    URL = URLPolyfill;
-  }
+  var URL = __global.URLPolyfill || __global.URL;
 
 /*
 *********************************************************************************************
@@ -908,74 +972,6 @@ function logloads(loads) {
     throw new TypeError('ES6 transpilation is only provided in the dev module loader build.');
   }
 })();
-// from https://gist.github.com/Yaffle/1088850
-function URLPolyfill(url, baseURL) {
-  if (typeof url != 'string')
-    throw new TypeError('URL must be a string');
-  var m = String(url).replace(/^\s+|\s+$/g, "").match(/^([^:\/?#]+:)?(?:\/\/(?:([^:@\/?#]*)(?::([^:@\/?#]*))?@)?(([^:\/?#]*)(?::(\d*))?))?([^?#]*)(\?[^#]*)?(#[\s\S]*)?/);
-  if (!m) {
-    throw new RangeError();
-  }
-  var protocol = m[1] || "";
-  var username = m[2] || "";
-  var password = m[3] || "";
-  var host = m[4] || "";
-  var hostname = m[5] || "";
-  var port = m[6] || "";
-  var pathname = m[7] || "";
-  var search = m[8] || "";
-  var hash = m[9] || "";
-  if (baseURL !== undefined) {
-    var base = baseURL instanceof URLPolyfill ? baseURL : new URLPolyfill(baseURL);
-    var flag = protocol === "" && host === "" && username === "";
-    if (flag && pathname === "" && search === "") {
-      search = base.search;
-    }
-    if (flag && pathname.charAt(0) !== "/") {
-      pathname = (pathname !== "" ? (((base.host !== "" || base.username !== "") && base.pathname === "" ? "/" : "") + base.pathname.slice(0, base.pathname.lastIndexOf("/") + 1) + pathname) : base.pathname);
-    }
-    // dot segments removal
-    var output = [];
-    pathname.replace(/^(\.\.?(\/|$))+/, "")
-      .replace(/\/(\.(\/|$))+/g, "/")
-      .replace(/\/\.\.$/, "/../")
-      .replace(/\/?[^\/]*/g, function (p) {
-        if (p === "/..") {
-          output.pop();
-        } else {
-          output.push(p);
-        }
-      });
-    pathname = output.join("").replace(/^\//, pathname.charAt(0) === "/" ? "/" : "");
-    if (flag) {
-      port = base.port;
-      hostname = base.hostname;
-      host = base.host;
-      password = base.password;
-      username = base.username;
-    }
-    if (protocol === "") {
-      protocol = base.protocol;
-    }
-  }
-
-  // convert windows file URLs to use /
-  if (protocol == 'file:')
-    pathname = pathname.replace(/\\/g, '/');
-
-  this.origin = protocol + (protocol !== "" || host !== "" ? "//" : "") + host;
-  this.href = protocol + (protocol !== "" || host !== "" ? "//" : "") + (username !== "" ? username + (password !== "" ? ":" + password : "") + "@" : "") + host + pathname + search + hash;
-  this.protocol = protocol;
-  this.username = username;
-  this.password = password;
-  this.host = host;
-  this.hostname = hostname;
-  this.port = port;
-  this.pathname = pathname;
-  this.search = search;
-  this.hash = hash;
-}
-(typeof self != 'undefined' ? self : global).URLPolyfill = URLPolyfill;
 /*
 *********************************************************************************************
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "es6-module-loader",
   "description": "An ES6 Module Loader shim",
-  "version": "0.17.2",
+  "version": "0.17.3",
   "homepage": "https://github.com/ModuleLoader/es6-module-loader",
   "author": {
     "name": "Guy Bedford, Luke Hoban, Addy Osmani",