diff --git a/package.json b/package.json index 18319641..3715b05d 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "eslint-scope": "^7.0.0", "eslint-visitor-keys": "^3.0.0", "espree": "^9.0.0", - "postcss": "^8.4.23", + "postcss": "^8.4.25", "postcss-scss": "^4.0.6" }, "devDependencies": { diff --git a/tests/fixtures/parser/style-context/empty-style-element-output.json b/tests/fixtures/parser/style-context/empty-style-element-output.json index 2e17f778..f7793306 100644 --- a/tests/fixtures/parser/style-context/empty-style-element-output.json +++ b/tests/fixtures/parser/style-context/empty-style-element-output.json @@ -10,9 +10,9 @@ "source": { "inputId": 0, "start": { - "offset": 52, + "column": 8, "line": 7, - "column": 8 + "offset": 52 } }, "lastEach": 1, diff --git a/tests/fixtures/parser/style-context/one-line-css-output.json b/tests/fixtures/parser/style-context/one-line-css-output.json index 669a9c69..f1c33607 100644 --- a/tests/fixtures/parser/style-context/one-line-css-output.json +++ b/tests/fixtures/parser/style-context/one-line-css-output.json @@ -24,16 +24,16 @@ }, "type": "decl", "source": { - "inputId": 0, - "start": { - "offset": 89, + "end": { + "column": 30, "line": 7, - "column": 20 + "offset": 99 }, - "end": { - "offset": 99, + "inputId": 0, + "start": { + "column": 20, "line": 7, - "column": 30 + "offset": 89 } }, "prop": "color", @@ -41,16 +41,16 @@ } ], "source": { - "inputId": 0, - "start": { - "offset": 78, + "end": { + "column": 32, "line": 7, - "column": 9 + "offset": 101 }, - "end": { - "offset": 101, + "inputId": 0, + "start": { + "column": 9, "line": 7, - "column": 32 + "offset": 78 } }, "selector": ".myClass", @@ -61,9 +61,9 @@ "source": { "inputId": 0, "start": { - "offset": 77, + "column": 8, "line": 7, - "column": 8 + "offset": 77 } }, "lastEach": 1, diff --git a/tests/fixtures/parser/style-context/parse-error-output.json b/tests/fixtures/parser/style-context/parse-error-output.json index 694cc9e0..965e96b6 100644 --- a/tests/fixtures/parser/style-context/parse-error-output.json +++ b/tests/fixtures/parser/style-context/parse-error-output.json @@ -10,10 +10,10 @@ "endLine": 4, "endColumn": 24, "input": { - "line": 4, "column": 11, - "endLine": 4, "endColumn": 24, + "endLine": 4, + "line": 4, "source": "\n // This syntax is intentionally invalid CSS - this is to be used to test resiliency against invalid input\n .container {\n class .div-class/35\n # Weird comment\n color: red;\n\n .span-class begin\n font-weight: bold;\n end\n }\n" } } diff --git a/tests/fixtures/parser/style-context/simple-css-output.json b/tests/fixtures/parser/style-context/simple-css-output.json index 103cd5ef..c17e3e9c 100644 --- a/tests/fixtures/parser/style-context/simple-css-output.json +++ b/tests/fixtures/parser/style-context/simple-css-output.json @@ -24,16 +24,16 @@ }, "type": "decl", "source": { - "inputId": 0, - "start": { - "offset": 107, + "end": { + "column": 15, "line": 11, - "column": 5 + "offset": 117 }, - "end": { - "offset": 117, + "inputId": 0, + "start": { + "column": 5, "line": 11, - "column": 15 + "offset": 107 } }, "prop": "color", @@ -41,16 +41,16 @@ } ], "source": { + "end": { + "column": 3, + "line": 12, + "offset": 121 + }, "inputId": 0, "start": { - "offset": 92, + "column": 3, "line": 10, - "column": 3 - }, - "end": { - "offset": 121, - "line": 12, - "column": 3 + "offset": 92 } }, "selector": ".myClass", @@ -73,16 +73,16 @@ }, "type": "decl", "source": { - "inputId": 0, - "start": { - "offset": 134, + "end": { + "column": 24, "line": 15, - "column": 5 + "offset": 153 }, - "end": { - "offset": 153, + "inputId": 0, + "start": { + "column": 5, "line": 15, - "column": 24 + "offset": 134 } }, "prop": "font-size", @@ -90,16 +90,16 @@ } ], "source": { + "end": { + "column": 3, + "line": 16, + "offset": 157 + }, "inputId": 0, "start": { - "offset": 126, + "column": 3, "line": 14, - "column": 3 - }, - "end": { - "offset": 157, - "line": 16, - "column": 3 + "offset": 126 } }, "selector": "b", @@ -110,9 +110,9 @@ "source": { "inputId": 0, "start": { - "offset": 89, + "column": 8, "line": 9, - "column": 8 + "offset": 89 } }, "lastEach": 1, diff --git a/tests/fixtures/parser/style-context/simple-scss-output.json b/tests/fixtures/parser/style-context/simple-scss-output.json index a3c34918..600b9962 100644 --- a/tests/fixtures/parser/style-context/simple-scss-output.json +++ b/tests/fixtures/parser/style-context/simple-scss-output.json @@ -36,16 +36,16 @@ }, "type": "comment", "source": { - "inputId": 0, - "start": { - "offset": 169, - "line": 10, - "column": 7 - }, "end": { "offset": 196, "line": 10, "column": 34 + }, + "inputId": 0, + "start": { + "column": 7, + "line": 10, + "offset": 169 } }, "text": "This is an inline comment" @@ -57,16 +57,16 @@ }, "type": "decl", "source": { - "inputId": 0, - "start": { - "offset": 204, + "end": { + "column": 17, "line": 11, - "column": 7 + "offset": 214 }, - "end": { - "offset": 214, + "inputId": 0, + "start": { + "column": 7, "line": 11, - "column": 17 + "offset": 204 } }, "prop": "color", @@ -74,16 +74,16 @@ } ], "source": { + "end": { + "column": 5, + "line": 12, + "offset": 220 + }, "inputId": 0, "start": { - "offset": 150, + "column": 5, "line": 9, - "column": 5 - }, - "end": { - "offset": 220, - "line": 12, - "column": 5 + "offset": 150 } }, "selector": ".div-class", @@ -106,16 +106,16 @@ }, "type": "decl", "source": { - "inputId": 0, - "start": { - "offset": 247, + "end": { + "column": 24, "line": 15, - "column": 7 + "offset": 264 }, - "end": { - "offset": 264, + "inputId": 0, + "start": { + "column": 7, "line": 15, - "column": 24 + "offset": 247 } }, "prop": "font-weight", @@ -123,16 +123,16 @@ } ], "source": { + "end": { + "column": 5, + "line": 16, + "offset": 270 + }, "inputId": 0, "start": { - "offset": 227, + "column": 5, "line": 14, - "column": 5 - }, - "end": { - "offset": 270, - "line": 16, - "column": 5 + "offset": 227 } }, "selector": ".span-class", @@ -141,16 +141,16 @@ } ], "source": { + "end": { + "column": 3, + "line": 17, + "offset": 274 + }, "inputId": 0, "start": { - "offset": 133, + "column": 3, "line": 8, - "column": 3 - }, - "end": { - "offset": 274, - "line": 17, - "column": 3 + "offset": 133 } }, "selector": ".container", @@ -161,9 +161,9 @@ "source": { "inputId": 0, "start": { - "offset": 130, + "column": 20, "line": 7, - "column": 20 + "offset": 130 } }, "lastEach": 1, diff --git a/tests/fixtures/parser/style-context/unrelated-style-attr-output.json b/tests/fixtures/parser/style-context/unrelated-style-attr-output.json index 1d6c539a..4d7100d8 100644 --- a/tests/fixtures/parser/style-context/unrelated-style-attr-output.json +++ b/tests/fixtures/parser/style-context/unrelated-style-attr-output.json @@ -24,16 +24,16 @@ }, "type": "decl", "source": { - "inputId": 0, - "start": { - "offset": 124, + "end": { + "column": 15, "line": 11, - "column": 5 + "offset": 134 }, - "end": { - "offset": 134, + "inputId": 0, + "start": { + "column": 5, "line": 11, - "column": 15 + "offset": 124 } }, "prop": "color", @@ -41,16 +41,16 @@ } ], "source": { + "end": { + "column": 3, + "line": 12, + "offset": 138 + }, "inputId": 0, "start": { - "offset": 109, + "column": 3, "line": 10, - "column": 3 - }, - "end": { - "offset": 138, - "line": 12, - "column": 3 + "offset": 109 } }, "selector": ".myClass", @@ -73,16 +73,16 @@ }, "type": "decl", "source": { - "inputId": 0, - "start": { - "offset": 151, + "end": { + "column": 24, "line": 15, - "column": 5 + "offset": 170 }, - "end": { - "offset": 170, + "inputId": 0, + "start": { + "column": 5, "line": 15, - "column": 24 + "offset": 151 } }, "prop": "font-size", @@ -90,16 +90,16 @@ } ], "source": { + "end": { + "column": 3, + "line": 16, + "offset": 174 + }, "inputId": 0, "start": { - "offset": 143, + "column": 3, "line": 14, - "column": 3 - }, - "end": { - "offset": 174, - "line": 16, - "column": 3 + "offset": 143 } }, "selector": "b", @@ -110,9 +110,9 @@ "source": { "inputId": 0, "start": { - "offset": 106, + "column": 25, "line": 9, - "column": 25 + "offset": 106 } }, "lastEach": 1,