update packages

2 files changed, 11 insertions, 4 deletions

diff --git a/node_modules/clean-css/lib/reader/input-source-map-tracker.js b/node_modules/clean-css/lib/reader/input-source-map-tracker.js
index ea2c03467..4b8730c29 100644
--- a/node_modules/clean-css/lib/reader/input-source-map-tracker.js
+++ b/node_modules/clean-css/lib/reader/input-source-map-tracker.js
@@ -34,6 +34,10 @@ function originalPositionFor(maps, metadata, range, selectorFallbacks) {
     originalPosition = maps[source].originalPositionFor(position);
   }
 
+  if (!originalPosition || originalPosition.column < 0) {
+    return metadata;
+  }
+
   if (originalPosition.line === null && line > 1 && selectorFallbacks > 0) {
     return originalPositionFor(maps, [line - 1, column, source], range, selectorFallbacks - 1);
   }
diff --git a/node_modules/clean-css/lib/reader/read-sources.js b/node_modules/clean-css/lib/reader/read-sources.js
index c9173ed62..1338f6adc 100644
--- a/node_modules/clean-css/lib/reader/read-sources.js
+++ b/node_modules/clean-css/lib/reader/read-sources.js
@@ -288,7 +288,6 @@ function inlineLocalStylesheet(uri, mediaQuery, metadata, inlinerContext) {
     path.resolve(inlinerContext.rebaseTo, uri);
   var relativeToCurrentPath = path.relative(currentPath, absoluteUri);
   var importedStyles;
-  var importedTokens;
   var isAllowed = isAllowedResource(uri, false, inlinerContext.inline);
   var normalizedPath = normalizePath(relativeToCurrentPath);
   var isLoaded = normalizedPath in inlinerContext.externalContext.sourcesContent;
@@ -316,10 +315,14 @@ function inlineLocalStylesheet(uri, mediaQuery, metadata, inlinerContext) {
     inlinerContext.externalContext.sourcesContent[normalizedPath] = importedStyles;
     inlinerContext.externalContext.stats.originalSize += importedStyles.length;
 
-    importedTokens = fromStyles(importedStyles, inlinerContext.externalContext, inlinerContext, function (tokens) { return tokens; });
-    importedTokens = wrapInMedia(importedTokens, mediaQuery, metadata);
+    return fromStyles(importedStyles, inlinerContext.externalContext, inlinerContext, function (importedTokens) {
+      importedTokens = wrapInMedia(importedTokens, mediaQuery, metadata);
 
-    inlinerContext.outputTokens = inlinerContext.outputTokens.concat(importedTokens);
+      inlinerContext.outputTokens = inlinerContext.outputTokens.concat(importedTokens);
+      inlinerContext.sourceTokens = inlinerContext.sourceTokens.slice(1);
+
+      return doInlineImports(inlinerContext);
+    });
   }
 
   inlinerContext.sourceTokens = inlinerContext.sourceTokens.slice(1);