postcss-bundler: fix import parsing

csstools · Nov 28, 2024 · eaeacd2 · eaeacd2
1 parent 0633b0a
commit eaeacd2
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 4 deletions.
diff --git a/plugin-packs/postcss-bundler/CHANGELOG.md b/plugin-packs/postcss-bundler/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changes to PostCSS Bundler
 
+### Unreleased (patch)
+
+- Fix import parsing so that `@import "foo.css" layer()` is considered invalid syntax and emits warnings.
+
 ### 2.0.5
 
 _November 1, 2024_

diff --git a/plugin-packs/postcss-bundler/dist/index.cjs b/plugin-packs/postcss-bundler/dist/index.cjs
diff --git a/plugin-packs/postcss-bundler/dist/index.mjs b/plugin-packs/postcss-bundler/dist/index.mjs
diff --git a/plugin-packs/postcss-bundler/src/postcss-import/lib/parse-at-import.ts b/plugin-packs/postcss-bundler/src/postcss-import/lib/parse-at-import.ts
@@ -111,6 +111,10 @@ export function parseAtImport(params: string): false | { uri: string; fullUri: s
 				return false;
 			}
 
+			if (!componentValue.value.some((x) => !isWhiteSpaceOrCommentNode(x))) {
+				return false;
+			}
+
 			layer = stringify([componentValue.value]);
 			continue;
 		}

diff --git a/plugin-packs/postcss-bundler/test/_tape.mjs b/plugin-packs/postcss-bundler/test/_tape.mjs
@@ -28,7 +28,7 @@ const testCases = {
 	},
 	'ignore': {
 		message: 'ignores incorrect syntax',
-		warnings: 4,
+		warnings: 5,
 	},
 	'layer-before-external': {
 		message: 'correctly handles layer statements before external resources',

diff --git a/plugin-packs/postcss-bundler/test/ignore.css b/plugin-packs/postcss-bundler/test/ignore.css
@@ -2,3 +2,4 @@
 @import supports(foo) "imports/basic.css";
 @import url('imports/basic.css' url-mod);
 @import url('imports/basic.css' 'imports/basic.css');
+@import url('imports/basic.css') layer();
diff --git a/plugins-stylelint/no-invalid-at-import-rules-when-bundling/CHANGELOG.md b/plugins-stylelint/no-invalid-at-import-rules-when-bundling/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### Unreleased (patch)
+
+- Fix import parsing so that `@import "foo.css" layer()` is considered invalid syntax and ignored.
+
 ### 3.0.4
 
 _November 1, 2024_

diff --git a/plugins-stylelint/no-invalid-at-import-rules-when-bundling/parse-at-import.mjs b/plugins-stylelint/no-invalid-at-import-rules-when-bundling/parse-at-import.mjs
@@ -1,4 +1,4 @@
-import { isCommentNode, isFunctionNode, isTokenNode, isWhitespaceNode, parseListOfComponentValues, stringify, sourceIndices } from '@csstools/css-parser-algorithms';
+import { isCommentNode, isFunctionNode, isTokenNode, isWhitespaceNode, parseListOfComponentValues, stringify, sourceIndices, isWhiteSpaceOrCommentNode } from '@csstools/css-parser-algorithms';
 import { TokenType, tokenize } from '@csstools/css-tokenizer';
 
 const IS_LAYER = /^layer$/i;
@@ -100,6 +100,10 @@ export function parseAtImport(params) {
 				return false;
 			}
 
+			if (!componentValue.value.some((x) => !isWhiteSpaceOrCommentNode(x))) {
+				return false;
+			}
+
 			layer = stringify([componentValue.value]);
 			layerSourceIndices = sourceIndices(componentValue);
 			continue;