diff --git a/package-lock.json b/package-lock.json index d885692..b7c48aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "MIT", "dependencies": { "postcss": "^8.4.20", - "postcss-sorting": "^8.0.0" + "postcss-sorting": "^8.0.1" }, "devDependencies": { "eslint": "^8.31.0", @@ -8176,9 +8176,9 @@ } }, "node_modules/postcss-sorting": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-8.0.0.tgz", - "integrity": "sha512-jM5m9ko8XAP1clKldYqDeVQHsr9O1/SsnMWWHYpHJ2FzoiFHySIzqyuvDo8Zo+ovuCZfu/ViDlBgIUXmcDtyUw==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-8.0.1.tgz", + "integrity": "sha512-go9Zoxx7KQH+uLrJ9xa5wRErFeXu01ydA6O8m7koPXkmAN7Ts//eRcIqjo0stBR4+Nir2gMYDOWAOx7O5EPUZA==", "peerDependencies": { "postcss": "^8.4.20" } @@ -15759,9 +15759,9 @@ } }, "postcss-sorting": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-8.0.0.tgz", - "integrity": "sha512-jM5m9ko8XAP1clKldYqDeVQHsr9O1/SsnMWWHYpHJ2FzoiFHySIzqyuvDo8Zo+ovuCZfu/ViDlBgIUXmcDtyUw==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-8.0.1.tgz", + "integrity": "sha512-go9Zoxx7KQH+uLrJ9xa5wRErFeXu01ydA6O8m7koPXkmAN7Ts//eRcIqjo0stBR4+Nir2gMYDOWAOx7O5EPUZA==", "requires": {} }, "postcss-styled-syntax": { diff --git a/package.json b/package.json index 3402225..91730ea 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "main": "index.js", "dependencies": { "postcss": "^8.4.20", - "postcss-sorting": "^8.0.0" + "postcss-sorting": "^8.0.1" }, "peerDependencies": { "stylelint": "^14.0.0" diff --git a/rules/order/tests/index.js b/rules/order/tests/index.js index f747327..df72729 100644 --- a/rules/order/tests/index.js +++ b/rules/order/tests/index.js @@ -58,6 +58,14 @@ testRule({ } `, }, + { + description: 'should not report things in css root', + code: ` + @media (min-width: 100px) {} + + display: none; + `, + }, ], reject: [ diff --git a/utils/getContainingNode.js b/utils/getContainingNode.js index 0c404b1..d2f8e0f 100644 --- a/utils/getContainingNode.js +++ b/utils/getContainingNode.js @@ -1,6 +1,15 @@ module.exports = function getContainingNode(node) { - // For styled-components: declarations are children of Root node - if (node.type !== 'rule' && node.type !== 'atrule' && node.parent.type === 'root') { + if (node.type === 'rule' || node.type === 'atrule') { + return node; + } + + // postcss-styled-syntax: declarations are children of Root node + if (node.parent?.type === 'root' && node.parent?.raws.styledSyntaxIsComponent) { + return node.parent; + } + + // @stylelint/postcss-css-in-js: declarations are children of Root node + if (node.parent?.document?.nodes?.some((item) => item.type === 'root')) { return node.parent; }