css-loader 5.2.3 → 5.2.4

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [5.2.4](https://github.com/webpack-contrib/css-loader/compare/v5.2.3...v5.2.4) (2021-04-19)
+
+
+### Bug Fixes
+
+* do not crash on 'false' aliases ([#1292](https://github.com/webpack-contrib/css-loader/issues/1292)) ([e913cb1](https://github.com/webpack-contrib/css-loader/commit/e913cb1d73a4f5c3c4464e0446a885e9f677a005))
+
 ### [5.2.3](https://github.com/webpack-contrib/css-loader/compare/v5.2.2...v5.2.3) (2021-04-19)
 
 ### Bug Fixes

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

@@ -47,6 +47,12 @@ const plugin = (options = {}) => {
             context
           } = options;
           const resolvedUrl = await (0, _utils.resolveRequests)(resolver, context, [...new Set([normalizedUrl, request])]);
+
+          if (!resolvedUrl) {
+            return;
+          } // eslint-disable-next-line consistent-return
+
+
           return {
             url: resolvedUrl,
             prefix,
@@ -60,12 +66,14 @@ const plugin = (options = {}) => {
       const results = await Promise.all(tasks);
 
       for (let index = 0; index <= results.length - 1; index++) {
-        const {
-          url,
-          prefix,
-          tokens
-        } = results[index];
-        const newUrl = prefix ? `${prefix}!${url}` : url;
+        const item = results[index];
+
+        if (!item) {
+          // eslint-disable-next-line no-continue
+          continue;
+        }
+
+        const newUrl = item.prefix ? `${item.prefix}!${item.url}` : item.url;
         const importKey = newUrl;
         let importName = imports.get(importKey);
 
@@ -85,9 +93,9 @@ const plugin = (options = {}) => {
           });
         }
 
-        for (const [replacementIndex, token] of Object.keys(tokens).entries()) {
+        for (const [replacementIndex, token] of Object.keys(item.tokens).entries()) {
           const replacementName = `___CSS_LOADER_ICSS_IMPORT_${index}_REPLACEMENT_${replacementIndex}___`;
-          const localName = tokens[token];
+          const localName = item.tokens[token];
           importReplacements[token] = replacementName;
           options.replacements.push({
             replacementName,

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

@@ -155,12 +155,10 @@ const plugin = (options = {}) => {
               const needKeep = await options.filter(url, media);
 
               if (!needKeep) {
-                return null;
+                return;
               }
             }
 
-            atRule.remove();
-
             if (isRequestable) {
               const request = (0, _utils.requestify)(url, options.rootContext);
               const {
@@ -168,6 +166,13 @@ const plugin = (options = {}) => {
                 context
               } = options;
               const resolvedUrl = await (0, _utils.resolveRequests)(resolver, context, [...new Set([request, url])]);
+
+              if (!resolvedUrl) {
+                return;
+              }
+
+              atRule.remove(); // eslint-disable-next-line consistent-return
+
               return {
                 url: resolvedUrl,
                 media,
@@ -176,6 +181,8 @@ const plugin = (options = {}) => {
               };
             }
 
+            atRule.remove(); // eslint-disable-next-line consistent-return
+
             return {
               url,
               media,

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

@@ -268,7 +268,7 @@ const plugin = (options = {}) => {
               const needKeep = await options.filter(url);
 
               if (!needKeep) {
-                return null;
+                return;
               }
             }
 
@@ -282,18 +282,23 @@ const plugin = (options = {}) => {
               context
             } = options;
             const resolvedUrl = await (0, _utils.resolveRequests)(resolver, context, [...new Set([request, url])]);
+
+            if (!resolvedUrl) {
+              return;
+            } // eslint-disable-next-line consistent-return
+
+
             return { ...parsedDeclaration,
               url: resolvedUrl,
               hash
             };
           }));
-          const results = await Promise.all(resolvedDeclarations);
           const urlToNameMap = new Map();
           const urlToReplacementMap = new Map();
           let hasUrlImportHelper = false;
 
-          for (let index = 0; index <= results.length - 1; index++) {
-            const item = results[index];
+          for (let index = 0; index <= resolvedDeclarations.length - 1; index++) {
+            const item = resolvedDeclarations[index];
 
             if (!item) {
               // eslint-disable-next-line no-continue

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "css-loader",
-  "version": "5.2.3",
+  "version": "5.2.4",
   "description": "css loader module for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/css-loader",
@@ -89,7 +89,7 @@
     "stylus": "^0.54.8",
     "stylus-loader": "^4.3.0",
     "url-loader": "^4.1.1",
-    "webpack": "^5.33.2"
+    "webpack": "^5.34.0"
   },
   "keywords": [
     "webpack",