Skip to content

Commit 8c34875

Browse files
gossibuschtoens
authored andcommitted
[BREAKING] refactor: use postcss-advanced-variables (#107)
* exchange archived plugins for advanced-variables * disable mixins * fix syntax * ignore unresolved variables
1 parent 11ac610 commit 8c34875

File tree

3 files changed

+24
-95
lines changed

3 files changed

+24
-95
lines changed

lib/clark-plugin.js

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = class ClarkPlugin extends Plugin {
1414
return (this.project.targets && this.project.targets.browsers) || null;
1515
}
1616

17-
config(env, baseConfig) {
17+
config(environment, baseConfig) {
1818
const before = [
1919
// https://github.com/postcss/postcss-mixins
2020
// Use @define-mixin and @mixin rules
@@ -41,17 +41,14 @@ module.exports = class ClarkPlugin extends Plugin {
4141
// Nest rules and reference the parent via &
4242
require('postcss-nested'),
4343

44-
// https://github.com/outpunk/postcss-each
45-
// Iterate over lists with @each
46-
require('postcss-each'),
47-
48-
// https://github.com/antyakushev/postcss-for
49-
// Iterate over numeric ranges with @for
50-
require('postcss-for'),
51-
52-
// https://github.com/andyjansson/postcss-conditionals
44+
// https://github.com/jonathantneal/postcss-advanced-variables
5345
// @if, @else and @else if
54-
require('postcss-conditionals'),
46+
// Iterate over numeric ranges with @for
47+
// Iterate over lists with @each
48+
require('postcss-advanced-variables')({
49+
disable: '@mixin, @include, @content',
50+
unresolved: 'ignore'
51+
}),
5552

5653
// https://github.com/jonathantneal/postcss-short
5754
// Shorthand properties

package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@
1919
"start": "ember serve"
2020
},
2121
"dependencies": {
22+
"postcss-advanced-variables": "^3.0.0",
2223
"postcss-calc": "^7.0.1",
2324
"postcss-color-function": "^4.1.0",
24-
"postcss-conditionals": "^2.1.0",
2525
"postcss-custom-selectors": "^5.1.2",
26-
"postcss-each": "^0.10.0",
2726
"postcss-easing-gradients": "^3.0.1",
28-
"postcss-for": "^2.1.1",
2927
"postcss-hexrgba": "^1.0.2",
3028
"postcss-mixins": "^6.2.2",
3129
"postcss-nested": "^4.1.2",

yarn.lock

Lines changed: 15 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -735,6 +735,11 @@
735735
resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
736736
integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
737737

738+
"@csstools/sass-import-resolve@^1.0.0":
739+
version "1.0.0"
740+
resolved "https://registry.yarnpkg.com/@csstools/sass-import-resolve/-/sass-import-resolve-1.0.0.tgz#32c3cdb2f7af3cd8f0dca357b592e7271f3831b5"
741+
integrity sha512-pH4KCsbtBLLe7eqUrw8brcuFO8IZlN36JjdKlOublibVdAIPHCzEnpBWOVUXK5sCf+DpBi8ZtuWtjF0srybdeA==
742+
738743
"@ember/optional-features@^0.7.0":
739744
version "0.7.0"
740745
resolved "https://registry.yarnpkg.com/@ember/optional-features/-/optional-features-0.7.0.tgz#f65a858007020ddfb8342f586112750c32abd2d9"
@@ -2598,11 +2603,6 @@ collection-visit@^1.0.0:
25982603
map-visit "^1.0.0"
25992604
object-visit "^1.0.0"
26002605

2601-
color-convert@^0.5.2:
2602-
version "0.5.3"
2603-
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"
2604-
integrity sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=
2605-
26062606
color-convert@^1.3.0, color-convert@^1.9.0:
26072607
version "1.9.3"
26082608
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -2878,14 +2878,6 @@ css-blank-pseudo@^0.1.4:
28782878
dependencies:
28792879
postcss "^7.0.5"
28802880

2881-
css-color-converter@^1.0.2:
2882-
version "1.1.0"
2883-
resolved "https://registry.yarnpkg.com/css-color-converter/-/css-color-converter-1.1.0.tgz#c2e7d93c2e96c8ad8cb1ac7a1f2e49d8052ade36"
2884-
integrity sha1-wufZPC6WyK2Msax6Hy5J2AUq3jY=
2885-
dependencies:
2886-
color-convert "^0.5.2"
2887-
color-name "^1.0.0"
2888-
28892881
css-color-function@~1.3.3:
28902882
version "1.3.3"
28912883
resolved "https://registry.yarnpkg.com/css-color-function/-/css-color-function-1.3.3.tgz#8ed24c2c0205073339fafa004bc8c141fccb282e"
@@ -2920,7 +2912,7 @@ css-selector-tokenizer@^0.7.0:
29202912
fastparse "^1.1.1"
29212913
regexpu-core "^1.0.0"
29222914

2923-
css-unit-converter@^1.0.0, css-unit-converter@^1.1.1:
2915+
css-unit-converter@^1.1.1:
29242916
version "1.1.1"
29252917
resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz#d9b9281adcfd8ced935bdbaba83786897f64e996"
29262918
integrity sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=
@@ -4668,11 +4660,6 @@ has-cors@1.1.0:
46684660
resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
46694661
integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
46704662

4671-
has-flag@^1.0.0:
4672-
version "1.0.0"
4673-
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
4674-
integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
4675-
46764663
has-flag@^3.0.0:
46774664
version "3.0.0"
46784665
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -5269,11 +5256,6 @@ jquery@^3.4.1:
52695256
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
52705257
integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
52715258

5272-
js-base64@^2.1.9:
5273-
version "2.5.1"
5274-
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121"
5275-
integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==
5276-
52775259
js-levenshtein@^1.1.3:
52785260
version "1.1.6"
52795261
resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
@@ -6483,6 +6465,14 @@ posix-character-classes@^0.1.0:
64836465
resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
64846466
integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
64856467

6468+
postcss-advanced-variables@^3.0.0:
6469+
version "3.0.0"
6470+
resolved "https://registry.yarnpkg.com/postcss-advanced-variables/-/postcss-advanced-variables-3.0.0.tgz#d1ca9a0da920c0be41213dd33ce6033d14f0b150"
6471+
integrity sha512-e5tcG0+l2qaqV65+qQCAW91vX4+mYbh2m5tdBYrzOhYjFgtNmtehmZWotvzWTGbtgbP11tgGirEYy2P7m6HceQ==
6472+
dependencies:
6473+
"@csstools/sass-import-resolve" "^1.0.0"
6474+
postcss "^7.0.6"
6475+
64866476
postcss-attribute-case-insensitive@^4.0.1:
64876477
version "4.0.1"
64886478
resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.1.tgz#b2a721a0d279c2f9103a36331c88981526428cc7"
@@ -6553,15 +6543,6 @@ postcss-color-rebeccapurple@^4.0.1:
65536543
postcss "^7.0.2"
65546544
postcss-values-parser "^2.0.0"
65556545

6556-
postcss-conditionals@^2.1.0:
6557-
version "2.1.0"
6558-
resolved "https://registry.yarnpkg.com/postcss-conditionals/-/postcss-conditionals-2.1.0.tgz#4d1f62aa540458ce7ab779f71656901c8f8e929a"
6559-
integrity sha1-TR9iqlQEWM56t3n3FlaQHI+Okpo=
6560-
dependencies:
6561-
css-color-converter "^1.0.2"
6562-
css-unit-converter "^1.0.0"
6563-
postcss "^5.0.4"
6564-
65656546
postcss-custom-media@^7.0.8:
65666547
version "7.0.8"
65676548
resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz#fffd13ffeffad73621be5f387076a28b00294e0c"
@@ -6601,14 +6582,6 @@ postcss-double-position-gradients@^1.0.0:
66016582
postcss "^7.0.5"
66026583
postcss-values-parser "^2.0.0"
66036584

6604-
postcss-each@^0.10.0:
6605-
version "0.10.0"
6606-
resolved "https://registry.yarnpkg.com/postcss-each/-/postcss-each-0.10.0.tgz#0877c6aea504bffd8a5d1f789d47d06a3e5feea1"
6607-
integrity sha1-CHfGrqUEv/2KXR94nUfQaj5f7qE=
6608-
dependencies:
6609-
postcss "^6.0.1"
6610-
postcss-simple-vars "^4.0.0"
6611-
66126585
postcss-easing-gradients@^3.0.1:
66136586
version "3.0.1"
66146587
resolved "https://registry.yarnpkg.com/postcss-easing-gradients/-/postcss-easing-gradients-3.0.1.tgz#6718b4090e79e0abd291e5ecbc2fcef632921319"
@@ -6655,14 +6628,6 @@ postcss-font-weights@^5.0.0:
66556628
dependencies:
66566629
postcss "^7.0.5"
66576630

6658-
postcss-for@^2.1.1:
6659-
version "2.1.1"
6660-
resolved "https://registry.yarnpkg.com/postcss-for/-/postcss-for-2.1.1.tgz#841378c0ef909d50e1980d5aa71e6a340e728fcd"
6661-
integrity sha1-hBN4wO+QnVDhmA1apx5qNA5yj80=
6662-
dependencies:
6663-
postcss "^5.0.0"
6664-
postcss-simple-vars "^2.0.0"
6665-
66666631
postcss-gap-properties@^2.0.0:
66676632
version "2.0.0"
66686633
resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz#431c192ab3ed96a3c3d09f2ff615960f902c1715"
@@ -7010,20 +6975,6 @@ postcss-short@^5.0.0:
70106975
postcss-short-size "^4.0.0"
70116976
postcss-short-spacing "^4.0.0"
70126977

7013-
postcss-simple-vars@^2.0.0:
7014-
version "2.0.0"
7015-
resolved "https://registry.yarnpkg.com/postcss-simple-vars/-/postcss-simple-vars-2.0.0.tgz#d0a1091b0da22b79507028f7b22b976c0a60b8d5"
7016-
integrity sha1-0KEJGw2iK3lQcCj3siuXbApguNU=
7017-
dependencies:
7018-
postcss "^5.0.21"
7019-
7020-
postcss-simple-vars@^4.0.0:
7021-
version "4.1.0"
7022-
resolved "https://registry.yarnpkg.com/postcss-simple-vars/-/postcss-simple-vars-4.1.0.tgz#043248cfef8d3f51b3486a28c09f8375dbf1b2f9"
7023-
integrity sha512-J/TRomA8EqXhS4VjQJsPCYTFIa9FYN/dkJK/8oZ0BYeVIPx91goqM8T+ljsP57+4bwSEywFOuB7EZ8n1gjjxZw==
7024-
dependencies:
7025-
postcss "^6.0.9"
7026-
70276978
postcss-simple-vars@^5.0.2:
70286979
version "5.0.2"
70296980
resolved "https://registry.yarnpkg.com/postcss-simple-vars/-/postcss-simple-vars-5.0.2.tgz#e2f81b3d0847ddd4169816b6d141b91d51e6e22e"
@@ -7050,17 +7001,7 @@ postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
70507001
indexes-of "^1.0.1"
70517002
uniq "^1.0.1"
70527003

7053-
postcss@^5.0.0, postcss@^5.0.21, postcss@^5.0.4:
7054-
version "5.2.18"
7055-
resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"
7056-
integrity sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==
7057-
dependencies:
7058-
chalk "^1.1.3"
7059-
js-base64 "^2.1.9"
7060-
source-map "^0.5.6"
7061-
supports-color "^3.2.3"
7062-
7063-
postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.14, postcss@^6.0.19, postcss@^6.0.23, postcss@^6.0.6, postcss@^6.0.7, postcss@^6.0.9:
7004+
postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.14, postcss@^6.0.19, postcss@^6.0.23, postcss@^6.0.6, postcss@^6.0.7:
70647005
version "6.0.23"
70657006
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
70667007
integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
@@ -8129,13 +8070,6 @@ supports-color@^2.0.0:
81298070
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
81308071
integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
81318072

8132-
supports-color@^3.2.3:
8133-
version "3.2.3"
8134-
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
8135-
integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
8136-
dependencies:
8137-
has-flag "^1.0.0"
8138-
81398073
supports-color@^5.3.0, supports-color@^5.4.0:
81408074
version "5.5.0"
81418075
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"

0 commit comments

Comments
 (0)