css-loader 3.4.1 → 3.5.2

package/dist/plugins/postcss-import-parser.js

@@ -17,112 +17,120 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const pluginName = 'postcss-import-parser';
 
-function getParsedValue(node) {
-  if (node.type === 'function' && node.value.toLowerCase() === 'url') {
-    const {
-      nodes
-    } = node;
-    const isStringValue = nodes.length !== 0 && nodes[0].type === 'string';
-    const url = isStringValue ? nodes[0].value : _postcssValueParser.default.stringify(nodes);
-    return {
-      url,
-      isStringValue
-    };
-  }
-
-  if (node.type === 'string') {
-    const url = node.value;
-    return {
-      url,
-      isStringValue: true
-    };
-  }
-
-  return null;
-}
-
-function parseImport(params) {
-  const {
-    nodes
-  } = (0, _postcssValueParser.default)(params);
-
-  if (nodes.length === 0) {
-    return null;
-  }
-
-  const value = getParsedValue(nodes[0]);
-
-  if (!value) {
-    return null;
-  }
-
-  let {
-    url
-  } = value;
-
-  if (url.trim().length === 0) {
-    return null;
-  }
-
-  if ((0, _loaderUtils.isUrlRequest)(url)) {
-    const {
-      isStringValue
-    } = value;
-    url = (0, _utils.normalizeUrl)(url, isStringValue);
-  }
-
-  return {
-    url,
-    media: _postcssValueParser.default.stringify(nodes.slice(1)).trim().toLowerCase()
-  };
-}
-
-function walkAtRules(css, result, filter) {
-  const items = [];
+var _default = _postcss.default.plugin(pluginName, options => (css, result) => {
+  const importsMap = new Map();
   css.walkAtRules(/^import$/i, atRule => {
     // Convert only top-level @import
     if (atRule.parent.type !== 'root') {
       return;
-    }
+    } // Nodes do not exists - `@import url('http://') :root {}`
+
 
     if (atRule.nodes) {
-      result.warn("It looks like you didn't end your @import statement correctly. " + 'Child nodes are attached to it.', {
+      result.warn("It looks like you didn't end your @import statement correctly. Child nodes are attached to it.", {
         node: atRule
       });
       return;
     }
 
-    const parsed = parseImport(atRule.params);
+    const {
+      nodes
+    } = (0, _postcssValueParser.default)(atRule.params); // No nodes - `@import ;`
+    // Invalid type - `@import foo-bar;`
 
-    if (!parsed) {
-      // eslint-disable-next-line consistent-return
-      return result.warn(`Unable to find uri in '${atRule.toString()}'`, {
+    if (nodes.length === 0 || nodes[0].type !== 'string' && nodes[0].type !== 'function') {
+      result.warn(`Unable to find uri in "${atRule.toString()}"`, {
         node: atRule
       });
+      return;
     }
 
-    if (filter && !filter(parsed)) {
+    let isStringValue;
+    let url;
+
+    if (nodes[0].type === 'string') {
+      isStringValue = true;
+      url = nodes[0].value;
+    } else if (nodes[0].type === 'function') {
+      // Invalid function - `@import nourl(test.css);`
+      if (nodes[0].value.toLowerCase() !== 'url') {
+        result.warn(`Unable to find uri in "${atRule.toString()}"`, {
+          node: atRule
+        });
+        return;
+      }
+
+      isStringValue = nodes[0].nodes.length !== 0 && nodes[0].nodes[0].type === 'string';
+      url = isStringValue ? nodes[0].nodes[0].value : _postcssValueParser.default.stringify(nodes[0].nodes);
+    } // Empty url - `@import "";` or `@import url();`
+
+
+    if (url.trim().length === 0) {
+      result.warn(`Unable to find uri in "${atRule.toString()}"`, {
+        node: atRule
+      });
       return;
     }
 
-    atRule.remove();
-    items.push(parsed);
-  });
-  return items;
-}
+    const isRequestable = (0, _loaderUtils.isUrlRequest)(url);
 
-var _default = _postcss.default.plugin(pluginName, options => function process(css, result) {
-  const items = walkAtRules(css, result, options.filter);
-  items.forEach(item => {
-    const {
+    if (isRequestable) {
+      url = (0, _utils.normalizeUrl)(url, isStringValue); // Empty url after normalize - `@import '\
+      // \
+      // \
+      // ';
+
+      if (url.trim().length === 0) {
+        result.warn(`Unable to find uri in "${atRule.toString()}"`, {
+          node: atRule
+        });
+        return;
+      }
+    }
+
+    const media = _postcssValueParser.default.stringify(nodes.slice(1)).trim().toLowerCase();
+
+    if (options.filter && !options.filter({
       url,
       media
-    } = item;
+    })) {
+      return;
+    }
+
+    atRule.remove();
+
+    if (isRequestable) {
+      const importKey = url;
+      let importName = importsMap.get(importKey);
+
+      if (!importName) {
+        importName = `___CSS_LOADER_AT_RULE_IMPORT_${importsMap.size}___`;
+        importsMap.set(importKey, importName);
+        result.messages.push({
+          type: 'import',
+          value: {
+            importName,
+            url: options.urlHandler ? options.urlHandler(url) : url
+          }
+        });
+      }
+
+      result.messages.push({
+        type: 'api-import',
+        value: {
+          type: 'internal',
+          importName,
+          media
+        }
+      });
+      return;
+    }
+
     result.messages.push({
       pluginName,
-      type: 'import',
+      type: 'api-import',
       value: {
-        type: '@import',
+        type: 'external',
         url,
         media
       }

package/dist/plugins/postcss-url-parser.js

@@ -41,7 +41,7 @@ function walkUrls(parsed, callback) {
     }
 
     if (isImageSetFunc.test(node.value)) {
-      node.nodes.forEach(nNode => {
+      for (const nNode of node.nodes) {
         const {
           type,
           value
@@ -59,139 +59,93 @@ function walkUrls(parsed, callback) {
         if (type === 'string') {
           callback(nNode, value, true, true);
         }
-      }); // Do not traverse inside `image-set`
+      } // Do not traverse inside `image-set`
       // eslint-disable-next-line consistent-return
 
+
       return false;
     }
   });
 }
 
-function getUrlsFromValue(value, result, filter, decl) {
-  if (!needParseDecl.test(value)) {
-    return;
-  }
-
-  const parsed = (0, _postcssValueParser.default)(value);
-  const urls = [];
-  walkUrls(parsed, (node, url, needQuotes, isStringValue) => {
-    if (url.trim().replace(/\\[\r\n]/g, '').length === 0) {
-      result.warn(`Unable to find uri in '${decl ? decl.toString() : value}'`, {
-        node: decl
-      });
-      return;
-    }
-
-    if (filter && !filter(url)) {
+var _default = _postcss.default.plugin(pluginName, options => (css, result) => {
+  const importsMap = new Map();
+  const replacementsMap = new Map();
+  let hasHelper = false;
+  css.walkDecls(decl => {
+    if (!needParseDecl.test(decl.value)) {
       return;
     }
 
-    const splittedUrl = url.split(/(\?)?#/);
-    const [urlWithoutHash, singleQuery, hashValue] = splittedUrl;
-    const hash = singleQuery || hashValue ? `${singleQuery ? '?' : ''}${hashValue ? `#${hashValue}` : ''}` : '';
-    const normalizedUrl = (0, _utils.normalizeUrl)(urlWithoutHash, isStringValue);
-    urls.push({
-      node,
-      url: normalizedUrl,
-      hash,
-      needQuotes
-    });
-  }); // eslint-disable-next-line consistent-return
-
-  return {
-    parsed,
-    urls
-  };
-}
-
-function walkDecls(css, result, filter) {
-  const items = [];
-  css.walkDecls(decl => {
-    const item = getUrlsFromValue(decl.value, result, filter, decl);
+    const parsed = (0, _postcssValueParser.default)(decl.value);
+    walkUrls(parsed, (node, url, needQuotes, isStringValue) => {
+      // https://www.w3.org/TR/css-syntax-3/#typedef-url-token
+      if (url.replace(/^[\s]+|[\s]+$/g, '').length === 0) {
+        result.warn(`Unable to find uri in '${decl ? decl.toString() : decl.value}'`, {
+          node: decl
+        });
+        return;
+      }
 
-    if (!item || item.urls.length === 0) {
-      return;
-    }
+      if (options.filter && !options.filter(url)) {
+        return;
+      }
 
-    items.push({
-      decl,
-      parsed: item.parsed,
-      urls: item.urls
-    });
-  });
-  return items;
-}
+      const splittedUrl = url.split(/(\?)?#/);
+      const [urlWithoutHash, singleQuery, hashValue] = splittedUrl;
+      const hash = singleQuery || hashValue ? `${singleQuery ? '?' : ''}${hashValue ? `#${hashValue}` : ''}` : '';
+      const normalizedUrl = (0, _utils.normalizeUrl)(urlWithoutHash, isStringValue);
+      const importKey = normalizedUrl;
+      let importName = importsMap.get(importKey);
+
+      if (!importName) {
+        importName = `___CSS_LOADER_URL_IMPORT_${importsMap.size}___`;
+        importsMap.set(importKey, importName);
+
+        if (!hasHelper) {
+          const urlToHelper = require.resolve('../runtime/getUrl.js');
+
+          result.messages.push({
+            pluginName,
+            type: 'import',
+            value: {
+              importName: '___CSS_LOADER_GET_URL_IMPORT___',
+              url: options.urlHandler ? options.urlHandler(urlToHelper) : urlToHelper
+            }
+          });
+          hasHelper = true;
+        }
 
-function flatten(array) {
-  return array.reduce((a, b) => a.concat(b), []);
-}
+        result.messages.push({
+          pluginName,
+          type: 'import',
+          value: {
+            importName,
+            url: options.urlHandler ? options.urlHandler(normalizedUrl) : normalizedUrl
+          }
+        });
+      }
 
-function collectUniqueUrlsWithNodes(array) {
-  return array.reduce((accumulator, currentValue) => {
-    const {
-      url,
-      needQuotes,
-      hash,
-      node
-    } = currentValue;
-    const found = accumulator.find(item => url === item.url && needQuotes === item.needQuotes && hash === item.hash);
-
-    if (!found) {
-      accumulator.push({
-        url,
+      const replacementKey = JSON.stringify({
+        importKey,
         hash,
-        needQuotes,
-        nodes: [node]
+        needQuotes
       });
-    } else {
-      found.nodes.push(node);
-    }
-
-    return accumulator;
-  }, []);
-}
-
-var _default = _postcss.default.plugin(pluginName, options => function process(css, result) {
-  const traversed = walkDecls(css, result, options.filter);
-  const flattenTraversed = flatten(traversed.map(item => item.urls));
-  const urlsWithNodes = collectUniqueUrlsWithNodes(flattenTraversed);
-  const replacers = new Map();
-  urlsWithNodes.forEach((urlWithNodes, index) => {
-    const {
-      url,
-      hash,
-      needQuotes,
-      nodes
-    } = urlWithNodes;
-    const replacementName = `___CSS_LOADER_URL_REPLACEMENT_${index}___`;
-    result.messages.push({
-      pluginName,
-      type: 'import',
-      value: {
-        type: 'url',
-        replacementName,
-        url,
-        needQuotes,
-        hash
-      }
-    }, {
-      pluginName,
-      type: 'replacer',
-      value: {
-        type: 'url',
-        replacementName
-      }
-    });
-    nodes.forEach(node => {
-      replacers.set(node, replacementName);
-    });
-  });
-  traversed.forEach(item => {
-    walkUrls(item.parsed, node => {
-      const replacementName = replacers.get(node);
+      let replacementName = replacementsMap.get(replacementKey);
 
       if (!replacementName) {
-        return;
+        replacementName = `___CSS_LOADER_URL_REPLACEMENT_${replacementsMap.size}___`;
+        replacementsMap.set(replacementKey, replacementName);
+        result.messages.push({
+          pluginName,
+          type: 'url-replacement',
+          value: {
+            replacementName,
+            importName,
+            hash,
+            needQuotes
+          }
+        });
       } // eslint-disable-next-line no-param-reassign
 
 
@@ -200,7 +154,7 @@ var _default = _postcss.default.plugin(pluginName, options => function process(c
       node.value = replacementName;
     }); // eslint-disable-next-line no-param-reassign
 
-    item.decl.value = item.parsed.toString();
+    decl.value = parsed.toString();
   });
 });
 

package/dist/runtime/api.js

@@ -23,14 +23,32 @@ module.exports = function (useSourceMap) {
   // eslint-disable-next-line func-names
 
 
-  list.i = function (modules, mediaQuery) {
+  list.i = function (modules, mediaQuery, dedupe) {
     if (typeof modules === 'string') {
       // eslint-disable-next-line no-param-reassign
       modules = [[null, modules, '']];
     }
 
-    for (var i = 0; i < modules.length; i++) {
-      var item = [].concat(modules[i]);
+    var alreadyImportedModules = {};
+
+    if (dedupe) {
+      for (var i = 0; i < this.length; i++) {
+        // eslint-disable-next-line prefer-destructuring
+        var id = this[i][0];
+
+        if (id != null) {
+          alreadyImportedModules[id] = true;
+        }
+      }
+    }
+
+    for (var _i = 0; _i < modules.length; _i++) {
+      var item = [].concat(modules[_i]);
+
+      if (dedupe && alreadyImportedModules[item[0]]) {
+        // eslint-disable-next-line no-continue
+        continue;
+      }
 
       if (mediaQuery) {
         if (!item[2]) {