Skip to content

Commit

Permalink
Merge pull request #3124 from alphagov/mh-fix-linter-errors
Browse files Browse the repository at this point in the history
Fix style-lint breaking change in static
  • Loading branch information
matthillco authored Aug 14, 2023
2 parents 010bc9f + 9bc2497 commit 6ca3008
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 64 deletions.
2 changes: 1 addition & 1 deletion app/assets/stylesheets/guides-print.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ $is-print: true;
@import "helpers/core-print";
@import "helpers/print-base";

section > header h1:after {
section > header h1::after {
content: "";
}

Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/helpers/_core-print.scss
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ article {
margin-left: govuk-spacing(6);
position: relative;

&:before {
&::before {
@include govuk-font(27);
font-weight: bold;
content: "!";
Expand All @@ -92,7 +92,7 @@ article {
color: rgb(225, 225, 225);
@include govuk-font(14);

&:after {
&::after {
content: "\00A9 Crown Copyright";
float: right;
}
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/helpers/_print-base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ a {
}

// Override relative link printing to include gov.uk
a[href^="/"]:after {
a[href^="/"]::after {
content: " (https://www.gov.uk" attr(href) ")";
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"jasmine-core": "^5.1.0",
"standardx": "^7.0.0",
"stylelint": "^15.10.2",
"stylelint-config-gds": "^0.3.0"
"stylelint-config-gds": "^1.0.0"
},
"packageManager": "[email protected]"
}
127 changes: 68 additions & 59 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2085,7 +2085,7 @@ __metadata:
languageName: node
linkType: hard

"lodash@npm:^4.17.14, lodash@npm:^4.17.19, lodash@npm:^4.17.21":
"lodash@npm:^4.17.14, lodash@npm:^4.17.19":
version: 4.17.21
resolution: "lodash@npm:4.17.21"
checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7
Expand Down Expand Up @@ -2748,12 +2748,12 @@ __metadata:
languageName: node
linkType: hard

"postcss-scss@npm:^4.0.2":
version: 4.0.3
resolution: "postcss-scss@npm:4.0.3"
"postcss-scss@npm:^4.0.6":
version: 4.0.6
resolution: "postcss-scss@npm:4.0.6"
peerDependencies:
postcss: ^8.3.3
checksum: d11110376ce2dcf624426d9edfb49d794d4f628aa4253849e841047761563ac2fe6e79a98aa46f8ed7f687cedd8c475a0956fa5e9e6802f8448ccd6538955b48
postcss: ^8.4.19
checksum: 133a1cba31e2e167f4e841e66ec6a798eaf44c7911f9182ade0b5b1e71a8198814aa390b8c9d5db6b01358115232e5b15b1a4f8c5198acfccfb1f3fdbd328cdf
languageName: node
linkType: hard

Expand All @@ -2767,17 +2767,7 @@ __metadata:
languageName: node
linkType: hard

"postcss-selector-parser@npm:^6.0.6":
version: 6.0.11
resolution: "postcss-selector-parser@npm:6.0.11"
dependencies:
cssesc: ^3.0.0
util-deprecate: ^1.0.2
checksum: 0b01aa9c2d2c8dbeb51e9b204796b678284be9823abc8d6d40a8b16d4149514e922c264a8ed4deb4d6dbced564b9be390f5942c058582d8656351516d6c49cde
languageName: node
linkType: hard

"postcss-value-parser@npm:^4.1.0, postcss-value-parser@npm:^4.2.0":
"postcss-value-parser@npm:^4.2.0":
version: 4.2.0
resolution: "postcss-value-parser@npm:4.2.0"
checksum: 819ffab0c9d51cf0acbabf8996dffbfafbafa57afc0e4c98db88b67f2094cb44488758f06e5da95d7036f19556a4a732525e84289a425f4f6fd8e412a9d7442f
Expand Down Expand Up @@ -3329,7 +3319,7 @@ __metadata:
jasmine-core: ^5.1.0
standardx: ^7.0.0
stylelint: ^15.10.2
stylelint-config-gds: ^0.3.0
stylelint-config-gds: ^1.0.0
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -3474,83 +3464,102 @@ __metadata:
languageName: node
linkType: hard

"stylelint-config-gds@npm:^0.3.0":
version: 0.3.0
resolution: "stylelint-config-gds@npm:0.3.0"
"stylelint-config-gds@npm:^1.0.0":
version: 1.0.0
resolution: "stylelint-config-gds@npm:1.0.0"
dependencies:
stylelint-config-standard: ^29.0.0
stylelint-config-standard-scss: ^6.1.0
stylelint-config-standard: ^34.0.0
stylelint-config-standard-scss: ^10.0.0
peerDependencies:
stylelint: ^14.14.0
checksum: 4e416ce75bb8b883bcb58e2b5122ec68f1b4516abde53838ee88a8f12bcf8febe952286d6cdd137b199554bedf206647a16363ec1b6bea5e5e680db9bceeb263
stylelint: ^15.10.2
checksum: ef38e234239a06ba685d359a7974db191c01e34809874e836a52a93ecc1168911744edb05e6cd95491f5a4b73f130e226d7a1b32b96fd55943f1d2e399d88926
languageName: node
linkType: hard

"stylelint-config-recommended-scss@npm:^8.0.0":
version: 8.0.0
resolution: "stylelint-config-recommended-scss@npm:8.0.0"
"stylelint-config-recommended-scss@npm:^12.0.0":
version: 12.0.0
resolution: "stylelint-config-recommended-scss@npm:12.0.0"
dependencies:
postcss-scss: ^4.0.2
stylelint-config-recommended: ^9.0.0
stylelint-scss: ^4.0.0
postcss-scss: ^4.0.6
stylelint-config-recommended: ^12.0.0
stylelint-scss: ^5.0.0
peerDependencies:
postcss: ^8.3.3
stylelint: ^14.10.0
stylelint: ^15.5.0
peerDependenciesMeta:
postcss:
optional: true
checksum: 9680c6709239229fbf988529b7fd2cb751feca29cecbcf1054ce136807c031e2e089b94aa4d193fc2dc60410774145e6800210ebb5f72af9c553c4fc4a26a0cd
checksum: 9bffa840a75c51b6bd7024ac8dbfd027983d57b86e9aad662c3023242deca433b9d7ccbfd9e909f7295081d55f7c0a3755a18e0d8a558997d4d37b8dc17ffc78
languageName: node
linkType: hard

"stylelint-config-recommended@npm:^9.0.0":
version: 9.0.0
resolution: "stylelint-config-recommended@npm:9.0.0"
"stylelint-config-recommended@npm:^12.0.0":
version: 12.0.0
resolution: "stylelint-config-recommended@npm:12.0.0"
peerDependencies:
stylelint: ^14.10.0
checksum: 6d94582cb6ef0ba7d0181f0ff500fb12092e465915730d0a7f6b6e8d16e8c920658f18bb2c670115cd177f5d3b481609ff3a91bcee083d546ae31d94fdc03261
stylelint: ^15.5.0
checksum: d1de0fa2673c8aa4e50259eb7320cc17e7d09d13a176afea943b3227befcaaaf4e78b546ec076ace1e031ff526c81ea5dc6efa98dd7dc77c582b7352a128d37c
languageName: node
linkType: hard

"stylelint-config-standard-scss@npm:^6.1.0":
version: 6.1.0
resolution: "stylelint-config-standard-scss@npm:6.1.0"
"stylelint-config-recommended@npm:^13.0.0":
version: 13.0.0
resolution: "stylelint-config-recommended@npm:13.0.0"
peerDependencies:
stylelint: ^15.10.0
checksum: a56eb6d1a7c7f3a7a172b54bc34218859ba22a5a06816fb4d0964f66cb83cf372062f2c97830e994ad68243548e15fc49abf28887c3261ab1b471b3aa69f8e82
languageName: node
linkType: hard

"stylelint-config-standard-scss@npm:^10.0.0":
version: 10.0.0
resolution: "stylelint-config-standard-scss@npm:10.0.0"
dependencies:
stylelint-config-recommended-scss: ^8.0.0
stylelint-config-standard: ^29.0.0
stylelint-config-recommended-scss: ^12.0.0
stylelint-config-standard: ^33.0.0
peerDependencies:
postcss: ^8.3.3
stylelint: ^14.14.0
stylelint: ^15.5.0
peerDependenciesMeta:
postcss:
optional: true
checksum: eac8cc4e5f1b4ec8bba6a7bd84fe1010765f46357483bbe63f74c1ffdb01a2dd650d3751072b35869933facaacbf4adb0dcd7f141d01c5adbf72eaf720d54653
checksum: 14f8ed7d27edb869e72d44e4872f79e1164625ed6de5c90b5cdd9b67383facb30c260eaed50b57428e56556fae27947ab17b9446577a232e013ba7af8ee9d25c
languageName: node
linkType: hard

"stylelint-config-standard@npm:^29.0.0":
version: 29.0.0
resolution: "stylelint-config-standard@npm:29.0.0"
"stylelint-config-standard@npm:^33.0.0":
version: 33.0.0
resolution: "stylelint-config-standard@npm:33.0.0"
dependencies:
stylelint-config-recommended: ^9.0.0
stylelint-config-recommended: ^12.0.0
peerDependencies:
stylelint: ^14.14.0
checksum: 9540e5153383e5aa477d36b7a191b8768cb584d91de4382926be9c0c12863ca9235d45b87d663b27aef11610c9d6c6666536f86cc843eb36e4fdada0b4749376
stylelint: ^15.5.0
checksum: c901e52901f6eb72285a869b04ed55eddfb94b794d2599eee4cc9d56365c874c2276563d26848d29c3665ca7de361bf8abb9f6f7d80073f16013afff60938bad
languageName: node
linkType: hard

"stylelint-scss@npm:^4.0.0":
version: 4.2.0
resolution: "stylelint-scss@npm:4.2.0"
"stylelint-config-standard@npm:^34.0.0":
version: 34.0.0
resolution: "stylelint-config-standard@npm:34.0.0"
dependencies:
stylelint-config-recommended: ^13.0.0
peerDependencies:
stylelint: ^15.10.0
checksum: 536249800c04b48a9c354067765f042713982e8222be17bb897a27d26546e50adfb87e6f1e4541807d720de3554345da99ab470e13e8d7ab0ab326c73ae3df61
languageName: node
linkType: hard

"stylelint-scss@npm:^5.0.0":
version: 5.0.1
resolution: "stylelint-scss@npm:5.0.1"
dependencies:
lodash: ^4.17.21
postcss-media-query-parser: ^0.2.3
postcss-resolve-nested-selector: ^0.1.1
postcss-selector-parser: ^6.0.6
postcss-value-parser: ^4.1.0
postcss-selector-parser: ^6.0.13
postcss-value-parser: ^4.2.0
peerDependencies:
stylelint: ^14.5.1
checksum: 1fb9e850fc7301c3481f7df193d9dda520a0d54a56284ffda2de5766432aebd4205daa5c3002e784548ba26d5d1dee402c162bbb46beb6377a40d75abc409a3d
stylelint: ^14.5.1 || ^15.0.0
checksum: a3c99cb27682e2b3381359f2a25998340203622b7f08166113aa90ce5111fafcf0af32765b546be31968afb6f17e83c4a9a7f1819c228540c5f5773b574a9216
languageName: node
linkType: hard

Expand Down

0 comments on commit 6ca3008

Please sign in to comment.