refactor: import part of plugin

Author: alexander-akait

lib/plugin.js

@@ -1,7 +1,6 @@
-var postcss = require("postcss");
-var valueParser = require("postcss-value-parser");
-var Tokenizer = require("css-selector-tokenizer");
-var loaderUtils = require("loader-utils");
+const postcss = require("postcss");
+const valueParser = require("postcss-value-parser");
+const loaderUtils = require("loader-utils");
 
 module.exports = postcss.plugin("css-loader-parser", function(options) {
   return function(css) {
@@ -10,38 +9,53 @@ module.exports = postcss.plugin("css-loader-parser", function(options) {
 
     if (options.import) {
       css.walkAtRules(/^import$/i, function(rule) {
-        const values = Tokenizer.parseValues(rule.params);
-        let url = values.nodes[0].nodes[0];
+        const parsedValue = valueParser(rule.params);
 
-        if (url && url.type === "url") {
-          url = url.url;
-        } else if (url && url.type === "string") {
-          url = url.value;
-        } else throw rule.error("Unexpected format " + rule.params);
-
-        if (!url.replace(/\s/g, "").length) {
-          return;
+        if (!parsedValue.nodes || !parsedValue.nodes[0]) {
+          throw rule.error("Unexpected format " + rule.params);
         }
 
-        values.nodes[0].nodes.shift();
+        const firstNode = parsedValue.nodes[0];
+
+        let url = null;
+
+        if (
+          firstNode.type === "function" &&
+          firstNode.value.toLowerCase() === "url"
+        ) {
+          if (firstNode.nodes[0]) {
+            firstNode.nodes[0].quote = "";
+          }
+
+          url = valueParser.stringify(firstNode.nodes);
+        } else if (firstNode.type === "string") {
+          url = firstNode.value;
+        }
 
-        const mediaQuery = Tokenizer.stringifyValues(values);
+        if (url.replace(/\s/g, "").length === 0) {
+          return;
+        }
 
         if (loaderUtils.isUrlRequest(url)) {
           url = loaderUtils.urlToRequest(url);
         }
 
+        const mediaQuery = valueParser
+          .stringify(parsedValue.nodes.slice(1))
+          .trim();
+
         importItems.push({
           url: url,
           mediaQuery: mediaQuery
         });
+
         rule.remove();
       });
     }
 
     if (options.url) {
       css.walkDecls(decl => {
-        if (!decl.value.includes("url(")) {
+        if (!/url\(/i.test(decl.value)) {
           return decl;
         }
 
@@ -58,7 +72,7 @@ module.exports = postcss.plugin("css-loader-parser", function(options) {
             }
 
             const URLNode = node.nodes[0];
-            const URLValue = URLNode.value.trim().replace(/\\[\r\n]/, "");
+            const URLValue = URLNode.value.trim().replace(/\\[\r\n]/g, "");
 
             // Skip empty URLs
             // Empty URL function equals request to current stylesheet where it is declared

package-lock.json

@@ -13,10 +13,7 @@
   ],
   "dependencies": {
     "babel-code-frame": "^6.26.0",
-    "css-selector-tokenizer": "^0.7.0",
-    "icss-utils": "^2.1.0",
     "loader-utils": "^1.0.2",
-    "lodash.camelcase": "^4.3.0",
     "postcss": "^6.0.23",
     "postcss-value-parser": "^3.3.0"
   },