refactor: drop icss utils

Author: alexander-akait

lib/loader.js

@@ -62,66 +62,48 @@ module.exports = function(content, map) {
     })
     .then(function(result) {
       var cssAsString = JSON.stringify(result.css);
-      // for importing CSS
-      var importUrlPrefix = getImportPrefix(loaderContext, query);
-      var alreadyImported = {};
       var importItems = parserOptions.importItems;
-      var importJs = importItems
-        .filter(function(imp) {
-          if (!imp.mediaQuery) {
-            if (alreadyImported[imp.url]) {
-              return false;
+
+      if (query.import !== false && importItems.length > 0) {
+        var alreadyImported = {};
+        var importJs = importItems
+          .filter(function(imp) {
+            if (!imp.mediaQuery) {
+              if (alreadyImported[imp.url]) {
+                return false;
+              }
+
+              alreadyImported[imp.url] = true;
             }
 
-            alreadyImported[imp.url] = true;
-          }
+            return true;
+          })
+          .map(function(imp) {
+            if (!loaderUtils.isUrlRequest(imp.url)) {
+              return (
+                "exports.push([module.id, " +
+                JSON.stringify("@import url(" + imp.url + ");") +
+                ", " +
+                JSON.stringify(imp.mediaQuery) +
+                "]);"
+              );
+            }
+
+            // for importing CSS
+            var importUrlPrefix = getImportPrefix(loaderContext, query);
+            var importUrl = importUrlPrefix + imp.url;
 
-          return true;
-        })
-        .map(function(imp) {
-          if (!loaderUtils.isUrlRequest(imp.url)) {
             return (
-              "exports.push([module.id, " +
-              JSON.stringify("@import url(" + imp.url + ");") +
-              ", " +
+              "exports.i(require(" +
+              loaderUtils.stringifyRequest(this, importUrl) +
+              "), " +
               JSON.stringify(imp.mediaQuery) +
-              "]);"
+              ");"
             );
-          }
-
-          var importUrl = importUrlPrefix + imp.url;
-
-          return (
-            "exports.i(require(" +
-            loaderUtils.stringifyRequest(this, importUrl) +
-            "), " +
-            JSON.stringify(imp.mediaQuery) +
-            ");"
-          );
-        }, loaderContext)
-        .join("\n");
-
-      function importItemMatcher(item) {
-        var match = /___CSS_LOADER_IMPORT___([0-9]+)___/.exec(item);
-        var idx = +match[1];
-        var importItem = parserOptions.importItems[idx];
-        var importUrl = importUrlPrefix + importItem.url;
-
-        return (
-          '" + require(' +
-          loaderUtils.stringifyRequest(this, importUrl) +
-          ").locals" +
-          "[" +
-          JSON.stringify(importItem.export) +
-          '] + "'
-        );
+          }, loaderContext)
+          .join("\n");
       }
 
-      cssAsString = cssAsString.replace(
-        /___CSS_LOADER_IMPORT___([0-9]+)___/g,
-        importItemMatcher
-      );
-
       // helper for ensuring valid CSS strings from requires
       var urlEscapeHelper = "";
       var urlItems = parserOptions.urlItems;

lib/plugin.js

@@ -2,33 +2,12 @@ var postcss = require("postcss");
 var valueParser = require("postcss-value-parser");
 var Tokenizer = require("css-selector-tokenizer");
 var loaderUtils = require("loader-utils");
-var icssUtils = require("icss-utils");
 
 module.exports = postcss.plugin("css-loader-parser", function(options) {
   return function(css) {
-    var imports = {};
-    var exports = {};
     var importItems = [];
     var urlItems = [];
 
-    function replaceImportsInString(str) {
-      if (options.import) {
-        var tokens = valueParser(str);
-        tokens.walk(function(node) {
-          if (node.type !== "word") {
-            return;
-          }
-          var token = node.value;
-          var importIndex = imports["$" + token];
-          if (typeof importIndex === "number") {
-            node.value = "___CSS_LOADER_IMPORT___" + importIndex + "___";
-          }
-        });
-        return tokens.toString();
-      }
-      return str;
-    }
-
     if (options.import) {
       css.walkAtRules(/^import$/i, function(rule) {
         var values = Tokenizer.parseValues(rule.params);
@@ -56,23 +35,6 @@ module.exports = postcss.plugin("css-loader-parser", function(options) {
       });
     }
 
-    var icss = icssUtils.extractICSS(css);
-    exports = icss.icssExports;
-    Object.keys(icss.icssImports).forEach(function(key) {
-      var url = loaderUtils.parseString(key);
-      Object.keys(icss.icssImports[key]).forEach(function(prop) {
-        imports["$" + prop] = importItems.length;
-        importItems.push({
-          url: url,
-          export: icss.icssImports[key][prop]
-        });
-      });
-    });
-
-    Object.keys(exports).forEach(function(exportName) {
-      exports[exportName] = replaceImportsInString(exports[exportName]);
-    });
-
     function processNode(item) {
       switch (item.type) {
         case "value":
@@ -81,12 +43,6 @@ module.exports = postcss.plugin("css-loader-parser", function(options) {
         case "nested-item":
           item.nodes.forEach(processNode);
           break;
-        case "item":
-          var importIndex = imports["$" + item.name];
-          if (typeof importIndex === "number") {
-            item.name = "___CSS_LOADER_IMPORT___" + importIndex + "___";
-          }
-          break;
         case "url":
           if (
             options.url &&
@@ -116,14 +72,8 @@ module.exports = postcss.plugin("css-loader-parser", function(options) {
       });
       decl.value = Tokenizer.stringifyValues(values);
     });
-    css.walkAtRules(function(atrule) {
-      if (typeof atrule.params === "string") {
-        atrule.params = replaceImportsInString(atrule.params);
-      }
-    });
 
     options.importItems = importItems;
     options.urlItems = urlItems;
-    options.exports = exports;
   };
 });