Skip to content

Commit

Permalink
Attempt to adjust for Sass v1.79
Browse files Browse the repository at this point in the history
  • Loading branch information
jgerigmeyer committed Oct 1, 2024
1 parent c4a8713 commit 3e1326a
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 67 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,5 @@
"name": "accoutrement",
"needs": "^1.0.0"
},
"packageManager": "yarn@4.4.1"
"packageManager": "yarn@4.5.0"
}
6 changes: 3 additions & 3 deletions sass/color/_contrast.scss
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,9 @@ $_wcag-contrast: (
$check: type.check($color, 'color', true, 'color.luminance', '$color');
$luminance: 0;
$rgb: (
'r': math.div(color.red($color), 255),
'g': math.div(color.green($color), 255),
'b': math.div(color.blue($color), 255),
'r': math.div(color.channel($color, 'red', $space: rgb), 255),
'g': math.div(color.channel($color, 'green', $space: rgb), 255),
'b': math.div(color.channel($color, 'blue', $space: rgb), 255),
);

@each $channel, $value in $rgb {
Expand Down
2 changes: 1 addition & 1 deletion sass/color/_themes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

@each $name, $color in $origin {
$color: tokens.color($name);
$light: color.lightness($color);
$light: color.channel($color, 'lightness', $space: hsl);
$light: if($light == 0, 0.00000001%, $light);
$lum: contrast.luminance($color);
$avg: math.div((math.div($light, 100%) + $lum), 2);
Expand Down
12 changes: 6 additions & 6 deletions test/tokens/_compile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@
);

$colors-compiled: (
'brand-blue': #0d7fa5,
'brand-blue': hsl(195, 85%, 35%),
'contrast-dark': maroon,
'dark-blue': c.mix(maroon, #0d7fa5, 25%),
'light-blue': c.mix(white, #0d7fa5, 25%),
'dark-blue': rgb(42.040625, 95.3859375, 123.834375),
'light-blue': rgb(73.790625, 159.1359375, 187.584375),
);
$fn: meta.get-function('color', $module: 'color');

Expand All @@ -111,10 +111,10 @@
)
),
(
'brand-blue': #a5330d,
'brand-blue': hsl(15, 85%, 35%),
'contrast-dark': teal,
'dark-blue': #7c472a,
'light-blue': #bc674a,
'dark-blue': rgb(123.834375, 70.4890625, 42.040625),
'light-blue': rgb(187.584375, 102.2390625, 73.790625),
)
);
}
Expand Down
4 changes: 2 additions & 2 deletions test/tokens/_parse.scss
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,8 @@ $scale: function.get('color.scale');

@include it('Removes null arguments') {
@include assert-equal(
parse.do('color.alpha', black, null),
color.alpha(black)
parse.do('color.channel', black, 'alpha', null),
color.channel(black, 'alpha')
);
}
}
Expand Down
90 changes: 36 additions & 54 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,11 @@ __metadata:
linkType: hard

"@types/node@npm:*":
version: 22.5.4
resolution: "@types/node@npm:22.5.4"
version: 22.7.4
resolution: "@types/node@npm:22.7.4"
dependencies:
undici-types: "npm:~6.19.2"
checksum: 10c0/b445daa7eecd761ad4d778b882d6ff7bcc3b4baad2086ea9804db7c5d4a4ab0298b00d7f5315fc640a73b5a1d52bbf9628e09c9fec0cf44dbf9b4df674a8717d
checksum: 10c0/c22bf54515c78ff3170142c1e718b90e2a0003419dc2d55f79c9c9362edd590a6ab1450deb09ff6e1b32d1b4698da407930b16285e8be3a009ea6cd2695cac01
languageName: node
linkType: hard

Expand Down Expand Up @@ -358,9 +358,9 @@ __metadata:
linkType: hard

"ansi-regex@npm:^6.0.1":
version: 6.0.1
resolution: "ansi-regex@npm:6.0.1"
checksum: 10c0/cbe16dbd2c6b2735d1df7976a7070dd277326434f0212f43abf6d87674095d247968209babdaad31bb00882fa68807256ba9be340eec2f1004de14ca75f52a08
version: 6.1.0
resolution: "ansi-regex@npm:6.1.0"
checksum: 10c0/a91daeddd54746338478eef88af3439a7edf30f8e23196e2d6ed182da9add559c601266dbef01c2efa46a958ad6f1f8b176799657616c702b5b02e799e7fd8dc
languageName: node
linkType: hard

Expand Down Expand Up @@ -532,9 +532,9 @@ __metadata:
linkType: hard

"b4a@npm:^1.6.4":
version: 1.6.6
resolution: "b4a@npm:1.6.6"
checksum: 10c0/56f30277666cb511a15829e38d369b114df7dc8cec4cedc09cc5d685bc0f27cb63c7bcfb58e09a19a1b3c4f2541069ab078b5328542e85d74a39620327709a38
version: 1.6.7
resolution: "b4a@npm:1.6.7"
checksum: 10c0/ec2f004d1daae04be8c5a1f8aeb7fea213c34025e279db4958eb0b82c1729ee25f7c6e89f92a5f65c8a9cf2d017ce27e3dda912403341d1781bd74528a4849d4
languageName: node
linkType: hard

Expand Down Expand Up @@ -563,9 +563,9 @@ __metadata:
linkType: hard

"bare-events@npm:^2.2.0":
version: 2.4.2
resolution: "bare-events@npm:2.4.2"
checksum: 10c0/09fa923061f31f815e83504e2ed4a8ba87732a01db40a7fae703dbb7eef7f05d99264b5e186074cbe9698213990d1af564c62cca07a5ff88baea8099ad9a6303
version: 2.5.0
resolution: "bare-events@npm:2.5.0"
checksum: 10c0/afbeec4e8be4d93fb4a3be65c3b4a891a2205aae30b5a38fafd42976cc76cf30dad348963fe330a0d70186e15dc507c11af42c89af5dddab2a54e5aff02e2896
languageName: node
linkType: hard

Expand Down Expand Up @@ -1830,9 +1830,9 @@ __metadata:
linkType: hard

"fast-uri@npm:^3.0.1":
version: 3.0.1
resolution: "fast-uri@npm:3.0.1"
checksum: 10c0/3cd46d6006083b14ca61ffe9a05b8eef75ef87e9574b6f68f2e17ecf4daa7aaadeff44e3f0f7a0ef4e0f7e7c20fc07beec49ff14dc72d0b500f00386592f2d10
version: 3.0.2
resolution: "fast-uri@npm:3.0.2"
checksum: 10c0/8cdd3da7b4022a037d348d587d55caff74b7e4f862bbdd2cc35c1e6e3f97d0aedb567894d44c57ee8798d3192cceb97dcf41dbdabfa07dd2842a0474a6c6eeef
languageName: node
linkType: hard

Expand Down Expand Up @@ -4145,9 +4145,9 @@ __metadata:
linkType: hard

"package-json-from-dist@npm:^1.0.0":
version: 1.0.0
resolution: "package-json-from-dist@npm:1.0.0"
checksum: 10c0/e3ffaf6ac1040ab6082a658230c041ad14e72fabe99076a2081bb1d5d41210f11872403fc09082daf4387fc0baa6577f96c9c0e94c90c394fd57794b66aa4033
version: 1.0.1
resolution: "package-json-from-dist@npm:1.0.1"
checksum: 10c0/62ba2785eb655fec084a257af34dbe24292ab74516d6aecef97ef72d4897310bc6898f6c85b5cd22770eaa1ce60d55a0230e150fb6a966e3ecd6c511e23d164b
languageName: node
linkType: hard

Expand Down Expand Up @@ -4369,7 +4369,7 @@ __metadata:
languageName: node
linkType: hard

"postcss-resolve-nested-selector@npm:^0.1.4, postcss-resolve-nested-selector@npm:^0.1.6":
"postcss-resolve-nested-selector@npm:^0.1.6":
version: 0.1.6
resolution: "postcss-resolve-nested-selector@npm:0.1.6"
checksum: 10c0/84213a2bccce481b1569c595a3c547b25c6ef1cca839fbd6c82c12ab407559966e968613c7454b573aa54f38cfd7e900c1fd603f0efc9f51939ab9f93f115455
Expand All @@ -4394,7 +4394,7 @@ __metadata:
languageName: node
linkType: hard

"postcss-selector-parser@npm:^6.1.1, postcss-selector-parser@npm:^6.1.2":
"postcss-selector-parser@npm:^6.1.2":
version: 6.1.2
resolution: "postcss-selector-parser@npm:6.1.2"
dependencies:
Expand All @@ -4411,18 +4411,7 @@ __metadata:
languageName: node
linkType: hard

"postcss@npm:^8.4.41":
version: 8.4.45
resolution: "postcss@npm:8.4.45"
dependencies:
nanoid: "npm:^3.3.7"
picocolors: "npm:^1.0.1"
source-map-js: "npm:^1.2.0"
checksum: 10c0/ad6f8b9b1157d678560373696109745ab97a947d449f8a997acac41c7f1e4c0f3ca4b092d6df1387f430f2c9a319987b1780dbdc27e35800a88cde9b606c1e8f
languageName: node
linkType: hard

"postcss@npm:^8.4.47":
"postcss@npm:^8.4.41, postcss@npm:^8.4.47":
version: 8.4.47
resolution: "postcss@npm:8.4.47"
dependencies:
Expand Down Expand Up @@ -4502,12 +4491,12 @@ __metadata:
linkType: hard

"pump@npm:^3.0.0":
version: 3.0.0
resolution: "pump@npm:3.0.0"
version: 3.0.2
resolution: "pump@npm:3.0.2"
dependencies:
end-of-stream: "npm:^1.1.0"
once: "npm:^1.3.1"
checksum: 10c0/bbdeda4f747cdf47db97428f3a135728669e56a0ae5f354a9ac5b74556556f5446a46f720a8f14ca2ece5be9b4d5d23c346db02b555f46739934cc6c093a5478
checksum: 10c0/5ad655cb2a7738b4bcf6406b24ad0970d680649d996b55ad20d1be8e0c02394034e4c45ff7cd105d87f1e9b96a0e3d06fd28e11fae8875da26e7f7a8e2c9726f
languageName: node
linkType: hard

Expand Down Expand Up @@ -5498,14 +5487,7 @@ __metadata:
languageName: node
linkType: hard

"source-map-js@npm:^1.0.1, source-map-js@npm:^1.2.0":
version: 1.2.0
resolution: "source-map-js@npm:1.2.0"
checksum: 10c0/7e5f896ac10a3a50fe2898e5009c58ff0dc102dcb056ed27a354623a0ece8954d4b2649e1a1b2b52ef2e161d26f8859c7710350930751640e71e374fe2d321a4
languageName: node
linkType: hard

"source-map-js@npm:^1.2.1":
"source-map-js@npm:^1.0.1, source-map-js@npm:^1.2.1":
version: 1.2.1
resolution: "source-map-js@npm:1.2.1"
checksum: 10c0/7bda1fc4c197e3c6ff17de1b8b2c20e60af81b63a52cb32ec5a5d67a20a7d42651e2cb34ebe93833c5a2a084377e17455854fee3e21e7925c64a51b6a52b0faf
Expand Down Expand Up @@ -5600,8 +5582,8 @@ __metadata:
linkType: hard

"streamx@npm:^2.12.0, streamx@npm:^2.12.5, streamx@npm:^2.13.2, streamx@npm:^2.14.0":
version: 2.20.0
resolution: "streamx@npm:2.20.0"
version: 2.20.1
resolution: "streamx@npm:2.20.1"
dependencies:
bare-events: "npm:^2.2.0"
fast-fifo: "npm:^1.3.2"
Expand All @@ -5610,7 +5592,7 @@ __metadata:
dependenciesMeta:
bare-events:
optional: true
checksum: 10c0/135d94dca174c0d169416d28449cd6dd6f2c9bb9cf380f73072ba2ec08ab042748b60f522b94badbaef721328313a885a4b6c51c9d4fa6f3538da733c3399831
checksum: 10c0/34ffa2ee9465d70e18c7e2ba70189720c166d150ab83eb7700304620fa23ff42a69cb37d712ea4b5fc6234d8e74346a88bb4baceb873c6b05e52ac420f8abb4d
languageName: node
linkType: hard

Expand Down Expand Up @@ -5840,19 +5822,19 @@ __metadata:
linkType: hard

"stylelint-scss@npm:^6.4.0":
version: 6.5.1
resolution: "stylelint-scss@npm:6.5.1"
version: 6.7.0
resolution: "stylelint-scss@npm:6.7.0"
dependencies:
css-tree: "npm:2.3.1"
is-plain-object: "npm:5.0.0"
known-css-properties: "npm:^0.34.0"
postcss-media-query-parser: "npm:^0.2.3"
postcss-resolve-nested-selector: "npm:^0.1.4"
postcss-selector-parser: "npm:^6.1.1"
postcss-resolve-nested-selector: "npm:^0.1.6"
postcss-selector-parser: "npm:^6.1.2"
postcss-value-parser: "npm:^4.2.0"
peerDependencies:
stylelint: ^16.0.2
checksum: 10c0/72712633eb5cd358667b814d5cc9fdd8f90729e34b4260cce69c3daa0bd91d6732fcd7abad424f3e2adfa60b7784bf8e98b1396ecce6e628b13540e110978357
checksum: 10c0/8464f8295109fb562a428111a6d1b8e5f66a9c79543334cf6307c5a85ffc5f5c27d44cb251334aa339d63dfaa544d02671d4d43c3bec3f993d618c8cd103fa47
languageName: node
linkType: hard

Expand Down Expand Up @@ -6000,11 +5982,11 @@ __metadata:
linkType: hard

"text-decoder@npm:^1.1.0":
version: 1.1.1
resolution: "text-decoder@npm:1.1.1"
version: 1.2.0
resolution: "text-decoder@npm:1.2.0"
dependencies:
b4a: "npm:^1.6.4"
checksum: 10c0/e527d05454b59c0fa77456495de68c88e560a122de3dd28b3ebdbf81828aabeaa7e9bb8054b9eb52bc5029ccb5899ad04f466cbba3c53b2685270599d1710cee
checksum: 10c0/398171bef376e06864cd6ba24e0787cc626bebc84a1bbda758d06a6e9b729cc8613f7923dd0d294abd88e8bb5cd7261aad5fda7911fb87253fe71b2b5ac6e507
languageName: node
linkType: hard

Expand Down

0 comments on commit 3e1326a

Please sign in to comment.