polyfill handling

Gruntfile.js

@@ -21,7 +21,6 @@ module.exports = function (grunt) {
       dist: {
         files: {
           'dist/<%= pkg.name %>.src.js': [
-            'node_modules/when/es6-shim/Promise.js',
             'src/wrapper-start.js',
             'src/loader.js',
             'src/dynamic-only.js',
@@ -32,7 +31,6 @@ module.exports = function (grunt) {
             'src/wrapper-end.js'
           ],
           'dist/<%= pkg.name %>-dev.src.js': [
-            'node_modules/when/es6-shim/Promise.js',
             'src/wrapper-start.js',
             'src/loader.js',
             'src/declarative.js',

src/url-polyfill.js

@@ -1,5 +1,5 @@
 // from https://gist.github.com/Yaffle/1088850
-function URL(url, baseURL) {
+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]*)?/);
@@ -16,7 +16,7 @@ function URL(url, baseURL) {
   var search = m[8] || "";
   var hash = m[9] || "";
   if (baseURL !== undefined) {
-    var base = baseURL instanceof URL ? baseURL : new URL(baseURL);
+    var base = baseURL instanceof URLPolyfill ? baseURL : new URLPolyfill(baseURL);
     var flag = protocol === "" && host === "" && username === "";
     if (flag && pathname === "" && search === "") {
       search = base.search;
@@ -64,4 +64,5 @@ function URL(url, baseURL) {
   this.pathname = pathname;
   this.search = search;
   this.hash = hash;
-}
+}
+(typeof self != 'undefined' ? self : global).URLPolyfill = URLPolyfill;

src/wrapper-end.js

@@ -18,4 +18,4 @@
 
   __global.System = System;
 
-})(typeof window != 'undefined' ? window : (typeof global != 'undefined' ? global : self));
+})(typeof self != 'undefined' ? self : global);

src/wrapper-start.js

@@ -55,3 +55,5 @@
       throw addToError(e, 'Evaluating ' + debugName);
     }
   }
+
+  var URL = __global.URL || URLPolyfill;

test/system.normalize.spec.js

@@ -47,11 +47,11 @@ describe('System', function () {
 
     describe('when having two arguments', function () {
 
-      var refererAddress = '/dir/file';
+      var refererAddress = 'http://parent.com/dir/file';
 
       it('should normalize relative paths against the parent address', function () {
-        expect(System.normalize('./d/e/f', null, refererAddress)).to.equal('/dir/d/e/f');
-        expect(System.normalize('../e/f', null, refererAddress)).to.equal('/e/f');
+        expect(System.normalize('./d/e/f', null, refererAddress)).to.equal('http://parent.com/dir/d/e/f');
+        expect(System.normalize('../e/f', null, refererAddress)).to.equal('http://parent.com/e/f');
       });
 
     });