fix build issues and add typedoc

4 files changed, 25 insertions, 14 deletions

diff --git a/node_modules/clean-css/lib/reader/apply-source-maps.js b/node_modules/clean-css/lib/reader/apply-source-maps.js
index d2f87250e..7c5a9282b 100644
--- a/node_modules/clean-css/lib/reader/apply-source-maps.js
+++ b/node_modules/clean-css/lib/reader/apply-source-maps.js
@@ -2,7 +2,6 @@ var fs = require('fs');
 var path = require('path');
 
 var isAllowedResource = require('./is-allowed-resource');
-var loadRemoteResource = require('./load-remote-resource');
 var matchDataUri = require('./match-data-uri');
 var rebaseLocalMap = require('./rebase-local-map');
 var rebaseRemoteMap = require('./rebase-remote-map');
@@ -17,6 +16,7 @@ var MAP_MARKER_PATTERN = /^\/\*# sourceMappingURL=(\S+) \*\/$/;
 function applySourceMaps(tokens, context, callback) {
   var applyContext = {
     callback: callback,
+    fetch: context.options.fetch,
     index: 0,
     inline: context.options.inline,
     inlineRequest: context.options.inlineRequest,
@@ -151,7 +151,7 @@ function loadInputSourceMapFromRemoteUri(uri, applyContext, whenLoaded) {
     return whenLoaded(null);
   }
 
-  loadRemoteResource(uri, applyContext.inlineRequest, applyContext.inlineTimeout, function (error, body) {
+  applyContext.fetch(uri, applyContext.inlineRequest, applyContext.inlineTimeout, function (error, body) {
     if (error) {
       applyContext.warnings.push('Missing source map at "' + uri + '" - ' + error);
       return whenLoaded(null);
diff --git a/node_modules/clean-css/lib/reader/load-original-sources.js b/node_modules/clean-css/lib/reader/load-original-sources.js
index dbe2cad09..465035d6b 100644
--- a/node_modules/clean-css/lib/reader/load-original-sources.js
+++ b/node_modules/clean-css/lib/reader/load-original-sources.js
@@ -2,7 +2,6 @@ var fs = require('fs');
 var path = require('path');
 
 var isAllowedResource = require('./is-allowed-resource');
-var loadRemoteResource = require('./load-remote-resource');
 
 var hasProtocol = require('../utils/has-protocol');
 var isRemoteResource = require('../utils/is-remote-resource');
@@ -10,6 +9,7 @@ var isRemoteResource = require('../utils/is-remote-resource');
 function loadOriginalSources(context, callback) {
   var loadContext = {
     callback: callback,
+    fetch: context.options.fetch,
     index: 0,
     inline: context.options.inline,
     inlineRequest: context.options.inlineRequest,
@@ -99,7 +99,7 @@ function loadOriginalSourceFromRemoteUri(uri, loadContext, whenLoaded) {
     return whenLoaded(null);
   }
 
-  loadRemoteResource(uri, loadContext.inlineRequest, loadContext.inlineTimeout, function (error, content) {
+  loadContext.fetch(uri, loadContext.inlineRequest, loadContext.inlineTimeout, function (error, content) {
     if (error) {
       loadContext.warnings.push('Missing original source at "' + uri + '" - ' + error);
     }
diff --git a/node_modules/clean-css/lib/reader/read-sources.js b/node_modules/clean-css/lib/reader/read-sources.js
index e12e23514..c9173ed62 100644
--- a/node_modules/clean-css/lib/reader/read-sources.js
+++ b/node_modules/clean-css/lib/reader/read-sources.js
@@ -5,7 +5,6 @@ var applySourceMaps = require('./apply-source-maps');
 var extractImportUrlAndMedia = require('./extract-import-url-and-media');
 var isAllowedResource = require('./is-allowed-resource');
 var loadOriginalSources = require('./load-original-sources');
-var loadRemoteResource = require('./load-remote-resource');
 var normalizePath = require('./normalize-path');
 var rebase = require('./rebase');
 var rebaseLocalMap = require('./rebase-local-map');
@@ -50,27 +49,38 @@ function fromString(input, context, callback) {
 }
 
 function fromArray(input, context, callback) {
-  var inputAsImports = input.reduce(function (accumulator, uri) {
-    var normalizedUri = normalizeUri(uri);
+  var inputAsImports = input.reduce(function (accumulator, uriOrHash) {
+    if (typeof uriOrHash === 'string') {
+      return addStringSource(uriOrHash, accumulator);
+    } else {
+      return addHashSource(uriOrHash, context, accumulator);
+    }
 
-    accumulator.push(restoreAsImport(normalizedUri));
-    return accumulator;
   }, []);
 
   return fromStyles(inputAsImports.join(''), context, { inline: ['all'] }, callback);
 }
 
 function fromHash(input, context, callback) {
+  var inputAsImports = addHashSource(input, context, []);
+  return fromStyles(inputAsImports.join(''), context, { inline: ['all'] }, callback);
+}
+
+function addStringSource(input, imports) {
+  imports.push(restoreAsImport(normalizeUri(input)));
+  return imports;
+}
+
+function addHashSource(input, context, imports) {
   var uri;
   var normalizedUri;
   var source;
-  var inputAsImports = [];
 
   for (uri in input) {
     source = input[uri];
     normalizedUri = normalizeUri(uri);
 
-    inputAsImports.push(restoreAsImport(normalizedUri));
+    imports.push(restoreAsImport(normalizedUri));
 
     context.sourcesContent[normalizedUri] = source.styles;
 
@@ -79,7 +89,7 @@ function fromHash(input, context, callback) {
     }
   }
 
-  return fromStyles(inputAsImports.join(''), context, { inline: ['all'] }, callback);
+  return imports;
 }
 
 function normalizeUri(uri) {
@@ -152,6 +162,7 @@ function inline(tokens, externalContext, parentInlinerContext, callback) {
     callback: callback,
     errors: externalContext.errors,
     externalContext: externalContext,
+    fetch: externalContext.options.fetch,
     inlinedStylesheets: parentInlinerContext.inlinedStylesheets || externalContext.inlinedStylesheets,
     inline: parentInlinerContext.inline,
     inlineRequest: externalContext.options.inlineRequest,
@@ -267,7 +278,7 @@ function inlineRemoteStylesheet(uri, mediaQuery, metadata, inlinerContext) {
 
   return isLoaded ?
     whenLoaded(null, inlinerContext.externalContext.sourcesContent[uri]) :
-    loadRemoteResource(uri, inlinerContext.inlineRequest, inlinerContext.inlineTimeout, whenLoaded);
+    inlinerContext.fetch(uri, inlinerContext.inlineRequest, inlinerContext.inlineTimeout, whenLoaded);
 }
 
 function inlineLocalStylesheet(uri, mediaQuery, metadata, inlinerContext) {
diff --git a/node_modules/clean-css/lib/reader/rebase.js b/node_modules/clean-css/lib/reader/rebase.js
index 4e0ff9751..181b319ad 100644
--- a/node_modules/clean-css/lib/reader/rebase.js
+++ b/node_modules/clean-css/lib/reader/rebase.js
@@ -91,7 +91,7 @@ function rebaseProperties(properties, validator, rebaseConfig) {
     for (j = 2 /* 0 is Token.PROPERTY, 1 is name */, m = property.length; j < m; j++) {
       value = property[j][1];
 
-      if (validator.isValidUrl(value)) {
+      if (validator.isUrl(value)) {
         property[j][1] = rewriteUrl(value, rebaseConfig);
       }
     }