Skip to content

Commit 50aaa86

Browse files
adamwathanadamwathan
authored
Merge pull request #618 from tailwindcss/update-postcss-dependencies
Update PostCSS dependencies
2 parents 2674e65 + 2b5358d commit 50aaa86

File tree

4 files changed

+89
-78
lines changed

4 files changed

+89
-78
lines changed

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@
4141
"rimraf": "^2.6.1"
4242
},
4343
"dependencies": {
44-
"autoprefixer": "^9.3.1",
44+
"autoprefixer": "^9.4.5",
4545
"bytes": "^3.0.0",
4646
"chalk": "^2.4.1",
4747
"css.escape": "^1.5.1",
4848
"fs-extra": "^4.0.2",
4949
"lodash": "^4.17.5",
5050
"node-emoji": "^1.8.1",
5151
"perfectionist": "^2.4.0",
52-
"postcss": "^6.0.9",
52+
"postcss": "^7.0.11",
5353
"postcss-functions": "^3.0.0",
54-
"postcss-js": "^1.0.1",
55-
"postcss-nested": "^3.0.0",
56-
"postcss-selector-parser": "^3.1.1",
54+
"postcss-js": "^2.0.0",
55+
"postcss-nested": "^4.1.1",
56+
"postcss-selector-parser": "^5.0.0",
5757
"pretty-hrtime": "^1.0.3",
5858
"strip-comments": "^1.0.2"
5959
},

‎src/util/buildSelectorVariant.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import escapeClassName from './escapeClassName'
22
import parser from 'postcss-selector-parser'
33
import tap from 'lodash/tap'
4+
import get from 'lodash/get'
45

56
export default function buildSelectorVariant(selector, variantName, separator, onError = () => {}) {
67
return parser(selectors => {
@@ -10,7 +11,12 @@ export default function buildSelectorVariant(selector, variantName, separator, o
1011
return
1112
}
1213

13-
classSelector.value = `${variantName}${escapeClassName(separator)}${classSelector.value}`
14+
const baseClass = get(classSelector, 'raws.value', classSelector.value)
15+
16+
classSelector.setPropertyAndEscape(
17+
'value',
18+
`${variantName}${escapeClassName(separator)}${baseClass}`
19+
)
1420
})
1521
}).processSync(selector)
1622
}

‎src/util/prefixSelector.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
import parser from 'postcss-selector-parser'
2+
import get from 'lodash/get'
23

34
export default function(prefix, selector) {
45
const getPrefix = typeof prefix === 'function' ? prefix : () => prefix
56

67
return parser(selectors => {
78
selectors.walkClasses(classSelector => {
8-
classSelector.value = `${getPrefix('.' + classSelector.value)}${classSelector.value}`
9+
const baseClass = get(classSelector, 'raws.value', classSelector.value)
10+
11+
classSelector.setPropertyAndEscape('value', `${getPrefix('.' + baseClass)}${baseClass}`)
912
})
1013
}).processSync(selector)
1114
}

‎yarn.lock‎

Lines changed: 73 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -273,16 +273,16 @@ atob@^2.1.1:
273273
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"
274274
integrity sha1-ri1acpR38onWDdf5amMUoi3Wwio=
275275

276-
autoprefixer@^9.3.1:
277-
version "9.3.1"
278-
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.3.1.tgz#71b622174de2b783d5fd99f9ad617b7a3c78443e"
279-
integrity sha512-DY9gOh8z3tnCbJ13JIWaeQsoYncTGdsrgCceBaQSIL4nvdrLxgbRSBPevg2XbX7u4QCSfLheSJEEIUUSlkbx6Q==
276+
autoprefixer@^9.4.5:
277+
version "9.4.5"
278+
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.5.tgz#a13ccb001e4bc8837f71c3354005b42f02cc03d7"
279+
integrity sha512-M602C0ZxzFpJKqD4V6eq2j+K5CkzlhekCrcQupJmAOrPEZjWJyj/wSeo6qRSNoN6M3/9mtLPQqTTrABfReytQg==
280280
dependencies:
281-
browserslist "^4.3.3"
282-
caniuse-lite "^1.0.30000898"
281+
browserslist "^4.4.0"
282+
caniuse-lite "^1.0.30000928"
283283
normalize-range "^0.1.2"
284284
num2fraction "^1.2.2"
285-
postcss "^7.0.5"
285+
postcss "^7.0.11"
286286
postcss-value-parser "^3.3.1"
287287

288288
aws-sign2@~0.7.0:
@@ -1160,14 +1160,14 @@ browserslist@^3.2.6:
11601160
caniuse-lite "^1.0.30000844"
11611161
electron-to-chromium "^1.3.47"
11621162

1163-
browserslist@^4.3.3:
1164-
version "4.3.4"
1165-
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.4.tgz#4477b737db6a1b07077275b24791e680d4300425"
1166-
integrity sha512-u5iz+ijIMUlmV8blX82VGFrB9ecnUg5qEt55CMZ/YJEhha+d8qpBfOFuutJ6F/VKRXjZoD33b6uvarpPxcl3RA==
1163+
browserslist@^4.4.0:
1164+
version "4.4.0"
1165+
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.0.tgz#7050d1412cbfc5274aba609ed5e50359ca1a5fdf"
1166+
integrity sha512-tQkHS8VVxWbrjnNDXgt7/+SuPJ7qDvD0Y2e6bLtoQluR2SPvlmPUcfcU75L1KAalhqULlIFJlJ6BDfnYyJxJsw==
11671167
dependencies:
1168-
caniuse-lite "^1.0.30000899"
1169-
electron-to-chromium "^1.3.82"
1170-
node-releases "^1.0.1"
1168+
caniuse-lite "^1.0.30000928"
1169+
electron-to-chromium "^1.3.100"
1170+
node-releases "^1.1.3"
11711171

11721172
bser@^2.0.0:
11731173
version "2.0.0"
@@ -1223,10 +1223,10 @@ callsites@^2.0.0:
12231223
resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
12241224
integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
12251225

1226-
camelcase-css@^1.0.1:
1227-
version "1.0.1"
1228-
resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-1.0.1.tgz#157c4238265f5cf94a1dffde86446552cbf3f705"
1229-
integrity sha1-FXxCOCZfXPlKHf/ehkRlUsvz9wU=
1226+
camelcase-css@^2.0.0:
1227+
version "2.0.1"
1228+
resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
1229+
integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
12301230

12311231
camelcase@^1.0.2:
12321232
version "1.2.1"
@@ -1243,10 +1243,10 @@ caniuse-lite@^1.0.30000844:
12431243
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000846.tgz#2092911eecad71a89dae1faa62bcc202fde7f959"
12441244
integrity sha512-qxUOHr5mTaadWH1ap0ueivHd8x42Bnemcn+JutVr7GWmm2bU4zoBhjuv5QdXgALQnnT626lOQros7cCDf8PwCg==
12451245

1246-
caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000899:
1247-
version "1.0.30000905"
1248-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000905.tgz#8f731ecf5b8553c7154a691c3df3a635a1a3fda5"
1249-
integrity sha512-cR6ICguvhRrkAjFfBoe54vJQMVOEz7vFmqrV6oor1a7GRg6DdswI40lkiV/QQvAMb4txzTkjSaLaJaiAtSuQzA==
1246+
caniuse-lite@^1.0.30000928:
1247+
version "1.0.30000928"
1248+
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000928.tgz#805e828dc72b06498e3683a32e61c7507fd67b88"
1249+
integrity sha512-aSpMWRXL6ZXNnzm8hgE4QDLibG5pVJ2Ujzsuj3icazlIkxXkPXtL+BWnMx6FBkWmkZgBHGUxPZQvrbRw2ZTxhg==
12501250

12511251
capture-exit@^1.2.0:
12521252
version "1.2.0"
@@ -1288,6 +1288,15 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1:
12881288
escape-string-regexp "^1.0.5"
12891289
supports-color "^5.3.0"
12901290

1291+
chalk@^2.4.2:
1292+
version "2.4.2"
1293+
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
1294+
integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
1295+
dependencies:
1296+
ansi-styles "^3.2.1"
1297+
escape-string-regexp "^1.0.5"
1298+
supports-color "^5.3.0"
1299+
12911300
chardet@^0.4.0:
12921301
version "0.4.2"
12931302
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
@@ -1477,6 +1486,11 @@ css.escape@^1.5.1:
14771486
resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
14781487
integrity sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=
14791488

1489+
cssesc@^2.0.0:
1490+
version "2.0.0"
1491+
resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"
1492+
integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==
1493+
14801494
[email protected], "cssom@>= 0.3.2 < 0.4.0":
14811495
version "0.3.2"
14821496
resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
@@ -1639,30 +1653,23 @@ domexception@^1.0.1:
16391653
dependencies:
16401654
webidl-conversions "^4.0.2"
16411655

1642-
dot-prop@^4.1.1:
1643-
version "4.2.0"
1644-
resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
1645-
integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
1646-
dependencies:
1647-
is-obj "^1.0.0"
1648-
16491656
ecc-jsbn@~0.1.1:
16501657
version "0.1.1"
16511658
resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
16521659
integrity sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=
16531660
dependencies:
16541661
jsbn "~0.1.0"
16551662

1663+
electron-to-chromium@^1.3.100:
1664+
version "1.3.102"
1665+
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.102.tgz#3ac43a037c8a63bca3dfa189eb3d90f097196787"
1666+
integrity sha512-2nzZuXw/KBPnI3QX3UOCSRvJiVy7o9+VHRDQ3D/EHCvVc89X6aj/GlNmEgiR2GBIhmSWXIi4W1M5okA5ScSlNg==
1667+
16561668
electron-to-chromium@^1.3.47:
16571669
version "1.3.48"
16581670
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.48.tgz#d3b0d8593814044e092ece2108fc3ac9aea4b900"
16591671
integrity sha1-07DYWTgUBE4JLs4hCPw6ya6kuQA=
16601672

1661-
electron-to-chromium@^1.3.82:
1662-
version "1.3.83"
1663-
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.83.tgz#74584eb0972bb6777811c5d68d988c722f5e6666"
1664-
integrity sha512-DqJoDarxq50dcHsOOlMLNoy+qQitlMNbYb6wwbE0oUw2veHdRkpNrhmngiUYKMErdJ8SJ48rpJsZTQgy5SoEAA==
1665-
16661673
error-ex@^1.2.0:
16671674
version "1.3.1"
16681675
resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
@@ -2616,11 +2623,6 @@ is-number@^4.0.0:
26162623
resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
26172624
integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
26182625

2619-
is-obj@^1.0.0:
2620-
version "1.0.1"
2621-
resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
2622-
integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
2623-
26242626
is-odd@^2.0.0:
26252627
version "2.0.0"
26262628
resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
@@ -3633,10 +3635,10 @@ node-pre-gyp@^0.10.0:
36333635
semver "^5.3.0"
36343636
tar "^4"
36353637

3636-
node-releases@^1.0.1:
3637-
version "1.0.3"
3638-
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.3.tgz#3414ed84595096459c251699bfcb47d88324a9e4"
3639-
integrity sha512-ZaZWMsbuDcetpHmYeKWPO6e63pSXLb50M7lJgCbcM2nC/nQC3daNifmtp5a2kp7EWwYfhuvH6zLPWkrF8IiDdw==
3638+
node-releases@^1.1.3:
3639+
version "1.1.3"
3640+
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.3.tgz#aad9ce0dcb98129c753f772c0aa01360fb90fbd2"
3641+
integrity sha512-6VrvH7z6jqqNFY200kdB6HdzkgM96Oaj9v3dqGfgp6mF+cHmU4wyQKZ2/WPDRVoR0Jz9KqbamaBN0ZhdUaysUQ==
36403642
dependencies:
36413643
semver "^5.3.0"
36423644

@@ -4001,21 +4003,21 @@ postcss-functions@^3.0.0:
40014003
postcss "^6.0.9"
40024004
postcss-value-parser "^3.3.0"
40034005

4004-
postcss-js@^1.0.1:
4005-
version "1.0.1"
4006-
resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-1.0.1.tgz#ffaf29226e399ea74b5dce02cab1729d7addbc7b"
4007-
integrity sha512-smhUUMF5o5W1ZCQSyh5A3lNOXFLdNrxqyhWbLsGolZH2AgVmlyhxhYbIixfsdKE6r1vG5i7O40DPcvEvE1mvjw==
4006+
postcss-js@^2.0.0:
4007+
version "2.0.0"
4008+
resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-2.0.0.tgz#f75b70470009eb37f998ee9bb516a2899c19ef8d"
4009+
integrity sha512-9kAApW9G5kN8FkQ0ZdvSmbgbHIRrKmXtde2ZWYbwrW51gfEWfGsLlUu57mTpioPrmQlQFOgEvaeGYp+poqlX0A==
40084010
dependencies:
4009-
camelcase-css "^1.0.1"
4010-
postcss "^6.0.11"
4011+
camelcase-css "^2.0.0"
4012+
postcss "^7.0.0"
40114013

4012-
postcss-nested@^3.0.0:
4013-
version "3.0.0"
4014-
resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-3.0.0.tgz#cde40bd07a078565f3df72e2dc2665871c724852"
4015-
integrity sha512-1xxmLHSfubuUi6xZZ0zLsNoiKfk3BWQj6fkNMaBJC529wKKLcdeCxXt6KJmDLva+trNyQNwEaE/ZWMA7cve1fA==
4014+
postcss-nested@^4.1.1:
4015+
version "4.1.1"
4016+
resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-4.1.1.tgz#2074e6641583bf7151d951908d68fa95039fe340"
4017+
integrity sha512-3+V8+g+i9zUQ/AADNtBj3DVVvSOhRCV7W8Kzn9n4ViWJtSQrSdtIJnxZaupfdTrnhCkY86sAsuKVxBCuyfJDeA==
40164018
dependencies:
4017-
postcss "^6.0.14"
4018-
postcss-selector-parser "^3.1.1"
4019+
postcss "^7.0.6"
4020+
postcss-selector-parser "^5.0.0-rc.4"
40194021

40204022
postcss-scss@^0.3.0:
40214023
version "0.3.1"
@@ -4024,12 +4026,12 @@ postcss-scss@^0.3.0:
40244026
dependencies:
40254027
postcss "^5.2.4"
40264028

4027-
postcss-selector-parser@^3.1.1:
4028-
version "3.1.1"
4029-
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865"
4030-
integrity sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=
4029+
postcss-selector-parser@^5.0.0, postcss-selector-parser@^5.0.0-rc.4:
4030+
version "5.0.0"
4031+
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c"
4032+
integrity sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==
40314033
dependencies:
4032-
dot-prop "^4.1.1"
4034+
cssesc "^2.0.0"
40334035
indexes-of "^1.0.1"
40344036
uniq "^1.0.1"
40354037

@@ -4053,7 +4055,7 @@ postcss@^5.0.8, postcss@^5.2.4:
40534055
source-map "^0.5.6"
40544056
supports-color "^3.2.3"
40554057

4056-
postcss@^6.0.11, postcss@^6.0.14, postcss@^6.0.9:
4058+
postcss@^6.0.9:
40574059
version "6.0.22"
40584060
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.22.tgz#e23b78314905c3b90cbd61702121e7a78848f2a3"
40594061
integrity sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==
@@ -4062,14 +4064,14 @@ postcss@^6.0.11, postcss@^6.0.14, postcss@^6.0.9:
40624064
source-map "^0.6.1"
40634065
supports-color "^5.4.0"
40644066

4065-
postcss@^7.0.5:
4066-
version "7.0.5"
4067-
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.5.tgz#70e6443e36a6d520b0fd4e7593fcca3635ee9f55"
4068-
integrity sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==
4067+
postcss@^7.0.0, postcss@^7.0.11, postcss@^7.0.6:
4068+
version "7.0.11"
4069+
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.11.tgz#f63c513b78026d66263bb2ca995bf02e3d1a697d"
4070+
integrity sha512-9AXb//5UcjeOEof9T+yPw3XTa5SL207ZOIC/lHYP4mbUTEh4M0rDAQekQpVANCZdwQwKhBtFZCk3i3h3h2hdWg==
40694071
dependencies:
4070-
chalk "^2.4.1"
4072+
chalk "^2.4.2"
40714073
source-map "^0.6.1"
4072-
supports-color "^5.5.0"
4074+
supports-color "^6.1.0"
40734075

40744076
prelude-ls@~1.1.2:
40754077
version "1.1.2"
@@ -4811,10 +4813,10 @@ supports-color@^5.3.0, supports-color@^5.4.0:
48114813
dependencies:
48124814
has-flag "^3.0.0"
48134815

4814-
supports-color@^5.5.0:
4815-
version "5.5.0"
4816-
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
4817-
integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
4816+
supports-color@^6.1.0:
4817+
version "6.1.0"
4818+
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
4819+
integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
48184820
dependencies:
48194821
has-flag "^3.0.0"
48204822

0 commit comments

Comments
 (0)