From 51f6655ffd20337d262633b366a1f91bb80fe702 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2020 06:14:32 +0000 Subject: [PATCH 01/52] Bump resolve from 1.15.0 to 1.15.1 Bumps [resolve](https://github.com/browserify/resolve) from 1.15.0 to 1.15.1. - [Release notes](https://github.com/browserify/resolve/releases) - [Commits](https://github.com/browserify/resolve/compare/v1.15.0...v1.15.1) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index fad41646c0c4..1b9d2b9e55ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4366,9 +4366,9 @@ resolve@1.1.7: integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= resolve@^1.13.1, resolve@^1.14.2, resolve@^1.3.2: - version "1.15.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.0.tgz#1b7ca96073ebb52e741ffd799f6b39ea462c67f5" - integrity sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw== + version "1.15.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" + integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w== dependencies: path-parse "^1.0.6" From c318666e3af4902b6d121088d82b947dca640b9f Mon Sep 17 00:00:00 2001 From: Shafiq Tahir Date: Mon, 10 Feb 2020 04:36:57 +0800 Subject: [PATCH 02/52] Add inline-grid --- src/plugins/display.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/display.js b/src/plugins/display.js index 41507755d85c..2ae81d6a752d 100644 --- a/src/plugins/display.js +++ b/src/plugins/display.js @@ -20,6 +20,9 @@ export default function() { '.grid': { display: 'grid', }, + '.inline-grid': { + display: 'inline-grid', + }, '.table': { display: 'table', }, From d193c008b532a357afc84290e0b806fb771cd8c1 Mon Sep 17 00:00:00 2001 From: Shafiq Tahir Date: Mon, 10 Feb 2020 04:37:31 +0800 Subject: [PATCH 03/52] Rebuild fixtures --- .../fixtures/tailwind-output-important.css | 20 +++++++++++++++++++ __tests__/fixtures/tailwind-output.css | 20 +++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index 0e8582e2c229..a5d81cb19749 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -3400,6 +3400,10 @@ video { display: grid !important; } +.inline-grid { + display: inline-grid !important; +} + .table { display: table !important; } @@ -13705,6 +13709,10 @@ video { display: grid !important; } + .sm\:inline-grid { + display: inline-grid !important; + } + .sm\:table { display: table !important; } @@ -24011,6 +24019,10 @@ video { display: grid !important; } + .md\:inline-grid { + display: inline-grid !important; + } + .md\:table { display: table !important; } @@ -34317,6 +34329,10 @@ video { display: grid !important; } + .lg\:inline-grid { + display: inline-grid !important; + } + .lg\:table { display: table !important; } @@ -44623,6 +44639,10 @@ video { display: grid !important; } + .xl\:inline-grid { + display: inline-grid !important; + } + .xl\:table { display: table !important; } diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index 931cc3e51793..4b8b1032f9ef 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -3400,6 +3400,10 @@ video { display: grid; } +.inline-grid { + display: inline-grid; +} + .table { display: table; } @@ -13705,6 +13709,10 @@ video { display: grid; } + .sm\:inline-grid { + display: inline-grid; + } + .sm\:table { display: table; } @@ -24011,6 +24019,10 @@ video { display: grid; } + .md\:inline-grid { + display: inline-grid; + } + .md\:table { display: table; } @@ -34317,6 +34329,10 @@ video { display: grid; } + .lg\:inline-grid { + display: inline-grid; + } + .lg\:table { display: table; } @@ -44623,6 +44639,10 @@ video { display: grid; } + .xl\:inline-grid { + display: inline-grid; + } + .xl\:table { display: table; } From 9776502ffd74a9161ecf7c359f23ba50f1e04c2a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2020 06:27:42 +0000 Subject: [PATCH 04/52] Bump rimraf from 3.0.1 to 3.0.2 Bumps [rimraf](https://github.com/isaacs/rimraf) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/isaacs/rimraf/releases) - [Changelog](https://github.com/isaacs/rimraf/blob/master/CHANGELOG.md) - [Commits](https://github.com/isaacs/rimraf/compare/v3.0.1...v3.0.2) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 1b9d2b9e55ff..999460030375 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4393,9 +4393,9 @@ rimraf@2.6.3, rimraf@^2.6.1: glob "^7.1.3" rimraf@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.1.tgz#48d3d4cb46c80d388ab26cd61b1b466ae9ae225a" - integrity sha512-IQ4ikL8SjBiEDZfk+DFVwqRK8md24RWMEJkdSlgNLkyyAImcjf8SWvU1qFMDOb4igBClbTQ/ugPqXcRwdFTxZw== + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== dependencies: glob "^7.1.3" From 43823453d93a6d37fe8121661a650e45ae047ec6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 18 Feb 2020 06:07:23 +0000 Subject: [PATCH 05/52] Bump postcss from 7.0.26 to 7.0.27 Bumps [postcss](https://github.com/postcss/postcss) from 7.0.26 to 7.0.27. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/master/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/7.0.26...7.0.27) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 999460030375..c77281520a0d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4067,9 +4067,9 @@ postcss@^6.0.9: supports-color "^5.4.0" postcss@^7.0.11, postcss@^7.0.18, postcss@^7.0.21, postcss@^7.0.26: - version "7.0.26" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.26.tgz#5ed615cfcab35ba9bbb82414a4fa88ea10429587" - integrity sha512-IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA== + version "7.0.27" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9" + integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ== dependencies: chalk "^2.4.2" source-map "^0.6.1" From 0f83fc9105dc39132c53651281284eb796e3edfa Mon Sep 17 00:00:00 2001 From: Owen Melbourne Date: Wed, 26 Feb 2020 11:43:23 +0000 Subject: [PATCH 06/52] =?UTF-8?q?=F0=9F=9A=80=20Feature=20-=20Added=20the?= =?UTF-8?q?=20ability=20to=20define=20the=20container=20padding=20based=20?= =?UTF-8?q?off=20screen=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __tests__/containerPlugin.test.js | 50 ++++++++++++++++++++++++ src/plugins/container.js | 65 +++++++++++++++++++++++++++---- 2 files changed, 108 insertions(+), 7 deletions(-) diff --git a/__tests__/containerPlugin.test.js b/__tests__/containerPlugin.test.js index c779b813fa42..8f1ae2dbcaf3 100644 --- a/__tests__/containerPlugin.test.js +++ b/__tests__/containerPlugin.test.js @@ -180,6 +180,56 @@ test.only('horizontal padding can be included by default', () => { `) }) +test.only('responsive horizontal padding can be included by default', () => { + const { components } = processPlugins( + [container()], + config({ + theme: { + container: { + padding: { + default: '1rem', + sm: '2rem', + lg: '4rem', + xl: '5rem', + }, + }, + }, + }) + ) + + expect(css(components)).toMatchCss(` + .container { + width: 100%; + padding-right: 1rem; + padding-left: 1rem + } + @media (min-width: 576px) { + .container { + max-width: 576px; + padding-right: 2rem; + padding-left: 2rem + } + } + @media (min-width: 768px) { + .container { max-width: 768px } + } + @media (min-width: 992px) { + .container { + max-width: 992px; + padding-right: 4rem; + padding-left: 4rem + } + } + @media (min-width: 1200px) { + .container { + max-width: 1200px; + padding-right: 5rem; + padding-left: 5rem + } + } + `) +}) + test.only('setting all options at once', () => { const { components } = processPlugins( [container()], diff --git a/src/plugins/container.js b/src/plugins/container.js index 269e6da297e1..e3ad7803780f 100644 --- a/src/plugins/container.js +++ b/src/plugins/container.js @@ -22,9 +22,64 @@ function extractMinWidths(breakpoints) { }) } +function mapMinWidthsToPadding(minWidths, screens, paddings) { + if (typeof paddings === 'undefined') { + return [] + } + + if (!_.isObject(paddings)) { + return [ + { + screen: 'default', + minWidth: 0, + padding: paddings, + }, + ] + } + + const mapping = [] + + if (paddings.default) { + mapping.push({ + screen: 'default', + minWidth: 0, + padding: paddings.default, + }) + } + + _.each(minWidths, minWidth => { + Object.keys(screens).forEach(screen => { + if (`${screens[screen]}` === `${minWidth}`) { + mapping.push({ + screen, + minWidth, + padding: paddings[screen], + }) + } + }) + }) + + return mapping +} + module.exports = function() { return function({ addComponents, theme }) { - const minWidths = extractMinWidths(theme('container.screens', theme('screens'))) + const screens = theme('container.screens', theme('screens')) + const minWidths = extractMinWidths(screens) + const paddings = mapMinWidthsToPadding(minWidths, screens, theme('container.padding')) + + const generatePaddingFor = minWidth => { + const paddingConfig = _.find(paddings, padding => `${padding.minWidth}` === `${minWidth}`) + + if (!paddingConfig) { + return {} + } + + return { + paddingRight: paddingConfig.padding, + paddingLeft: paddingConfig.padding, + } + } const atRules = _(minWidths) .sortBy(minWidth => parseInt(minWidth)) @@ -34,6 +89,7 @@ module.exports = function() { [`@media (min-width: ${minWidth})`]: { '.container': { 'max-width': minWidth, + ...generatePaddingFor(minWidth), }, }, } @@ -45,12 +101,7 @@ module.exports = function() { '.container': Object.assign( { width: '100%' }, theme('container.center', false) ? { marginRight: 'auto', marginLeft: 'auto' } : {}, - _.has(theme('container', {}), 'padding') - ? { - paddingRight: theme('container.padding'), - paddingLeft: theme('container.padding'), - } - : {} + generatePaddingFor(0) ), }, ...atRules, From 68671a6e57c406f7a52c3b9b22edc7ad26076eeb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 28 Feb 2020 06:25:20 +0000 Subject: [PATCH 07/52] Bump @babel/preset-env from 7.8.4 to 7.8.6 Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.4 to 7.8.6. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.8.4...v7.8.6) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 100 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 70 insertions(+), 30 deletions(-) diff --git a/yarn.lock b/yarn.lock index c77281520a0d..3ecccb5a9111 100644 --- a/yarn.lock +++ b/yarn.lock @@ -25,10 +25,10 @@ dependencies: "@babel/highlight" "^7.8.3" -"@babel/compat-data@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.8.4.tgz#bbe65d05a291667a8394fe8a0e0e277ef22b0d2a" - integrity sha512-lHLhlsvFjJAqNU71b7k6Vv9ewjmTXKvqaMv7n0G1etdCabWLw3nEYE8mmgoVOxMIFE07xOvo7H7XBASirX6Rrg== +"@babel/compat-data@^7.8.6": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.8.6.tgz#7eeaa0dfa17e50c7d9c0832515eee09b56f04e35" + integrity sha512-CurCIKPTkS25Mb8mz267vU95vy+TyUpnctEX2lV33xWNmHAfjruztgiPBbXZRh3xZZy1CYvGx6XfxyTVS+sk7Q== dependencies: browserslist "^4.8.5" invariant "^2.2.4" @@ -65,6 +65,16 @@ lodash "^4.17.13" source-map "^0.5.0" +"@babel/generator@^7.8.6": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.6.tgz#57adf96d370c9a63c241cd719f9111468578537a" + integrity sha512-4bpOR5ZBz+wWcMeVtcf7FbjcFzCp+817z2/gHNncIRcM9MmKzUhtWCYAq27RAfUrAFwb+OCG1s9WEaVxfi6cjg== + dependencies: + "@babel/types" "^7.8.6" + jsesc "^2.5.1" + lodash "^4.17.13" + source-map "^0.5.0" + "@babel/helper-annotate-as-pure@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee" @@ -89,12 +99,12 @@ "@babel/traverse" "^7.8.3" "@babel/types" "^7.8.3" -"@babel/helper-compilation-targets@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.4.tgz#03d7ecd454b7ebe19a254f76617e61770aed2c88" - integrity sha512-3k3BsKMvPp5bjxgMdrFyq0UaEO48HciVrOVF0+lon8pp95cyJ2ujAh0TrBHNMnJGT2rr0iKOJPFFbSqjDyf/Pg== +"@babel/helper-compilation-targets@^7.8.6": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.6.tgz#015b85db69e3a34240d5c2b761fc53eb9695f09c" + integrity sha512-UrJdk27hKVJSnibFcUWYLkCL0ZywTUoot8yii1lsHJcvwrypagmYKjHLMWivQPm4s6GdyygCL8fiH5EYLxhQwQ== dependencies: - "@babel/compat-data" "^7.8.4" + "@babel/compat-data" "^7.8.6" browserslist "^4.8.5" invariant "^2.2.4" levenary "^1.1.1" @@ -214,6 +224,16 @@ "@babel/traverse" "^7.8.3" "@babel/types" "^7.8.3" +"@babel/helper-replace-supers@^7.8.6": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz#5ada744fd5ad73203bf1d67459a27dcba67effc8" + integrity sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.8.3" + "@babel/helper-optimise-call-expression" "^7.8.3" + "@babel/traverse" "^7.8.6" + "@babel/types" "^7.8.6" + "@babel/helper-simple-access@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae" @@ -276,6 +296,11 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz#d1dbe64691d60358a974295fa53da074dd2ce8e8" integrity sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw== +"@babel/parser@^7.8.6": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.6.tgz#ba5c9910cddb77685a008e3c587af8d27b67962c" + integrity sha512-trGNYSfwq5s0SgM1BMEB8hX3NDmO7EP2wsDGDexiaKMB92BaRpS+qZfpkMqUBhcsOTBwNy9B/jieo4ad/t/z2g== + "@babel/plugin-proposal-async-generator-functions@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f" @@ -435,17 +460,17 @@ "@babel/helper-plugin-utils" "^7.8.3" lodash "^4.17.13" -"@babel/plugin-transform-classes@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.3.tgz#46fd7a9d2bb9ea89ce88720477979fe0d71b21b8" - integrity sha512-SjT0cwFJ+7Rbr1vQsvphAHwUHvSUPmMjMU/0P59G8U2HLFqSa082JO7zkbDNWs9kH/IUqpHI6xWNesGf8haF1w== +"@babel/plugin-transform-classes@^7.8.6": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.6.tgz#77534447a477cbe5995ae4aee3e39fbc8090c46d" + integrity sha512-k9r8qRay/R6v5aWZkrEclEhKO6mc1CCQr2dLsVHBmOQiMpN6I2bpjX3vgnldUWeEI1GHVNByULVxZ4BdP4Hmdg== dependencies: "@babel/helper-annotate-as-pure" "^7.8.3" "@babel/helper-define-map" "^7.8.3" "@babel/helper-function-name" "^7.8.3" "@babel/helper-optimise-call-expression" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" - "@babel/helper-replace-supers" "^7.8.3" + "@babel/helper-replace-supers" "^7.8.6" "@babel/helper-split-export-declaration" "^7.8.3" globals "^11.1.0" @@ -486,10 +511,10 @@ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-for-of@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.4.tgz#6fe8eae5d6875086ee185dd0b098a8513783b47d" - integrity sha512-iAXNlOWvcYUYoV8YIxwS7TxGRJcxyl8eQCfT+A5j8sKUzRFvJdcyjp97jL2IghWSRDaL2PU2O2tX8Cu9dTBq5A== +"@babel/plugin-transform-for-of@^7.8.6": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.6.tgz#a051bd1b402c61af97a27ff51b468321c7c2a085" + integrity sha512-M0pw4/1/KI5WAxPsdcUL/w2LJ7o89YHN3yLkzNjg7Yl15GlVGgzHyCU+FMeAxevHGsLVmUqbirlUIKTafPmzdw== dependencies: "@babel/helper-plugin-utils" "^7.8.3" @@ -650,12 +675,12 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/preset-env@^7.0.0": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.4.tgz#9dac6df5f423015d3d49b6e9e5fa3413e4a72c4e" - integrity sha512-HihCgpr45AnSOHRbS5cWNTINs0TwaR8BS8xIIH+QwiW8cKL0llV91njQMpeMReEPVs+1Ao0x3RLEBLtt1hOq4w== + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.6.tgz#2a0773b08589ecba4995fc71b1965e4f531af40b" + integrity sha512-M5u8llV9DIVXBFB/ArIpqJuvXpO+ymxcJ6e8ZAmzeK3sQeBNOD1y+rHvHCGG4TlEmsNpIrdecsHGHT8ZCoOSJg== dependencies: - "@babel/compat-data" "^7.8.4" - "@babel/helper-compilation-targets" "^7.8.4" + "@babel/compat-data" "^7.8.6" + "@babel/helper-compilation-targets" "^7.8.6" "@babel/helper-module-imports" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-proposal-async-generator-functions" "^7.8.3" @@ -678,13 +703,13 @@ "@babel/plugin-transform-async-to-generator" "^7.8.3" "@babel/plugin-transform-block-scoped-functions" "^7.8.3" "@babel/plugin-transform-block-scoping" "^7.8.3" - "@babel/plugin-transform-classes" "^7.8.3" + "@babel/plugin-transform-classes" "^7.8.6" "@babel/plugin-transform-computed-properties" "^7.8.3" "@babel/plugin-transform-destructuring" "^7.8.3" "@babel/plugin-transform-dotall-regex" "^7.8.3" "@babel/plugin-transform-duplicate-keys" "^7.8.3" "@babel/plugin-transform-exponentiation-operator" "^7.8.3" - "@babel/plugin-transform-for-of" "^7.8.4" + "@babel/plugin-transform-for-of" "^7.8.6" "@babel/plugin-transform-function-name" "^7.8.3" "@babel/plugin-transform-literals" "^7.8.3" "@babel/plugin-transform-member-expression-literals" "^7.8.3" @@ -705,7 +730,7 @@ "@babel/plugin-transform-template-literals" "^7.8.3" "@babel/plugin-transform-typeof-symbol" "^7.8.4" "@babel/plugin-transform-unicode-regex" "^7.8.3" - "@babel/types" "^7.8.3" + "@babel/types" "^7.8.6" browserslist "^4.8.5" core-js-compat "^3.6.2" invariant "^2.2.2" @@ -747,10 +772,25 @@ globals "^11.1.0" lodash "^4.17.13" -"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c" - integrity sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg== +"@babel/traverse@^7.8.6": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.6.tgz#acfe0c64e1cd991b3e32eae813a6eb564954b5ff" + integrity sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A== + dependencies: + "@babel/code-frame" "^7.8.3" + "@babel/generator" "^7.8.6" + "@babel/helper-function-name" "^7.8.3" + "@babel/helper-split-export-declaration" "^7.8.3" + "@babel/parser" "^7.8.6" + "@babel/types" "^7.8.6" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.13" + +"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.6.tgz#629ecc33c2557fcde7126e58053127afdb3e6d01" + integrity sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA== dependencies: esutils "^2.0.2" lodash "^4.17.13" From 39ec5f48ca3a5429c0461824e2491d3eb6eaacfb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 28 Feb 2020 06:30:01 +0000 Subject: [PATCH 08/52] Bump @babel/core from 7.8.4 to 7.8.6 Bumps [@babel/core](https://github.com/babel/babel) from 7.8.4 to 7.8.6. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.8.4...v7.8.6) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 62 ++++++++++++++----------------------------------------- 1 file changed, 16 insertions(+), 46 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3ecccb5a9111..a7f8a520ee83 100644 --- a/yarn.lock +++ b/yarn.lock @@ -35,17 +35,17 @@ semver "^5.5.0" "@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.7.5": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.4.tgz#d496799e5c12195b3602d0fddd77294e3e38e80e" - integrity sha512-0LiLrB2PwrVI+a2/IEskBopDYSd8BCb3rOvH7D5tzoWd696TBEduBvuLVm4Nx6rltrLZqvI3MCalB2K2aVzQjA== + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.6.tgz#27d7df9258a45c2e686b6f18b6c659e563aa4636" + integrity sha512-Sheg7yEJD51YHAvLEV/7Uvw95AeWqYPL3Vk3zGujJKIhJ+8oLw2ALaf3hbucILhKsgSoADOvtKRJuNVdcJkOrg== dependencies: "@babel/code-frame" "^7.8.3" - "@babel/generator" "^7.8.4" + "@babel/generator" "^7.8.6" "@babel/helpers" "^7.8.4" - "@babel/parser" "^7.8.4" - "@babel/template" "^7.8.3" - "@babel/traverse" "^7.8.4" - "@babel/types" "^7.8.3" + "@babel/parser" "^7.8.6" + "@babel/template" "^7.8.6" + "@babel/traverse" "^7.8.6" + "@babel/types" "^7.8.6" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.1" @@ -55,16 +55,6 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.4.tgz#35bbc74486956fe4251829f9f6c48330e8d0985e" - integrity sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA== - dependencies: - "@babel/types" "^7.8.3" - jsesc "^2.5.1" - lodash "^4.17.13" - source-map "^0.5.0" - "@babel/generator@^7.8.6": version "7.8.6" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.6.tgz#57adf96d370c9a63c241cd719f9111468578537a" @@ -291,12 +281,7 @@ resolve "^1.13.1" v8flags "^3.1.1" -"@babel/parser@^7.1.0", "@babel/parser@^7.7.5", "@babel/parser@^7.8.3", "@babel/parser@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz#d1dbe64691d60358a974295fa53da074dd2ce8e8" - integrity sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw== - -"@babel/parser@^7.8.6": +"@babel/parser@^7.1.0", "@babel/parser@^7.7.5", "@babel/parser@^7.8.6": version "7.8.6" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.6.tgz#ba5c9910cddb77685a008e3c587af8d27b67962c" integrity sha512-trGNYSfwq5s0SgM1BMEB8hX3NDmO7EP2wsDGDexiaKMB92BaRpS+qZfpkMqUBhcsOTBwNy9B/jieo4ad/t/z2g== @@ -748,31 +733,16 @@ pirates "^4.0.0" source-map-support "^0.5.16" -"@babel/template@^7.7.4", "@babel/template@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8" - integrity sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ== - dependencies: - "@babel/code-frame" "^7.8.3" - "@babel/parser" "^7.8.3" - "@babel/types" "^7.8.3" - -"@babel/traverse@^7.1.0", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.4.tgz#f0845822365f9d5b0e312ed3959d3f827f869e3c" - integrity sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg== +"@babel/template@^7.7.4", "@babel/template@^7.8.3", "@babel/template@^7.8.6": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b" + integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg== dependencies: "@babel/code-frame" "^7.8.3" - "@babel/generator" "^7.8.4" - "@babel/helper-function-name" "^7.8.3" - "@babel/helper-split-export-declaration" "^7.8.3" - "@babel/parser" "^7.8.4" - "@babel/types" "^7.8.3" - debug "^4.1.0" - globals "^11.1.0" - lodash "^4.17.13" + "@babel/parser" "^7.8.6" + "@babel/types" "^7.8.6" -"@babel/traverse@^7.8.6": +"@babel/traverse@^7.1.0", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4", "@babel/traverse@^7.8.6": version "7.8.6" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.6.tgz#acfe0c64e1cd991b3e32eae813a6eb564954b5ff" integrity sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A== From 3c20ae8ebfb7034a9920cd54e1e98d6430d47864 Mon Sep 17 00:00:00 2001 From: Florian Bouvot Date: Mon, 2 Mar 2020 09:50:51 +0100 Subject: [PATCH 09/52] Add clear-none --- .../fixtures/tailwind-output-important.css | 20 +++++++++++++++++++ __tests__/fixtures/tailwind-output.css | 20 +++++++++++++++++++ src/plugins/clear.js | 1 + 3 files changed, 41 insertions(+) diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index 0e8582e2c229..a5adfe8fa2a2 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -3674,6 +3674,10 @@ video { clear: both !important; } +.clear-none { + clear: none !important; +} + .font-sans { font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important; } @@ -13979,6 +13983,10 @@ video { clear: both !important; } + .sm\:clear-none { + clear: none !important; + } + .sm\:font-sans { font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important; } @@ -24285,6 +24293,10 @@ video { clear: both !important; } + .md\:clear-none { + clear: none !important; + } + .md\:font-sans { font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important; } @@ -34591,6 +34603,10 @@ video { clear: both !important; } + .lg\:clear-none { + clear: none !important; + } + .lg\:font-sans { font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important; } @@ -44897,6 +44913,10 @@ video { clear: both !important; } + .xl\:clear-none { + clear: none !important; + } + .xl\:font-sans { font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important; } diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index 931cc3e51793..8155dbc90310 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -3674,6 +3674,10 @@ video { clear: both; } +.clear-none { + clear: none; +} + .font-sans { font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; } @@ -13979,6 +13983,10 @@ video { clear: both; } + .sm\:clear-none { + clear: none; + } + .sm\:font-sans { font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; } @@ -24285,6 +24293,10 @@ video { clear: both; } + .md\:clear-none { + clear: none; + } + .md\:font-sans { font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; } @@ -34591,6 +34603,10 @@ video { clear: both; } + .lg\:clear-none { + clear: none; + } + .lg\:font-sans { font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; } @@ -44897,6 +44913,10 @@ video { clear: both; } + .xl\:clear-none { + clear: none; + } + .xl\:font-sans { font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; } diff --git a/src/plugins/clear.js b/src/plugins/clear.js index 12232ac9cf19..81905328b0e6 100644 --- a/src/plugins/clear.js +++ b/src/plugins/clear.js @@ -5,6 +5,7 @@ export default function() { '.clear-left': { clear: 'left' }, '.clear-right': { clear: 'right' }, '.clear-both': { clear: 'both' }, + '.clear-none': { clear: 'none' }, }, variants('clear') ) From 241b63602a3e7c7b77588604edb0a661ac64ba05 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 5 Mar 2020 06:13:34 +0000 Subject: [PATCH 10/52] Bump @babel/core from 7.8.6 to 7.8.7 Bumps [@babel/core](https://github.com/babel/babel) from 7.8.6 to 7.8.7. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.8.6...v7.8.7) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/yarn.lock b/yarn.lock index a7f8a520ee83..dfa7496ebc25 100644 --- a/yarn.lock +++ b/yarn.lock @@ -35,17 +35,17 @@ semver "^5.5.0" "@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.7.5": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.6.tgz#27d7df9258a45c2e686b6f18b6c659e563aa4636" - integrity sha512-Sheg7yEJD51YHAvLEV/7Uvw95AeWqYPL3Vk3zGujJKIhJ+8oLw2ALaf3hbucILhKsgSoADOvtKRJuNVdcJkOrg== + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.7.tgz#b69017d221ccdeb203145ae9da269d72cf102f3b" + integrity sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA== dependencies: "@babel/code-frame" "^7.8.3" - "@babel/generator" "^7.8.6" + "@babel/generator" "^7.8.7" "@babel/helpers" "^7.8.4" - "@babel/parser" "^7.8.6" + "@babel/parser" "^7.8.7" "@babel/template" "^7.8.6" "@babel/traverse" "^7.8.6" - "@babel/types" "^7.8.6" + "@babel/types" "^7.8.7" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.1" @@ -55,12 +55,12 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.8.6": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.6.tgz#57adf96d370c9a63c241cd719f9111468578537a" - integrity sha512-4bpOR5ZBz+wWcMeVtcf7FbjcFzCp+817z2/gHNncIRcM9MmKzUhtWCYAq27RAfUrAFwb+OCG1s9WEaVxfi6cjg== +"@babel/generator@^7.8.6", "@babel/generator@^7.8.7": + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.7.tgz#870b3cf7984f5297998152af625c4f3e341400f7" + integrity sha512-DQwjiKJqH4C3qGiyQCAExJHoZssn49JTMJgZ8SANGgVFdkupcUhLOdkAeoC6kmHZCPfoDG5M0b6cFlSN5wW7Ew== dependencies: - "@babel/types" "^7.8.6" + "@babel/types" "^7.8.7" jsesc "^2.5.1" lodash "^4.17.13" source-map "^0.5.0" @@ -281,10 +281,10 @@ resolve "^1.13.1" v8flags "^3.1.1" -"@babel/parser@^7.1.0", "@babel/parser@^7.7.5", "@babel/parser@^7.8.6": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.6.tgz#ba5c9910cddb77685a008e3c587af8d27b67962c" - integrity sha512-trGNYSfwq5s0SgM1BMEB8hX3NDmO7EP2wsDGDexiaKMB92BaRpS+qZfpkMqUBhcsOTBwNy9B/jieo4ad/t/z2g== +"@babel/parser@^7.1.0", "@babel/parser@^7.7.5", "@babel/parser@^7.8.6", "@babel/parser@^7.8.7": + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.7.tgz#7b8facf95d25fef9534aad51c4ffecde1a61e26a" + integrity sha512-9JWls8WilDXFGxs0phaXAZgpxTZhSk/yOYH2hTHC0X1yC7Z78IJfvR1vJ+rmJKq3I35td2XzXzN6ZLYlna+r/A== "@babel/plugin-proposal-async-generator-functions@^7.8.3": version "7.8.3" @@ -757,10 +757,10 @@ globals "^11.1.0" lodash "^4.17.13" -"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.6.tgz#629ecc33c2557fcde7126e58053127afdb3e6d01" - integrity sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA== +"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7": + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.7.tgz#1fc9729e1acbb2337d5b6977a63979b4819f5d1d" + integrity sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw== dependencies: esutils "^2.0.2" lodash "^4.17.13" From 7a366239f2ecb3817b056daafb6c347ec7611199 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 5 Mar 2020 06:13:57 +0000 Subject: [PATCH 11/52] Bump @babel/node from 7.8.4 to 7.8.7 Bumps [@babel/node](https://github.com/babel/babel) from 7.8.4 to 7.8.7. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.8.4...v7.8.7) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index a7f8a520ee83..70a3094cc5c8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -268,16 +268,16 @@ js-tokens "^4.0.0" "@babel/node@^7.0.0": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.8.4.tgz#59b2ed7e5a9df2224592f83292d77d616fbf1ab8" - integrity sha512-MlczXI/VYRnoaWHjicqrzq2z4DhRPaWQIC+C3ISEQs5z+mEccBsn7IAI5Q97ZDTnFYw6ts5IUTzqArilC/g7nw== + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.8.7.tgz#4213ea99f0c86cc1cf460e61131e7acbb723e13a" + integrity sha512-o8cBT3cfRPLwoPh7VBYonSeZypIawGUeVfOIt1xSDgcDdirRGDPZ7/x+FLhhgQmKp3PKbz5Juh9/BNP4Jzrr9Q== dependencies: "@babel/register" "^7.8.3" commander "^4.0.1" core-js "^3.2.1" lodash "^4.17.13" node-environment-flags "^1.0.5" - regenerator-runtime "^0.13.3" + regenerator-runtime "^0.13.4" resolve "^1.13.1" v8flags "^3.1.1" @@ -4232,10 +4232,10 @@ regenerate@^1.4.0: resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg== -regenerator-runtime@^0.13.3: - version "0.13.3" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5" - integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw== +regenerator-runtime@^0.13.4: + version "0.13.4" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz#e96bf612a3362d12bb69f7e8f74ffeab25c7ac91" + integrity sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g== regenerator-transform@^0.14.0: version "0.14.0" From 67756a0c6f0615a92b55417344de565e8b978f7e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 5 Mar 2020 06:14:36 +0000 Subject: [PATCH 12/52] Bump @babel/preset-env from 7.8.6 to 7.8.7 Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.6 to 7.8.7. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.8.6...v7.8.7) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 125 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 69 insertions(+), 56 deletions(-) diff --git a/yarn.lock b/yarn.lock index a7f8a520ee83..a539080efe80 100644 --- a/yarn.lock +++ b/yarn.lock @@ -80,22 +80,22 @@ "@babel/helper-explode-assignable-expression" "^7.8.3" "@babel/types" "^7.8.3" -"@babel/helper-call-delegate@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.3.tgz#de82619898aa605d409c42be6ffb8d7204579692" - integrity sha512-6Q05px0Eb+N4/GTyKPPvnkig7Lylw+QzihMpws9iiZQv7ZImf84ZsZpQH7QoWN4n4tm81SnSzPgHw2qtO0Zf3A== +"@babel/helper-call-delegate@^7.8.7": + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz#28a279c2e6c622a6233da548127f980751324cab" + integrity sha512-doAA5LAKhsFCR0LAFIf+r2RSMmC+m8f/oQ+URnUET/rWeEzC0yTRmAGyWkD4sSu3xwbS7MYQ2u+xlt1V5R56KQ== dependencies: "@babel/helper-hoist-variables" "^7.8.3" "@babel/traverse" "^7.8.3" - "@babel/types" "^7.8.3" + "@babel/types" "^7.8.7" -"@babel/helper-compilation-targets@^7.8.6": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.6.tgz#015b85db69e3a34240d5c2b761fc53eb9695f09c" - integrity sha512-UrJdk27hKVJSnibFcUWYLkCL0ZywTUoot8yii1lsHJcvwrypagmYKjHLMWivQPm4s6GdyygCL8fiH5EYLxhQwQ== +"@babel/helper-compilation-targets@^7.8.7": + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz#dac1eea159c0e4bd46e309b5a1b04a66b53c1dde" + integrity sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw== dependencies: "@babel/compat-data" "^7.8.6" - browserslist "^4.8.5" + browserslist "^4.9.1" invariant "^2.2.4" levenary "^1.1.1" semver "^5.5.0" @@ -584,12 +584,12 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/helper-replace-supers" "^7.8.3" -"@babel/plugin-transform-parameters@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.4.tgz#1d5155de0b65db0ccf9971165745d3bb990d77d3" - integrity sha512-IsS3oTxeTsZlE5KqzTbcC2sV0P9pXdec53SU+Yxv7o/6dvGM5AkTotQKhoSffhNgZ/dftsSiOoxy7evCYJXzVA== +"@babel/plugin-transform-parameters@^7.8.7": + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.7.tgz#66fa2f1de4129b4e0447509223ac71bda4955395" + integrity sha512-brYWaEPTRimOctz2NDA3jnBbDi7SVN2T4wYuu0aqSzxC3nozFZngGaw29CJ9ZPweB7k+iFmZuoG3IVPIcXmD2g== dependencies: - "@babel/helper-call-delegate" "^7.8.3" + "@babel/helper-call-delegate" "^7.8.7" "@babel/helper-get-function-arity" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" @@ -600,12 +600,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-regenerator@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.3.tgz#b31031e8059c07495bf23614c97f3d9698bc6ec8" - integrity sha512-qt/kcur/FxrQrzFR432FGZznkVAjiyFtCOANjkAKwCbt465L6ZCiUQh2oMYGU3Wo8LRFJxNDFwWn106S5wVUNA== +"@babel/plugin-transform-regenerator@^7.8.7": + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8" + integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA== dependencies: - regenerator-transform "^0.14.0" + regenerator-transform "^0.14.2" "@babel/plugin-transform-reserved-words@^7.8.3": version "7.8.3" @@ -660,12 +660,12 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/preset-env@^7.0.0": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.6.tgz#2a0773b08589ecba4995fc71b1965e4f531af40b" - integrity sha512-M5u8llV9DIVXBFB/ArIpqJuvXpO+ymxcJ6e8ZAmzeK3sQeBNOD1y+rHvHCGG4TlEmsNpIrdecsHGHT8ZCoOSJg== + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.7.tgz#1fc7d89c7f75d2d70c2b6768de6c2e049b3cb9db" + integrity sha512-BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw== dependencies: "@babel/compat-data" "^7.8.6" - "@babel/helper-compilation-targets" "^7.8.6" + "@babel/helper-compilation-targets" "^7.8.7" "@babel/helper-module-imports" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-proposal-async-generator-functions" "^7.8.3" @@ -705,9 +705,9 @@ "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3" "@babel/plugin-transform-new-target" "^7.8.3" "@babel/plugin-transform-object-super" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.8.4" + "@babel/plugin-transform-parameters" "^7.8.7" "@babel/plugin-transform-property-literals" "^7.8.3" - "@babel/plugin-transform-regenerator" "^7.8.3" + "@babel/plugin-transform-regenerator" "^7.8.7" "@babel/plugin-transform-reserved-words" "^7.8.3" "@babel/plugin-transform-shorthand-properties" "^7.8.3" "@babel/plugin-transform-spread" "^7.8.3" @@ -715,7 +715,7 @@ "@babel/plugin-transform-template-literals" "^7.8.3" "@babel/plugin-transform-typeof-symbol" "^7.8.4" "@babel/plugin-transform-unicode-regex" "^7.8.3" - "@babel/types" "^7.8.6" + "@babel/types" "^7.8.7" browserslist "^4.8.5" core-js-compat "^3.6.2" invariant "^2.2.2" @@ -733,6 +733,13 @@ pirates "^4.0.0" source-map-support "^0.5.16" +"@babel/runtime@^7.8.4": + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.7.tgz#8fefce9802db54881ba59f90bb28719b4996324d" + integrity sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/template@^7.7.4", "@babel/template@^7.8.3", "@babel/template@^7.8.6": version "7.8.6" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b" @@ -757,10 +764,10 @@ globals "^11.1.0" lodash "^4.17.13" -"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.6.tgz#629ecc33c2557fcde7126e58053127afdb3e6d01" - integrity sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA== +"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7": + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.7.tgz#1fc9729e1acbb2337d5b6977a63979b4819f5d1d" + integrity sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw== dependencies: esutils "^2.0.2" lodash "^4.17.13" @@ -1392,14 +1399,14 @@ browser-resolve@^1.11.3: dependencies: resolve "1.1.7" -browserslist@^4.8.3, browserslist@^4.8.5: - version "4.8.6" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.6.tgz#96406f3f5f0755d272e27a66f4163ca821590a7e" - integrity sha512-ZHao85gf0eZ0ESxLfCp73GG9O/VTytYDIkIiZDlURppLTI9wErSM/5yAKEq6rcUdxBLjMELmrYUJGg5sxGKMHg== +browserslist@^4.8.3, browserslist@^4.8.5, browserslist@^4.9.1: + version "4.9.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.9.1.tgz#01ffb9ca31a1aef7678128fc6a2253316aa7287c" + integrity sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw== dependencies: - caniuse-lite "^1.0.30001023" - electron-to-chromium "^1.3.341" - node-releases "^1.1.47" + caniuse-lite "^1.0.30001030" + electron-to-chromium "^1.3.363" + node-releases "^1.1.50" bser@^2.0.0: version "2.1.0" @@ -1453,10 +1460,10 @@ caniuse-lite@^1.0.30001020: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001021.tgz#e75ed1ef6dbadd580ac7e7720bb16f07b083f254" integrity sha512-wuMhT7/hwkgd8gldgp2jcrUjOU9RXJ4XxGumQeOsUr91l3WwmM68Cpa/ymCnWEDqakwFXhuDQbaKNHXBPgeE9g== -caniuse-lite@^1.0.30001023: - version "1.0.30001023" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001023.tgz#b82155827f3f5009077bdd2df3d8968bcbcc6fc4" - integrity sha512-C5TDMiYG11EOhVOA62W1p3UsJ2z4DsHtMBQtjzp3ZsUglcQn62WOUgW0y795c7A5uZ+GCEIvzkMatLIlAsbNTA== +caniuse-lite@^1.0.30001030: + version "1.0.30001032" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001032.tgz#b8d224914e2cd7f507085583d4e38144c652bce4" + integrity sha512-8joOm7BwcpEN4BfVHtfh0hBXSAPVYk+eUIcNntGtMkUWy/6AKRCDZINCLe3kB1vHhT2vBxBF85Hh9VlPXi/qjA== capture-exit@^2.0.0: version "2.0.0" @@ -1862,10 +1869,10 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" -electron-to-chromium@^1.3.341: - version "1.3.344" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.344.tgz#f1397a633c35e726730c24be1084cd25c3ee8148" - integrity sha512-tvbx2Wl8WBR+ym3u492D0L6/jH+8NoQXqe46+QhbWH3voVPauGuZYeb1QAXYoOAWuiP2dbSvlBx0kQ1F3hu/Mw== +electron-to-chromium@^1.3.363: + version "1.3.368" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.368.tgz#d7597e04339f7ca70762031ec473d38eb2df6acb" + integrity sha512-fqzDipW3p+uDkHUHFPrdW3wINRKcJsbnJwBD7hgaQEQwcuLSvNLw6SeUp5gKDpTbmTl7zri7IZfhsdTUTnygJg== emoji-regex@^7.0.1: version "7.0.3" @@ -3682,10 +3689,10 @@ node-pre-gyp@^0.12.0: semver "^5.3.0" tar "^4" -node-releases@^1.1.47: - version "1.1.47" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.47.tgz#c59ef739a1fd7ecbd9f0b7cf5b7871e8a8b591e4" - integrity sha512-k4xjVPx5FpwBUj0Gw7uvFOTF4Ep8Hok1I6qjwL3pLfwe7Y0REQSAqOwwv9TWBCUtMHxcXfY4PgRLRozcChvTcA== +node-releases@^1.1.50: + version "1.1.50" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.50.tgz#803c40d2c45db172d0410e4efec83aa8c6ad0592" + integrity sha512-lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ== dependencies: semver "^6.3.0" @@ -4117,7 +4124,7 @@ pretty-hrtime@^1.0.3: resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE= -private@^0.1.6: +private@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== @@ -4237,12 +4244,18 @@ regenerator-runtime@^0.13.3: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5" integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw== -regenerator-transform@^0.14.0: - version "0.14.0" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.0.tgz#2ca9aaf7a2c239dd32e4761218425b8c7a86ecaf" - integrity sha512-rtOelq4Cawlbmq9xuMR5gdFmv7ku/sFoB7sRiywx7aq53bc52b4j6zvH7Te1Vt/X2YveDKnCGUbioieU7FEL3w== +regenerator-runtime@^0.13.4: + version "0.13.4" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz#e96bf612a3362d12bb69f7e8f74ffeab25c7ac91" + integrity sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g== + +regenerator-transform@^0.14.2: + version "0.14.2" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.2.tgz#949d9d87468ff88d5a7e4734ebb994a892de1ff2" + integrity sha512-V4+lGplCM/ikqi5/mkkpJ06e9Bujq1NFmNLvsCs56zg3ZbzrnUzAtizZ24TXxtRX/W2jcdScwQCnbL0CICTFkQ== dependencies: - private "^0.1.6" + "@babel/runtime" "^7.8.4" + private "^0.1.8" regex-not@^1.0.0, regex-not@^1.0.2: version "1.0.2" From 2558618a940e2910df72c239de715fcb264bee0e Mon Sep 17 00:00:00 2001 From: Philipp Bosch Date: Thu, 12 Mar 2020 11:31:26 +0100 Subject: [PATCH 13/52] Add `current` to default color palette as discussed in #998 --- stubs/defaultConfig.stub.js | 1 + 1 file changed, 1 insertion(+) diff --git a/stubs/defaultConfig.stub.js b/stubs/defaultConfig.stub.js index 1a1c81894dfb..810bddd0c61d 100644 --- a/stubs/defaultConfig.stub.js +++ b/stubs/defaultConfig.stub.js @@ -11,6 +11,7 @@ module.exports = { }, colors: { transparent: 'transparent', + current: 'currentColor', black: '#000', white: '#fff', From 2cf443f222ef9bdc73bfee867923695c025330bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2020 23:03:03 +0000 Subject: [PATCH 14/52] Bump acorn from 6.2.0 to 6.4.1 Bumps [acorn](https://github.com/acornjs/acorn) from 6.2.0 to 6.4.1. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/6.2.0...6.4.1) Signed-off-by: dependabot[bot] --- yarn.lock | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/yarn.lock b/yarn.lock index 970584bd6a91..3362e0d1cfe4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1085,16 +1085,11 @@ acorn-walk@^7.0.0: integrity sha512-7Bv1We7ZGuU79zZbb6rRqcpxo3OY+zrdtloZWoyD8fmGX+FeXRjE+iuGkZjSXLVovLzrsvMGMy0EkwA0E0umxg== acorn@^6.0.1: - version "6.2.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.2.0.tgz#67f0da2fc339d6cfb5d6fb244fd449f33cd8bbe3" - integrity sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw== - -acorn@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.0.0.tgz#26b8d1cd9a9b700350b71c0905546f64d1284e7a" - integrity sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ== + version "6.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474" + integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== -acorn@^7.1.0: +acorn@^7.0.0, acorn@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c" integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ== @@ -4244,11 +4239,6 @@ regenerator-runtime@^0.13.4: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz#e96bf612a3362d12bb69f7e8f74ffeab25c7ac91" integrity sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g== -regenerator-runtime@^0.13.4: - version "0.13.4" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz#e96bf612a3362d12bb69f7e8f74ffeab25c7ac91" - integrity sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g== - regenerator-transform@^0.14.2: version "0.14.2" resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.2.tgz#949d9d87468ff88d5a7e4734ebb994a892de1ff2" From 59c8e111c2604e3adf40ad5430bfabdf4a4e3b8e Mon Sep 17 00:00:00 2001 From: Philipp Bosch Date: Sat, 14 Mar 2020 10:29:22 +0100 Subject: [PATCH 15/52] Adjust test fixture for currentColor --- .../fixtures/tailwind-output-important.css | 220 ++++++++++++++++++ __tests__/fixtures/tailwind-output.css | 220 ++++++++++++++++++ 2 files changed, 440 insertions(+) diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index f27919397b39..498410ff9e93 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -672,6 +672,10 @@ video { background-color: transparent !important; } +.bg-current { + background-color: currentColor !important; +} + .bg-black { background-color: #000 !important; } @@ -1044,6 +1048,10 @@ video { background-color: transparent !important; } +.hover\:bg-current:hover { + background-color: currentColor !important; +} + .hover\:bg-black:hover { background-color: #000 !important; } @@ -1416,6 +1424,10 @@ video { background-color: transparent !important; } +.focus\:bg-current:focus { + background-color: currentColor !important; +} + .focus\:bg-black:focus { background-color: #000 !important; } @@ -1868,6 +1880,10 @@ video { border-color: transparent !important; } +.border-current { + border-color: currentColor !important; +} + .border-black { border-color: #000 !important; } @@ -2240,6 +2256,10 @@ video { border-color: transparent !important; } +.hover\:border-current:hover { + border-color: currentColor !important; +} + .hover\:border-black:hover { border-color: #000 !important; } @@ -2612,6 +2632,10 @@ video { border-color: transparent !important; } +.focus\:border-current:focus { + border-color: currentColor !important; +} + .focus\:border-black:focus { border-color: #000 !important; } @@ -5952,6 +5976,10 @@ video { color: transparent !important; } +.placeholder-current::placeholder { + color: currentColor !important; +} + .placeholder-black::placeholder { color: #000 !important; } @@ -6324,6 +6352,10 @@ video { color: transparent !important; } +.focus\:placeholder-current:focus::placeholder { + color: currentColor !important; +} + .focus\:placeholder-black:focus::placeholder { color: #000 !important; } @@ -6970,6 +7002,10 @@ video { color: transparent !important; } +.text-current { + color: currentColor !important; +} + .text-black { color: #000 !important; } @@ -7342,6 +7378,10 @@ video { color: transparent !important; } +.hover\:text-current:hover { + color: currentColor !important; +} + .hover\:text-black:hover { color: #000 !important; } @@ -7714,6 +7754,10 @@ video { color: transparent !important; } +.focus\:text-current:focus { + color: currentColor !important; +} + .focus\:text-black:focus { color: #000 !important; } @@ -10985,6 +11029,10 @@ video { background-color: transparent !important; } + .sm\:bg-current { + background-color: currentColor !important; + } + .sm\:bg-black { background-color: #000 !important; } @@ -11357,6 +11405,10 @@ video { background-color: transparent !important; } + .sm\:hover\:bg-current:hover { + background-color: currentColor !important; + } + .sm\:hover\:bg-black:hover { background-color: #000 !important; } @@ -11729,6 +11781,10 @@ video { background-color: transparent !important; } + .sm\:focus\:bg-current:focus { + background-color: currentColor !important; + } + .sm\:focus\:bg-black:focus { background-color: #000 !important; } @@ -12181,6 +12237,10 @@ video { border-color: transparent !important; } + .sm\:border-current { + border-color: currentColor !important; + } + .sm\:border-black { border-color: #000 !important; } @@ -12553,6 +12613,10 @@ video { border-color: transparent !important; } + .sm\:hover\:border-current:hover { + border-color: currentColor !important; + } + .sm\:hover\:border-black:hover { border-color: #000 !important; } @@ -12925,6 +12989,10 @@ video { border-color: transparent !important; } + .sm\:focus\:border-current:focus { + border-color: currentColor !important; + } + .sm\:focus\:border-black:focus { border-color: #000 !important; } @@ -16265,6 +16333,10 @@ video { color: transparent !important; } + .sm\:placeholder-current::placeholder { + color: currentColor !important; + } + .sm\:placeholder-black::placeholder { color: #000 !important; } @@ -16637,6 +16709,10 @@ video { color: transparent !important; } + .sm\:focus\:placeholder-current:focus::placeholder { + color: currentColor !important; + } + .sm\:focus\:placeholder-black:focus::placeholder { color: #000 !important; } @@ -17283,6 +17359,10 @@ video { color: transparent !important; } + .sm\:text-current { + color: currentColor !important; + } + .sm\:text-black { color: #000 !important; } @@ -17655,6 +17735,10 @@ video { color: transparent !important; } + .sm\:hover\:text-current:hover { + color: currentColor !important; + } + .sm\:hover\:text-black:hover { color: #000 !important; } @@ -18027,6 +18111,10 @@ video { color: transparent !important; } + .sm\:focus\:text-current:focus { + color: currentColor !important; + } + .sm\:focus\:text-black:focus { color: #000 !important; } @@ -21299,6 +21387,10 @@ video { background-color: transparent !important; } + .md\:bg-current { + background-color: currentColor !important; + } + .md\:bg-black { background-color: #000 !important; } @@ -21671,6 +21763,10 @@ video { background-color: transparent !important; } + .md\:hover\:bg-current:hover { + background-color: currentColor !important; + } + .md\:hover\:bg-black:hover { background-color: #000 !important; } @@ -22043,6 +22139,10 @@ video { background-color: transparent !important; } + .md\:focus\:bg-current:focus { + background-color: currentColor !important; + } + .md\:focus\:bg-black:focus { background-color: #000 !important; } @@ -22495,6 +22595,10 @@ video { border-color: transparent !important; } + .md\:border-current { + border-color: currentColor !important; + } + .md\:border-black { border-color: #000 !important; } @@ -22867,6 +22971,10 @@ video { border-color: transparent !important; } + .md\:hover\:border-current:hover { + border-color: currentColor !important; + } + .md\:hover\:border-black:hover { border-color: #000 !important; } @@ -23239,6 +23347,10 @@ video { border-color: transparent !important; } + .md\:focus\:border-current:focus { + border-color: currentColor !important; + } + .md\:focus\:border-black:focus { border-color: #000 !important; } @@ -26579,6 +26691,10 @@ video { color: transparent !important; } + .md\:placeholder-current::placeholder { + color: currentColor !important; + } + .md\:placeholder-black::placeholder { color: #000 !important; } @@ -26951,6 +27067,10 @@ video { color: transparent !important; } + .md\:focus\:placeholder-current:focus::placeholder { + color: currentColor !important; + } + .md\:focus\:placeholder-black:focus::placeholder { color: #000 !important; } @@ -27597,6 +27717,10 @@ video { color: transparent !important; } + .md\:text-current { + color: currentColor !important; + } + .md\:text-black { color: #000 !important; } @@ -27969,6 +28093,10 @@ video { color: transparent !important; } + .md\:hover\:text-current:hover { + color: currentColor !important; + } + .md\:hover\:text-black:hover { color: #000 !important; } @@ -28341,6 +28469,10 @@ video { color: transparent !important; } + .md\:focus\:text-current:focus { + color: currentColor !important; + } + .md\:focus\:text-black:focus { color: #000 !important; } @@ -31613,6 +31745,10 @@ video { background-color: transparent !important; } + .lg\:bg-current { + background-color: currentColor !important; + } + .lg\:bg-black { background-color: #000 !important; } @@ -31985,6 +32121,10 @@ video { background-color: transparent !important; } + .lg\:hover\:bg-current:hover { + background-color: currentColor !important; + } + .lg\:hover\:bg-black:hover { background-color: #000 !important; } @@ -32357,6 +32497,10 @@ video { background-color: transparent !important; } + .lg\:focus\:bg-current:focus { + background-color: currentColor !important; + } + .lg\:focus\:bg-black:focus { background-color: #000 !important; } @@ -32809,6 +32953,10 @@ video { border-color: transparent !important; } + .lg\:border-current { + border-color: currentColor !important; + } + .lg\:border-black { border-color: #000 !important; } @@ -33181,6 +33329,10 @@ video { border-color: transparent !important; } + .lg\:hover\:border-current:hover { + border-color: currentColor !important; + } + .lg\:hover\:border-black:hover { border-color: #000 !important; } @@ -33553,6 +33705,10 @@ video { border-color: transparent !important; } + .lg\:focus\:border-current:focus { + border-color: currentColor !important; + } + .lg\:focus\:border-black:focus { border-color: #000 !important; } @@ -36893,6 +37049,10 @@ video { color: transparent !important; } + .lg\:placeholder-current::placeholder { + color: currentColor !important; + } + .lg\:placeholder-black::placeholder { color: #000 !important; } @@ -37265,6 +37425,10 @@ video { color: transparent !important; } + .lg\:focus\:placeholder-current:focus::placeholder { + color: currentColor !important; + } + .lg\:focus\:placeholder-black:focus::placeholder { color: #000 !important; } @@ -37911,6 +38075,10 @@ video { color: transparent !important; } + .lg\:text-current { + color: currentColor !important; + } + .lg\:text-black { color: #000 !important; } @@ -38283,6 +38451,10 @@ video { color: transparent !important; } + .lg\:hover\:text-current:hover { + color: currentColor !important; + } + .lg\:hover\:text-black:hover { color: #000 !important; } @@ -38655,6 +38827,10 @@ video { color: transparent !important; } + .lg\:focus\:text-current:focus { + color: currentColor !important; + } + .lg\:focus\:text-black:focus { color: #000 !important; } @@ -41927,6 +42103,10 @@ video { background-color: transparent !important; } + .xl\:bg-current { + background-color: currentColor !important; + } + .xl\:bg-black { background-color: #000 !important; } @@ -42299,6 +42479,10 @@ video { background-color: transparent !important; } + .xl\:hover\:bg-current:hover { + background-color: currentColor !important; + } + .xl\:hover\:bg-black:hover { background-color: #000 !important; } @@ -42671,6 +42855,10 @@ video { background-color: transparent !important; } + .xl\:focus\:bg-current:focus { + background-color: currentColor !important; + } + .xl\:focus\:bg-black:focus { background-color: #000 !important; } @@ -43123,6 +43311,10 @@ video { border-color: transparent !important; } + .xl\:border-current { + border-color: currentColor !important; + } + .xl\:border-black { border-color: #000 !important; } @@ -43495,6 +43687,10 @@ video { border-color: transparent !important; } + .xl\:hover\:border-current:hover { + border-color: currentColor !important; + } + .xl\:hover\:border-black:hover { border-color: #000 !important; } @@ -43867,6 +44063,10 @@ video { border-color: transparent !important; } + .xl\:focus\:border-current:focus { + border-color: currentColor !important; + } + .xl\:focus\:border-black:focus { border-color: #000 !important; } @@ -47207,6 +47407,10 @@ video { color: transparent !important; } + .xl\:placeholder-current::placeholder { + color: currentColor !important; + } + .xl\:placeholder-black::placeholder { color: #000 !important; } @@ -47579,6 +47783,10 @@ video { color: transparent !important; } + .xl\:focus\:placeholder-current:focus::placeholder { + color: currentColor !important; + } + .xl\:focus\:placeholder-black:focus::placeholder { color: #000 !important; } @@ -48225,6 +48433,10 @@ video { color: transparent !important; } + .xl\:text-current { + color: currentColor !important; + } + .xl\:text-black { color: #000 !important; } @@ -48597,6 +48809,10 @@ video { color: transparent !important; } + .xl\:hover\:text-current:hover { + color: currentColor !important; + } + .xl\:hover\:text-black:hover { color: #000 !important; } @@ -48969,6 +49185,10 @@ video { color: transparent !important; } + .xl\:focus\:text-current:focus { + color: currentColor !important; + } + .xl\:focus\:text-black:focus { color: #000 !important; } diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index e459a84fbe71..8bc6e243ca5b 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -672,6 +672,10 @@ video { background-color: transparent; } +.bg-current { + background-color: currentColor; +} + .bg-black { background-color: #000; } @@ -1044,6 +1048,10 @@ video { background-color: transparent; } +.hover\:bg-current:hover { + background-color: currentColor; +} + .hover\:bg-black:hover { background-color: #000; } @@ -1416,6 +1424,10 @@ video { background-color: transparent; } +.focus\:bg-current:focus { + background-color: currentColor; +} + .focus\:bg-black:focus { background-color: #000; } @@ -1868,6 +1880,10 @@ video { border-color: transparent; } +.border-current { + border-color: currentColor; +} + .border-black { border-color: #000; } @@ -2240,6 +2256,10 @@ video { border-color: transparent; } +.hover\:border-current:hover { + border-color: currentColor; +} + .hover\:border-black:hover { border-color: #000; } @@ -2612,6 +2632,10 @@ video { border-color: transparent; } +.focus\:border-current:focus { + border-color: currentColor; +} + .focus\:border-black:focus { border-color: #000; } @@ -5952,6 +5976,10 @@ video { color: transparent; } +.placeholder-current::placeholder { + color: currentColor; +} + .placeholder-black::placeholder { color: #000; } @@ -6324,6 +6352,10 @@ video { color: transparent; } +.focus\:placeholder-current:focus::placeholder { + color: currentColor; +} + .focus\:placeholder-black:focus::placeholder { color: #000; } @@ -6970,6 +7002,10 @@ video { color: transparent; } +.text-current { + color: currentColor; +} + .text-black { color: #000; } @@ -7342,6 +7378,10 @@ video { color: transparent; } +.hover\:text-current:hover { + color: currentColor; +} + .hover\:text-black:hover { color: #000; } @@ -7714,6 +7754,10 @@ video { color: transparent; } +.focus\:text-current:focus { + color: currentColor; +} + .focus\:text-black:focus { color: #000; } @@ -10985,6 +11029,10 @@ video { background-color: transparent; } + .sm\:bg-current { + background-color: currentColor; + } + .sm\:bg-black { background-color: #000; } @@ -11357,6 +11405,10 @@ video { background-color: transparent; } + .sm\:hover\:bg-current:hover { + background-color: currentColor; + } + .sm\:hover\:bg-black:hover { background-color: #000; } @@ -11729,6 +11781,10 @@ video { background-color: transparent; } + .sm\:focus\:bg-current:focus { + background-color: currentColor; + } + .sm\:focus\:bg-black:focus { background-color: #000; } @@ -12181,6 +12237,10 @@ video { border-color: transparent; } + .sm\:border-current { + border-color: currentColor; + } + .sm\:border-black { border-color: #000; } @@ -12553,6 +12613,10 @@ video { border-color: transparent; } + .sm\:hover\:border-current:hover { + border-color: currentColor; + } + .sm\:hover\:border-black:hover { border-color: #000; } @@ -12925,6 +12989,10 @@ video { border-color: transparent; } + .sm\:focus\:border-current:focus { + border-color: currentColor; + } + .sm\:focus\:border-black:focus { border-color: #000; } @@ -16265,6 +16333,10 @@ video { color: transparent; } + .sm\:placeholder-current::placeholder { + color: currentColor; + } + .sm\:placeholder-black::placeholder { color: #000; } @@ -16637,6 +16709,10 @@ video { color: transparent; } + .sm\:focus\:placeholder-current:focus::placeholder { + color: currentColor; + } + .sm\:focus\:placeholder-black:focus::placeholder { color: #000; } @@ -17283,6 +17359,10 @@ video { color: transparent; } + .sm\:text-current { + color: currentColor; + } + .sm\:text-black { color: #000; } @@ -17655,6 +17735,10 @@ video { color: transparent; } + .sm\:hover\:text-current:hover { + color: currentColor; + } + .sm\:hover\:text-black:hover { color: #000; } @@ -18027,6 +18111,10 @@ video { color: transparent; } + .sm\:focus\:text-current:focus { + color: currentColor; + } + .sm\:focus\:text-black:focus { color: #000; } @@ -21299,6 +21387,10 @@ video { background-color: transparent; } + .md\:bg-current { + background-color: currentColor; + } + .md\:bg-black { background-color: #000; } @@ -21671,6 +21763,10 @@ video { background-color: transparent; } + .md\:hover\:bg-current:hover { + background-color: currentColor; + } + .md\:hover\:bg-black:hover { background-color: #000; } @@ -22043,6 +22139,10 @@ video { background-color: transparent; } + .md\:focus\:bg-current:focus { + background-color: currentColor; + } + .md\:focus\:bg-black:focus { background-color: #000; } @@ -22495,6 +22595,10 @@ video { border-color: transparent; } + .md\:border-current { + border-color: currentColor; + } + .md\:border-black { border-color: #000; } @@ -22867,6 +22971,10 @@ video { border-color: transparent; } + .md\:hover\:border-current:hover { + border-color: currentColor; + } + .md\:hover\:border-black:hover { border-color: #000; } @@ -23239,6 +23347,10 @@ video { border-color: transparent; } + .md\:focus\:border-current:focus { + border-color: currentColor; + } + .md\:focus\:border-black:focus { border-color: #000; } @@ -26579,6 +26691,10 @@ video { color: transparent; } + .md\:placeholder-current::placeholder { + color: currentColor; + } + .md\:placeholder-black::placeholder { color: #000; } @@ -26951,6 +27067,10 @@ video { color: transparent; } + .md\:focus\:placeholder-current:focus::placeholder { + color: currentColor; + } + .md\:focus\:placeholder-black:focus::placeholder { color: #000; } @@ -27597,6 +27717,10 @@ video { color: transparent; } + .md\:text-current { + color: currentColor; + } + .md\:text-black { color: #000; } @@ -27969,6 +28093,10 @@ video { color: transparent; } + .md\:hover\:text-current:hover { + color: currentColor; + } + .md\:hover\:text-black:hover { color: #000; } @@ -28341,6 +28469,10 @@ video { color: transparent; } + .md\:focus\:text-current:focus { + color: currentColor; + } + .md\:focus\:text-black:focus { color: #000; } @@ -31613,6 +31745,10 @@ video { background-color: transparent; } + .lg\:bg-current { + background-color: currentColor; + } + .lg\:bg-black { background-color: #000; } @@ -31985,6 +32121,10 @@ video { background-color: transparent; } + .lg\:hover\:bg-current:hover { + background-color: currentColor; + } + .lg\:hover\:bg-black:hover { background-color: #000; } @@ -32357,6 +32497,10 @@ video { background-color: transparent; } + .lg\:focus\:bg-current:focus { + background-color: currentColor; + } + .lg\:focus\:bg-black:focus { background-color: #000; } @@ -32809,6 +32953,10 @@ video { border-color: transparent; } + .lg\:border-current { + border-color: currentColor; + } + .lg\:border-black { border-color: #000; } @@ -33181,6 +33329,10 @@ video { border-color: transparent; } + .lg\:hover\:border-current:hover { + border-color: currentColor; + } + .lg\:hover\:border-black:hover { border-color: #000; } @@ -33553,6 +33705,10 @@ video { border-color: transparent; } + .lg\:focus\:border-current:focus { + border-color: currentColor; + } + .lg\:focus\:border-black:focus { border-color: #000; } @@ -36893,6 +37049,10 @@ video { color: transparent; } + .lg\:placeholder-current::placeholder { + color: currentColor; + } + .lg\:placeholder-black::placeholder { color: #000; } @@ -37265,6 +37425,10 @@ video { color: transparent; } + .lg\:focus\:placeholder-current:focus::placeholder { + color: currentColor; + } + .lg\:focus\:placeholder-black:focus::placeholder { color: #000; } @@ -37911,6 +38075,10 @@ video { color: transparent; } + .lg\:text-current { + color: currentColor; + } + .lg\:text-black { color: #000; } @@ -38283,6 +38451,10 @@ video { color: transparent; } + .lg\:hover\:text-current:hover { + color: currentColor; + } + .lg\:hover\:text-black:hover { color: #000; } @@ -38655,6 +38827,10 @@ video { color: transparent; } + .lg\:focus\:text-current:focus { + color: currentColor; + } + .lg\:focus\:text-black:focus { color: #000; } @@ -41927,6 +42103,10 @@ video { background-color: transparent; } + .xl\:bg-current { + background-color: currentColor; + } + .xl\:bg-black { background-color: #000; } @@ -42299,6 +42479,10 @@ video { background-color: transparent; } + .xl\:hover\:bg-current:hover { + background-color: currentColor; + } + .xl\:hover\:bg-black:hover { background-color: #000; } @@ -42671,6 +42855,10 @@ video { background-color: transparent; } + .xl\:focus\:bg-current:focus { + background-color: currentColor; + } + .xl\:focus\:bg-black:focus { background-color: #000; } @@ -43123,6 +43311,10 @@ video { border-color: transparent; } + .xl\:border-current { + border-color: currentColor; + } + .xl\:border-black { border-color: #000; } @@ -43495,6 +43687,10 @@ video { border-color: transparent; } + .xl\:hover\:border-current:hover { + border-color: currentColor; + } + .xl\:hover\:border-black:hover { border-color: #000; } @@ -43867,6 +44063,10 @@ video { border-color: transparent; } + .xl\:focus\:border-current:focus { + border-color: currentColor; + } + .xl\:focus\:border-black:focus { border-color: #000; } @@ -47207,6 +47407,10 @@ video { color: transparent; } + .xl\:placeholder-current::placeholder { + color: currentColor; + } + .xl\:placeholder-black::placeholder { color: #000; } @@ -47579,6 +47783,10 @@ video { color: transparent; } + .xl\:focus\:placeholder-current:focus::placeholder { + color: currentColor; + } + .xl\:focus\:placeholder-black:focus::placeholder { color: #000; } @@ -48225,6 +48433,10 @@ video { color: transparent; } + .xl\:text-current { + color: currentColor; + } + .xl\:text-black { color: #000; } @@ -48597,6 +48809,10 @@ video { color: transparent; } + .xl\:hover\:text-current:hover { + color: currentColor; + } + .xl\:hover\:text-black:hover { color: #000; } @@ -48969,6 +49185,10 @@ video { color: transparent; } + .xl\:focus\:text-current:focus { + color: currentColor; + } + .xl\:focus\:text-black:focus { color: #000; } From 57122d68cce6a0cbc2368ac9d93e3ef5cd37219b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benoi=CC=82t=20Rouleau?= Date: Mon, 2 Dec 2019 20:09:03 -0500 Subject: [PATCH 16/52] Add flow-root display utility --- .../fixtures/tailwind-output-important.css | 20 +++++++++++++++++++ __tests__/fixtures/tailwind-output.css | 20 +++++++++++++++++++ src/plugins/display.js | 3 +++ 3 files changed, 43 insertions(+) diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index f27919397b39..5349760f7bd9 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -3388,6 +3388,10 @@ video { display: inline !important; } +.flow-root { + display: flow-root !important; +} + .flex { display: flex !important; } @@ -13701,6 +13705,10 @@ video { display: inline !important; } + .sm\:flow-root { + display: flow-root !important; + } + .sm\:flex { display: flex !important; } @@ -24015,6 +24023,10 @@ video { display: inline !important; } + .md\:flow-root { + display: flow-root !important; + } + .md\:flex { display: flex !important; } @@ -34329,6 +34341,10 @@ video { display: inline !important; } + .lg\:flow-root { + display: flow-root !important; + } + .lg\:flex { display: flex !important; } @@ -44643,6 +44659,10 @@ video { display: inline !important; } + .xl\:flow-root { + display: flow-root !important; + } + .xl\:flex { display: flex !important; } diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index e459a84fbe71..76029ade1ebe 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -3388,6 +3388,10 @@ video { display: inline; } +.flow-root { + display: flow-root; +} + .flex { display: flex; } @@ -13701,6 +13705,10 @@ video { display: inline; } + .sm\:flow-root { + display: flow-root; + } + .sm\:flex { display: flex; } @@ -24015,6 +24023,10 @@ video { display: inline; } + .md\:flow-root { + display: flow-root; + } + .md\:flex { display: flex; } @@ -34329,6 +34341,10 @@ video { display: inline; } + .lg\:flow-root { + display: flow-root; + } + .lg\:flex { display: flex; } @@ -44643,6 +44659,10 @@ video { display: inline; } + .xl\:flow-root { + display: flow-root; + } + .xl\:flex { display: flex; } diff --git a/src/plugins/display.js b/src/plugins/display.js index 2ae81d6a752d..56169769411e 100644 --- a/src/plugins/display.js +++ b/src/plugins/display.js @@ -11,6 +11,9 @@ export default function() { '.inline': { display: 'inline', }, + '.flow-root': { + display: 'flow-root', + }, '.flex': { display: 'flex', }, From 0034fb86ac6777745179f0073237f38aed0b5638 Mon Sep 17 00:00:00 2001 From: Philipp Bosch Date: Thu, 19 Mar 2020 17:03:12 +0100 Subject: [PATCH 17/52] Add support for transition-delay --- .../fixtures/tailwind-output-important.css | 160 ++++++++++++++++++ __tests__/fixtures/tailwind-output.css | 160 ++++++++++++++++++ src/corePlugins.js | 2 + src/plugins/transitionDelay.js | 5 + stubs/defaultConfig.stub.js | 11 ++ 5 files changed, 338 insertions(+) create mode 100644 src/plugins/transitionDelay.js diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index f27919397b39..b05db311aa48 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -10913,6 +10913,38 @@ video { transition-duration: 1000ms !important; } +.delay-75 { + transition-delay: 75ms !important; +} + +.delay-100 { + transition-delay: 100ms !important; +} + +.delay-150 { + transition-delay: 150ms !important; +} + +.delay-200 { + transition-delay: 200ms !important; +} + +.delay-300 { + transition-delay: 300ms !important; +} + +.delay-500 { + transition-delay: 500ms !important; +} + +.delay-700 { + transition-delay: 700ms !important; +} + +.delay-1000 { + transition-delay: 1000ms !important; +} + .example { font-weight: 700; color: #f56565; @@ -21226,6 +21258,38 @@ video { transition-duration: 1000ms !important; } + .sm\:delay-75 { + transition-delay: 75ms !important; + } + + .sm\:delay-100 { + transition-delay: 100ms !important; + } + + .sm\:delay-150 { + transition-delay: 150ms !important; + } + + .sm\:delay-200 { + transition-delay: 200ms !important; + } + + .sm\:delay-300 { + transition-delay: 300ms !important; + } + + .sm\:delay-500 { + transition-delay: 500ms !important; + } + + .sm\:delay-700 { + transition-delay: 700ms !important; + } + + .sm\:delay-1000 { + transition-delay: 1000ms !important; + } + .sm\:example { font-weight: 700; color: #f56565; @@ -31540,6 +31604,38 @@ video { transition-duration: 1000ms !important; } + .md\:delay-75 { + transition-delay: 75ms !important; + } + + .md\:delay-100 { + transition-delay: 100ms !important; + } + + .md\:delay-150 { + transition-delay: 150ms !important; + } + + .md\:delay-200 { + transition-delay: 200ms !important; + } + + .md\:delay-300 { + transition-delay: 300ms !important; + } + + .md\:delay-500 { + transition-delay: 500ms !important; + } + + .md\:delay-700 { + transition-delay: 700ms !important; + } + + .md\:delay-1000 { + transition-delay: 1000ms !important; + } + .md\:example { font-weight: 700; color: #f56565; @@ -41854,6 +41950,38 @@ video { transition-duration: 1000ms !important; } + .lg\:delay-75 { + transition-delay: 75ms !important; + } + + .lg\:delay-100 { + transition-delay: 100ms !important; + } + + .lg\:delay-150 { + transition-delay: 150ms !important; + } + + .lg\:delay-200 { + transition-delay: 200ms !important; + } + + .lg\:delay-300 { + transition-delay: 300ms !important; + } + + .lg\:delay-500 { + transition-delay: 500ms !important; + } + + .lg\:delay-700 { + transition-delay: 700ms !important; + } + + .lg\:delay-1000 { + transition-delay: 1000ms !important; + } + .lg\:example { font-weight: 700; color: #f56565; @@ -52168,6 +52296,38 @@ video { transition-duration: 1000ms !important; } + .xl\:delay-75 { + transition-delay: 75ms !important; + } + + .xl\:delay-100 { + transition-delay: 100ms !important; + } + + .xl\:delay-150 { + transition-delay: 150ms !important; + } + + .xl\:delay-200 { + transition-delay: 200ms !important; + } + + .xl\:delay-300 { + transition-delay: 300ms !important; + } + + .xl\:delay-500 { + transition-delay: 500ms !important; + } + + .xl\:delay-700 { + transition-delay: 700ms !important; + } + + .xl\:delay-1000 { + transition-delay: 1000ms !important; + } + .xl\:example { font-weight: 700; color: #f56565; diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index e459a84fbe71..3ec852c8b0e6 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -10913,6 +10913,38 @@ video { transition-duration: 1000ms; } +.delay-75 { + transition-delay: 75ms; +} + +.delay-100 { + transition-delay: 100ms; +} + +.delay-150 { + transition-delay: 150ms; +} + +.delay-200 { + transition-delay: 200ms; +} + +.delay-300 { + transition-delay: 300ms; +} + +.delay-500 { + transition-delay: 500ms; +} + +.delay-700 { + transition-delay: 700ms; +} + +.delay-1000 { + transition-delay: 1000ms; +} + .example { font-weight: 700; color: #f56565; @@ -21226,6 +21258,38 @@ video { transition-duration: 1000ms; } + .sm\:delay-75 { + transition-delay: 75ms; + } + + .sm\:delay-100 { + transition-delay: 100ms; + } + + .sm\:delay-150 { + transition-delay: 150ms; + } + + .sm\:delay-200 { + transition-delay: 200ms; + } + + .sm\:delay-300 { + transition-delay: 300ms; + } + + .sm\:delay-500 { + transition-delay: 500ms; + } + + .sm\:delay-700 { + transition-delay: 700ms; + } + + .sm\:delay-1000 { + transition-delay: 1000ms; + } + .sm\:example { font-weight: 700; color: #f56565; @@ -31540,6 +31604,38 @@ video { transition-duration: 1000ms; } + .md\:delay-75 { + transition-delay: 75ms; + } + + .md\:delay-100 { + transition-delay: 100ms; + } + + .md\:delay-150 { + transition-delay: 150ms; + } + + .md\:delay-200 { + transition-delay: 200ms; + } + + .md\:delay-300 { + transition-delay: 300ms; + } + + .md\:delay-500 { + transition-delay: 500ms; + } + + .md\:delay-700 { + transition-delay: 700ms; + } + + .md\:delay-1000 { + transition-delay: 1000ms; + } + .md\:example { font-weight: 700; color: #f56565; @@ -41854,6 +41950,38 @@ video { transition-duration: 1000ms; } + .lg\:delay-75 { + transition-delay: 75ms; + } + + .lg\:delay-100 { + transition-delay: 100ms; + } + + .lg\:delay-150 { + transition-delay: 150ms; + } + + .lg\:delay-200 { + transition-delay: 200ms; + } + + .lg\:delay-300 { + transition-delay: 300ms; + } + + .lg\:delay-500 { + transition-delay: 500ms; + } + + .lg\:delay-700 { + transition-delay: 700ms; + } + + .lg\:delay-1000 { + transition-delay: 1000ms; + } + .lg\:example { font-weight: 700; color: #f56565; @@ -52168,6 +52296,38 @@ video { transition-duration: 1000ms; } + .xl\:delay-75 { + transition-delay: 75ms; + } + + .xl\:delay-100 { + transition-delay: 100ms; + } + + .xl\:delay-150 { + transition-delay: 150ms; + } + + .xl\:delay-200 { + transition-delay: 200ms; + } + + .xl\:delay-300 { + transition-delay: 300ms; + } + + .xl\:delay-500 { + transition-delay: 500ms; + } + + .xl\:delay-700 { + transition-delay: 700ms; + } + + .xl\:delay-1000 { + transition-delay: 1000ms; + } + .xl\:example { font-weight: 700; color: #f56565; diff --git a/src/corePlugins.js b/src/corePlugins.js index fa6f0f461da5..ce66a904904b 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -88,6 +88,7 @@ import skew from './plugins/skew' import transitionProperty from './plugins/transitionProperty' import transitionTimingFunction from './plugins/transitionTimingFunction' import transitionDuration from './plugins/transitionDuration' +import transitionDelay from './plugins/transitionDelay' import configurePlugins from './util/configurePlugins' @@ -183,5 +184,6 @@ export default function({ corePlugins: corePluginConfig }) { transitionProperty, transitionTimingFunction, transitionDuration, + transitionDelay, }) } diff --git a/src/plugins/transitionDelay.js b/src/plugins/transitionDelay.js new file mode 100644 index 000000000000..67d808b00497 --- /dev/null +++ b/src/plugins/transitionDelay.js @@ -0,0 +1,5 @@ +import createUtilityPlugin from '../util/createUtilityPlugin' + +export default function() { + return createUtilityPlugin('transitionDelay', [['delay', ['transitionDelay']]]) +} diff --git a/stubs/defaultConfig.stub.js b/stubs/defaultConfig.stub.js index 1a1c81894dfb..f58c895f44dc 100644 --- a/stubs/defaultConfig.stub.js +++ b/stubs/defaultConfig.stub.js @@ -598,6 +598,16 @@ module.exports = { '700': '700ms', '1000': '1000ms', }, + transitionDelay: { + '75': '75ms', + '100': '100ms', + '150': '150ms', + '200': '200ms', + '300': '300ms', + '500': '500ms', + '700': '700ms', + '1000': '1000ms', + }, }, variants: { accessibility: ['responsive', 'focus'], @@ -688,6 +698,7 @@ module.exports = { transitionProperty: ['responsive'], transitionTimingFunction: ['responsive'], transitionDuration: ['responsive'], + transitionDelay: ['responsive'], }, corePlugins: {}, plugins: [], From 617b3996097e4d186aa0697c3fbe45c9170989f8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 20 Mar 2020 06:20:06 +0000 Subject: [PATCH 18/52] Bump fs-extra from 8.1.0 to 9.0.0 Bumps [fs-extra](https://github.com/jprichardson/node-fs-extra) from 8.1.0 to 9.0.0. - [Release notes](https://github.com/jprichardson/node-fs-extra/releases) - [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md) - [Commits](https://github.com/jprichardson/node-fs-extra/compare/8.1.0...9.0.0) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 43 +++++++++++++++++++++++-------------------- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 20dcce055217..e5ecbb9586a5 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "bytes": "^3.0.0", "chalk": "^3.0.0", "detective": "^5.2.0", - "fs-extra": "^8.0.0", + "fs-extra": "^9.0.0", "lodash": "^4.17.15", "node-emoji": "^1.8.1", "normalize.css": "^8.0.1", diff --git a/yarn.lock b/yarn.lock index 3362e0d1cfe4..1f8c8d120b0e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1246,6 +1246,11 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= +at-least-node@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== + atob@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" @@ -2283,14 +2288,15 @@ fragment-cache@^0.2.1: dependencies: map-cache "^0.2.2" -fs-extra@^8.0.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" - integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== +fs-extra@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.0.tgz#b6afc31036e247b2466dc99c29ae797d5d4580a3" + integrity sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g== dependencies: + at-least-node "^1.0.0" graceful-fs "^4.2.0" - jsonfile "^4.0.0" - universalify "^0.1.0" + jsonfile "^6.0.1" + universalify "^1.0.0" fs-minipass@^1.2.5: version "1.2.6" @@ -2426,12 +2432,7 @@ globals@^12.1.0: dependencies: type-fest "^0.8.1" -graceful-fs@^4.1.11, graceful-fs@^4.1.6, graceful-fs@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b" - integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg== - -graceful-fs@^4.2.3: +graceful-fs@^4.1.11, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== @@ -3336,10 +3337,12 @@ json5@^2.1.0: dependencies: minimist "^1.2.0" -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= +jsonfile@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz#98966cba214378c8c84b82e085907b40bf614179" + integrity sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg== + dependencies: + universalify "^1.0.0" optionalDependencies: graceful-fs "^4.1.6" @@ -5061,10 +5064,10 @@ uniq@^1.0.1: resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8= -universalify@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== +universalify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" + integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug== unset-value@^1.0.0: version "1.0.0" From f6df665257cd30746c2d7e98e464d37c9b4c33c7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Mar 2020 06:38:15 +0000 Subject: [PATCH 19/52] Bump eslint-config-prettier from 6.10.0 to 6.10.1 Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.10.0 to 6.10.1. - [Release notes](https://github.com/prettier/eslint-config-prettier/releases) - [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md) - [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.10.0...v6.10.1) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 1f8c8d120b0e..cc622c3b39c7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1935,9 +1935,9 @@ eslint-config-postcss@^2.0.2: integrity sha1-yuHGCTzteFCJSluF++HR4jK3Kvs= eslint-config-prettier@^6.0.0: - version "6.10.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.10.0.tgz#7b15e303bf9c956875c948f6b21500e48ded6a7f" - integrity sha512-AtndijGte1rPILInUdHjvKEGbIV06NuvPrqlIEaEaWtbtvJh464mDeyGMdZEQMsGvC0ZVkiex1fSNcC4HAbRGg== + version "6.10.1" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.10.1.tgz#129ef9ec575d5ddc0e269667bf09defcd898642a" + integrity sha512-svTy6zh1ecQojvpbJSgH3aei/Rt7C6i090l5f2WQ4aB05lYHeZIR1qL4wZyyILTbtmnbHP5Yn8MrsOJMGa8RkQ== dependencies: get-stdin "^6.0.0" From d66992b1e19bf72ed09a4870b693918a906c8b2e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Mar 2020 06:38:41 +0000 Subject: [PATCH 20/52] Bump @babel/core from 7.8.7 to 7.9.0 Bumps [@babel/core](https://github.com/babel/babel) from 7.8.7 to 7.9.0. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.8.7...v7.9.0) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 106 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 59 insertions(+), 47 deletions(-) diff --git a/yarn.lock b/yarn.lock index 1f8c8d120b0e..31bd489c2409 100644 --- a/yarn.lock +++ b/yarn.lock @@ -35,32 +35,33 @@ semver "^5.5.0" "@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.7.5": - version "7.8.7" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.7.tgz#b69017d221ccdeb203145ae9da269d72cf102f3b" - integrity sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA== + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e" + integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w== dependencies: "@babel/code-frame" "^7.8.3" - "@babel/generator" "^7.8.7" - "@babel/helpers" "^7.8.4" - "@babel/parser" "^7.8.7" + "@babel/generator" "^7.9.0" + "@babel/helper-module-transforms" "^7.9.0" + "@babel/helpers" "^7.9.0" + "@babel/parser" "^7.9.0" "@babel/template" "^7.8.6" - "@babel/traverse" "^7.8.6" - "@babel/types" "^7.8.7" + "@babel/traverse" "^7.9.0" + "@babel/types" "^7.9.0" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.1" - json5 "^2.1.0" + json5 "^2.1.2" lodash "^4.17.13" resolve "^1.3.2" semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.8.6", "@babel/generator@^7.8.7": - version "7.8.7" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.7.tgz#870b3cf7984f5297998152af625c4f3e341400f7" - integrity sha512-DQwjiKJqH4C3qGiyQCAExJHoZssn49JTMJgZ8SANGgVFdkupcUhLOdkAeoC6kmHZCPfoDG5M0b6cFlSN5wW7Ew== +"@babel/generator@^7.9.0": + version "7.9.3" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.3.tgz#7c8b2956c6f68b3ab732bd16305916fbba521d94" + integrity sha512-RpxM252EYsz9qLUIq6F7YJyK1sv0wWDBFuztfDGWaQKzHjqDHysxSiRUpA/X9jmfqo+WzkAVKFaUily5h+gDCQ== dependencies: - "@babel/types" "^7.8.7" + "@babel/types" "^7.9.0" jsesc "^2.5.1" lodash "^4.17.13" source-map "^0.5.0" @@ -162,16 +163,17 @@ dependencies: "@babel/types" "^7.8.3" -"@babel/helper-module-transforms@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.8.3.tgz#d305e35d02bee720fbc2c3c3623aa0c316c01590" - integrity sha512-C7NG6B7vfBa/pwCOshpMbOYUmrYQDfCpVL/JCRu0ek8B5p8kue1+BCXpg2vOYs7w5ACB9GTOBYQ5U6NwrMg+3Q== +"@babel/helper-module-transforms@^7.8.3", "@babel/helper-module-transforms@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5" + integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA== dependencies: "@babel/helper-module-imports" "^7.8.3" + "@babel/helper-replace-supers" "^7.8.6" "@babel/helper-simple-access" "^7.8.3" "@babel/helper-split-export-declaration" "^7.8.3" - "@babel/template" "^7.8.3" - "@babel/types" "^7.8.3" + "@babel/template" "^7.8.6" + "@babel/types" "^7.9.0" lodash "^4.17.13" "@babel/helper-optimise-call-expression@^7.8.3": @@ -239,6 +241,11 @@ dependencies: "@babel/types" "^7.8.3" +"@babel/helper-validator-identifier@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz#ad53562a7fc29b3b9a91bbf7d10397fd146346ed" + integrity sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw== + "@babel/helper-wrap-function@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610" @@ -249,14 +256,14 @@ "@babel/traverse" "^7.8.3" "@babel/types" "^7.8.3" -"@babel/helpers@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.4.tgz#754eb3ee727c165e0a240d6c207de7c455f36f73" - integrity sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w== +"@babel/helpers@^7.9.0": + version "7.9.2" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz#b42a81a811f1e7313b88cba8adc66b3d9ae6c09f" + integrity sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA== dependencies: "@babel/template" "^7.8.3" - "@babel/traverse" "^7.8.4" - "@babel/types" "^7.8.3" + "@babel/traverse" "^7.9.0" + "@babel/types" "^7.9.0" "@babel/highlight@^7.8.3": version "7.8.3" @@ -281,10 +288,10 @@ resolve "^1.13.1" v8flags "^3.1.1" -"@babel/parser@^7.1.0", "@babel/parser@^7.7.5", "@babel/parser@^7.8.6", "@babel/parser@^7.8.7": - version "7.8.7" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.7.tgz#7b8facf95d25fef9534aad51c4ffecde1a61e26a" - integrity sha512-9JWls8WilDXFGxs0phaXAZgpxTZhSk/yOYH2hTHC0X1yC7Z78IJfvR1vJ+rmJKq3I35td2XzXzN6ZLYlna+r/A== +"@babel/parser@^7.1.0", "@babel/parser@^7.7.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0": + version "7.9.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.3.tgz#043a5fc2ad8b7ea9facddc4e802a1f0f25da7255" + integrity sha512-E6SpIDJZ0cZAKoCNk+qSDd0ChfTnpiJN9FfNf3RZ20dzwA2vL2oq5IX1XTVT+4vDmRlta2nGk5HGMMskJAR+4A== "@babel/plugin-proposal-async-generator-functions@^7.8.3": version "7.8.3" @@ -749,27 +756,27 @@ "@babel/parser" "^7.8.6" "@babel/types" "^7.8.6" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4", "@babel/traverse@^7.8.6": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.6.tgz#acfe0c64e1cd991b3e32eae813a6eb564954b5ff" - integrity sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892" + integrity sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w== dependencies: "@babel/code-frame" "^7.8.3" - "@babel/generator" "^7.8.6" + "@babel/generator" "^7.9.0" "@babel/helper-function-name" "^7.8.3" "@babel/helper-split-export-declaration" "^7.8.3" - "@babel/parser" "^7.8.6" - "@babel/types" "^7.8.6" + "@babel/parser" "^7.9.0" + "@babel/types" "^7.9.0" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.13" -"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7": - version "7.8.7" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.7.tgz#1fc9729e1acbb2337d5b6977a63979b4819f5d1d" - integrity sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw== +"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7", "@babel/types@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.0.tgz#00b064c3df83ad32b2dbf5ff07312b15c7f1efb5" + integrity sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng== dependencies: - esutils "^2.0.2" + "@babel/helper-validator-identifier" "^7.9.0" lodash "^4.17.13" to-fast-properties "^2.0.0" @@ -3330,12 +3337,12 @@ json-stringify-safe@~5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= -json5@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850" - integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ== +json5@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e" + integrity sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ== dependencies: - minimist "^1.2.0" + minimist "^1.2.5" jsonfile@^6.0.1: version "6.0.1" @@ -3549,6 +3556,11 @@ minimist@^1.1.1, minimist@^1.2.0: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= +minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + minipass@^2.2.1, minipass@^2.3.5: version "2.3.5" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848" From 635296d9efcf93d42037bd8f4e75b33316fe1523 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Mar 2020 06:43:28 +0000 Subject: [PATCH 21/52] Bump @babel/preset-env from 7.8.7 to 7.9.0 Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.7 to 7.9.0. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.8.7...v7.9.0) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 200 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 137 insertions(+), 63 deletions(-) diff --git a/yarn.lock b/yarn.lock index 74e929f977eb..8e435b7245bd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -25,12 +25,12 @@ dependencies: "@babel/highlight" "^7.8.3" -"@babel/compat-data@^7.8.6": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.8.6.tgz#7eeaa0dfa17e50c7d9c0832515eee09b56f04e35" - integrity sha512-CurCIKPTkS25Mb8mz267vU95vy+TyUpnctEX2lV33xWNmHAfjruztgiPBbXZRh3xZZy1CYvGx6XfxyTVS+sk7Q== +"@babel/compat-data@^7.8.6", "@babel/compat-data@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.0.tgz#04815556fc90b0c174abd2c0c1bb966faa036a6c" + integrity sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g== dependencies: - browserslist "^4.8.5" + browserslist "^4.9.1" invariant "^2.2.4" semver "^5.5.0" @@ -109,6 +109,15 @@ "@babel/helper-regex" "^7.8.3" regexpu-core "^4.6.0" +"@babel/helper-create-regexp-features-plugin@^7.8.8": + version "7.8.8" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087" + integrity sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.8.3" + "@babel/helper-regex" "^7.8.3" + regexpu-core "^4.7.0" + "@babel/helper-define-map@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz#a0655cad5451c3760b726eba875f1cd8faa02c15" @@ -163,7 +172,7 @@ dependencies: "@babel/types" "^7.8.3" -"@babel/helper-module-transforms@^7.8.3", "@babel/helper-module-transforms@^7.9.0": +"@babel/helper-module-transforms@^7.9.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5" integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA== @@ -326,10 +335,18 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" -"@babel/plugin-proposal-object-rest-spread@^7.8.3": +"@babel/plugin-proposal-numeric-separator@^7.8.3": version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz#eb5ae366118ddca67bed583b53d7554cad9951bb" - integrity sha512-8qvuPwU/xxUCt78HocNlv0mXXo0wdh9VT1R04WU8HGOfaOob26pF+9P5/lYjN/q7DHOX1bvX60hnhOvuQUJdbA== + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8" + integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-syntax-numeric-separator" "^7.8.3" + +"@babel/plugin-proposal-object-rest-spread@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz#a28993699fc13df165995362693962ba6b061d6f" + integrity sha512-UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow== dependencies: "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-object-rest-spread" "^7.8.0" @@ -342,20 +359,20 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" -"@babel/plugin-proposal-optional-chaining@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz#ae10b3214cb25f7adb1f3bc87ba42ca10b7e2543" - integrity sha512-QIoIR9abkVn+seDE3OjA08jWcs3eZ9+wJCKSRgo3WdEU2csFYgdScb+8qHB3+WXsGJD55u+5hWCISI7ejXS+kg== +"@babel/plugin-proposal-optional-chaining@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58" + integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w== dependencies: "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-optional-chaining" "^7.8.0" -"@babel/plugin-proposal-unicode-property-regex@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.3.tgz#b646c3adea5f98800c9ab45105ac34d06cd4a47f" - integrity sha512-1/1/rEZv2XGweRwwSkLpY+s60za9OZ1hJs4YDqFHCw0kYWYwL5IFljVY1MYBL+weT1l9pokDO2uhSTLVxzoHkQ== +"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3": + version "7.8.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d" + integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.8.3" + "@babel/helper-create-regexp-features-plugin" "^7.8.8" "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-async-generators@^7.8.0": @@ -393,6 +410,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" +"@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f" + integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.0": version "7.8.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.0.tgz#9b37d580d459682364d8602494c69145b394fd4c" @@ -452,10 +476,10 @@ "@babel/helper-plugin-utils" "^7.8.3" lodash "^4.17.13" -"@babel/plugin-transform-classes@^7.8.6": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.6.tgz#77534447a477cbe5995ae4aee3e39fbc8090c46d" - integrity sha512-k9r8qRay/R6v5aWZkrEclEhKO6mc1CCQr2dLsVHBmOQiMpN6I2bpjX3vgnldUWeEI1GHVNByULVxZ4BdP4Hmdg== +"@babel/plugin-transform-classes@^7.9.0": + version "7.9.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz#8603fc3cc449e31fdbdbc257f67717536a11af8d" + integrity sha512-TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ== dependencies: "@babel/helper-annotate-as-pure" "^7.8.3" "@babel/helper-define-map" "^7.8.3" @@ -480,7 +504,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-dotall-regex@^7.8.3": +"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e" integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw== @@ -503,10 +527,10 @@ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-for-of@^7.8.6": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.6.tgz#a051bd1b402c61af97a27ff51b468321c7c2a085" - integrity sha512-M0pw4/1/KI5WAxPsdcUL/w2LJ7o89YHN3yLkzNjg7Yl15GlVGgzHyCU+FMeAxevHGsLVmUqbirlUIKTafPmzdw== +"@babel/plugin-transform-for-of@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e" + integrity sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ== dependencies: "@babel/helper-plugin-utils" "^7.8.3" @@ -532,41 +556,41 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-modules-amd@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz#65606d44616b50225e76f5578f33c568a0b876a5" - integrity sha512-MadJiU3rLKclzT5kBH4yxdry96odTUwuqrZM+GllFI/VhxfPz+k9MshJM+MwhfkCdxxclSbSBbUGciBngR+kEQ== +"@babel/plugin-transform-modules-amd@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz#19755ee721912cf5bb04c07d50280af3484efef4" + integrity sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q== dependencies: - "@babel/helper-module-transforms" "^7.8.3" + "@babel/helper-module-transforms" "^7.9.0" "@babel/helper-plugin-utils" "^7.8.3" babel-plugin-dynamic-import-node "^2.3.0" -"@babel/plugin-transform-modules-commonjs@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz#df251706ec331bd058a34bdd72613915f82928a5" - integrity sha512-JpdMEfA15HZ/1gNuB9XEDlZM1h/gF/YOH7zaZzQu2xCFRfwc01NXBMHHSTT6hRjlXJJs5x/bfODM3LiCk94Sxg== +"@babel/plugin-transform-modules-commonjs@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz#e3e72f4cbc9b4a260e30be0ea59bdf5a39748940" + integrity sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g== dependencies: - "@babel/helper-module-transforms" "^7.8.3" + "@babel/helper-module-transforms" "^7.9.0" "@babel/helper-plugin-utils" "^7.8.3" "@babel/helper-simple-access" "^7.8.3" babel-plugin-dynamic-import-node "^2.3.0" -"@babel/plugin-transform-modules-systemjs@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz#d8bbf222c1dbe3661f440f2f00c16e9bb7d0d420" - integrity sha512-8cESMCJjmArMYqa9AO5YuMEkE4ds28tMpZcGZB/jl3n0ZzlsxOAi3mC+SKypTfT8gjMupCnd3YiXCkMjj2jfOg== +"@babel/plugin-transform-modules-systemjs@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz#e9fd46a296fc91e009b64e07ddaa86d6f0edeb90" + integrity sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ== dependencies: "@babel/helper-hoist-variables" "^7.8.3" - "@babel/helper-module-transforms" "^7.8.3" + "@babel/helper-module-transforms" "^7.9.0" "@babel/helper-plugin-utils" "^7.8.3" babel-plugin-dynamic-import-node "^2.3.0" -"@babel/plugin-transform-modules-umd@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz#592d578ce06c52f5b98b02f913d653ffe972661a" - integrity sha512-evhTyWhbwbI3/U6dZAnx/ePoV7H6OUG+OjiJFHmhr9FPn0VShjwC2kdxqIuQ/+1P50TMrneGzMeyMTFOjKSnAw== +"@babel/plugin-transform-modules-umd@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697" + integrity sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ== dependencies: - "@babel/helper-module-transforms" "^7.8.3" + "@babel/helper-module-transforms" "^7.9.0" "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-transform-named-capturing-groups-regex@^7.8.3": @@ -667,11 +691,11 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/preset-env@^7.0.0": - version "7.8.7" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.7.tgz#1fc7d89c7f75d2d70c2b6768de6c2e049b3cb9db" - integrity sha512-BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw== + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.0.tgz#a5fc42480e950ae8f5d9f8f2bbc03f52722df3a8" + integrity sha512-712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ== dependencies: - "@babel/compat-data" "^7.8.6" + "@babel/compat-data" "^7.9.0" "@babel/helper-compilation-targets" "^7.8.7" "@babel/helper-module-imports" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" @@ -679,14 +703,16 @@ "@babel/plugin-proposal-dynamic-import" "^7.8.3" "@babel/plugin-proposal-json-strings" "^7.8.3" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-proposal-object-rest-spread" "^7.8.3" + "@babel/plugin-proposal-numeric-separator" "^7.8.3" + "@babel/plugin-proposal-object-rest-spread" "^7.9.0" "@babel/plugin-proposal-optional-catch-binding" "^7.8.3" - "@babel/plugin-proposal-optional-chaining" "^7.8.3" + "@babel/plugin-proposal-optional-chaining" "^7.9.0" "@babel/plugin-proposal-unicode-property-regex" "^7.8.3" "@babel/plugin-syntax-async-generators" "^7.8.0" "@babel/plugin-syntax-dynamic-import" "^7.8.0" "@babel/plugin-syntax-json-strings" "^7.8.0" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" + "@babel/plugin-syntax-numeric-separator" "^7.8.0" "@babel/plugin-syntax-object-rest-spread" "^7.8.0" "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" "@babel/plugin-syntax-optional-chaining" "^7.8.0" @@ -695,20 +721,20 @@ "@babel/plugin-transform-async-to-generator" "^7.8.3" "@babel/plugin-transform-block-scoped-functions" "^7.8.3" "@babel/plugin-transform-block-scoping" "^7.8.3" - "@babel/plugin-transform-classes" "^7.8.6" + "@babel/plugin-transform-classes" "^7.9.0" "@babel/plugin-transform-computed-properties" "^7.8.3" "@babel/plugin-transform-destructuring" "^7.8.3" "@babel/plugin-transform-dotall-regex" "^7.8.3" "@babel/plugin-transform-duplicate-keys" "^7.8.3" "@babel/plugin-transform-exponentiation-operator" "^7.8.3" - "@babel/plugin-transform-for-of" "^7.8.6" + "@babel/plugin-transform-for-of" "^7.9.0" "@babel/plugin-transform-function-name" "^7.8.3" "@babel/plugin-transform-literals" "^7.8.3" "@babel/plugin-transform-member-expression-literals" "^7.8.3" - "@babel/plugin-transform-modules-amd" "^7.8.3" - "@babel/plugin-transform-modules-commonjs" "^7.8.3" - "@babel/plugin-transform-modules-systemjs" "^7.8.3" - "@babel/plugin-transform-modules-umd" "^7.8.3" + "@babel/plugin-transform-modules-amd" "^7.9.0" + "@babel/plugin-transform-modules-commonjs" "^7.9.0" + "@babel/plugin-transform-modules-systemjs" "^7.9.0" + "@babel/plugin-transform-modules-umd" "^7.9.0" "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3" "@babel/plugin-transform-new-target" "^7.8.3" "@babel/plugin-transform-object-super" "^7.8.3" @@ -722,13 +748,25 @@ "@babel/plugin-transform-template-literals" "^7.8.3" "@babel/plugin-transform-typeof-symbol" "^7.8.4" "@babel/plugin-transform-unicode-regex" "^7.8.3" - "@babel/types" "^7.8.7" - browserslist "^4.8.5" + "@babel/preset-modules" "^0.1.3" + "@babel/types" "^7.9.0" + browserslist "^4.9.1" core-js-compat "^3.6.2" invariant "^2.2.2" levenary "^1.1.1" semver "^5.5.0" +"@babel/preset-modules@^0.1.3": + version "0.1.3" + resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72" + integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" + "@babel/plugin-transform-dotall-regex" "^7.4.4" + "@babel/types" "^7.4.4" + esutils "^2.0.2" + "@babel/register@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.8.3.tgz#5d5d30cfcc918437535d724b8ac1e4a60c5db1f8" @@ -771,7 +809,7 @@ globals "^11.1.0" lodash "^4.17.13" -"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7", "@babel/types@^7.9.0": +"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7", "@babel/types@^7.9.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.0.tgz#00b064c3df83ad32b2dbf5ff07312b15c7f1efb5" integrity sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng== @@ -1406,7 +1444,7 @@ browser-resolve@^1.11.3: dependencies: resolve "1.1.7" -browserslist@^4.8.3, browserslist@^4.8.5, browserslist@^4.9.1: +browserslist@^4.8.3, browserslist@^4.9.1: version "4.9.1" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.9.1.tgz#01ffb9ca31a1aef7678128fc6a2253316aa7287c" integrity sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw== @@ -4244,6 +4282,13 @@ regenerate-unicode-properties@^8.1.0: dependencies: regenerate "^1.4.0" +regenerate-unicode-properties@^8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec" + integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA== + dependencies: + regenerate "^1.4.0" + regenerate@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" @@ -4287,11 +4332,28 @@ regexpu-core@^4.6.0: unicode-match-property-ecmascript "^1.0.4" unicode-match-property-value-ecmascript "^1.1.0" +regexpu-core@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938" + integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ== + dependencies: + regenerate "^1.4.0" + regenerate-unicode-properties "^8.2.0" + regjsgen "^0.5.1" + regjsparser "^0.6.4" + unicode-match-property-ecmascript "^1.0.4" + unicode-match-property-value-ecmascript "^1.2.0" + regjsgen@^0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz#a7634dc08f89209c2049adda3525711fb97265dd" integrity sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA== +regjsgen@^0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c" + integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg== + regjsparser@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c" @@ -4299,6 +4361,13 @@ regjsparser@^0.6.0: dependencies: jsesc "~0.5.0" +regjsparser@^0.6.4: + version "0.6.4" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272" + integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw== + dependencies: + jsesc "~0.5.0" + remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" @@ -5056,6 +5125,11 @@ unicode-match-property-value-ecmascript@^1.1.0: resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277" integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g== +unicode-match-property-value-ecmascript@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531" + integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ== + unicode-property-aliases-ecmascript@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57" From d330aaaf49c19677af15af301f38e509a0147b06 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 24 Mar 2020 06:28:49 +0000 Subject: [PATCH 22/52] Bump autoprefixer from 9.7.4 to 9.7.5 Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.7.4 to 9.7.5. - [Release notes](https://github.com/postcss/autoprefixer/releases) - [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md) - [Commits](https://github.com/postcss/autoprefixer/compare/9.7.4...9.7.5) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 75 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8e435b7245bd..4147cf6e0d93 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1302,17 +1302,17 @@ atob@^2.1.1: integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== autoprefixer@^9.4.5: - version "9.7.4" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.4.tgz#f8bf3e06707d047f0641d87aee8cfb174b2a5378" - integrity sha512-g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g== + version "9.7.5" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.5.tgz#8df10b9ff9b5814a8d411a5cfbab9c793c392376" + integrity sha512-URo6Zvt7VYifomeAfJlMFnYDhow1rk2bufwkbamPEAtQFcL11moLk4PnR7n9vlu7M+BkXAZkHFA0mIcY7tjQFg== dependencies: - browserslist "^4.8.3" - caniuse-lite "^1.0.30001020" + browserslist "^4.11.0" + caniuse-lite "^1.0.30001036" chalk "^2.4.2" normalize-range "^0.1.2" num2fraction "^1.2.2" - postcss "^7.0.26" - postcss-value-parser "^4.0.2" + postcss "^7.0.27" + postcss-value-parser "^4.0.3" aws-sign2@~0.7.0: version "0.7.0" @@ -1444,14 +1444,15 @@ browser-resolve@^1.11.3: dependencies: resolve "1.1.7" -browserslist@^4.8.3, browserslist@^4.9.1: - version "4.9.1" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.9.1.tgz#01ffb9ca31a1aef7678128fc6a2253316aa7287c" - integrity sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw== +browserslist@^4.11.0, browserslist@^4.8.3, browserslist@^4.9.1: + version "4.11.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.11.0.tgz#aef4357b10a8abda00f97aac7cd587b2082ba1ad" + integrity sha512-WqEC7Yr5wUH5sg6ruR++v2SGOQYpyUdYYd4tZoAq1F7y+QXoLoYGXVbxhtaIqWmAJjtNTRjVD3HuJc1OXTel2A== dependencies: - caniuse-lite "^1.0.30001030" - electron-to-chromium "^1.3.363" - node-releases "^1.1.50" + caniuse-lite "^1.0.30001035" + electron-to-chromium "^1.3.380" + node-releases "^1.1.52" + pkg-up "^3.1.0" bser@^2.0.0: version "2.1.0" @@ -1500,15 +1501,10 @@ camelcase@^5.0.0, camelcase@^5.3.1: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -caniuse-lite@^1.0.30001020: - version "1.0.30001021" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001021.tgz#e75ed1ef6dbadd580ac7e7720bb16f07b083f254" - integrity sha512-wuMhT7/hwkgd8gldgp2jcrUjOU9RXJ4XxGumQeOsUr91l3WwmM68Cpa/ymCnWEDqakwFXhuDQbaKNHXBPgeE9g== - -caniuse-lite@^1.0.30001030: - version "1.0.30001032" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001032.tgz#b8d224914e2cd7f507085583d4e38144c652bce4" - integrity sha512-8joOm7BwcpEN4BfVHtfh0hBXSAPVYk+eUIcNntGtMkUWy/6AKRCDZINCLe3kB1vHhT2vBxBF85Hh9VlPXi/qjA== +caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001036: + version "1.0.30001036" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001036.tgz#930ea5272010d8bf190d859159d757c0b398caf0" + integrity sha512-jU8CIFIj2oR7r4W+5AKcsvWNVIb6Q6OZE3UsrXrZBHFtreT4YgTeOJtTucp+zSedEpTi3L5wASSP0LYIE3if6w== capture-exit@^2.0.0: version "2.0.0" @@ -1914,10 +1910,10 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" -electron-to-chromium@^1.3.363: - version "1.3.368" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.368.tgz#d7597e04339f7ca70762031ec473d38eb2df6acb" - integrity sha512-fqzDipW3p+uDkHUHFPrdW3wINRKcJsbnJwBD7hgaQEQwcuLSvNLw6SeUp5gKDpTbmTl7zri7IZfhsdTUTnygJg== +electron-to-chromium@^1.3.380: + version "1.3.382" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.382.tgz#cad02da655c33f7a3d6ca7525bd35c17e90f3a8f" + integrity sha512-gJfxOcgnBlXhfnUUObsq3n3ReU8CT6S8je97HndYRkKsNZMJJ38zO/pI5aqO7L3Myfq+E3pqPyKK/ynyLEQfBA== emoji-regex@^7.0.1: version "7.0.3" @@ -3737,10 +3733,10 @@ node-pre-gyp@^0.12.0: semver "^5.3.0" tar "^4" -node-releases@^1.1.50: - version "1.1.50" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.50.tgz#803c40d2c45db172d0410e4efec83aa8c6ad0592" - integrity sha512-lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ== +node-releases@^1.1.52: + version "1.1.52" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.52.tgz#bcffee3e0a758e92e44ecfaecd0a47554b0bcba9" + integrity sha512-snSiT1UypkgGt2wxPqS6ImEUICbNCMb31yaxWrOLXjhlt2z2/IBpaOxzONExqSm4y5oLnAqjjRWu+wsDzK5yNQ== dependencies: semver "^6.3.0" @@ -4067,6 +4063,13 @@ pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" +pkg-up@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" + integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA== + dependencies: + find-up "^3.0.0" + pn@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" @@ -4117,10 +4120,10 @@ postcss-value-parser@^3.3.0: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== -postcss-value-parser@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9" - integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ== +postcss-value-parser@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz#651ff4593aa9eda8d5d0d66593a2417aeaeb325d" + integrity sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg== postcss@^6.0.9: version "6.0.23" @@ -4131,7 +4134,7 @@ postcss@^6.0.9: source-map "^0.6.1" supports-color "^5.4.0" -postcss@^7.0.11, postcss@^7.0.18, postcss@^7.0.21, postcss@^7.0.26: +postcss@^7.0.11, postcss@^7.0.18, postcss@^7.0.21, postcss@^7.0.27: version "7.0.27" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9" integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ== From c8bfe3bbf3be6861e683f20e50c0657822089f25 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 16 Apr 2020 08:36:36 -0400 Subject: [PATCH 23/52] Add .circleci/config.yml --- .circleci/config.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 000000000000..4a8a9e2d14ff --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,17 @@ +version: 2.1 +orbs: + node: circleci/node@1.1.6 +jobs: + build-and-test: + executor: + name: node/default + steps: + - checkout + - node/with-cache: + steps: + - run: npm install + - run: npm test +workflows: + build-and-test: + jobs: + - build-and-test \ No newline at end of file From ad9fcaf91924ced53ce8a97b49709173b500c7af Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 16 Apr 2020 08:43:29 -0400 Subject: [PATCH 24/52] Create nodejs.yml --- .github/workflows/nodejs.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/nodejs.yml diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml new file mode 100644 index 000000000000..4390e93081b0 --- /dev/null +++ b/.github/workflows/nodejs.yml @@ -0,0 +1,31 @@ +# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node +# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions + +name: Node.js CI + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [10.x, 12.x] + + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - run: npm ci + - run: npm run build --if-present + - run: npm test + env: + CI: true From da83070c24385bcc62d575ab0f6437ab711e8e87 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 16 Apr 2020 08:45:53 -0400 Subject: [PATCH 25/52] Update nodejs.yml --- .github/workflows/nodejs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 4390e93081b0..3045f4c4555b 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -24,8 +24,8 @@ jobs: uses: actions/setup-node@v1 with: node-version: ${{ matrix.node-version }} - - run: npm ci - - run: npm run build --if-present + - run: npm install + - run: npm run prepare - run: npm test env: CI: true From 50073935b42d48f24dfacfb7b60810b4b4de1bc3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 16 Apr 2020 13:14:37 +0000 Subject: [PATCH 26/52] Bump resolve from 1.15.1 to 1.16.0 Bumps [resolve](https://github.com/browserify/resolve) from 1.15.1 to 1.16.0. - [Release notes](https://github.com/browserify/resolve/releases) - [Commits](https://github.com/browserify/resolve/compare/v1.15.1...v1.16.0) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 4147cf6e0d93..75189c22b1eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4466,9 +4466,9 @@ resolve@1.1.7: integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= resolve@^1.13.1, resolve@^1.14.2, resolve@^1.3.2: - version "1.15.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" - integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w== + version "1.16.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.16.0.tgz#063dc704fa3413e13ac1d0d1756a7cbfe95dd1a7" + integrity sha512-LarL/PIKJvc09k1jaeT4kQb/8/7P+qV4qSnN2K80AES+OHdfZELAKVOBjxsvtToT/uLOfFbvYvKfZmV8cee7nA== dependencies: path-parse "^1.0.6" From 25a030ab41d8b16fbece106572204f5feccb1c0e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 16 Apr 2020 13:18:27 +0000 Subject: [PATCH 27/52] Bump jest from 25.1.0 to 25.3.0 Bumps [jest](https://github.com/facebook/jest) from 25.1.0 to 25.3.0. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/compare/v25.1.0...v25.3.0) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 852 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 526 insertions(+), 326 deletions(-) diff --git a/yarn.lock b/yarn.lock index 75189c22b1eb..bcfc7117300a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -382,13 +382,27 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-bigint@^7.0.0": +"@babel/plugin-syntax-async-generators@^7.8.4": + version "7.8.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" + integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-bigint@^7.0.0", "@babel/plugin-syntax-bigint@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg== dependencies: "@babel/helper-plugin-utils" "^7.8.0" +"@babel/plugin-syntax-class-properties@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.8.3.tgz#6cb933a8872c8d359bfde69bbeaae5162fd1e8f7" + integrity sha512-UcAyQWg2bAN647Q+O811tG9MrJ38Z10jjhQdKNAL8fsyPzE3cCN/uT+f55cFVY4aGO4jqJAvmqsuY3GQDwAoXg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-syntax-dynamic-import@^7.8.0": version "7.8.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.0.tgz#3a6c1cd36af923db602df83c5aa72e08bb14353a" @@ -403,6 +417,20 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" +"@babel/plugin-syntax-json-strings@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" + integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-logical-assignment-operators@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.8.3.tgz#3995d7d7ffff432f6ddc742b47e730c054599897" + integrity sha512-Zpg2Sgc++37kuFl6ppq2Q7Awc6E6AIW671x5PY8E/f7MCIyPPGK/EoeZXvvY3P42exZ3Q4/t3YOzP/HiN79jDg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0": version "7.8.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.0.tgz#5d8f24ecffa4ae74164e53264953c5ea8ba6d149" @@ -410,6 +438,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" +"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" + integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + "@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f" @@ -424,6 +459,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" +"@babel/plugin-syntax-object-rest-spread@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" + integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + "@babel/plugin-syntax-optional-catch-binding@^7.8.0": version "7.8.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.0.tgz#180c7bdd6b7fd81cc6d18269de12d5ddd60cabce" @@ -431,6 +473,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" +"@babel/plugin-syntax-optional-catch-binding@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" + integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + "@babel/plugin-syntax-optional-chaining@^7.8.0": version "7.8.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.0.tgz#c40f4d4d6a4f5e71d2bfd949b0a7f1e1e6792fe0" @@ -438,6 +487,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" +"@babel/plugin-syntax-optional-chaining@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" + integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + "@babel/plugin-syntax-top-level-await@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz#3acdece695e6b13aaf57fc291d1a800950c71391" @@ -846,81 +902,80 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -"@jest/console@^25.1.0": - version "25.1.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-25.1.0.tgz#1fc765d44a1e11aec5029c08e798246bd37075ab" - integrity sha512-3P1DpqAMK/L07ag/Y9/Jup5iDEG9P4pRAuZiMQnU0JB3UOvCyYCjCoxr7sIA80SeyUCUKrr24fKAxVpmBgQonA== +"@jest/console@^25.3.0": + version "25.3.0" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-25.3.0.tgz#33b56b81238427bf3ebe3f7b3378d2f79cdbd409" + integrity sha512-LvSDNqpmZIZyweFaEQ6wKY7CbexPitlsLHGJtcooNECo0An/w49rFhjCJzu6efeb6+a3ee946xss1Jcd9r03UQ== dependencies: - "@jest/source-map" "^25.1.0" + "@jest/source-map" "^25.2.6" chalk "^3.0.0" - jest-util "^25.1.0" + jest-util "^25.3.0" slash "^3.0.0" -"@jest/core@^25.1.0": - version "25.1.0" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-25.1.0.tgz#3d4634fc3348bb2d7532915d67781cdac0869e47" - integrity sha512-iz05+NmwCmZRzMXvMo6KFipW7nzhbpEawrKrkkdJzgytavPse0biEnCNr2wRlyCsp3SmKaEY+SGv7YWYQnIdig== +"@jest/core@^25.3.0": + version "25.3.0" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-25.3.0.tgz#80f97a7a8b59dde741a24f30871cc26d0197d426" + integrity sha512-+D5a/tFf6pA/Gqft2DLBp/yeSRgXhlJ+Wpst0X/ZkfTRP54qDR3C61VfHwaex+GzZBiTcE9vQeoZ2v5T10+Mqw== dependencies: - "@jest/console" "^25.1.0" - "@jest/reporters" "^25.1.0" - "@jest/test-result" "^25.1.0" - "@jest/transform" "^25.1.0" - "@jest/types" "^25.1.0" + "@jest/console" "^25.3.0" + "@jest/reporters" "^25.3.0" + "@jest/test-result" "^25.3.0" + "@jest/transform" "^25.3.0" + "@jest/types" "^25.3.0" ansi-escapes "^4.2.1" chalk "^3.0.0" exit "^0.1.2" graceful-fs "^4.2.3" - jest-changed-files "^25.1.0" - jest-config "^25.1.0" - jest-haste-map "^25.1.0" - jest-message-util "^25.1.0" - jest-regex-util "^25.1.0" - jest-resolve "^25.1.0" - jest-resolve-dependencies "^25.1.0" - jest-runner "^25.1.0" - jest-runtime "^25.1.0" - jest-snapshot "^25.1.0" - jest-util "^25.1.0" - jest-validate "^25.1.0" - jest-watcher "^25.1.0" + jest-changed-files "^25.3.0" + jest-config "^25.3.0" + jest-haste-map "^25.3.0" + jest-message-util "^25.3.0" + jest-regex-util "^25.2.6" + jest-resolve "^25.3.0" + jest-resolve-dependencies "^25.3.0" + jest-runner "^25.3.0" + jest-runtime "^25.3.0" + jest-snapshot "^25.3.0" + jest-util "^25.3.0" + jest-validate "^25.3.0" + jest-watcher "^25.3.0" micromatch "^4.0.2" p-each-series "^2.1.0" - realpath-native "^1.1.0" + realpath-native "^2.0.0" rimraf "^3.0.0" slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^25.1.0": - version "25.1.0" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-25.1.0.tgz#4a97f64770c9d075f5d2b662b5169207f0a3f787" - integrity sha512-cTpUtsjU4cum53VqBDlcW0E4KbQF03Cn0jckGPW/5rrE9tb+porD3+hhLtHAwhthsqfyF+bizyodTlsRA++sHg== +"@jest/environment@^25.3.0": + version "25.3.0" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-25.3.0.tgz#587f28ddb4b0dfe97404d3d4a4c9dbfa0245fb2e" + integrity sha512-vgooqwJTHLLak4fE+TaCGeYP7Tz1Y3CKOsNxR1sE0V3nx3KRUHn3NUnt+wbcfd5yQWKZQKAfW6wqbuwQLrXo3g== dependencies: - "@jest/fake-timers" "^25.1.0" - "@jest/types" "^25.1.0" - jest-mock "^25.1.0" + "@jest/fake-timers" "^25.3.0" + "@jest/types" "^25.3.0" + jest-mock "^25.3.0" -"@jest/fake-timers@^25.1.0": - version "25.1.0" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.1.0.tgz#a1e0eff51ffdbb13ee81f35b52e0c1c11a350ce8" - integrity sha512-Eu3dysBzSAO1lD7cylZd/CVKdZZ1/43SF35iYBNV1Lvvn2Undp3Grwsv8PrzvbLhqwRzDd4zxrY4gsiHc+wygQ== +"@jest/fake-timers@^25.3.0": + version "25.3.0" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.3.0.tgz#995aad36d5c8984165ca5db12e740ab8dbf7042a" + integrity sha512-NHAj7WbsyR3qBJPpBwSwqaq2WluIvUQsyzpJTN7XDVk7VnlC/y1BAnaYZL3vbPIP8Nhm0Ae5DJe0KExr/SdMJQ== dependencies: - "@jest/types" "^25.1.0" - jest-message-util "^25.1.0" - jest-mock "^25.1.0" - jest-util "^25.1.0" + "@jest/types" "^25.3.0" + jest-message-util "^25.3.0" + jest-mock "^25.3.0" + jest-util "^25.3.0" lolex "^5.0.0" -"@jest/reporters@^25.1.0": - version "25.1.0" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-25.1.0.tgz#9178ecf136c48f125674ac328f82ddea46e482b0" - integrity sha512-ORLT7hq2acJQa8N+NKfs68ZtHFnJPxsGqmofxW7v7urVhzJvpKZG9M7FAcgh9Ee1ZbCteMrirHA3m5JfBtAaDg== +"@jest/reporters@^25.3.0": + version "25.3.0" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-25.3.0.tgz#7f39f0e6911561cc5112a1b54656de18faee269b" + integrity sha512-1u0ZBygs0C9DhdYgLCrRfZfNKQa+9+J7Uo+Z9z0RWLHzgsxhoG32lrmMOtUw48yR6bLNELdvzormwUqSk4H4Vg== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^25.1.0" - "@jest/environment" "^25.1.0" - "@jest/test-result" "^25.1.0" - "@jest/transform" "^25.1.0" - "@jest/types" "^25.1.0" + "@jest/console" "^25.3.0" + "@jest/test-result" "^25.3.0" + "@jest/transform" "^25.3.0" + "@jest/types" "^25.3.0" chalk "^3.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" @@ -929,12 +984,11 @@ istanbul-lib-instrument "^4.0.0" istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" - istanbul-reports "^3.0.0" - jest-haste-map "^25.1.0" - jest-resolve "^25.1.0" - jest-runtime "^25.1.0" - jest-util "^25.1.0" - jest-worker "^25.1.0" + istanbul-reports "^3.0.2" + jest-haste-map "^25.3.0" + jest-resolve "^25.3.0" + jest-util "^25.3.0" + jest-worker "^25.2.6" slash "^3.0.0" source-map "^0.6.0" string-length "^3.1.0" @@ -943,35 +997,34 @@ optionalDependencies: node-notifier "^6.0.0" -"@jest/source-map@^25.1.0": - version "25.1.0" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-25.1.0.tgz#b012e6c469ccdbc379413f5c1b1ffb7ba7034fb0" - integrity sha512-ohf2iKT0xnLWcIUhL6U6QN+CwFWf9XnrM2a6ybL9NXxJjgYijjLSitkYHIdzkd8wFliH73qj/+epIpTiWjRtAA== +"@jest/source-map@^25.2.6": + version "25.2.6" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-25.2.6.tgz#0ef2209514c6d445ebccea1438c55647f22abb4c" + integrity sha512-VuIRZF8M2zxYFGTEhkNSvQkUKafQro4y+mwUxy5ewRqs5N/ynSFUODYp3fy1zCnbCMy1pz3k+u57uCqx8QRSQQ== dependencies: callsites "^3.0.0" graceful-fs "^4.2.3" source-map "^0.6.0" -"@jest/test-result@^25.1.0": - version "25.1.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.1.0.tgz#847af2972c1df9822a8200457e64be4ff62821f7" - integrity sha512-FZzSo36h++U93vNWZ0KgvlNuZ9pnDnztvaM7P/UcTx87aPDotG18bXifkf1Ji44B7k/eIatmMzkBapnAzjkJkg== +"@jest/test-result@^25.3.0": + version "25.3.0" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.3.0.tgz#137fab5e5c6fed36e5d40735d1eb029325e3bf06" + integrity sha512-mqrGuiiPXl1ap09Mydg4O782F3ouDQfsKqtQzIjitpwv3t1cHDwCto21jThw6WRRE+dKcWQvLG70GpyLJICfGw== dependencies: - "@jest/console" "^25.1.0" - "@jest/transform" "^25.1.0" - "@jest/types" "^25.1.0" + "@jest/console" "^25.3.0" + "@jest/types" "^25.3.0" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^25.1.0": - version "25.1.0" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-25.1.0.tgz#4df47208542f0065f356fcdb80026e3c042851ab" - integrity sha512-WgZLRgVr2b4l/7ED1J1RJQBOharxS11EFhmwDqknpknE0Pm87HLZVS2Asuuw+HQdfQvm2aXL2FvvBLxOD1D0iw== +"@jest/test-sequencer@^25.3.0": + version "25.3.0" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-25.3.0.tgz#271ad5f2b8f8137d092ccedc87e16a50f8676209" + integrity sha512-Xvns3xbji7JCvVcDGvqJ/pf4IpmohPODumoPEZJ0/VgC5gI4XaNVIBET2Dq5Czu6Gk3xFcmhtthh/MBOTljdNg== dependencies: - "@jest/test-result" "^25.1.0" - jest-haste-map "^25.1.0" - jest-runner "^25.1.0" - jest-runtime "^25.1.0" + "@jest/test-result" "^25.3.0" + jest-haste-map "^25.3.0" + jest-runner "^25.3.0" + jest-runtime "^25.3.0" "@jest/transform@^25.1.0": version "25.1.0" @@ -995,6 +1048,28 @@ source-map "^0.6.1" write-file-atomic "^3.0.0" +"@jest/transform@^25.3.0": + version "25.3.0" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.3.0.tgz#083c5447d5307d9b9494d6968115b647460e71f1" + integrity sha512-W01p8kTDvvEX6kd0tJc7Y5VdYyFaKwNWy1HQz6Jqlhu48z/8Gxp+yFCDVj+H8Rc7ezl3Mg0hDaGuFVkmHOqirg== + dependencies: + "@babel/core" "^7.1.0" + "@jest/types" "^25.3.0" + babel-plugin-istanbul "^6.0.0" + chalk "^3.0.0" + convert-source-map "^1.4.0" + fast-json-stable-stringify "^2.0.0" + graceful-fs "^4.2.3" + jest-haste-map "^25.3.0" + jest-regex-util "^25.2.6" + jest-util "^25.3.0" + micromatch "^4.0.2" + pirates "^4.0.1" + realpath-native "^2.0.0" + slash "^3.0.0" + source-map "^0.6.1" + write-file-atomic "^3.0.0" + "@jest/types@^25.1.0": version "25.1.0" resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.1.0.tgz#b26831916f0d7c381e11dbb5e103a72aed1b4395" @@ -1005,6 +1080,16 @@ "@types/yargs" "^15.0.0" chalk "^3.0.0" +"@jest/types@^25.3.0": + version "25.3.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.3.0.tgz#88f94b277a1d028fd7117bc1f74451e0fc2131e7" + integrity sha512-UkaDNewdqXAmCDbN2GlUM6amDKS78eCqiw/UmF5nE0mmLTd6moJkiZJML/X52Ke3LH7Swhw883IRXq8o9nWjVw== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^1.1.1" + "@types/yargs" "^15.0.0" + chalk "^3.0.0" + "@sinonjs/commons@^1.7.0": version "1.7.0" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.0.tgz#f90ffc52a2e519f018b13b6c4da03cbff36ebed6" @@ -1023,6 +1108,17 @@ "@types/babel__template" "*" "@types/babel__traverse" "*" +"@types/babel__core@^7.1.7": + version "7.1.7" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89" + integrity sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw== + dependencies: + "@babel/parser" "^7.1.0" + "@babel/types" "^7.0.0" + "@types/babel__generator" "*" + "@types/babel__template" "*" + "@types/babel__traverse" "*" + "@types/babel__generator@*": version "7.0.2" resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.0.2.tgz#d2112a6b21fad600d7674274293c85dce0cb47fc" @@ -1070,6 +1166,11 @@ "@types/istanbul-lib-coverage" "*" "@types/istanbul-lib-report" "*" +"@types/prettier@^1.19.0": + version "1.19.1" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-1.19.1.tgz#33509849f8e679e4add158959fdb086440e9553f" + integrity sha512-5qOlnZscTn4xxM5MeGXAMOsIOIKIbh9e85zJWfBRVPlRMEVawzoPhINYbRGkBZCI8LxvBe7tJCdWiarA99OZfQ== + "@types/stack-utils@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" @@ -1337,6 +1438,19 @@ babel-jest@^25.1.0: chalk "^3.0.0" slash "^3.0.0" +babel-jest@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.3.0.tgz#999d0c19e8427f66b796bf9ea233eedf087b957c" + integrity sha512-qiXeX1Cmw4JZ5yQ4H57WpkO0MZ61Qj+YnsVUwAMnDV5ls+yHon11XjarDdgP7H8lTmiEi6biiZA8y3Tmvx6pCg== + dependencies: + "@jest/transform" "^25.3.0" + "@jest/types" "^25.3.0" + "@types/babel__core" "^7.1.7" + babel-plugin-istanbul "^6.0.0" + babel-preset-jest "^25.3.0" + chalk "^3.0.0" + slash "^3.0.0" + babel-plugin-dynamic-import-node@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" @@ -1362,6 +1476,29 @@ babel-plugin-jest-hoist@^25.1.0: dependencies: "@types/babel__traverse" "^7.0.6" +babel-plugin-jest-hoist@^25.2.6: + version "25.2.6" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.2.6.tgz#2af07632b8ac7aad7d414c1e58425d5fc8e84909" + integrity sha512-qE2xjMathybYxjiGFJg0mLFrz0qNp83aNZycWDY/SuHiZNq+vQfRQtuINqyXyue1ELd8Rd+1OhFSLjms8msMbw== + dependencies: + "@types/babel__traverse" "^7.0.6" + +babel-preset-current-node-syntax@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz#fb4a4c51fe38ca60fede1dc74ab35eb843cb41d6" + integrity sha512-u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw== + dependencies: + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-syntax-bigint" "^7.8.3" + "@babel/plugin-syntax-class-properties" "^7.8.3" + "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-syntax-numeric-separator" "^7.8.3" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + babel-preset-jest@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.1.0.tgz#d0aebfebb2177a21cde710996fce8486d34f1d33" @@ -1371,6 +1508,14 @@ babel-preset-jest@^25.1.0: "@babel/plugin-syntax-object-rest-spread" "^7.0.0" babel-plugin-jest-hoist "^25.1.0" +babel-preset-jest@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.3.0.tgz#9ab40aee52a19bdc52b8b1ec2403d5914ac3d86b" + integrity sha512-tjdvLKNMwDI9r+QWz9sZUQGTq1dpoxjUqFUpEasAc7MOtHg9XuLT2fx0udFG+k1nvMV0WvHHVAN7VmCZ+1Zxbw== + dependencies: + babel-plugin-jest-hoist "^25.2.6" + babel-preset-current-node-syntax "^0.1.2" + balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -1820,6 +1965,11 @@ deep-is@~0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= +deepmerge@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== + define-properties@^1.1.2: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" @@ -1883,10 +2033,10 @@ detective@^5.2.0: defined "^1.0.0" minimist "^1.1.1" -diff-sequences@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.1.0.tgz#fd29a46f1c913fd66c22645dc75bffbe43051f32" - integrity sha512-nFIfVk5B/NStCsJ+zaPO4vYuLjlzQ6uFvPxzYyHlejNZ/UGa7G/n7peOXVrVNvRuyfstt+mZQYGpjxg9Z6N8Kw== +diff-sequences@^25.2.6: + version "25.2.6" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd" + integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg== doctrine@^3.0.0: version "3.0.0" @@ -2142,17 +2292,17 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" -expect@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-25.1.0.tgz#7e8d7b06a53f7d66ec927278db3304254ee683ee" - integrity sha512-wqHzuoapQkhc3OKPlrpetsfueuEiMf3iWh0R8+duCu9PIjXoP7HgD5aeypwTnXUAjC8aMsiVDaWwlbJ1RlQ38g== +expect@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/expect/-/expect-25.3.0.tgz#5fd36e51befd05afb7184bc954f8a4792d184c71" + integrity sha512-buboTXML2h/L0Kh44Ys2Cx49mX20ISc5KDirkxIs3Q9AJv0kazweUAbukegr+nHDOvFRKmxdojjIHCjqAceYfg== dependencies: - "@jest/types" "^25.1.0" + "@jest/types" "^25.3.0" ansi-styles "^4.0.0" - jest-get-type "^25.1.0" - jest-matcher-utils "^25.1.0" - jest-message-util "^25.1.0" - jest-regex-util "^25.1.0" + jest-get-type "^25.2.6" + jest-matcher-utils "^25.3.0" + jest-message-util "^25.3.0" + jest-regex-util "^25.2.6" extend-shallow@^2.0.1: version "2.0.1" @@ -2935,120 +3085,122 @@ istanbul-lib-source-maps@^4.0.0: istanbul-lib-coverage "^3.0.0" source-map "^0.6.1" -istanbul-reports@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.0.tgz#d4d16d035db99581b6194e119bbf36c963c5eb70" - integrity sha512-2osTcC8zcOSUkImzN2EWQta3Vdi4WjjKw99P2yWx5mLnigAM0Rd5uYFn1cf2i/Ois45GkNjaoTqc5CxgMSX80A== +istanbul-reports@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b" + integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw== dependencies: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -jest-changed-files@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-25.1.0.tgz#73dae9a7d9949fdfa5c278438ce8f2ff3ec78131" - integrity sha512-bdL1aHjIVy3HaBO3eEQeemGttsq1BDlHgWcOjEOIAcga7OOEGWHD2WSu8HhL7I1F0mFFyci8VKU4tRNk+qtwDA== +jest-changed-files@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-25.3.0.tgz#85d8de6f4bd13dafda9d7f1e3f2565fc0e183c78" + integrity sha512-eqd5hyLbUjIVvLlJ3vQ/MoPxsxfESVXG9gvU19XXjKzxr+dXmZIqCXiY0OiYaibwlHZBJl2Vebkc0ADEMzCXew== dependencies: - "@jest/types" "^25.1.0" + "@jest/types" "^25.3.0" execa "^3.2.0" throat "^5.0.0" -jest-cli@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-25.1.0.tgz#75f0b09cf6c4f39360906bf78d580be1048e4372" - integrity sha512-p+aOfczzzKdo3AsLJlhs8J5EW6ffVidfSZZxXedJ0mHPBOln1DccqFmGCoO8JWd4xRycfmwy1eoQkMsF8oekPg== +jest-cli@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-25.3.0.tgz#d9e11f5700cc5946583cf0d01a9bdebceed448d2" + integrity sha512-XpNQPlW1tzpP7RGG8dxpkRegYDuLjzSiENu92+CYM87nEbmEPb3b4+yo8xcsHOnj0AG7DUt9b3uG8LuHI3MDzw== dependencies: - "@jest/core" "^25.1.0" - "@jest/test-result" "^25.1.0" - "@jest/types" "^25.1.0" + "@jest/core" "^25.3.0" + "@jest/test-result" "^25.3.0" + "@jest/types" "^25.3.0" chalk "^3.0.0" exit "^0.1.2" import-local "^3.0.2" is-ci "^2.0.0" - jest-config "^25.1.0" - jest-util "^25.1.0" - jest-validate "^25.1.0" + jest-config "^25.3.0" + jest-util "^25.3.0" + jest-validate "^25.3.0" prompts "^2.0.1" - realpath-native "^1.1.0" - yargs "^15.0.0" + realpath-native "^2.0.0" + yargs "^15.3.1" -jest-config@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-25.1.0.tgz#d114e4778c045d3ef239452213b7ad3ec1cbea90" - integrity sha512-tLmsg4SZ5H7tuhBC5bOja0HEblM0coS3Wy5LTCb2C8ZV6eWLewHyK+3qSq9Bi29zmWQ7ojdCd3pxpx4l4d2uGw== +jest-config@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-25.3.0.tgz#112b5e2f2e57dec4501dd2fe979044c06fb1317e" + integrity sha512-CmF1JnNWFmoCSPC4tnU52wnVBpuxHjilA40qH/03IHxIevkjUInSMwaDeE6ACfxMPTLidBGBCO3EbxvzPbo8wA== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^25.1.0" - "@jest/types" "^25.1.0" - babel-jest "^25.1.0" + "@jest/test-sequencer" "^25.3.0" + "@jest/types" "^25.3.0" + babel-jest "^25.3.0" chalk "^3.0.0" + deepmerge "^4.2.2" glob "^7.1.1" - jest-environment-jsdom "^25.1.0" - jest-environment-node "^25.1.0" - jest-get-type "^25.1.0" - jest-jasmine2 "^25.1.0" - jest-regex-util "^25.1.0" - jest-resolve "^25.1.0" - jest-util "^25.1.0" - jest-validate "^25.1.0" + jest-environment-jsdom "^25.3.0" + jest-environment-node "^25.3.0" + jest-get-type "^25.2.6" + jest-jasmine2 "^25.3.0" + jest-regex-util "^25.2.6" + jest-resolve "^25.3.0" + jest-util "^25.3.0" + jest-validate "^25.3.0" micromatch "^4.0.2" - pretty-format "^25.1.0" - realpath-native "^1.1.0" + pretty-format "^25.3.0" + realpath-native "^2.0.0" -jest-diff@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.1.0.tgz#58b827e63edea1bc80c1de952b80cec9ac50e1ad" - integrity sha512-nepXgajT+h017APJTreSieh4zCqnSHEJ1iT8HDlewu630lSJ4Kjjr9KNzm+kzGwwcpsDE6Snx1GJGzzsefaEHw== +jest-diff@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.3.0.tgz#0d7d6f5d6171e5dacde9e05be47b3615e147c26f" + integrity sha512-vyvs6RPoVdiwARwY4kqFWd4PirPLm2dmmkNzKqo38uZOzJvLee87yzDjIZLmY1SjM3XR5DwsUH+cdQ12vgqi1w== dependencies: chalk "^3.0.0" - diff-sequences "^25.1.0" - jest-get-type "^25.1.0" - pretty-format "^25.1.0" + diff-sequences "^25.2.6" + jest-get-type "^25.2.6" + pretty-format "^25.3.0" -jest-docblock@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-25.1.0.tgz#0f44bea3d6ca6dfc38373d465b347c8818eccb64" - integrity sha512-370P/mh1wzoef6hUKiaMcsPtIapY25suP6JqM70V9RJvdKLrV4GaGbfUseUVk4FZJw4oTZ1qSCJNdrClKt5JQA== +jest-docblock@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-25.3.0.tgz#8b777a27e3477cd77a168c05290c471a575623ef" + integrity sha512-aktF0kCar8+zxRHxQZwxMy70stc9R1mOmrLsT5VO3pIT0uzGRSDAXxSlz4NqQWpuLjPpuMhPRl7H+5FRsvIQAg== dependencies: detect-newline "^3.0.0" -jest-each@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-25.1.0.tgz#a6b260992bdf451c2d64a0ccbb3ac25e9b44c26a" - integrity sha512-R9EL8xWzoPySJ5wa0DXFTj7NrzKpRD40Jy+zQDp3Qr/2QmevJgkN9GqioCGtAJ2bW9P/MQRznQHQQhoeAyra7A== +jest-each@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-25.3.0.tgz#a319eecf1f6076164ab86f99ca166a55b96c0bd4" + integrity sha512-aBfS4VOf/Qs95yUlX6d6WBv0szvOcTkTTyCIaLuQGj4bSHsT+Wd9dDngVHrCe5uytxpN8VM+NAloI6nbPjXfXw== dependencies: - "@jest/types" "^25.1.0" + "@jest/types" "^25.3.0" chalk "^3.0.0" - jest-get-type "^25.1.0" - jest-util "^25.1.0" - pretty-format "^25.1.0" - -jest-environment-jsdom@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-25.1.0.tgz#6777ab8b3e90fd076801efd3bff8e98694ab43c3" - integrity sha512-ILb4wdrwPAOHX6W82GGDUiaXSSOE274ciuov0lztOIymTChKFtC02ddyicRRCdZlB5YSrv3vzr1Z5xjpEe1OHQ== - dependencies: - "@jest/environment" "^25.1.0" - "@jest/fake-timers" "^25.1.0" - "@jest/types" "^25.1.0" - jest-mock "^25.1.0" - jest-util "^25.1.0" - jsdom "^15.1.1" - -jest-environment-node@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-25.1.0.tgz#797bd89b378cf0bd794dc8e3dca6ef21126776db" - integrity sha512-U9kFWTtAPvhgYY5upnH9rq8qZkj6mYLup5l1caAjjx9uNnkLHN2xgZy5mo4SyLdmrh/EtB9UPpKFShvfQHD0Iw== - dependencies: - "@jest/environment" "^25.1.0" - "@jest/fake-timers" "^25.1.0" - "@jest/types" "^25.1.0" - jest-mock "^25.1.0" - jest-util "^25.1.0" + jest-get-type "^25.2.6" + jest-util "^25.3.0" + pretty-format "^25.3.0" + +jest-environment-jsdom@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-25.3.0.tgz#c493ab8c41f28001520c70ef67dd88b88be6af05" + integrity sha512-jdE4bQN+k2QEZ9sWOxsqDJvMzbdFSCN/4tw8X0TQaCqyzKz58PyEf41oIr4WO7ERdp7WaJGBSUKF7imR3UW1lg== + dependencies: + "@jest/environment" "^25.3.0" + "@jest/fake-timers" "^25.3.0" + "@jest/types" "^25.3.0" + jest-mock "^25.3.0" + jest-util "^25.3.0" + jsdom "^15.2.1" + +jest-environment-node@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-25.3.0.tgz#9845f0e63991e8498448cb0ae804935689533db9" + integrity sha512-XO09S29Nx1NU7TiMPHMoDIkxoGBuKSTbE+sHp0gXbeLDXhIdhysUI25kOqFFSD9AuDgvPvxWCXrvNqiFsOH33g== + dependencies: + "@jest/environment" "^25.3.0" + "@jest/fake-timers" "^25.3.0" + "@jest/types" "^25.3.0" + jest-mock "^25.3.0" + jest-util "^25.3.0" + semver "^6.3.0" -jest-get-type@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.1.0.tgz#1cfe5fc34f148dc3a8a3b7275f6b9ce9e2e8a876" - integrity sha512-yWkBnT+5tMr8ANB6V+OjmrIJufHtCAqI5ic2H40v+tRqxDmE0PGnIiTyvRWFOMtmVHYpwRqyazDbTnhpjsGvLw== +jest-get-type@^25.2.6: + version "25.2.6" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877" + integrity sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig== jest-haste-map@^25.1.0: version "25.1.0" @@ -3068,67 +3220,85 @@ jest-haste-map@^25.1.0: optionalDependencies: fsevents "^2.1.2" -jest-jasmine2@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-25.1.0.tgz#681b59158a430f08d5d0c1cce4f01353e4b48137" - integrity sha512-GdncRq7jJ7sNIQ+dnXvpKO2MyP6j3naNK41DTTjEAhLEdpImaDA9zSAZwDhijjSF/D7cf4O5fdyUApGBZleaEg== +jest-haste-map@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.3.0.tgz#b7683031c9c9ddc0521d311564108b244b11e4c6" + integrity sha512-LjXaRa+F8wwtSxo9G+hHD/Cp63PPQzvaBL9XCVoJD2rrcJO0Zr2+YYzAFWWYJ5GlPUkoaJFJtOuk0sL6MJY80A== + dependencies: + "@jest/types" "^25.3.0" + anymatch "^3.0.3" + fb-watchman "^2.0.0" + graceful-fs "^4.2.3" + jest-serializer "^25.2.6" + jest-util "^25.3.0" + jest-worker "^25.2.6" + micromatch "^4.0.2" + sane "^4.0.3" + walker "^1.0.7" + which "^2.0.2" + optionalDependencies: + fsevents "^2.1.2" + +jest-jasmine2@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-25.3.0.tgz#16ae4f68adef65fb45001b26c864bcbcbf972830" + integrity sha512-NCYOGE6+HNzYFSui52SefgpsnIzvxjn6KAgqw66BdRp37xpMD/4kujDHLNW5bS5i53os5TcMn6jYrzQRO8VPrQ== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^25.1.0" - "@jest/source-map" "^25.1.0" - "@jest/test-result" "^25.1.0" - "@jest/types" "^25.1.0" + "@jest/environment" "^25.3.0" + "@jest/source-map" "^25.2.6" + "@jest/test-result" "^25.3.0" + "@jest/types" "^25.3.0" chalk "^3.0.0" co "^4.6.0" - expect "^25.1.0" + expect "^25.3.0" is-generator-fn "^2.0.0" - jest-each "^25.1.0" - jest-matcher-utils "^25.1.0" - jest-message-util "^25.1.0" - jest-runtime "^25.1.0" - jest-snapshot "^25.1.0" - jest-util "^25.1.0" - pretty-format "^25.1.0" + jest-each "^25.3.0" + jest-matcher-utils "^25.3.0" + jest-message-util "^25.3.0" + jest-runtime "^25.3.0" + jest-snapshot "^25.3.0" + jest-util "^25.3.0" + pretty-format "^25.3.0" throat "^5.0.0" -jest-leak-detector@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-25.1.0.tgz#ed6872d15aa1c72c0732d01bd073dacc7c38b5c6" - integrity sha512-3xRI264dnhGaMHRvkFyEKpDeaRzcEBhyNrOG5oT8xPxOyUAblIAQnpiR3QXu4wDor47MDTiHbiFcbypdLcLW5w== +jest-leak-detector@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-25.3.0.tgz#5b6bf04903b35be56038915a55f47291771f769f" + integrity sha512-jk7k24dMIfk8LUSQQGN8PyOy9+J0NAfHZWiDmUDYVMctY8FLJQ1eQ8+PjMoN8PgwhLIggUqgYJnyRFvUz3jLRw== dependencies: - jest-get-type "^25.1.0" - pretty-format "^25.1.0" + jest-get-type "^25.2.6" + pretty-format "^25.3.0" -jest-matcher-utils@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.1.0.tgz#fa5996c45c7193a3c24e73066fc14acdee020220" - integrity sha512-KGOAFcSFbclXIFE7bS4C53iYobKI20ZWleAdAFun4W1Wz1Kkej8Ng6RRbhL8leaEvIOjGXhGf/a1JjO8bkxIWQ== +jest-matcher-utils@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.3.0.tgz#76765788a26edaa8bc5f0100aea52ae383559648" + integrity sha512-ZBUJ2fchNIZt+fyzkuCFBb8SKaU//Rln45augfUtbHaGyVxCO++ANARdBK9oPGXU3hEDgyy7UHnOP/qNOJXFUg== dependencies: chalk "^3.0.0" - jest-diff "^25.1.0" - jest-get-type "^25.1.0" - pretty-format "^25.1.0" + jest-diff "^25.3.0" + jest-get-type "^25.2.6" + pretty-format "^25.3.0" -jest-message-util@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.1.0.tgz#702a9a5cb05c144b9aa73f06e17faa219389845e" - integrity sha512-Nr/Iwar2COfN22aCqX0kCVbXgn8IBm9nWf4xwGr5Olv/KZh0CZ32RKgZWMVDXGdOahicM10/fgjdimGNX/ttCQ== +jest-message-util@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.3.0.tgz#e3836826fe5ca538a337b87d9bd2648190867f85" + integrity sha512-5QNy9Id4WxJbRITEbA1T1kem9bk7y2fD0updZMSTNHtbEDnYOGLDPAuFBhFgVmOZpv0n6OMdVkK+WhyXEPCcOw== dependencies: "@babel/code-frame" "^7.0.0" - "@jest/test-result" "^25.1.0" - "@jest/types" "^25.1.0" + "@jest/types" "^25.3.0" "@types/stack-utils" "^1.0.1" chalk "^3.0.0" micromatch "^4.0.2" slash "^3.0.0" stack-utils "^1.0.1" -jest-mock@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.1.0.tgz#411d549e1b326b7350b2e97303a64715c28615fd" - integrity sha512-28/u0sqS+42vIfcd1mlcg4ZVDmSUYuNvImP4X2lX5hRMLW+CN0BeiKVD4p+ujKKbSPKd3rg/zuhCF+QBLJ4vag== +jest-mock@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.3.0.tgz#d72644509e40987a732a9a2534a1054f4649402c" + integrity sha512-yRn6GbuqB4j3aYu+Z1ezwRiZfp0o9om5uOcBovVtkcRLeBCNP5mT0ysdenUsxAHnQUgGwPOE1wwhtQYe6NKirQ== dependencies: - "@jest/types" "^25.1.0" + "@jest/types" "^25.3.0" jest-pnp-resolver@^1.2.1: version "1.2.1" @@ -3140,105 +3310,117 @@ jest-regex-util@^25.1.0: resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.1.0.tgz#efaf75914267741838e01de24da07b2192d16d87" integrity sha512-9lShaDmDpqwg+xAd73zHydKrBbbrIi08Kk9YryBEBybQFg/lBWR/2BDjjiSE7KIppM9C5+c03XiDaZ+m4Pgs1w== -jest-resolve-dependencies@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-25.1.0.tgz#8a1789ec64eb6aaa77fd579a1066a783437e70d2" - integrity sha512-Cu/Je38GSsccNy4I2vL12ZnBlD170x2Oh1devzuM9TLH5rrnLW1x51lN8kpZLYTvzx9j+77Y5pqBaTqfdzVzrw== +jest-regex-util@^25.2.6: + version "25.2.6" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.2.6.tgz#d847d38ba15d2118d3b06390056028d0f2fd3964" + integrity sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw== + +jest-resolve-dependencies@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-25.3.0.tgz#b0e4ae053dd44ddacc18c6ee12b5b7c28e445a90" + integrity sha512-bDUlLYmHW+f7J7KgcY2lkq8EMRqKonRl0XoD4Wp5SJkgAxKJnsaIOlrrVNTfXYf+YOu3VCjm/Ac2hPF2nfsCIA== dependencies: - "@jest/types" "^25.1.0" - jest-regex-util "^25.1.0" - jest-snapshot "^25.1.0" + "@jest/types" "^25.3.0" + jest-regex-util "^25.2.6" + jest-snapshot "^25.3.0" -jest-resolve@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-25.1.0.tgz#23d8b6a4892362baf2662877c66aa241fa2eaea3" - integrity sha512-XkBQaU1SRCHj2Evz2Lu4Czs+uIgJXWypfO57L7JYccmAXv4slXA6hzNblmcRmf7P3cQ1mE7fL3ABV6jAwk4foQ== +jest-resolve@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-25.3.0.tgz#cb90a5bbea54a02eccdbbf4126a819595dcf91d6" + integrity sha512-IHoQAAybulsJ+ZgWis+ekYKDAoFkVH5Nx/znpb41zRtpxj4fr2WNV9iDqavdSm8GIpMlsfZxbC/fV9DhW0q9VQ== dependencies: - "@jest/types" "^25.1.0" + "@jest/types" "^25.3.0" browser-resolve "^1.11.3" chalk "^3.0.0" jest-pnp-resolver "^1.2.1" - realpath-native "^1.1.0" - -jest-runner@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-25.1.0.tgz#fef433a4d42c89ab0a6b6b268e4a4fbe6b26e812" - integrity sha512-su3O5fy0ehwgt+e8Wy7A8CaxxAOCMzL4gUBftSs0Ip32S0epxyZPDov9Znvkl1nhVOJNf4UwAsnqfc3plfQH9w== - dependencies: - "@jest/console" "^25.1.0" - "@jest/environment" "^25.1.0" - "@jest/test-result" "^25.1.0" - "@jest/types" "^25.1.0" + realpath-native "^2.0.0" + resolve "^1.15.1" + +jest-runner@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-25.3.0.tgz#673ef2ac79d2810eb6b2c1a3f82398375a3d1174" + integrity sha512-csDqSC9qGHYWDrzrElzEgFbteztFeZJmKhSgY5jlCIcN0+PhActzRNku0DA1Xa1HxGOb0/AfbP1EGJlP4fGPtA== + dependencies: + "@jest/console" "^25.3.0" + "@jest/environment" "^25.3.0" + "@jest/test-result" "^25.3.0" + "@jest/types" "^25.3.0" chalk "^3.0.0" exit "^0.1.2" graceful-fs "^4.2.3" - jest-config "^25.1.0" - jest-docblock "^25.1.0" - jest-haste-map "^25.1.0" - jest-jasmine2 "^25.1.0" - jest-leak-detector "^25.1.0" - jest-message-util "^25.1.0" - jest-resolve "^25.1.0" - jest-runtime "^25.1.0" - jest-util "^25.1.0" - jest-worker "^25.1.0" + jest-config "^25.3.0" + jest-docblock "^25.3.0" + jest-haste-map "^25.3.0" + jest-jasmine2 "^25.3.0" + jest-leak-detector "^25.3.0" + jest-message-util "^25.3.0" + jest-resolve "^25.3.0" + jest-runtime "^25.3.0" + jest-util "^25.3.0" + jest-worker "^25.2.6" source-map-support "^0.5.6" throat "^5.0.0" -jest-runtime@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-25.1.0.tgz#02683218f2f95aad0f2ec1c9cdb28c1dc0ec0314" - integrity sha512-mpPYYEdbExKBIBB16ryF6FLZTc1Rbk9Nx0ryIpIMiDDkOeGa0jQOKVI/QeGvVGlunKKm62ywcioeFVzIbK03bA== - dependencies: - "@jest/console" "^25.1.0" - "@jest/environment" "^25.1.0" - "@jest/source-map" "^25.1.0" - "@jest/test-result" "^25.1.0" - "@jest/transform" "^25.1.0" - "@jest/types" "^25.1.0" +jest-runtime@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-25.3.0.tgz#af4d40dbcc590fa5de9910cb6a120a13d131050b" + integrity sha512-gn5KYB1wxXRM3nfw8fVpthFu60vxQUCr+ShGq41+ZBFF3DRHZRKj3HDWVAVB4iTNBj2y04QeAo5cZ/boYaPg0w== + dependencies: + "@jest/console" "^25.3.0" + "@jest/environment" "^25.3.0" + "@jest/source-map" "^25.2.6" + "@jest/test-result" "^25.3.0" + "@jest/transform" "^25.3.0" + "@jest/types" "^25.3.0" "@types/yargs" "^15.0.0" chalk "^3.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.3" - jest-config "^25.1.0" - jest-haste-map "^25.1.0" - jest-message-util "^25.1.0" - jest-mock "^25.1.0" - jest-regex-util "^25.1.0" - jest-resolve "^25.1.0" - jest-snapshot "^25.1.0" - jest-util "^25.1.0" - jest-validate "^25.1.0" - realpath-native "^1.1.0" + jest-config "^25.3.0" + jest-haste-map "^25.3.0" + jest-message-util "^25.3.0" + jest-mock "^25.3.0" + jest-regex-util "^25.2.6" + jest-resolve "^25.3.0" + jest-snapshot "^25.3.0" + jest-util "^25.3.0" + jest-validate "^25.3.0" + realpath-native "^2.0.0" slash "^3.0.0" strip-bom "^4.0.0" - yargs "^15.0.0" + yargs "^15.3.1" jest-serializer@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.1.0.tgz#73096ba90e07d19dec4a0c1dd89c355e2f129e5d" integrity sha512-20Wkq5j7o84kssBwvyuJ7Xhn7hdPeTXndnwIblKDR2/sy1SUm6rWWiG9kSCgJPIfkDScJCIsTtOKdlzfIHOfKA== -jest-snapshot@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-25.1.0.tgz#d5880bd4b31faea100454608e15f8d77b9d221d9" - integrity sha512-xZ73dFYN8b/+X2hKLXz4VpBZGIAn7muD/DAg+pXtDzDGw3iIV10jM7WiHqhCcpDZfGiKEj7/2HXAEPtHTj0P2A== +jest-serializer@^25.2.6: + version "25.2.6" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.2.6.tgz#3bb4cc14fe0d8358489dbbefbb8a4e708ce039b7" + integrity sha512-RMVCfZsezQS2Ww4kB5HJTMaMJ0asmC0BHlnobQC6yEtxiFKIxohFA4QSXSabKwSggaNkqxn6Z2VwdFCjhUWuiQ== + +jest-snapshot@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-25.3.0.tgz#d4feb457494f4aaedcc83fbbf1ca21808fc3df71" + integrity sha512-GGpR6Oro2htJPKh5RX4PR1xwo5jCEjtvSPLW1IS7N85y+2bWKbiknHpJJRKSdGXghElb5hWaeQASJI4IiRayGg== dependencies: "@babel/types" "^7.0.0" - "@jest/types" "^25.1.0" + "@jest/types" "^25.3.0" + "@types/prettier" "^1.19.0" chalk "^3.0.0" - expect "^25.1.0" - jest-diff "^25.1.0" - jest-get-type "^25.1.0" - jest-matcher-utils "^25.1.0" - jest-message-util "^25.1.0" - jest-resolve "^25.1.0" - mkdirp "^0.5.1" + expect "^25.3.0" + jest-diff "^25.3.0" + jest-get-type "^25.2.6" + jest-matcher-utils "^25.3.0" + jest-message-util "^25.3.0" + jest-resolve "^25.3.0" + make-dir "^3.0.0" natural-compare "^1.4.0" - pretty-format "^25.1.0" - semver "^7.1.1" + pretty-format "^25.3.0" + semver "^6.3.0" jest-util@^25.1.0: version "25.1.0" @@ -3250,28 +3432,38 @@ jest-util@^25.1.0: is-ci "^2.0.0" mkdirp "^0.5.1" -jest-validate@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-25.1.0.tgz#1469fa19f627bb0a9a98e289f3e9ab6a668c732a" - integrity sha512-kGbZq1f02/zVO2+t1KQGSVoCTERc5XeObLwITqC6BTRH3Adv7NZdYqCpKIZLUgpLXf2yISzQ465qOZpul8abXA== +jest-util@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.3.0.tgz#e3b0064165818f10d78514696fd25efba82cf049" + integrity sha512-dc625P/KS/CpWTJJJxKc4bA3A6c+PJGBAqS8JTJqx4HqPoKNqXg/Ec8biL2Z1TabwK7E7Ilf0/ukSEXM1VwzNA== dependencies: - "@jest/types" "^25.1.0" + "@jest/types" "^25.3.0" + chalk "^3.0.0" + is-ci "^2.0.0" + make-dir "^3.0.0" + +jest-validate@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-25.3.0.tgz#eb95fdee0039647bcd5d4be641b21e4a142a880c" + integrity sha512-3WuXgIZ4HXUvW6gk9twFFkT9j6zUorKnF2oEY8VEsHb7x5LGvVlN3WUsbqazVKuyXwvikO2zFJ/YTySMsMje2w== + dependencies: + "@jest/types" "^25.3.0" camelcase "^5.3.1" chalk "^3.0.0" - jest-get-type "^25.1.0" + jest-get-type "^25.2.6" leven "^3.1.0" - pretty-format "^25.1.0" + pretty-format "^25.3.0" -jest-watcher@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-25.1.0.tgz#97cb4a937f676f64c9fad2d07b824c56808e9806" - integrity sha512-Q9eZ7pyaIr6xfU24OeTg4z1fUqBF/4MP6J801lyQfg7CsnZ/TCzAPvCfckKdL5dlBBEKBeHV0AdyjFZ5eWj4ig== +jest-watcher@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-25.3.0.tgz#fd03fd5ca52f02bd3161ab177466bf1bfdd34e5c" + integrity sha512-dtFkfidFCS9Ucv8azOg2hkiY3sgJEHeTLtGFHS+jfBEE7eRtrO6+2r1BokyDkaG2FOD7485r/SgpC1MFAENfeA== dependencies: - "@jest/test-result" "^25.1.0" - "@jest/types" "^25.1.0" + "@jest/test-result" "^25.3.0" + "@jest/types" "^25.3.0" ansi-escapes "^4.2.1" chalk "^3.0.0" - jest-util "^25.1.0" + jest-util "^25.3.0" string-length "^3.1.0" jest-worker@^25.1.0: @@ -3282,14 +3474,22 @@ jest-worker@^25.1.0: merge-stream "^2.0.0" supports-color "^7.0.0" +jest-worker@^25.2.6: + version "25.2.6" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.2.6.tgz#d1292625326794ce187c38f51109faced3846c58" + integrity sha512-FJn9XDUSxcOR4cwDzRfL1z56rUofNTFs539FGASpd50RHdb6EVkhxQqktodW2mI49l+W3H+tFJDotCHUQF6dmA== + dependencies: + merge-stream "^2.0.0" + supports-color "^7.0.0" + jest@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest/-/jest-25.1.0.tgz#b85ef1ddba2fdb00d295deebbd13567106d35be9" - integrity sha512-FV6jEruneBhokkt9MQk0WUFoNTwnF76CLXtwNMfsc0um0TlB/LG2yxUd0KqaFjEJ9laQmVWQWS0sG/t2GsuI0w== + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest/-/jest-25.3.0.tgz#7a5e59741d94b8662664c77a9f346246d6bf228b" + integrity sha512-iKd5ShQSHzFT5IL/6h5RZJhApgqXSoPxhp5HEi94v6OAw9QkF8T7X+liEU2eEHJ1eMFYTHmeWLrpBWulsDpaUg== dependencies: - "@jest/core" "^25.1.0" + "@jest/core" "^25.3.0" import-local "^3.0.2" - jest-cli "^25.1.0" + jest-cli "^25.3.0" "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" @@ -3309,7 +3509,7 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= -jsdom@^15.1.1: +jsdom@^15.2.1: version "15.2.1" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-15.2.1.tgz#d2feb1aef7183f86be521b8c6833ff5296d07ec5" integrity sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g== @@ -4160,12 +4360,12 @@ prettier@^1.7.4: resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== -pretty-format@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.1.0.tgz#ed869bdaec1356fc5ae45de045e2c8ec7b07b0c8" - integrity sha512-46zLRSGLd02Rp+Lhad9zzuNZ+swunitn8zIpfD2B4OPCRLXbM87RJT2aBLBWYOznNUML/2l/ReMyWNC80PJBUQ== +pretty-format@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.3.0.tgz#d0a4f988ff4a6cd350342fdabbb809aeb4d49ad5" + integrity sha512-wToHwF8bkQknIcFkBqNfKu4+UZqnrLn/Vr+wwKQwwvPzkBfDDKp/qIabFqdgtoi5PEnM8LFByVsOrHoa3SpTVA== dependencies: - "@jest/types" "^25.1.0" + "@jest/types" "^25.3.0" ansi-regex "^5.0.0" ansi-styles "^4.0.0" react-is "^16.12.0" @@ -4270,6 +4470,11 @@ realpath-native@^1.1.0: dependencies: util.promisify "^1.0.0" +realpath-native@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-2.0.0.tgz#7377ac429b6e1fd599dc38d08ed942d0d7beb866" + integrity sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q== + reduce-css-calc@^2.1.6: version "2.1.7" resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-2.1.7.tgz#1ace2e02c286d78abcd01fd92bfe8097ab0602c2" @@ -4465,7 +4670,7 @@ resolve@1.1.7: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= -resolve@^1.13.1, resolve@^1.14.2, resolve@^1.3.2: +resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.3.2: version "1.16.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.16.0.tgz#063dc704fa3413e13ac1d0d1756a7cbfe95dd1a7" integrity sha512-LarL/PIKJvc09k1jaeT4kQb/8/7P+qV4qSnN2K80AES+OHdfZELAKVOBjxsvtToT/uLOfFbvYvKfZmV8cee7nA== @@ -4582,11 +4787,6 @@ semver@^6.0.0, semver@^6.1.2, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.1.1: - version "7.1.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.2.tgz#847bae5bce68c5d08889824f02667199b70e3d87" - integrity sha512-BJs9T/H8sEVHbeigqzIEo57Iu/3DG6c4QoqTfbQB3BPA4zgzAomh/Fk9E7QtjWQ8mx2dgA9YCfSF4y9k9bHNpQ== - set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" @@ -5297,7 +5497,7 @@ which@^1.2.9, which@^1.3.1: dependencies: isexe "^2.0.0" -which@^2.0.1: +which@^2.0.1, which@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== @@ -5377,18 +5577,18 @@ yallist@^3.0.0, yallist@^3.0.3: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A== -yargs-parser@^16.1.0: - version "16.1.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-16.1.0.tgz#73747d53ae187e7b8dbe333f95714c76ea00ecf1" - integrity sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg== +yargs-parser@^18.1.1: + version "18.1.2" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.2.tgz#2f482bea2136dbde0861683abea7756d30b504f1" + integrity sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ== dependencies: camelcase "^5.0.0" decamelize "^1.2.0" -yargs@^15.0.0: - version "15.1.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.1.0.tgz#e111381f5830e863a89550bd4b136bb6a5f37219" - integrity sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg== +yargs@^15.3.1: + version "15.3.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b" + integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA== dependencies: cliui "^6.0.0" decamelize "^1.2.0" @@ -5400,4 +5600,4 @@ yargs@^15.0.0: string-width "^4.2.0" which-module "^2.0.0" y18n "^4.0.0" - yargs-parser "^16.1.0" + yargs-parser "^18.1.1" From 64728bf5ed8b1884276ab4baeff5170a7a82daf6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 16 Apr 2020 13:22:14 +0000 Subject: [PATCH 28/52] Bump chalk from 3.0.0 to 4.0.0 Bumps [chalk](https://github.com/chalk/chalk) from 3.0.0 to 4.0.0. - [Release notes](https://github.com/chalk/chalk/releases) - [Commits](https://github.com/chalk/chalk/compare/v3.0.0...v4.0.0) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index e5ecbb9586a5..9b1c853b257c 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "dependencies": { "autoprefixer": "^9.4.5", "bytes": "^3.0.0", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "detective": "^5.2.0", "fs-extra": "^9.0.0", "lodash": "^4.17.15", diff --git a/yarn.lock b/yarn.lock index bcfc7117300a..bc73468f0eed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1284,7 +1284,7 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" -ansi-styles@^4.0.0: +ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA== @@ -1292,13 +1292,6 @@ ansi-styles@^4.0.0: "@types/color-name" "^1.1.1" color-convert "^2.0.1" -ansi-styles@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.1.0.tgz#d3ba8047b818293eaaa7978321dd61bff9842cfc" - integrity sha512-Qts4KCLKG+waHc9C4m07weIY8qyeixoS0h6RnbsNVD6Fw+pEZGW3vTyObL3WXpE09Mq4Oi7/lBEyLmOiLtlYWQ== - dependencies: - color-convert "^2.0.1" - anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -1680,6 +1673,14 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +chalk@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.0.0.tgz#6e98081ed2d17faab615eb52ac66ec1fe6209e72" + integrity sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" From 67fdf7e053fe42f76fc7ac9fc453dca6d61bc733 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 16 Apr 2020 13:22:14 +0000 Subject: [PATCH 29/52] Bump babel-jest from 25.1.0 to 25.3.0 Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 25.1.0 to 25.3.0. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v25.3.0/packages/babel-jest) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 139 ++---------------------------------------------------- 1 file changed, 3 insertions(+), 136 deletions(-) diff --git a/yarn.lock b/yarn.lock index bcfc7117300a..3a1169666681 100644 --- a/yarn.lock +++ b/yarn.lock @@ -389,7 +389,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-bigint@^7.0.0", "@babel/plugin-syntax-bigint@^7.8.3": +"@babel/plugin-syntax-bigint@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg== @@ -452,7 +452,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.0": +"@babel/plugin-syntax-object-rest-spread@^7.8.0": version "7.8.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.0.tgz#9b37d580d459682364d8602494c69145b394fd4c" integrity sha512-dt89fDlkfkTrQcy5KavMQPyF2A6tR0kYp8HAnIoQv5hO34iAUffHghP/hMGd7Gf/+uYTmLQO0ar7peX1SUWyIA== @@ -1026,28 +1026,6 @@ jest-runner "^25.3.0" jest-runtime "^25.3.0" -"@jest/transform@^25.1.0": - version "25.1.0" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.1.0.tgz#221f354f512b4628d88ce776d5b9e601028ea9da" - integrity sha512-4ktrQ2TPREVeM+KxB4zskAT84SnmG1vaz4S+51aTefyqn3zocZUnliLLm5Fsl85I3p/kFPN4CRp1RElIfXGegQ== - dependencies: - "@babel/core" "^7.1.0" - "@jest/types" "^25.1.0" - babel-plugin-istanbul "^6.0.0" - chalk "^3.0.0" - convert-source-map "^1.4.0" - fast-json-stable-stringify "^2.0.0" - graceful-fs "^4.2.3" - jest-haste-map "^25.1.0" - jest-regex-util "^25.1.0" - jest-util "^25.1.0" - micromatch "^4.0.2" - pirates "^4.0.1" - realpath-native "^1.1.0" - slash "^3.0.0" - source-map "^0.6.1" - write-file-atomic "^3.0.0" - "@jest/transform@^25.3.0": version "25.3.0" resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.3.0.tgz#083c5447d5307d9b9494d6968115b647460e71f1" @@ -1070,16 +1048,6 @@ source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/types@^25.1.0": - version "25.1.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.1.0.tgz#b26831916f0d7c381e11dbb5e103a72aed1b4395" - integrity sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^1.1.1" - "@types/yargs" "^15.0.0" - chalk "^3.0.0" - "@jest/types@^25.3.0": version "25.3.0" resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.3.0.tgz#88f94b277a1d028fd7117bc1f74451e0fc2131e7" @@ -1097,17 +1065,6 @@ dependencies: type-detect "4.0.8" -"@types/babel__core@^7.1.0": - version "7.1.2" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.2.tgz#608c74f55928033fce18b99b213c16be4b3d114f" - integrity sha512-cfCCrFmiGY/yq0NuKNxIQvZFy9kY/1immpSpTngOnyIbD4+eJOG5mxphhHDv3CHL9GltO4GcKr54kGBg3RNdbg== - dependencies: - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" - "@types/babel__generator" "*" - "@types/babel__template" "*" - "@types/babel__traverse" "*" - "@types/babel__core@^7.1.7": version "7.1.7" resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89" @@ -1425,20 +1382,7 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== -babel-jest@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.1.0.tgz#206093ac380a4b78c4404a05b3277391278f80fb" - integrity sha512-tz0VxUhhOE2y+g8R2oFrO/2VtVjA1lkJeavlhExuRBg3LdNJY9gwQ+Vcvqt9+cqy71MCTJhewvTB7Qtnnr9SWg== - dependencies: - "@jest/transform" "^25.1.0" - "@jest/types" "^25.1.0" - "@types/babel__core" "^7.1.0" - babel-plugin-istanbul "^6.0.0" - babel-preset-jest "^25.1.0" - chalk "^3.0.0" - slash "^3.0.0" - -babel-jest@^25.3.0: +babel-jest@^25.1.0, babel-jest@^25.3.0: version "25.3.0" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.3.0.tgz#999d0c19e8427f66b796bf9ea233eedf087b957c" integrity sha512-qiXeX1Cmw4JZ5yQ4H57WpkO0MZ61Qj+YnsVUwAMnDV5ls+yHon11XjarDdgP7H8lTmiEi6biiZA8y3Tmvx6pCg== @@ -1469,13 +1413,6 @@ babel-plugin-istanbul@^6.0.0: istanbul-lib-instrument "^4.0.0" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.1.0.tgz#fb62d7b3b53eb36c97d1bc7fec2072f9bd115981" - integrity sha512-oIsopO41vW4YFZ9yNYoLQATnnN46lp+MZ6H4VvPKFkcc2/fkl3CfE/NZZSmnEIEsJRmJAgkVEK0R7Zbl50CpTw== - dependencies: - "@types/babel__traverse" "^7.0.6" - babel-plugin-jest-hoist@^25.2.6: version "25.2.6" resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.2.6.tgz#2af07632b8ac7aad7d414c1e58425d5fc8e84909" @@ -1499,15 +1436,6 @@ babel-preset-current-node-syntax@^0.1.2: "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -babel-preset-jest@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.1.0.tgz#d0aebfebb2177a21cde710996fce8486d34f1d33" - integrity sha512-eCGn64olaqwUMaugXsTtGAM2I0QTahjEtnRu0ql8Ie+gDWAc1N6wqN0k2NilnyTunM69Pad7gJY7LOtwLimoFQ== - dependencies: - "@babel/plugin-syntax-bigint" "^7.0.0" - "@babel/plugin-syntax-object-rest-spread" "^7.0.0" - babel-plugin-jest-hoist "^25.1.0" - babel-preset-jest@^25.3.0: version "25.3.0" resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.3.0.tgz#9ab40aee52a19bdc52b8b1ec2403d5914ac3d86b" @@ -3202,24 +3130,6 @@ jest-get-type@^25.2.6: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877" integrity sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig== -jest-haste-map@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.1.0.tgz#ae12163d284f19906260aa51fd405b5b2e5a4ad3" - integrity sha512-/2oYINIdnQZAqyWSn1GTku571aAfs8NxzSErGek65Iu5o8JYb+113bZysRMcC/pjE5v9w0Yz+ldbj9NxrFyPyw== - dependencies: - "@jest/types" "^25.1.0" - anymatch "^3.0.3" - fb-watchman "^2.0.0" - graceful-fs "^4.2.3" - jest-serializer "^25.1.0" - jest-util "^25.1.0" - jest-worker "^25.1.0" - micromatch "^4.0.2" - sane "^4.0.3" - walker "^1.0.7" - optionalDependencies: - fsevents "^2.1.2" - jest-haste-map@^25.3.0: version "25.3.0" resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.3.0.tgz#b7683031c9c9ddc0521d311564108b244b11e4c6" @@ -3305,11 +3215,6 @@ jest-pnp-resolver@^1.2.1: resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a" integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ== -jest-regex-util@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.1.0.tgz#efaf75914267741838e01de24da07b2192d16d87" - integrity sha512-9lShaDmDpqwg+xAd73zHydKrBbbrIi08Kk9YryBEBybQFg/lBWR/2BDjjiSE7KIppM9C5+c03XiDaZ+m4Pgs1w== - jest-regex-util@^25.2.6: version "25.2.6" resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.2.6.tgz#d847d38ba15d2118d3b06390056028d0f2fd3964" @@ -3392,11 +3297,6 @@ jest-runtime@^25.3.0: strip-bom "^4.0.0" yargs "^15.3.1" -jest-serializer@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.1.0.tgz#73096ba90e07d19dec4a0c1dd89c355e2f129e5d" - integrity sha512-20Wkq5j7o84kssBwvyuJ7Xhn7hdPeTXndnwIblKDR2/sy1SUm6rWWiG9kSCgJPIfkDScJCIsTtOKdlzfIHOfKA== - jest-serializer@^25.2.6: version "25.2.6" resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.2.6.tgz#3bb4cc14fe0d8358489dbbefbb8a4e708ce039b7" @@ -3422,16 +3322,6 @@ jest-snapshot@^25.3.0: pretty-format "^25.3.0" semver "^6.3.0" -jest-util@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.1.0.tgz#7bc56f7b2abd534910e9fa252692f50624c897d9" - integrity sha512-7did6pLQ++87Qsj26Fs/TIwZMUFBXQ+4XXSodRNy3luch2DnRXsSnmpVtxxQ0Yd6WTipGpbhh2IFP1mq6/fQGw== - dependencies: - "@jest/types" "^25.1.0" - chalk "^3.0.0" - is-ci "^2.0.0" - mkdirp "^0.5.1" - jest-util@^25.3.0: version "25.3.0" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.3.0.tgz#e3b0064165818f10d78514696fd25efba82cf049" @@ -3466,14 +3356,6 @@ jest-watcher@^25.3.0: jest-util "^25.3.0" string-length "^3.1.0" -jest-worker@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.1.0.tgz#75d038bad6fdf58eba0d2ec1835856c497e3907a" - integrity sha512-ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg== - dependencies: - merge-stream "^2.0.0" - supports-color "^7.0.0" - jest-worker@^25.2.6: version "25.2.6" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.2.6.tgz#d1292625326794ce187c38f51109faced3846c58" @@ -4463,13 +4345,6 @@ readdirp@^2.2.1: micromatch "^3.1.10" readable-stream "^2.0.2" -realpath-native@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c" - integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA== - dependencies: - util.promisify "^1.0.0" - realpath-native@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-2.0.0.tgz#7377ac429b6e1fd599dc38d08ed942d0d7beb866" @@ -5393,14 +5268,6 @@ util-deprecate@~1.0.1: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= -util.promisify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030" - integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA== - dependencies: - define-properties "^1.1.2" - object.getownpropertydescriptors "^2.0.3" - uuid@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" From 50569de37f2a94b0fba3c333ac466f9221e72062 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 16 Apr 2020 09:23:08 -0400 Subject: [PATCH 30/52] Remove unused CI configs --- .circleci/config.yml | 17 ----------------- .travis.yml | 12 ------------ 2 files changed, 29 deletions(-) delete mode 100644 .circleci/config.yml delete mode 100644 .travis.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 4a8a9e2d14ff..000000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,17 +0,0 @@ -version: 2.1 -orbs: - node: circleci/node@1.1.6 -jobs: - build-and-test: - executor: - name: node/default - steps: - - checkout - - node/with-cache: - steps: - - run: npm install - - run: npm test -workflows: - build-and-test: - jobs: - - build-and-test \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 1bf312886c2c..000000000000 --- a/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ -language: node_js -node_js: - - '10' - - '12' - -cache: - directories: - - $HOME/.cache/yarn - -script: - - yarn - - yarn run test From 5dc5938ae8b2ae0ae1bb2d9adf38f89aec056e40 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 16 Apr 2020 13:25:40 +0000 Subject: [PATCH 31/52] Bump autoprefixer from 9.7.5 to 9.7.6 Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.7.5 to 9.7.6. - [Release notes](https://github.com/postcss/autoprefixer/releases) - [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md) - [Commits](https://github.com/postcss/autoprefixer/compare/9.7.5...9.7.6) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 96 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 64 insertions(+), 32 deletions(-) diff --git a/yarn.lock b/yarn.lock index bc73468f0eed..0885cd484d5c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1396,12 +1396,12 @@ atob@^2.1.1: integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== autoprefixer@^9.4.5: - version "9.7.5" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.5.tgz#8df10b9ff9b5814a8d411a5cfbab9c793c392376" - integrity sha512-URo6Zvt7VYifomeAfJlMFnYDhow1rk2bufwkbamPEAtQFcL11moLk4PnR7n9vlu7M+BkXAZkHFA0mIcY7tjQFg== + version "9.7.6" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.6.tgz#63ac5bbc0ce7934e6997207d5bb00d68fa8293a4" + integrity sha512-F7cYpbN7uVVhACZTeeIeealwdGM6wMtfWARVLTy5xmKtgVdBNJvbDRoCK3YO1orcs7gv/KwYlb3iXwu9Ug9BkQ== dependencies: - browserslist "^4.11.0" - caniuse-lite "^1.0.30001036" + browserslist "^4.11.1" + caniuse-lite "^1.0.30001039" chalk "^2.4.2" normalize-range "^0.1.2" num2fraction "^1.2.2" @@ -1582,15 +1582,15 @@ browser-resolve@^1.11.3: dependencies: resolve "1.1.7" -browserslist@^4.11.0, browserslist@^4.8.3, browserslist@^4.9.1: - version "4.11.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.11.0.tgz#aef4357b10a8abda00f97aac7cd587b2082ba1ad" - integrity sha512-WqEC7Yr5wUH5sg6ruR++v2SGOQYpyUdYYd4tZoAq1F7y+QXoLoYGXVbxhtaIqWmAJjtNTRjVD3HuJc1OXTel2A== +browserslist@^4.11.1, browserslist@^4.8.3, browserslist@^4.9.1: + version "4.11.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.11.1.tgz#92f855ee88d6e050e7e7311d987992014f1a1f1b" + integrity sha512-DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g== dependencies: - caniuse-lite "^1.0.30001035" - electron-to-chromium "^1.3.380" - node-releases "^1.1.52" - pkg-up "^3.1.0" + caniuse-lite "^1.0.30001038" + electron-to-chromium "^1.3.390" + node-releases "^1.1.53" + pkg-up "^2.0.0" bser@^2.0.0: version "2.1.0" @@ -1639,10 +1639,10 @@ camelcase@^5.0.0, camelcase@^5.3.1: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001036: - version "1.0.30001036" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001036.tgz#930ea5272010d8bf190d859159d757c0b398caf0" - integrity sha512-jU8CIFIj2oR7r4W+5AKcsvWNVIb6Q6OZE3UsrXrZBHFtreT4YgTeOJtTucp+zSedEpTi3L5wASSP0LYIE3if6w== +caniuse-lite@^1.0.30001038, caniuse-lite@^1.0.30001039: + version "1.0.30001042" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001042.tgz#c91ec21ec2d270bd76dbc2ce261260c292b8c93c" + integrity sha512-igMQ4dlqnf4tWv0xjaaE02op9AJ2oQzXKjWf4EuAHFN694Uo9/EfPVIPJcmn2WkU9RqozCxx5e2KPcVClHDbDw== capture-exit@^2.0.0: version "2.0.0" @@ -2061,10 +2061,10 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" -electron-to-chromium@^1.3.380: - version "1.3.382" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.382.tgz#cad02da655c33f7a3d6ca7525bd35c17e90f3a8f" - integrity sha512-gJfxOcgnBlXhfnUUObsq3n3ReU8CT6S8je97HndYRkKsNZMJJ38zO/pI5aqO7L3Myfq+E3pqPyKK/ynyLEQfBA== +electron-to-chromium@^1.3.390: + version "1.3.410" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.410.tgz#00e0ec61c22933daa8b4de172c03932678783adc" + integrity sha512-DbCBdwtARI0l3e3m6ZIxVaTNahb6dSsmGjuag/twiVcWuM4MSpL5IfsJsJSyqLqxosE/m0CXlZaBmxegQW/dAg== emoji-regex@^7.0.1: version "7.0.3" @@ -2425,6 +2425,13 @@ find-cache-dir@^2.0.0: make-dir "^2.0.0" pkg-dir "^3.0.0" +find-up@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" + integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= + dependencies: + locate-path "^2.0.0" + find-up@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" @@ -3647,6 +3654,14 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" +locate-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" + integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= + dependencies: + p-locate "^2.0.0" + path-exists "^3.0.0" + locate-path@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" @@ -3934,12 +3949,10 @@ node-pre-gyp@^0.12.0: semver "^5.3.0" tar "^4" -node-releases@^1.1.52: - version "1.1.52" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.52.tgz#bcffee3e0a758e92e44ecfaecd0a47554b0bcba9" - integrity sha512-snSiT1UypkgGt2wxPqS6ImEUICbNCMb31yaxWrOLXjhlt2z2/IBpaOxzONExqSm4y5oLnAqjjRWu+wsDzK5yNQ== - dependencies: - semver "^6.3.0" +node-releases@^1.1.53: + version "1.1.53" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4" + integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ== nopt@^4.0.1: version "4.0.1" @@ -4138,6 +4151,13 @@ p-finally@^2.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw== +p-limit@^1.1.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" + integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== + dependencies: + p-try "^1.0.0" + p-limit@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2" @@ -4152,6 +4172,13 @@ p-limit@^2.2.0: dependencies: p-try "^2.0.0" +p-locate@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" + integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= + dependencies: + p-limit "^1.1.0" + p-locate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" @@ -4166,6 +4193,11 @@ p-locate@^4.1.0: dependencies: p-limit "^2.2.0" +p-try@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" + integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= + p-try@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" @@ -4264,12 +4296,12 @@ pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -pkg-up@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" - integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA== +pkg-up@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f" + integrity sha1-yBmscoBZpGHKscOImivjxJoATX8= dependencies: - find-up "^3.0.0" + find-up "^2.1.0" pn@^1.1.0: version "1.1.0" From 921e2ff2025e7f385cd0c24c1009bfc06b4ad8ef Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 16 Apr 2020 09:25:21 -0400 Subject: [PATCH 32/52] Add helper for testing utility plugins --- __tests__/plugins/util/invokePlugin.js | 29 ++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 __tests__/plugins/util/invokePlugin.js diff --git a/__tests__/plugins/util/invokePlugin.js b/__tests__/plugins/util/invokePlugin.js new file mode 100644 index 000000000000..df663a4c508b --- /dev/null +++ b/__tests__/plugins/util/invokePlugin.js @@ -0,0 +1,29 @@ +import _ from 'lodash' +import escapeClassName from '../../../src/util/escapeClassName' + +export default function(plugin, config) { + const addedUtilities = [] + + const getConfigValue = (path, defaultValue) => _.get(config, path, defaultValue) + const pluginApi = { + config: getConfigValue, + e: escapeClassName, + theme: (path, defaultValue) => getConfigValue(`theme.${path}`, defaultValue), + variants: (path, defaultValue) => { + if (_.isArray(config.variants)) { + return config.variants + } + + return getConfigValue(`variants.${path}`, defaultValue) + }, + addUtilities(utilities, variants) { + addedUtilities.push([utilities, variants]) + }, + } + + plugin(pluginApi) + + return { + utilities: addedUtilities, + } +} From 7ce6b2c424b09be27b98c106cb6a7278a4c49294 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 16 Apr 2020 09:29:25 -0400 Subject: [PATCH 33/52] Move plugin helpers up one folder --- __tests__/{plugins => }/util/invokePlugin.js | 0 package.json | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename __tests__/{plugins => }/util/invokePlugin.js (100%) diff --git a/__tests__/plugins/util/invokePlugin.js b/__tests__/util/invokePlugin.js similarity index 100% rename from __tests__/plugins/util/invokePlugin.js rename to __tests__/util/invokePlugin.js diff --git a/package.json b/package.json index 9b1c853b257c..6e75f9cb922a 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,8 @@ "/jest/customMatchers.js" ], "testPathIgnorePatterns": [ - "/__tests__/fixtures/" + "/__tests__/fixtures/", + "/__tests__/util/" ] }, "engines": { From 9c82fecae9edc51b7d4226adf30d414fd1adaded Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 16 Apr 2020 09:31:41 -0400 Subject: [PATCH 34/52] Fix path --- __tests__/util/invokePlugin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tests__/util/invokePlugin.js b/__tests__/util/invokePlugin.js index df663a4c508b..a2ed90c92814 100644 --- a/__tests__/util/invokePlugin.js +++ b/__tests__/util/invokePlugin.js @@ -1,5 +1,5 @@ import _ from 'lodash' -import escapeClassName from '../../../src/util/escapeClassName' +import escapeClassName from '../../src/util/escapeClassName' export default function(plugin, config) { const addedUtilities = [] From aa4fd1ae99cf2b183e2fcd0fa0063b71bc9c6d87 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Sun, 5 Apr 2020 14:07:30 -0400 Subject: [PATCH 35/52] Add support for providing a default line-height for each font-size --- .../fixtures/tailwind-output-important.css | 400 +++++++++--------- __tests__/fixtures/tailwind-output.css | 400 +++++++++--------- __tests__/plugins/fontSize.test.js | 30 ++ src/corePlugins.js | 2 +- src/plugins/fontSize.js | 9 +- 5 files changed, 439 insertions(+), 402 deletions(-) create mode 100644 __tests__/plugins/fontSize.test.js diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index 513c74bd7120..df0a26237ebd 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -3918,6 +3918,46 @@ video { height: 100vh !important; } +.text-xs { + font-size: 0.75rem !important; +} + +.text-sm { + font-size: 0.875rem !important; +} + +.text-base { + font-size: 1rem !important; +} + +.text-lg { + font-size: 1.125rem !important; +} + +.text-xl { + font-size: 1.25rem !important; +} + +.text-2xl { + font-size: 1.5rem !important; +} + +.text-3xl { + font-size: 1.875rem !important; +} + +.text-4xl { + font-size: 2.25rem !important; +} + +.text-5xl { + font-size: 3rem !important; +} + +.text-6xl { + font-size: 4rem !important; +} + .leading-3 { line-height: .75rem !important; } @@ -8130,46 +8170,6 @@ video { color: #702459 !important; } -.text-xs { - font-size: 0.75rem !important; -} - -.text-sm { - font-size: 0.875rem !important; -} - -.text-base { - font-size: 1rem !important; -} - -.text-lg { - font-size: 1.125rem !important; -} - -.text-xl { - font-size: 1.25rem !important; -} - -.text-2xl { - font-size: 1.5rem !important; -} - -.text-3xl { - font-size: 1.875rem !important; -} - -.text-4xl { - font-size: 2.25rem !important; -} - -.text-5xl { - font-size: 3rem !important; -} - -.text-6xl { - font-size: 4rem !important; -} - .italic { font-style: italic !important; } @@ -14311,6 +14311,46 @@ video { height: 100vh !important; } + .sm\:text-xs { + font-size: 0.75rem !important; + } + + .sm\:text-sm { + font-size: 0.875rem !important; + } + + .sm\:text-base { + font-size: 1rem !important; + } + + .sm\:text-lg { + font-size: 1.125rem !important; + } + + .sm\:text-xl { + font-size: 1.25rem !important; + } + + .sm\:text-2xl { + font-size: 1.5rem !important; + } + + .sm\:text-3xl { + font-size: 1.875rem !important; + } + + .sm\:text-4xl { + font-size: 2.25rem !important; + } + + .sm\:text-5xl { + font-size: 3rem !important; + } + + .sm\:text-6xl { + font-size: 4rem !important; + } + .sm\:leading-3 { line-height: .75rem !important; } @@ -18523,46 +18563,6 @@ video { color: #702459 !important; } - .sm\:text-xs { - font-size: 0.75rem !important; - } - - .sm\:text-sm { - font-size: 0.875rem !important; - } - - .sm\:text-base { - font-size: 1rem !important; - } - - .sm\:text-lg { - font-size: 1.125rem !important; - } - - .sm\:text-xl { - font-size: 1.25rem !important; - } - - .sm\:text-2xl { - font-size: 1.5rem !important; - } - - .sm\:text-3xl { - font-size: 1.875rem !important; - } - - .sm\:text-4xl { - font-size: 2.25rem !important; - } - - .sm\:text-5xl { - font-size: 3rem !important; - } - - .sm\:text-6xl { - font-size: 4rem !important; - } - .sm\:italic { font-style: italic !important; } @@ -24705,6 +24705,46 @@ video { height: 100vh !important; } + .md\:text-xs { + font-size: 0.75rem !important; + } + + .md\:text-sm { + font-size: 0.875rem !important; + } + + .md\:text-base { + font-size: 1rem !important; + } + + .md\:text-lg { + font-size: 1.125rem !important; + } + + .md\:text-xl { + font-size: 1.25rem !important; + } + + .md\:text-2xl { + font-size: 1.5rem !important; + } + + .md\:text-3xl { + font-size: 1.875rem !important; + } + + .md\:text-4xl { + font-size: 2.25rem !important; + } + + .md\:text-5xl { + font-size: 3rem !important; + } + + .md\:text-6xl { + font-size: 4rem !important; + } + .md\:leading-3 { line-height: .75rem !important; } @@ -28917,46 +28957,6 @@ video { color: #702459 !important; } - .md\:text-xs { - font-size: 0.75rem !important; - } - - .md\:text-sm { - font-size: 0.875rem !important; - } - - .md\:text-base { - font-size: 1rem !important; - } - - .md\:text-lg { - font-size: 1.125rem !important; - } - - .md\:text-xl { - font-size: 1.25rem !important; - } - - .md\:text-2xl { - font-size: 1.5rem !important; - } - - .md\:text-3xl { - font-size: 1.875rem !important; - } - - .md\:text-4xl { - font-size: 2.25rem !important; - } - - .md\:text-5xl { - font-size: 3rem !important; - } - - .md\:text-6xl { - font-size: 4rem !important; - } - .md\:italic { font-style: italic !important; } @@ -35099,6 +35099,46 @@ video { height: 100vh !important; } + .lg\:text-xs { + font-size: 0.75rem !important; + } + + .lg\:text-sm { + font-size: 0.875rem !important; + } + + .lg\:text-base { + font-size: 1rem !important; + } + + .lg\:text-lg { + font-size: 1.125rem !important; + } + + .lg\:text-xl { + font-size: 1.25rem !important; + } + + .lg\:text-2xl { + font-size: 1.5rem !important; + } + + .lg\:text-3xl { + font-size: 1.875rem !important; + } + + .lg\:text-4xl { + font-size: 2.25rem !important; + } + + .lg\:text-5xl { + font-size: 3rem !important; + } + + .lg\:text-6xl { + font-size: 4rem !important; + } + .lg\:leading-3 { line-height: .75rem !important; } @@ -39311,46 +39351,6 @@ video { color: #702459 !important; } - .lg\:text-xs { - font-size: 0.75rem !important; - } - - .lg\:text-sm { - font-size: 0.875rem !important; - } - - .lg\:text-base { - font-size: 1rem !important; - } - - .lg\:text-lg { - font-size: 1.125rem !important; - } - - .lg\:text-xl { - font-size: 1.25rem !important; - } - - .lg\:text-2xl { - font-size: 1.5rem !important; - } - - .lg\:text-3xl { - font-size: 1.875rem !important; - } - - .lg\:text-4xl { - font-size: 2.25rem !important; - } - - .lg\:text-5xl { - font-size: 3rem !important; - } - - .lg\:text-6xl { - font-size: 4rem !important; - } - .lg\:italic { font-style: italic !important; } @@ -45493,6 +45493,46 @@ video { height: 100vh !important; } + .xl\:text-xs { + font-size: 0.75rem !important; + } + + .xl\:text-sm { + font-size: 0.875rem !important; + } + + .xl\:text-base { + font-size: 1rem !important; + } + + .xl\:text-lg { + font-size: 1.125rem !important; + } + + .xl\:text-xl { + font-size: 1.25rem !important; + } + + .xl\:text-2xl { + font-size: 1.5rem !important; + } + + .xl\:text-3xl { + font-size: 1.875rem !important; + } + + .xl\:text-4xl { + font-size: 2.25rem !important; + } + + .xl\:text-5xl { + font-size: 3rem !important; + } + + .xl\:text-6xl { + font-size: 4rem !important; + } + .xl\:leading-3 { line-height: .75rem !important; } @@ -49705,46 +49745,6 @@ video { color: #702459 !important; } - .xl\:text-xs { - font-size: 0.75rem !important; - } - - .xl\:text-sm { - font-size: 0.875rem !important; - } - - .xl\:text-base { - font-size: 1rem !important; - } - - .xl\:text-lg { - font-size: 1.125rem !important; - } - - .xl\:text-xl { - font-size: 1.25rem !important; - } - - .xl\:text-2xl { - font-size: 1.5rem !important; - } - - .xl\:text-3xl { - font-size: 1.875rem !important; - } - - .xl\:text-4xl { - font-size: 2.25rem !important; - } - - .xl\:text-5xl { - font-size: 3rem !important; - } - - .xl\:text-6xl { - font-size: 4rem !important; - } - .xl\:italic { font-style: italic !important; } diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index 0136ffc83734..09ec4d8e5751 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -3918,6 +3918,46 @@ video { height: 100vh; } +.text-xs { + font-size: 0.75rem; +} + +.text-sm { + font-size: 0.875rem; +} + +.text-base { + font-size: 1rem; +} + +.text-lg { + font-size: 1.125rem; +} + +.text-xl { + font-size: 1.25rem; +} + +.text-2xl { + font-size: 1.5rem; +} + +.text-3xl { + font-size: 1.875rem; +} + +.text-4xl { + font-size: 2.25rem; +} + +.text-5xl { + font-size: 3rem; +} + +.text-6xl { + font-size: 4rem; +} + .leading-3 { line-height: .75rem; } @@ -8130,46 +8170,6 @@ video { color: #702459; } -.text-xs { - font-size: 0.75rem; -} - -.text-sm { - font-size: 0.875rem; -} - -.text-base { - font-size: 1rem; -} - -.text-lg { - font-size: 1.125rem; -} - -.text-xl { - font-size: 1.25rem; -} - -.text-2xl { - font-size: 1.5rem; -} - -.text-3xl { - font-size: 1.875rem; -} - -.text-4xl { - font-size: 2.25rem; -} - -.text-5xl { - font-size: 3rem; -} - -.text-6xl { - font-size: 4rem; -} - .italic { font-style: italic; } @@ -14311,6 +14311,46 @@ video { height: 100vh; } + .sm\:text-xs { + font-size: 0.75rem; + } + + .sm\:text-sm { + font-size: 0.875rem; + } + + .sm\:text-base { + font-size: 1rem; + } + + .sm\:text-lg { + font-size: 1.125rem; + } + + .sm\:text-xl { + font-size: 1.25rem; + } + + .sm\:text-2xl { + font-size: 1.5rem; + } + + .sm\:text-3xl { + font-size: 1.875rem; + } + + .sm\:text-4xl { + font-size: 2.25rem; + } + + .sm\:text-5xl { + font-size: 3rem; + } + + .sm\:text-6xl { + font-size: 4rem; + } + .sm\:leading-3 { line-height: .75rem; } @@ -18523,46 +18563,6 @@ video { color: #702459; } - .sm\:text-xs { - font-size: 0.75rem; - } - - .sm\:text-sm { - font-size: 0.875rem; - } - - .sm\:text-base { - font-size: 1rem; - } - - .sm\:text-lg { - font-size: 1.125rem; - } - - .sm\:text-xl { - font-size: 1.25rem; - } - - .sm\:text-2xl { - font-size: 1.5rem; - } - - .sm\:text-3xl { - font-size: 1.875rem; - } - - .sm\:text-4xl { - font-size: 2.25rem; - } - - .sm\:text-5xl { - font-size: 3rem; - } - - .sm\:text-6xl { - font-size: 4rem; - } - .sm\:italic { font-style: italic; } @@ -24705,6 +24705,46 @@ video { height: 100vh; } + .md\:text-xs { + font-size: 0.75rem; + } + + .md\:text-sm { + font-size: 0.875rem; + } + + .md\:text-base { + font-size: 1rem; + } + + .md\:text-lg { + font-size: 1.125rem; + } + + .md\:text-xl { + font-size: 1.25rem; + } + + .md\:text-2xl { + font-size: 1.5rem; + } + + .md\:text-3xl { + font-size: 1.875rem; + } + + .md\:text-4xl { + font-size: 2.25rem; + } + + .md\:text-5xl { + font-size: 3rem; + } + + .md\:text-6xl { + font-size: 4rem; + } + .md\:leading-3 { line-height: .75rem; } @@ -28917,46 +28957,6 @@ video { color: #702459; } - .md\:text-xs { - font-size: 0.75rem; - } - - .md\:text-sm { - font-size: 0.875rem; - } - - .md\:text-base { - font-size: 1rem; - } - - .md\:text-lg { - font-size: 1.125rem; - } - - .md\:text-xl { - font-size: 1.25rem; - } - - .md\:text-2xl { - font-size: 1.5rem; - } - - .md\:text-3xl { - font-size: 1.875rem; - } - - .md\:text-4xl { - font-size: 2.25rem; - } - - .md\:text-5xl { - font-size: 3rem; - } - - .md\:text-6xl { - font-size: 4rem; - } - .md\:italic { font-style: italic; } @@ -35099,6 +35099,46 @@ video { height: 100vh; } + .lg\:text-xs { + font-size: 0.75rem; + } + + .lg\:text-sm { + font-size: 0.875rem; + } + + .lg\:text-base { + font-size: 1rem; + } + + .lg\:text-lg { + font-size: 1.125rem; + } + + .lg\:text-xl { + font-size: 1.25rem; + } + + .lg\:text-2xl { + font-size: 1.5rem; + } + + .lg\:text-3xl { + font-size: 1.875rem; + } + + .lg\:text-4xl { + font-size: 2.25rem; + } + + .lg\:text-5xl { + font-size: 3rem; + } + + .lg\:text-6xl { + font-size: 4rem; + } + .lg\:leading-3 { line-height: .75rem; } @@ -39311,46 +39351,6 @@ video { color: #702459; } - .lg\:text-xs { - font-size: 0.75rem; - } - - .lg\:text-sm { - font-size: 0.875rem; - } - - .lg\:text-base { - font-size: 1rem; - } - - .lg\:text-lg { - font-size: 1.125rem; - } - - .lg\:text-xl { - font-size: 1.25rem; - } - - .lg\:text-2xl { - font-size: 1.5rem; - } - - .lg\:text-3xl { - font-size: 1.875rem; - } - - .lg\:text-4xl { - font-size: 2.25rem; - } - - .lg\:text-5xl { - font-size: 3rem; - } - - .lg\:text-6xl { - font-size: 4rem; - } - .lg\:italic { font-style: italic; } @@ -45493,6 +45493,46 @@ video { height: 100vh; } + .xl\:text-xs { + font-size: 0.75rem; + } + + .xl\:text-sm { + font-size: 0.875rem; + } + + .xl\:text-base { + font-size: 1rem; + } + + .xl\:text-lg { + font-size: 1.125rem; + } + + .xl\:text-xl { + font-size: 1.25rem; + } + + .xl\:text-2xl { + font-size: 1.5rem; + } + + .xl\:text-3xl { + font-size: 1.875rem; + } + + .xl\:text-4xl { + font-size: 2.25rem; + } + + .xl\:text-5xl { + font-size: 3rem; + } + + .xl\:text-6xl { + font-size: 4rem; + } + .xl\:leading-3 { line-height: .75rem; } @@ -49705,46 +49745,6 @@ video { color: #702459; } - .xl\:text-xs { - font-size: 0.75rem; - } - - .xl\:text-sm { - font-size: 0.875rem; - } - - .xl\:text-base { - font-size: 1rem; - } - - .xl\:text-lg { - font-size: 1.125rem; - } - - .xl\:text-xl { - font-size: 1.25rem; - } - - .xl\:text-2xl { - font-size: 1.5rem; - } - - .xl\:text-3xl { - font-size: 1.875rem; - } - - .xl\:text-4xl { - font-size: 2.25rem; - } - - .xl\:text-5xl { - font-size: 3rem; - } - - .xl\:text-6xl { - font-size: 4rem; - } - .xl\:italic { font-style: italic; } diff --git a/__tests__/plugins/fontSize.test.js b/__tests__/plugins/fontSize.test.js new file mode 100644 index 000000000000..431ccc052bec --- /dev/null +++ b/__tests__/plugins/fontSize.test.js @@ -0,0 +1,30 @@ +import invokePlugin from '../util/invokePlugin' +import plugin from '../../src/plugins/fontSize' + +test('font-size utilities can include a default line-height', () => { + const config = { + theme: { + fontSize: { + sm: '12px', + md: ['16px', '24px'], + lg: ['20px', '28px'], + }, + }, + variants: { + fontSize: ['responsive'], + }, + } + + const { utilities } = invokePlugin(plugin(), config) + + expect(utilities).toEqual([ + [ + { + '.text-sm': { 'font-size': '12px' }, + '.text-md': { 'font-size': '16px', 'line-height': '24px' }, + '.text-lg': { 'font-size': '20px', 'line-height': '28px' }, + }, + ['responsive'], + ], + ]) +}) diff --git a/src/corePlugins.js b/src/corePlugins.js index ce66a904904b..53d0c32804e9 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -126,6 +126,7 @@ export default function({ corePlugins: corePluginConfig }) { fontFamily, fontWeight, height, + fontSize, lineHeight, listStylePosition, listStyleType, @@ -152,7 +153,6 @@ export default function({ corePlugins: corePluginConfig }) { tableLayout, textAlign, textColor, - fontSize, fontStyle, textTransform, textDecoration, diff --git a/src/plugins/fontSize.js b/src/plugins/fontSize.js index 709cb0371995..ea06168a6fe5 100644 --- a/src/plugins/fontSize.js +++ b/src/plugins/fontSize.js @@ -4,10 +4,17 @@ export default function() { return function({ addUtilities, e, theme, variants }) { const utilities = _.fromPairs( _.map(theme('fontSize'), (value, modifier) => { + const [fontSize, lineHeight] = Array.isArray(value) ? value : [value] + return [ `.${e(`text-${modifier}`)}`, { - 'font-size': value, + 'font-size': fontSize, + ...(lineHeight === undefined + ? {} + : { + 'line-height': lineHeight, + }), }, ] }) From a85d4104c0523ded824a44377feb53ed7e5cf414 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 16 Apr 2020 13:52:55 +0000 Subject: [PATCH 36/52] Bump @babel/preset-env from 7.9.0 to 7.9.5 Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.9.0 to 7.9.5. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.9.0...v7.9.5) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 142 +++++++++++++++++++----------------------------------- 1 file changed, 50 insertions(+), 92 deletions(-) diff --git a/yarn.lock b/yarn.lock index 7bec6aaf9ce3..818db3dd167c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -81,15 +81,6 @@ "@babel/helper-explode-assignable-expression" "^7.8.3" "@babel/types" "^7.8.3" -"@babel/helper-call-delegate@^7.8.7": - version "7.8.7" - resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz#28a279c2e6c622a6233da548127f980751324cab" - integrity sha512-doAA5LAKhsFCR0LAFIf+r2RSMmC+m8f/oQ+URnUET/rWeEzC0yTRmAGyWkD4sSu3xwbS7MYQ2u+xlt1V5R56KQ== - dependencies: - "@babel/helper-hoist-variables" "^7.8.3" - "@babel/traverse" "^7.8.3" - "@babel/types" "^7.8.7" - "@babel/helper-compilation-targets@^7.8.7": version "7.8.7" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz#dac1eea159c0e4bd46e309b5a1b04a66b53c1dde" @@ -144,6 +135,15 @@ "@babel/template" "^7.8.3" "@babel/types" "^7.8.3" +"@babel/helper-function-name@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c" + integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw== + dependencies: + "@babel/helper-get-function-arity" "^7.8.3" + "@babel/template" "^7.8.3" + "@babel/types" "^7.9.5" + "@babel/helper-get-function-arity@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5" @@ -250,10 +250,10 @@ dependencies: "@babel/types" "^7.8.3" -"@babel/helper-validator-identifier@^7.9.0": - version "7.9.0" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz#ad53562a7fc29b3b9a91bbf7d10397fd146346ed" - integrity sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw== +"@babel/helper-validator-identifier@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80" + integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g== "@babel/helper-wrap-function@^7.8.3": version "7.8.3" @@ -343,13 +343,14 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-numeric-separator" "^7.8.3" -"@babel/plugin-proposal-object-rest-spread@^7.9.0": - version "7.9.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz#a28993699fc13df165995362693962ba6b061d6f" - integrity sha512-UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow== +"@babel/plugin-proposal-object-rest-spread@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz#3fd65911306d8746014ec0d0cf78f0e39a149116" + integrity sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg== dependencies: "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-object-rest-spread" "^7.8.0" + "@babel/plugin-transform-parameters" "^7.9.5" "@babel/plugin-proposal-optional-catch-binding@^7.8.3": version "7.8.3" @@ -375,14 +376,7 @@ "@babel/helper-create-regexp-features-plugin" "^7.8.8" "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-async-generators@^7.8.0": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.0.tgz#e6c3dba5a61ecf72ba00a3f3f5f1234989a58e6a" - integrity sha512-a8w8k7pK8nYhem07rXdAq03T+DlTX8LFojUptrh9JEx80AgLqGiuoFIyQOGTWif39kFnDOQqbzl1s6KQqrfV+A== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-async-generators@^7.8.4": +"@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== @@ -410,14 +404,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-json-strings@^7.8.0": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.0.tgz#7f798eb7e8cfd3821388120679d23d530bae6e53" - integrity sha512-LPykaAbH86L5NnDfCRSpNxtEHZk+6GaFzXfWEFU/6R4v69EXQr6GOp7hwH+Uw0QlYVN++s6TukTJ3flFcspahA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-json-strings@^7.8.3": +"@babel/plugin-syntax-json-strings@^7.8.0", "@babel/plugin-syntax-json-strings@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== @@ -431,14 +418,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.0.tgz#5d8f24ecffa4ae74164e53264953c5ea8ba6d149" - integrity sha512-Rv2hnBToN6rbA9hO2a4vtwXZLzNa+TWkoSIMMvUezFz5+D9NPeX7SFrArwtFzzbwndmWiqboTr5rNpzAz0MPpA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": +"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== @@ -452,42 +432,21 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-object-rest-spread@^7.8.0": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.0.tgz#9b37d580d459682364d8602494c69145b394fd4c" - integrity sha512-dt89fDlkfkTrQcy5KavMQPyF2A6tR0kYp8HAnIoQv5hO34iAUffHghP/hMGd7Gf/+uYTmLQO0ar7peX1SUWyIA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-object-rest-spread@^7.8.3": +"@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-optional-catch-binding@^7.8.0": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.0.tgz#180c7bdd6b7fd81cc6d18269de12d5ddd60cabce" - integrity sha512-EIgJVy+u1RvR2gJfX4ReLwAupO/twllUue1wPrRxhu18+eC3bGTEcOSXLQdaE9ya9NG1rE0eQs0GSiloUGFEwg== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-catch-binding@^7.8.3": +"@babel/plugin-syntax-optional-catch-binding@^7.8.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-optional-chaining@^7.8.0": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.0.tgz#c40f4d4d6a4f5e71d2bfd949b0a7f1e1e6792fe0" - integrity sha512-LV1c+TTAO8Vawe3t+WXBHYWbS7endP8MSlqKPKEZOyWPEJX2akl3jfvFG828/OE7RpyoC3JXfLJDFj/jN7A8hg== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-chaining@^7.8.3": +"@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== @@ -532,14 +491,14 @@ "@babel/helper-plugin-utils" "^7.8.3" lodash "^4.17.13" -"@babel/plugin-transform-classes@^7.9.0": - version "7.9.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz#8603fc3cc449e31fdbdbc257f67717536a11af8d" - integrity sha512-TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ== +"@babel/plugin-transform-classes@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz#800597ddb8aefc2c293ed27459c1fcc935a26c2c" + integrity sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg== dependencies: "@babel/helper-annotate-as-pure" "^7.8.3" "@babel/helper-define-map" "^7.8.3" - "@babel/helper-function-name" "^7.8.3" + "@babel/helper-function-name" "^7.9.5" "@babel/helper-optimise-call-expression" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" "@babel/helper-replace-supers" "^7.8.6" @@ -553,10 +512,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-destructuring@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.3.tgz#20ddfbd9e4676906b1056ee60af88590cc7aaa0b" - integrity sha512-H4X646nCkiEcHZUZaRkhE2XVsoz0J/1x3VVujnn96pSoGCtKPA99ZZA+va+gK+92Zycd6OBKCD8tDb/731bhgQ== +"@babel/plugin-transform-destructuring@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz#72c97cf5f38604aea3abf3b935b0e17b1db76a50" + integrity sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q== dependencies: "@babel/helper-plugin-utils" "^7.8.3" @@ -671,12 +630,11 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/helper-replace-supers" "^7.8.3" -"@babel/plugin-transform-parameters@^7.8.7": - version "7.8.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.7.tgz#66fa2f1de4129b4e0447509223ac71bda4955395" - integrity sha512-brYWaEPTRimOctz2NDA3jnBbDi7SVN2T4wYuu0aqSzxC3nozFZngGaw29CJ9ZPweB7k+iFmZuoG3IVPIcXmD2g== +"@babel/plugin-transform-parameters@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795" + integrity sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA== dependencies: - "@babel/helper-call-delegate" "^7.8.7" "@babel/helper-get-function-arity" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" @@ -747,9 +705,9 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/preset-env@^7.0.0": - version "7.9.0" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.0.tgz#a5fc42480e950ae8f5d9f8f2bbc03f52722df3a8" - integrity sha512-712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ== + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.5.tgz#8ddc76039bc45b774b19e2fc548f6807d8a8919f" + integrity sha512-eWGYeADTlPJH+wq1F0wNfPbVS1w1wtmMJiYk55Td5Yu28AsdR9AsC97sZ0Qq8fHqQuslVSIYSGJMcblr345GfQ== dependencies: "@babel/compat-data" "^7.9.0" "@babel/helper-compilation-targets" "^7.8.7" @@ -760,7 +718,7 @@ "@babel/plugin-proposal-json-strings" "^7.8.3" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3" "@babel/plugin-proposal-numeric-separator" "^7.8.3" - "@babel/plugin-proposal-object-rest-spread" "^7.9.0" + "@babel/plugin-proposal-object-rest-spread" "^7.9.5" "@babel/plugin-proposal-optional-catch-binding" "^7.8.3" "@babel/plugin-proposal-optional-chaining" "^7.9.0" "@babel/plugin-proposal-unicode-property-regex" "^7.8.3" @@ -777,9 +735,9 @@ "@babel/plugin-transform-async-to-generator" "^7.8.3" "@babel/plugin-transform-block-scoped-functions" "^7.8.3" "@babel/plugin-transform-block-scoping" "^7.8.3" - "@babel/plugin-transform-classes" "^7.9.0" + "@babel/plugin-transform-classes" "^7.9.5" "@babel/plugin-transform-computed-properties" "^7.8.3" - "@babel/plugin-transform-destructuring" "^7.8.3" + "@babel/plugin-transform-destructuring" "^7.9.5" "@babel/plugin-transform-dotall-regex" "^7.8.3" "@babel/plugin-transform-duplicate-keys" "^7.8.3" "@babel/plugin-transform-exponentiation-operator" "^7.8.3" @@ -794,7 +752,7 @@ "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3" "@babel/plugin-transform-new-target" "^7.8.3" "@babel/plugin-transform-object-super" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.8.7" + "@babel/plugin-transform-parameters" "^7.9.5" "@babel/plugin-transform-property-literals" "^7.8.3" "@babel/plugin-transform-regenerator" "^7.8.7" "@babel/plugin-transform-reserved-words" "^7.8.3" @@ -805,7 +763,7 @@ "@babel/plugin-transform-typeof-symbol" "^7.8.4" "@babel/plugin-transform-unicode-regex" "^7.8.3" "@babel/preset-modules" "^0.1.3" - "@babel/types" "^7.9.0" + "@babel/types" "^7.9.5" browserslist "^4.9.1" core-js-compat "^3.6.2" invariant "^2.2.2" @@ -865,12 +823,12 @@ globals "^11.1.0" lodash "^4.17.13" -"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7", "@babel/types@^7.9.0": - version "7.9.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.0.tgz#00b064c3df83ad32b2dbf5ff07312b15c7f1efb5" - integrity sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng== +"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.5.tgz#89231f82915a8a566a703b3b20133f73da6b9444" + integrity sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg== dependencies: - "@babel/helper-validator-identifier" "^7.9.0" + "@babel/helper-validator-identifier" "^7.9.5" lodash "^4.17.13" to-fast-properties "^2.0.0" From a1cfa000333227357bf1fc747620147a50be718d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 16 Apr 2020 13:53:16 +0000 Subject: [PATCH 37/52] Bump eslint-plugin-prettier from 3.1.2 to 3.1.3 Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases) - [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md) - [Commits](https://github.com/prettier/eslint-plugin-prettier/commits) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 7bec6aaf9ce3..1ddf0ffcc22e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2062,9 +2062,9 @@ eslint-config-prettier@^6.0.0: get-stdin "^6.0.0" eslint-plugin-prettier@^3.0.1: - version "3.1.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.2.tgz#432e5a667666ab84ce72f945c72f77d996a5c9ba" - integrity sha512-GlolCC9y3XZfv3RQfwGew7NnuFDKsfI4lbvRK+PIIo23SFH+LemGs4cKwzAaRa+Mdb+lQO/STaIayno8T5sJJA== + version "3.1.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.3.tgz#ae116a0fc0e598fdae48743a4430903de5b4e6ca" + integrity sha512-+HG5jmu/dN3ZV3T6eCD7a4BlAySdN7mLIbJYo0z1cFQuI+r2DiTJEFeF68ots93PsnrMxbzIZ2S/ieX+mkrBeQ== dependencies: prettier-linter-helpers "^1.0.0" From c84c397f0b25c9ff4442359078b5b0dc26988de9 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 16 Apr 2020 10:45:05 -0400 Subject: [PATCH 38/52] Add stack-x and stack-y utilities --- .../fixtures/tailwind-output-important.css | 152 ++++++++++++++++++ __tests__/fixtures/tailwind-output.css | 152 ++++++++++++++++++ __tests__/plugins/stack.test.js | 44 +++++ src/corePlugins.js | 2 + src/plugins/stack.js | 18 +++ stubs/defaultConfig.stub.js | 1 + 6 files changed, 369 insertions(+) create mode 100644 __tests__/plugins/stack.test.js create mode 100644 src/plugins/stack.js diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index 513c74bd7120..24040287ec06 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -606,6 +606,158 @@ video { } } +.stack-y-0 > * + * { + margin-top: 0 !important; +} + +.stack-x-0 > * + * { + margin-left: 0 !important; +} + +.stack-y-1 > * + * { + margin-top: 0.25rem !important; +} + +.stack-x-1 > * + * { + margin-left: 0.25rem !important; +} + +.stack-y-2 > * + * { + margin-top: 0.5rem !important; +} + +.stack-x-2 > * + * { + margin-left: 0.5rem !important; +} + +.stack-y-3 > * + * { + margin-top: 0.75rem !important; +} + +.stack-x-3 > * + * { + margin-left: 0.75rem !important; +} + +.stack-y-4 > * + * { + margin-top: 1rem !important; +} + +.stack-x-4 > * + * { + margin-left: 1rem !important; +} + +.stack-y-5 > * + * { + margin-top: 1.25rem !important; +} + +.stack-x-5 > * + * { + margin-left: 1.25rem !important; +} + +.stack-y-6 > * + * { + margin-top: 1.5rem !important; +} + +.stack-x-6 > * + * { + margin-left: 1.5rem !important; +} + +.stack-y-8 > * + * { + margin-top: 2rem !important; +} + +.stack-x-8 > * + * { + margin-left: 2rem !important; +} + +.stack-y-10 > * + * { + margin-top: 2.5rem !important; +} + +.stack-x-10 > * + * { + margin-left: 2.5rem !important; +} + +.stack-y-12 > * + * { + margin-top: 3rem !important; +} + +.stack-x-12 > * + * { + margin-left: 3rem !important; +} + +.stack-y-16 > * + * { + margin-top: 4rem !important; +} + +.stack-x-16 > * + * { + margin-left: 4rem !important; +} + +.stack-y-20 > * + * { + margin-top: 5rem !important; +} + +.stack-x-20 > * + * { + margin-left: 5rem !important; +} + +.stack-y-24 > * + * { + margin-top: 6rem !important; +} + +.stack-x-24 > * + * { + margin-left: 6rem !important; +} + +.stack-y-32 > * + * { + margin-top: 8rem !important; +} + +.stack-x-32 > * + * { + margin-left: 8rem !important; +} + +.stack-y-40 > * + * { + margin-top: 10rem !important; +} + +.stack-x-40 > * + * { + margin-left: 10rem !important; +} + +.stack-y-48 > * + * { + margin-top: 12rem !important; +} + +.stack-x-48 > * + * { + margin-left: 12rem !important; +} + +.stack-y-56 > * + * { + margin-top: 14rem !important; +} + +.stack-x-56 > * + * { + margin-left: 14rem !important; +} + +.stack-y-64 > * + * { + margin-top: 16rem !important; +} + +.stack-x-64 > * + * { + margin-left: 16rem !important; +} + +.stack-y-px > * + * { + margin-top: 1px !important; +} + +.stack-x-px > * + * { + margin-left: 1px !important; +} + .sr-only { position: absolute !important; width: 1px !important; diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index 0136ffc83734..a66f47fcc3a9 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -606,6 +606,158 @@ video { } } +.stack-y-0 > * + * { + margin-top: 0; +} + +.stack-x-0 > * + * { + margin-left: 0; +} + +.stack-y-1 > * + * { + margin-top: 0.25rem; +} + +.stack-x-1 > * + * { + margin-left: 0.25rem; +} + +.stack-y-2 > * + * { + margin-top: 0.5rem; +} + +.stack-x-2 > * + * { + margin-left: 0.5rem; +} + +.stack-y-3 > * + * { + margin-top: 0.75rem; +} + +.stack-x-3 > * + * { + margin-left: 0.75rem; +} + +.stack-y-4 > * + * { + margin-top: 1rem; +} + +.stack-x-4 > * + * { + margin-left: 1rem; +} + +.stack-y-5 > * + * { + margin-top: 1.25rem; +} + +.stack-x-5 > * + * { + margin-left: 1.25rem; +} + +.stack-y-6 > * + * { + margin-top: 1.5rem; +} + +.stack-x-6 > * + * { + margin-left: 1.5rem; +} + +.stack-y-8 > * + * { + margin-top: 2rem; +} + +.stack-x-8 > * + * { + margin-left: 2rem; +} + +.stack-y-10 > * + * { + margin-top: 2.5rem; +} + +.stack-x-10 > * + * { + margin-left: 2.5rem; +} + +.stack-y-12 > * + * { + margin-top: 3rem; +} + +.stack-x-12 > * + * { + margin-left: 3rem; +} + +.stack-y-16 > * + * { + margin-top: 4rem; +} + +.stack-x-16 > * + * { + margin-left: 4rem; +} + +.stack-y-20 > * + * { + margin-top: 5rem; +} + +.stack-x-20 > * + * { + margin-left: 5rem; +} + +.stack-y-24 > * + * { + margin-top: 6rem; +} + +.stack-x-24 > * + * { + margin-left: 6rem; +} + +.stack-y-32 > * + * { + margin-top: 8rem; +} + +.stack-x-32 > * + * { + margin-left: 8rem; +} + +.stack-y-40 > * + * { + margin-top: 10rem; +} + +.stack-x-40 > * + * { + margin-left: 10rem; +} + +.stack-y-48 > * + * { + margin-top: 12rem; +} + +.stack-x-48 > * + * { + margin-left: 12rem; +} + +.stack-y-56 > * + * { + margin-top: 14rem; +} + +.stack-x-56 > * + * { + margin-left: 14rem; +} + +.stack-y-64 > * + * { + margin-top: 16rem; +} + +.stack-x-64 > * + * { + margin-left: 16rem; +} + +.stack-y-px > * + * { + margin-top: 1px; +} + +.stack-x-px > * + * { + margin-left: 1px; +} + .sr-only { position: absolute; width: 1px; diff --git a/__tests__/plugins/stack.test.js b/__tests__/plugins/stack.test.js new file mode 100644 index 000000000000..616c51197d57 --- /dev/null +++ b/__tests__/plugins/stack.test.js @@ -0,0 +1,44 @@ +import invokePlugin from '../util/invokePlugin' +import plugin from '../../src/plugins/stack' + +test('generating stack utilities', () => { + const config = { + theme: { + stack: { + '1': '1px', + '2': '2px', + '4': '4px', + '8': '8px', + }, + }, + variants: { + stack: ['responsive'], + }, + } + + const { utilities } = invokePlugin(plugin(), config) + + expect(utilities).toEqual([ + [ + [ + { + '.stack-y-1 > * + *': { 'margin-top': '1px' }, + '.stack-x-1 > * + *': { 'margin-left': '1px' }, + }, + { + '.stack-y-2 > * + *': { 'margin-top': '2px' }, + '.stack-x-2 > * + *': { 'margin-left': '2px' }, + }, + { + '.stack-y-4 > * + *': { 'margin-top': '4px' }, + '.stack-x-4 > * + *': { 'margin-left': '4px' }, + }, + { + '.stack-y-8 > * + *': { 'margin-top': '8px' }, + '.stack-x-8 > * + *': { 'margin-left': '8px' }, + }, + ], + ['responsive'], + ], + ]) +}) diff --git a/src/corePlugins.js b/src/corePlugins.js index ce66a904904b..0cfcac3d7df7 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -1,5 +1,6 @@ import preflight from './plugins/preflight' import container from './plugins/container' +import stack from './plugins/stack' import accessibility from './plugins/accessibility' import appearance from './plugins/appearance' import backgroundAttachment from './plugins/backgroundAttachment' @@ -96,6 +97,7 @@ export default function({ corePlugins: corePluginConfig }) { return configurePlugins(corePluginConfig, { preflight, container, + stack, accessibility, appearance, backgroundAttachment, diff --git a/src/plugins/stack.js b/src/plugins/stack.js new file mode 100644 index 000000000000..dd8195c9d950 --- /dev/null +++ b/src/plugins/stack.js @@ -0,0 +1,18 @@ +import _ from 'lodash' + +export default function() { + return function({ addUtilities, e, theme, variants }) { + const generators = [ + (size, modifier) => ({ + [`.${e(`stack-y-${modifier}`)} > * + *`]: { 'margin-top': `${size}` }, + [`.${e(`stack-x-${modifier}`)} > * + *`]: { 'margin-left': `${size}` }, + }), + ] + + const utilities = _.flatMap(generators, generator => { + return _.flatMap(theme('stack'), generator) + }) + + addUtilities(utilities, variants('stack')) + } +} diff --git a/stubs/defaultConfig.stub.js b/stubs/defaultConfig.stub.js index a1cc24a983f3..b6ad0005a5fd 100644 --- a/stubs/defaultConfig.stub.js +++ b/stubs/defaultConfig.stub.js @@ -374,6 +374,7 @@ module.exports = { }, padding: theme => theme('spacing'), placeholderColor: theme => theme('colors'), + stack: theme => theme('spacing'), stroke: { current: 'currentColor', }, From b447cd6ccd54b147128d46e5ee9bdf760fd66cdd Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 16 Apr 2020 10:53:19 -0400 Subject: [PATCH 39/52] Add divideWidth plugin --- .../fixtures/tailwind-output-important.css | 40 +++++++++++++++++ __tests__/fixtures/tailwind-output.css | 40 +++++++++++++++++ __tests__/plugins/divideWidth.test.js | 44 +++++++++++++++++++ src/corePlugins.js | 2 + src/plugins/divideWidth.js | 20 +++++++++ stubs/defaultConfig.stub.js | 1 + 6 files changed, 147 insertions(+) create mode 100644 __tests__/plugins/divideWidth.test.js create mode 100644 src/plugins/divideWidth.js diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index 24040287ec06..f96fc3de2cd8 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -758,6 +758,46 @@ video { margin-left: 1px !important; } +.divide-y-0 > * + * { + border-top-width: 0 !important; +} + +.divide-x-0 > * + * { + border-left-width: 0 !important; +} + +.divide-y-2 > * + * { + border-top-width: 2px !important; +} + +.divide-x-2 > * + * { + border-left-width: 2px !important; +} + +.divide-y-4 > * + * { + border-top-width: 4px !important; +} + +.divide-x-4 > * + * { + border-left-width: 4px !important; +} + +.divide-y-8 > * + * { + border-top-width: 8px !important; +} + +.divide-x-8 > * + * { + border-left-width: 8px !important; +} + +.divide-y > * + * { + border-top-width: 1px !important; +} + +.divide-x > * + * { + border-left-width: 1px !important; +} + .sr-only { position: absolute !important; width: 1px !important; diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index a66f47fcc3a9..a9076ae42ef1 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -758,6 +758,46 @@ video { margin-left: 1px; } +.divide-y-0 > * + * { + border-top-width: 0; +} + +.divide-x-0 > * + * { + border-left-width: 0; +} + +.divide-y-2 > * + * { + border-top-width: 2px; +} + +.divide-x-2 > * + * { + border-left-width: 2px; +} + +.divide-y-4 > * + * { + border-top-width: 4px; +} + +.divide-x-4 > * + * { + border-left-width: 4px; +} + +.divide-y-8 > * + * { + border-top-width: 8px; +} + +.divide-x-8 > * + * { + border-left-width: 8px; +} + +.divide-y > * + * { + border-top-width: 1px; +} + +.divide-x > * + * { + border-left-width: 1px; +} + .sr-only { position: absolute; width: 1px; diff --git a/__tests__/plugins/divideWidth.test.js b/__tests__/plugins/divideWidth.test.js new file mode 100644 index 000000000000..b13cc591d16c --- /dev/null +++ b/__tests__/plugins/divideWidth.test.js @@ -0,0 +1,44 @@ +import invokePlugin from '../util/invokePlugin' +import plugin from '../../src/plugins/divideWidth' + +test('generating divide width utilities', () => { + const config = { + theme: { + divideWidth: { + default: '1px', + '2': '2px', + '4': '4px', + '8': '8px', + }, + }, + variants: { + divideWidth: ['responsive'], + }, + } + + const { utilities } = invokePlugin(plugin(), config) + + expect(utilities).toEqual([ + [ + [ + { + '.divide-y-2 > * + *': { 'border-top-width': '2px' }, + '.divide-x-2 > * + *': { 'border-left-width': '2px' }, + }, + { + '.divide-y-4 > * + *': { 'border-top-width': '4px' }, + '.divide-x-4 > * + *': { 'border-left-width': '4px' }, + }, + { + '.divide-y-8 > * + *': { 'border-top-width': '8px' }, + '.divide-x-8 > * + *': { 'border-left-width': '8px' }, + }, + { + '.divide-y > * + *': { 'border-top-width': '1px' }, + '.divide-x > * + *': { 'border-left-width': '1px' }, + }, + ], + ['responsive'], + ], + ]) +}) diff --git a/src/corePlugins.js b/src/corePlugins.js index 0cfcac3d7df7..5f72a29ae7e7 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -1,6 +1,7 @@ import preflight from './plugins/preflight' import container from './plugins/container' import stack from './plugins/stack' +import divideWidth from './plugins/divideWidth' import accessibility from './plugins/accessibility' import appearance from './plugins/appearance' import backgroundAttachment from './plugins/backgroundAttachment' @@ -98,6 +99,7 @@ export default function({ corePlugins: corePluginConfig }) { preflight, container, stack, + divideWidth, accessibility, appearance, backgroundAttachment, diff --git a/src/plugins/divideWidth.js b/src/plugins/divideWidth.js new file mode 100644 index 000000000000..52a36047a645 --- /dev/null +++ b/src/plugins/divideWidth.js @@ -0,0 +1,20 @@ +import _ from 'lodash' + +export default function() { + return function({ addUtilities, e, theme, variants }) { + const generators = [ + (value, modifier) => ({ + [`.${e(`divide-y${modifier}`)} > * + *`]: { 'border-top-width': `${value}` }, + [`.${e(`divide-x${modifier}`)} > * + *`]: { 'border-left-width': `${value}` }, + }), + ] + + const utilities = _.flatMap(generators, generator => { + return _.flatMap(theme('divideWidth'), (value, modifier) => { + return generator(value, modifier === 'default' ? '' : `-${modifier}`) + }) + }) + + addUtilities(utilities, variants('divideWidth')) + } +} diff --git a/stubs/defaultConfig.stub.js b/stubs/defaultConfig.stub.js index b6ad0005a5fd..ab7dd497b674 100644 --- a/stubs/defaultConfig.stub.js +++ b/stubs/defaultConfig.stub.js @@ -206,6 +206,7 @@ module.exports = { move: 'move', 'not-allowed': 'not-allowed', }, + divideWidth: theme => theme('borderWidth'), fill: { current: 'currentColor', }, From 3143f20850c1818712b54e298ebb36dea426b688 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 16 Apr 2020 11:01:24 -0400 Subject: [PATCH 40/52] Add divideColor utilities --- .../fixtures/tailwind-output-important.css | 376 ++++++++++++++++++ __tests__/fixtures/tailwind-output.css | 376 ++++++++++++++++++ __tests__/plugins/divideColor.test.js | 61 +++ src/corePlugins.js | 2 + src/plugins/divideColor.js | 21 + stubs/defaultConfig.stub.js | 1 + 6 files changed, 837 insertions(+) create mode 100644 __tests__/plugins/divideColor.test.js create mode 100644 src/plugins/divideColor.js diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index f96fc3de2cd8..0f9d51eec6e2 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -798,6 +798,382 @@ video { border-left-width: 1px !important; } +.divide-transparent > * + * { + border-color: transparent !important; +} + +.divide-current > * + * { + border-color: currentColor !important; +} + +.divide-black > * + * { + border-color: #000 !important; +} + +.divide-white > * + * { + border-color: #fff !important; +} + +.divide-gray-100 > * + * { + border-color: #f7fafc !important; +} + +.divide-gray-200 > * + * { + border-color: #edf2f7 !important; +} + +.divide-gray-300 > * + * { + border-color: #e2e8f0 !important; +} + +.divide-gray-400 > * + * { + border-color: #cbd5e0 !important; +} + +.divide-gray-500 > * + * { + border-color: #a0aec0 !important; +} + +.divide-gray-600 > * + * { + border-color: #718096 !important; +} + +.divide-gray-700 > * + * { + border-color: #4a5568 !important; +} + +.divide-gray-800 > * + * { + border-color: #2d3748 !important; +} + +.divide-gray-900 > * + * { + border-color: #1a202c !important; +} + +.divide-red-100 > * + * { + border-color: #fff5f5 !important; +} + +.divide-red-200 > * + * { + border-color: #fed7d7 !important; +} + +.divide-red-300 > * + * { + border-color: #feb2b2 !important; +} + +.divide-red-400 > * + * { + border-color: #fc8181 !important; +} + +.divide-red-500 > * + * { + border-color: #f56565 !important; +} + +.divide-red-600 > * + * { + border-color: #e53e3e !important; +} + +.divide-red-700 > * + * { + border-color: #c53030 !important; +} + +.divide-red-800 > * + * { + border-color: #9b2c2c !important; +} + +.divide-red-900 > * + * { + border-color: #742a2a !important; +} + +.divide-orange-100 > * + * { + border-color: #fffaf0 !important; +} + +.divide-orange-200 > * + * { + border-color: #feebc8 !important; +} + +.divide-orange-300 > * + * { + border-color: #fbd38d !important; +} + +.divide-orange-400 > * + * { + border-color: #f6ad55 !important; +} + +.divide-orange-500 > * + * { + border-color: #ed8936 !important; +} + +.divide-orange-600 > * + * { + border-color: #dd6b20 !important; +} + +.divide-orange-700 > * + * { + border-color: #c05621 !important; +} + +.divide-orange-800 > * + * { + border-color: #9c4221 !important; +} + +.divide-orange-900 > * + * { + border-color: #7b341e !important; +} + +.divide-yellow-100 > * + * { + border-color: #fffff0 !important; +} + +.divide-yellow-200 > * + * { + border-color: #fefcbf !important; +} + +.divide-yellow-300 > * + * { + border-color: #faf089 !important; +} + +.divide-yellow-400 > * + * { + border-color: #f6e05e !important; +} + +.divide-yellow-500 > * + * { + border-color: #ecc94b !important; +} + +.divide-yellow-600 > * + * { + border-color: #d69e2e !important; +} + +.divide-yellow-700 > * + * { + border-color: #b7791f !important; +} + +.divide-yellow-800 > * + * { + border-color: #975a16 !important; +} + +.divide-yellow-900 > * + * { + border-color: #744210 !important; +} + +.divide-green-100 > * + * { + border-color: #f0fff4 !important; +} + +.divide-green-200 > * + * { + border-color: #c6f6d5 !important; +} + +.divide-green-300 > * + * { + border-color: #9ae6b4 !important; +} + +.divide-green-400 > * + * { + border-color: #68d391 !important; +} + +.divide-green-500 > * + * { + border-color: #48bb78 !important; +} + +.divide-green-600 > * + * { + border-color: #38a169 !important; +} + +.divide-green-700 > * + * { + border-color: #2f855a !important; +} + +.divide-green-800 > * + * { + border-color: #276749 !important; +} + +.divide-green-900 > * + * { + border-color: #22543d !important; +} + +.divide-teal-100 > * + * { + border-color: #e6fffa !important; +} + +.divide-teal-200 > * + * { + border-color: #b2f5ea !important; +} + +.divide-teal-300 > * + * { + border-color: #81e6d9 !important; +} + +.divide-teal-400 > * + * { + border-color: #4fd1c5 !important; +} + +.divide-teal-500 > * + * { + border-color: #38b2ac !important; +} + +.divide-teal-600 > * + * { + border-color: #319795 !important; +} + +.divide-teal-700 > * + * { + border-color: #2c7a7b !important; +} + +.divide-teal-800 > * + * { + border-color: #285e61 !important; +} + +.divide-teal-900 > * + * { + border-color: #234e52 !important; +} + +.divide-blue-100 > * + * { + border-color: #ebf8ff !important; +} + +.divide-blue-200 > * + * { + border-color: #bee3f8 !important; +} + +.divide-blue-300 > * + * { + border-color: #90cdf4 !important; +} + +.divide-blue-400 > * + * { + border-color: #63b3ed !important; +} + +.divide-blue-500 > * + * { + border-color: #4299e1 !important; +} + +.divide-blue-600 > * + * { + border-color: #3182ce !important; +} + +.divide-blue-700 > * + * { + border-color: #2b6cb0 !important; +} + +.divide-blue-800 > * + * { + border-color: #2c5282 !important; +} + +.divide-blue-900 > * + * { + border-color: #2a4365 !important; +} + +.divide-indigo-100 > * + * { + border-color: #ebf4ff !important; +} + +.divide-indigo-200 > * + * { + border-color: #c3dafe !important; +} + +.divide-indigo-300 > * + * { + border-color: #a3bffa !important; +} + +.divide-indigo-400 > * + * { + border-color: #7f9cf5 !important; +} + +.divide-indigo-500 > * + * { + border-color: #667eea !important; +} + +.divide-indigo-600 > * + * { + border-color: #5a67d8 !important; +} + +.divide-indigo-700 > * + * { + border-color: #4c51bf !important; +} + +.divide-indigo-800 > * + * { + border-color: #434190 !important; +} + +.divide-indigo-900 > * + * { + border-color: #3c366b !important; +} + +.divide-purple-100 > * + * { + border-color: #faf5ff !important; +} + +.divide-purple-200 > * + * { + border-color: #e9d8fd !important; +} + +.divide-purple-300 > * + * { + border-color: #d6bcfa !important; +} + +.divide-purple-400 > * + * { + border-color: #b794f4 !important; +} + +.divide-purple-500 > * + * { + border-color: #9f7aea !important; +} + +.divide-purple-600 > * + * { + border-color: #805ad5 !important; +} + +.divide-purple-700 > * + * { + border-color: #6b46c1 !important; +} + +.divide-purple-800 > * + * { + border-color: #553c9a !important; +} + +.divide-purple-900 > * + * { + border-color: #44337a !important; +} + +.divide-pink-100 > * + * { + border-color: #fff5f7 !important; +} + +.divide-pink-200 > * + * { + border-color: #fed7e2 !important; +} + +.divide-pink-300 > * + * { + border-color: #fbb6ce !important; +} + +.divide-pink-400 > * + * { + border-color: #f687b3 !important; +} + +.divide-pink-500 > * + * { + border-color: #ed64a6 !important; +} + +.divide-pink-600 > * + * { + border-color: #d53f8c !important; +} + +.divide-pink-700 > * + * { + border-color: #b83280 !important; +} + +.divide-pink-800 > * + * { + border-color: #97266d !important; +} + +.divide-pink-900 > * + * { + border-color: #702459 !important; +} + .sr-only { position: absolute !important; width: 1px !important; diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index a9076ae42ef1..b0aac92a48f9 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -798,6 +798,382 @@ video { border-left-width: 1px; } +.divide-transparent > * + * { + border-color: transparent; +} + +.divide-current > * + * { + border-color: currentColor; +} + +.divide-black > * + * { + border-color: #000; +} + +.divide-white > * + * { + border-color: #fff; +} + +.divide-gray-100 > * + * { + border-color: #f7fafc; +} + +.divide-gray-200 > * + * { + border-color: #edf2f7; +} + +.divide-gray-300 > * + * { + border-color: #e2e8f0; +} + +.divide-gray-400 > * + * { + border-color: #cbd5e0; +} + +.divide-gray-500 > * + * { + border-color: #a0aec0; +} + +.divide-gray-600 > * + * { + border-color: #718096; +} + +.divide-gray-700 > * + * { + border-color: #4a5568; +} + +.divide-gray-800 > * + * { + border-color: #2d3748; +} + +.divide-gray-900 > * + * { + border-color: #1a202c; +} + +.divide-red-100 > * + * { + border-color: #fff5f5; +} + +.divide-red-200 > * + * { + border-color: #fed7d7; +} + +.divide-red-300 > * + * { + border-color: #feb2b2; +} + +.divide-red-400 > * + * { + border-color: #fc8181; +} + +.divide-red-500 > * + * { + border-color: #f56565; +} + +.divide-red-600 > * + * { + border-color: #e53e3e; +} + +.divide-red-700 > * + * { + border-color: #c53030; +} + +.divide-red-800 > * + * { + border-color: #9b2c2c; +} + +.divide-red-900 > * + * { + border-color: #742a2a; +} + +.divide-orange-100 > * + * { + border-color: #fffaf0; +} + +.divide-orange-200 > * + * { + border-color: #feebc8; +} + +.divide-orange-300 > * + * { + border-color: #fbd38d; +} + +.divide-orange-400 > * + * { + border-color: #f6ad55; +} + +.divide-orange-500 > * + * { + border-color: #ed8936; +} + +.divide-orange-600 > * + * { + border-color: #dd6b20; +} + +.divide-orange-700 > * + * { + border-color: #c05621; +} + +.divide-orange-800 > * + * { + border-color: #9c4221; +} + +.divide-orange-900 > * + * { + border-color: #7b341e; +} + +.divide-yellow-100 > * + * { + border-color: #fffff0; +} + +.divide-yellow-200 > * + * { + border-color: #fefcbf; +} + +.divide-yellow-300 > * + * { + border-color: #faf089; +} + +.divide-yellow-400 > * + * { + border-color: #f6e05e; +} + +.divide-yellow-500 > * + * { + border-color: #ecc94b; +} + +.divide-yellow-600 > * + * { + border-color: #d69e2e; +} + +.divide-yellow-700 > * + * { + border-color: #b7791f; +} + +.divide-yellow-800 > * + * { + border-color: #975a16; +} + +.divide-yellow-900 > * + * { + border-color: #744210; +} + +.divide-green-100 > * + * { + border-color: #f0fff4; +} + +.divide-green-200 > * + * { + border-color: #c6f6d5; +} + +.divide-green-300 > * + * { + border-color: #9ae6b4; +} + +.divide-green-400 > * + * { + border-color: #68d391; +} + +.divide-green-500 > * + * { + border-color: #48bb78; +} + +.divide-green-600 > * + * { + border-color: #38a169; +} + +.divide-green-700 > * + * { + border-color: #2f855a; +} + +.divide-green-800 > * + * { + border-color: #276749; +} + +.divide-green-900 > * + * { + border-color: #22543d; +} + +.divide-teal-100 > * + * { + border-color: #e6fffa; +} + +.divide-teal-200 > * + * { + border-color: #b2f5ea; +} + +.divide-teal-300 > * + * { + border-color: #81e6d9; +} + +.divide-teal-400 > * + * { + border-color: #4fd1c5; +} + +.divide-teal-500 > * + * { + border-color: #38b2ac; +} + +.divide-teal-600 > * + * { + border-color: #319795; +} + +.divide-teal-700 > * + * { + border-color: #2c7a7b; +} + +.divide-teal-800 > * + * { + border-color: #285e61; +} + +.divide-teal-900 > * + * { + border-color: #234e52; +} + +.divide-blue-100 > * + * { + border-color: #ebf8ff; +} + +.divide-blue-200 > * + * { + border-color: #bee3f8; +} + +.divide-blue-300 > * + * { + border-color: #90cdf4; +} + +.divide-blue-400 > * + * { + border-color: #63b3ed; +} + +.divide-blue-500 > * + * { + border-color: #4299e1; +} + +.divide-blue-600 > * + * { + border-color: #3182ce; +} + +.divide-blue-700 > * + * { + border-color: #2b6cb0; +} + +.divide-blue-800 > * + * { + border-color: #2c5282; +} + +.divide-blue-900 > * + * { + border-color: #2a4365; +} + +.divide-indigo-100 > * + * { + border-color: #ebf4ff; +} + +.divide-indigo-200 > * + * { + border-color: #c3dafe; +} + +.divide-indigo-300 > * + * { + border-color: #a3bffa; +} + +.divide-indigo-400 > * + * { + border-color: #7f9cf5; +} + +.divide-indigo-500 > * + * { + border-color: #667eea; +} + +.divide-indigo-600 > * + * { + border-color: #5a67d8; +} + +.divide-indigo-700 > * + * { + border-color: #4c51bf; +} + +.divide-indigo-800 > * + * { + border-color: #434190; +} + +.divide-indigo-900 > * + * { + border-color: #3c366b; +} + +.divide-purple-100 > * + * { + border-color: #faf5ff; +} + +.divide-purple-200 > * + * { + border-color: #e9d8fd; +} + +.divide-purple-300 > * + * { + border-color: #d6bcfa; +} + +.divide-purple-400 > * + * { + border-color: #b794f4; +} + +.divide-purple-500 > * + * { + border-color: #9f7aea; +} + +.divide-purple-600 > * + * { + border-color: #805ad5; +} + +.divide-purple-700 > * + * { + border-color: #6b46c1; +} + +.divide-purple-800 > * + * { + border-color: #553c9a; +} + +.divide-purple-900 > * + * { + border-color: #44337a; +} + +.divide-pink-100 > * + * { + border-color: #fff5f7; +} + +.divide-pink-200 > * + * { + border-color: #fed7e2; +} + +.divide-pink-300 > * + * { + border-color: #fbb6ce; +} + +.divide-pink-400 > * + * { + border-color: #f687b3; +} + +.divide-pink-500 > * + * { + border-color: #ed64a6; +} + +.divide-pink-600 > * + * { + border-color: #d53f8c; +} + +.divide-pink-700 > * + * { + border-color: #b83280; +} + +.divide-pink-800 > * + * { + border-color: #97266d; +} + +.divide-pink-900 > * + * { + border-color: #702459; +} + .sr-only { position: absolute; width: 1px; diff --git a/__tests__/plugins/divideColor.test.js b/__tests__/plugins/divideColor.test.js new file mode 100644 index 000000000000..8d73795400a2 --- /dev/null +++ b/__tests__/plugins/divideColor.test.js @@ -0,0 +1,61 @@ +import invokePlugin from '../util/invokePlugin' +import plugin from '../../src/plugins/divideColor' + +test('generating divide color utilities', () => { + const config = { + theme: { + divideColor: { + default: 'orange', // This should be ignored + purple: 'purple', + white: { + 25: 'rgba(255,255,255,.25)', + 50: 'rgba(255,255,255,.5)', + 75: 'rgba(255,255,255,.75)', + default: '#fff', + }, + red: { + 1: 'rgb(33,0,0)', + 2: 'rgb(67,0,0)', + 3: 'rgb(100,0,0)', + }, + green: { + 1: 'rgb(0,33,0)', + 2: 'rgb(0,67,0)', + 3: 'rgb(0,100,0)', + }, + blue: { + 1: 'rgb(0,0,33)', + 2: 'rgb(0,0,67)', + 3: 'rgb(0,0,100)', + }, + }, + }, + variants: { + divideColor: ['responsive'], + }, + } + + const { utilities } = invokePlugin(plugin(), config) + + expect(utilities).toEqual([ + [ + { + '.divide-purple > * + *': { 'border-color': 'purple' }, + '.divide-white-25 > * + *': { 'border-color': 'rgba(255,255,255,.25)' }, + '.divide-white-50 > * + *': { 'border-color': 'rgba(255,255,255,.5)' }, + '.divide-white-75 > * + *': { 'border-color': 'rgba(255,255,255,.75)' }, + '.divide-white > * + *': { 'border-color': '#fff' }, + '.divide-red-1 > * + *': { 'border-color': 'rgb(33,0,0)' }, + '.divide-red-2 > * + *': { 'border-color': 'rgb(67,0,0)' }, + '.divide-red-3 > * + *': { 'border-color': 'rgb(100,0,0)' }, + '.divide-green-1 > * + *': { 'border-color': 'rgb(0,33,0)' }, + '.divide-green-2 > * + *': { 'border-color': 'rgb(0,67,0)' }, + '.divide-green-3 > * + *': { 'border-color': 'rgb(0,100,0)' }, + '.divide-blue-1 > * + *': { 'border-color': 'rgb(0,0,33)' }, + '.divide-blue-2 > * + *': { 'border-color': 'rgb(0,0,67)' }, + '.divide-blue-3 > * + *': { 'border-color': 'rgb(0,0,100)' }, + }, + ['responsive'], + ], + ]) +}) diff --git a/src/corePlugins.js b/src/corePlugins.js index 5f72a29ae7e7..75d4d25696fb 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -2,6 +2,7 @@ import preflight from './plugins/preflight' import container from './plugins/container' import stack from './plugins/stack' import divideWidth from './plugins/divideWidth' +import divideColor from './plugins/divideColor' import accessibility from './plugins/accessibility' import appearance from './plugins/appearance' import backgroundAttachment from './plugins/backgroundAttachment' @@ -100,6 +101,7 @@ export default function({ corePlugins: corePluginConfig }) { container, stack, divideWidth, + divideColor, accessibility, appearance, backgroundAttachment, diff --git a/src/plugins/divideColor.js b/src/plugins/divideColor.js new file mode 100644 index 000000000000..e76c8f65353c --- /dev/null +++ b/src/plugins/divideColor.js @@ -0,0 +1,21 @@ +import _ from 'lodash' +import flattenColorPalette from '../util/flattenColorPalette' + +export default function() { + return function({ addUtilities, e, theme, variants }) { + const colors = flattenColorPalette(theme('divideColor')) + + const utilities = _.fromPairs( + _.map(_.omit(colors, 'default'), (value, modifier) => { + return [ + `.${e(`divide-${modifier}`)} > * + *`, + { + 'border-color': value, + }, + ] + }) + ) + + addUtilities(utilities, variants('divideColor')) + } +} diff --git a/stubs/defaultConfig.stub.js b/stubs/defaultConfig.stub.js index ab7dd497b674..4ac22ad96581 100644 --- a/stubs/defaultConfig.stub.js +++ b/stubs/defaultConfig.stub.js @@ -206,6 +206,7 @@ module.exports = { move: 'move', 'not-allowed': 'not-allowed', }, + divideColor: theme => theme('borderColor'), divideWidth: theme => theme('borderWidth'), fill: { current: 'currentColor', From a6f5137a73afc214c222198221116242cc7ceab0 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 16 Apr 2020 12:43:22 -0400 Subject: [PATCH 41/52] Rename stack to space, make invokePlugin output consistent --- .../fixtures/tailwind-output-important.css | 76 +++++++++---------- __tests__/fixtures/tailwind-output.css | 76 +++++++++---------- __tests__/plugins/divideWidth.test.js | 28 +++---- __tests__/plugins/space.test.js | 36 +++++++++ __tests__/plugins/stack.test.js | 44 ----------- __tests__/util/invokePlugin.js | 5 +- src/corePlugins.js | 4 +- src/plugins/{stack.js => space.js} | 8 +- stubs/defaultConfig.stub.js | 2 +- 9 files changed, 133 insertions(+), 146 deletions(-) create mode 100644 __tests__/plugins/space.test.js delete mode 100644 __tests__/plugins/stack.test.js rename src/plugins/{stack.js => space.js} (55%) diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index 0f9d51eec6e2..871f9d18aade 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -606,155 +606,155 @@ video { } } -.stack-y-0 > * + * { +.space-y-0 > * + * { margin-top: 0 !important; } -.stack-x-0 > * + * { +.space-x-0 > * + * { margin-left: 0 !important; } -.stack-y-1 > * + * { +.space-y-1 > * + * { margin-top: 0.25rem !important; } -.stack-x-1 > * + * { +.space-x-1 > * + * { margin-left: 0.25rem !important; } -.stack-y-2 > * + * { +.space-y-2 > * + * { margin-top: 0.5rem !important; } -.stack-x-2 > * + * { +.space-x-2 > * + * { margin-left: 0.5rem !important; } -.stack-y-3 > * + * { +.space-y-3 > * + * { margin-top: 0.75rem !important; } -.stack-x-3 > * + * { +.space-x-3 > * + * { margin-left: 0.75rem !important; } -.stack-y-4 > * + * { +.space-y-4 > * + * { margin-top: 1rem !important; } -.stack-x-4 > * + * { +.space-x-4 > * + * { margin-left: 1rem !important; } -.stack-y-5 > * + * { +.space-y-5 > * + * { margin-top: 1.25rem !important; } -.stack-x-5 > * + * { +.space-x-5 > * + * { margin-left: 1.25rem !important; } -.stack-y-6 > * + * { +.space-y-6 > * + * { margin-top: 1.5rem !important; } -.stack-x-6 > * + * { +.space-x-6 > * + * { margin-left: 1.5rem !important; } -.stack-y-8 > * + * { +.space-y-8 > * + * { margin-top: 2rem !important; } -.stack-x-8 > * + * { +.space-x-8 > * + * { margin-left: 2rem !important; } -.stack-y-10 > * + * { +.space-y-10 > * + * { margin-top: 2.5rem !important; } -.stack-x-10 > * + * { +.space-x-10 > * + * { margin-left: 2.5rem !important; } -.stack-y-12 > * + * { +.space-y-12 > * + * { margin-top: 3rem !important; } -.stack-x-12 > * + * { +.space-x-12 > * + * { margin-left: 3rem !important; } -.stack-y-16 > * + * { +.space-y-16 > * + * { margin-top: 4rem !important; } -.stack-x-16 > * + * { +.space-x-16 > * + * { margin-left: 4rem !important; } -.stack-y-20 > * + * { +.space-y-20 > * + * { margin-top: 5rem !important; } -.stack-x-20 > * + * { +.space-x-20 > * + * { margin-left: 5rem !important; } -.stack-y-24 > * + * { +.space-y-24 > * + * { margin-top: 6rem !important; } -.stack-x-24 > * + * { +.space-x-24 > * + * { margin-left: 6rem !important; } -.stack-y-32 > * + * { +.space-y-32 > * + * { margin-top: 8rem !important; } -.stack-x-32 > * + * { +.space-x-32 > * + * { margin-left: 8rem !important; } -.stack-y-40 > * + * { +.space-y-40 > * + * { margin-top: 10rem !important; } -.stack-x-40 > * + * { +.space-x-40 > * + * { margin-left: 10rem !important; } -.stack-y-48 > * + * { +.space-y-48 > * + * { margin-top: 12rem !important; } -.stack-x-48 > * + * { +.space-x-48 > * + * { margin-left: 12rem !important; } -.stack-y-56 > * + * { +.space-y-56 > * + * { margin-top: 14rem !important; } -.stack-x-56 > * + * { +.space-x-56 > * + * { margin-left: 14rem !important; } -.stack-y-64 > * + * { +.space-y-64 > * + * { margin-top: 16rem !important; } -.stack-x-64 > * + * { +.space-x-64 > * + * { margin-left: 16rem !important; } -.stack-y-px > * + * { +.space-y-px > * + * { margin-top: 1px !important; } -.stack-x-px > * + * { +.space-x-px > * + * { margin-left: 1px !important; } diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index b0aac92a48f9..29e2e031e10c 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -606,155 +606,155 @@ video { } } -.stack-y-0 > * + * { +.space-y-0 > * + * { margin-top: 0; } -.stack-x-0 > * + * { +.space-x-0 > * + * { margin-left: 0; } -.stack-y-1 > * + * { +.space-y-1 > * + * { margin-top: 0.25rem; } -.stack-x-1 > * + * { +.space-x-1 > * + * { margin-left: 0.25rem; } -.stack-y-2 > * + * { +.space-y-2 > * + * { margin-top: 0.5rem; } -.stack-x-2 > * + * { +.space-x-2 > * + * { margin-left: 0.5rem; } -.stack-y-3 > * + * { +.space-y-3 > * + * { margin-top: 0.75rem; } -.stack-x-3 > * + * { +.space-x-3 > * + * { margin-left: 0.75rem; } -.stack-y-4 > * + * { +.space-y-4 > * + * { margin-top: 1rem; } -.stack-x-4 > * + * { +.space-x-4 > * + * { margin-left: 1rem; } -.stack-y-5 > * + * { +.space-y-5 > * + * { margin-top: 1.25rem; } -.stack-x-5 > * + * { +.space-x-5 > * + * { margin-left: 1.25rem; } -.stack-y-6 > * + * { +.space-y-6 > * + * { margin-top: 1.5rem; } -.stack-x-6 > * + * { +.space-x-6 > * + * { margin-left: 1.5rem; } -.stack-y-8 > * + * { +.space-y-8 > * + * { margin-top: 2rem; } -.stack-x-8 > * + * { +.space-x-8 > * + * { margin-left: 2rem; } -.stack-y-10 > * + * { +.space-y-10 > * + * { margin-top: 2.5rem; } -.stack-x-10 > * + * { +.space-x-10 > * + * { margin-left: 2.5rem; } -.stack-y-12 > * + * { +.space-y-12 > * + * { margin-top: 3rem; } -.stack-x-12 > * + * { +.space-x-12 > * + * { margin-left: 3rem; } -.stack-y-16 > * + * { +.space-y-16 > * + * { margin-top: 4rem; } -.stack-x-16 > * + * { +.space-x-16 > * + * { margin-left: 4rem; } -.stack-y-20 > * + * { +.space-y-20 > * + * { margin-top: 5rem; } -.stack-x-20 > * + * { +.space-x-20 > * + * { margin-left: 5rem; } -.stack-y-24 > * + * { +.space-y-24 > * + * { margin-top: 6rem; } -.stack-x-24 > * + * { +.space-x-24 > * + * { margin-left: 6rem; } -.stack-y-32 > * + * { +.space-y-32 > * + * { margin-top: 8rem; } -.stack-x-32 > * + * { +.space-x-32 > * + * { margin-left: 8rem; } -.stack-y-40 > * + * { +.space-y-40 > * + * { margin-top: 10rem; } -.stack-x-40 > * + * { +.space-x-40 > * + * { margin-left: 10rem; } -.stack-y-48 > * + * { +.space-y-48 > * + * { margin-top: 12rem; } -.stack-x-48 > * + * { +.space-x-48 > * + * { margin-left: 12rem; } -.stack-y-56 > * + * { +.space-y-56 > * + * { margin-top: 14rem; } -.stack-x-56 > * + * { +.space-x-56 > * + * { margin-left: 14rem; } -.stack-y-64 > * + * { +.space-y-64 > * + * { margin-top: 16rem; } -.stack-x-64 > * + * { +.space-x-64 > * + * { margin-left: 16rem; } -.stack-y-px > * + * { +.space-y-px > * + * { margin-top: 1px; } -.stack-x-px > * + * { +.space-x-px > * + * { margin-left: 1px; } diff --git a/__tests__/plugins/divideWidth.test.js b/__tests__/plugins/divideWidth.test.js index b13cc591d16c..b9f9b9b06ce3 100644 --- a/__tests__/plugins/divideWidth.test.js +++ b/__tests__/plugins/divideWidth.test.js @@ -20,24 +20,16 @@ test('generating divide width utilities', () => { expect(utilities).toEqual([ [ - [ - { - '.divide-y-2 > * + *': { 'border-top-width': '2px' }, - '.divide-x-2 > * + *': { 'border-left-width': '2px' }, - }, - { - '.divide-y-4 > * + *': { 'border-top-width': '4px' }, - '.divide-x-4 > * + *': { 'border-left-width': '4px' }, - }, - { - '.divide-y-8 > * + *': { 'border-top-width': '8px' }, - '.divide-x-8 > * + *': { 'border-left-width': '8px' }, - }, - { - '.divide-y > * + *': { 'border-top-width': '1px' }, - '.divide-x > * + *': { 'border-left-width': '1px' }, - }, - ], + { + '.divide-y-2 > * + *': { 'border-top-width': '2px' }, + '.divide-x-2 > * + *': { 'border-left-width': '2px' }, + '.divide-y-4 > * + *': { 'border-top-width': '4px' }, + '.divide-x-4 > * + *': { 'border-left-width': '4px' }, + '.divide-y-8 > * + *': { 'border-top-width': '8px' }, + '.divide-x-8 > * + *': { 'border-left-width': '8px' }, + '.divide-y > * + *': { 'border-top-width': '1px' }, + '.divide-x > * + *': { 'border-left-width': '1px' }, + }, ['responsive'], ], ]) diff --git a/__tests__/plugins/space.test.js b/__tests__/plugins/space.test.js new file mode 100644 index 000000000000..2b8d70f580eb --- /dev/null +++ b/__tests__/plugins/space.test.js @@ -0,0 +1,36 @@ +import invokePlugin from '../util/invokePlugin' +import plugin from '../../src/plugins/space' + +test('generating space utilities', () => { + const config = { + theme: { + space: { + '1': '1px', + '2': '2px', + '4': '4px', + '8': '8px', + }, + }, + variants: { + space: ['responsive'], + }, + } + + const { utilities } = invokePlugin(plugin(), config) + + expect(utilities).toEqual([ + [ + { + '.space-y-1 > * + *': { 'margin-top': '1px' }, + '.space-x-1 > * + *': { 'margin-left': '1px' }, + '.space-y-2 > * + *': { 'margin-top': '2px' }, + '.space-x-2 > * + *': { 'margin-left': '2px' }, + '.space-y-4 > * + *': { 'margin-top': '4px' }, + '.space-x-4 > * + *': { 'margin-left': '4px' }, + '.space-y-8 > * + *': { 'margin-top': '8px' }, + '.space-x-8 > * + *': { 'margin-left': '8px' }, + }, + ['responsive'], + ], + ]) +}) diff --git a/__tests__/plugins/stack.test.js b/__tests__/plugins/stack.test.js deleted file mode 100644 index 616c51197d57..000000000000 --- a/__tests__/plugins/stack.test.js +++ /dev/null @@ -1,44 +0,0 @@ -import invokePlugin from '../util/invokePlugin' -import plugin from '../../src/plugins/stack' - -test('generating stack utilities', () => { - const config = { - theme: { - stack: { - '1': '1px', - '2': '2px', - '4': '4px', - '8': '8px', - }, - }, - variants: { - stack: ['responsive'], - }, - } - - const { utilities } = invokePlugin(plugin(), config) - - expect(utilities).toEqual([ - [ - [ - { - '.stack-y-1 > * + *': { 'margin-top': '1px' }, - '.stack-x-1 > * + *': { 'margin-left': '1px' }, - }, - { - '.stack-y-2 > * + *': { 'margin-top': '2px' }, - '.stack-x-2 > * + *': { 'margin-left': '2px' }, - }, - { - '.stack-y-4 > * + *': { 'margin-top': '4px' }, - '.stack-x-4 > * + *': { 'margin-left': '4px' }, - }, - { - '.stack-y-8 > * + *': { 'margin-top': '8px' }, - '.stack-x-8 > * + *': { 'margin-left': '8px' }, - }, - ], - ['responsive'], - ], - ]) -}) diff --git a/__tests__/util/invokePlugin.js b/__tests__/util/invokePlugin.js index a2ed90c92814..5b417d23f620 100644 --- a/__tests__/util/invokePlugin.js +++ b/__tests__/util/invokePlugin.js @@ -24,6 +24,9 @@ export default function(plugin, config) { plugin(pluginApi) return { - utilities: addedUtilities, + utilities: addedUtilities.map(([utilities, variants]) => [ + _.merge({}, ..._.castArray(utilities)), + variants, + ]), } } diff --git a/src/corePlugins.js b/src/corePlugins.js index 75d4d25696fb..9f5a3077191f 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -1,6 +1,6 @@ import preflight from './plugins/preflight' import container from './plugins/container' -import stack from './plugins/stack' +import space from './plugins/space' import divideWidth from './plugins/divideWidth' import divideColor from './plugins/divideColor' import accessibility from './plugins/accessibility' @@ -99,7 +99,7 @@ export default function({ corePlugins: corePluginConfig }) { return configurePlugins(corePluginConfig, { preflight, container, - stack, + space, divideWidth, divideColor, accessibility, diff --git a/src/plugins/stack.js b/src/plugins/space.js similarity index 55% rename from src/plugins/stack.js rename to src/plugins/space.js index dd8195c9d950..618dd2797fc2 100644 --- a/src/plugins/stack.js +++ b/src/plugins/space.js @@ -4,15 +4,15 @@ export default function() { return function({ addUtilities, e, theme, variants }) { const generators = [ (size, modifier) => ({ - [`.${e(`stack-y-${modifier}`)} > * + *`]: { 'margin-top': `${size}` }, - [`.${e(`stack-x-${modifier}`)} > * + *`]: { 'margin-left': `${size}` }, + [`.${e(`space-y-${modifier}`)} > * + *`]: { 'margin-top': `${size}` }, + [`.${e(`space-x-${modifier}`)} > * + *`]: { 'margin-left': `${size}` }, }), ] const utilities = _.flatMap(generators, generator => { - return _.flatMap(theme('stack'), generator) + return _.flatMap(theme('space'), generator) }) - addUtilities(utilities, variants('stack')) + addUtilities(utilities, variants('space')) } } diff --git a/stubs/defaultConfig.stub.js b/stubs/defaultConfig.stub.js index 4ac22ad96581..acdbe7c4c13d 100644 --- a/stubs/defaultConfig.stub.js +++ b/stubs/defaultConfig.stub.js @@ -376,7 +376,7 @@ module.exports = { }, padding: theme => theme('spacing'), placeholderColor: theme => theme('colors'), - stack: theme => theme('spacing'), + space: theme => theme('spacing'), stroke: { current: 'currentColor', }, From ebd157f16e7aa2bba34ca9232b2168771c3747df Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 16 Apr 2020 12:51:12 -0400 Subject: [PATCH 42/52] Add group-focus variant --- __tests__/variantsAtRule.test.js | 45 ++++++++++++++++++++++++++++ src/lib/substituteVariantsAtRules.js | 13 ++++++++ 2 files changed, 58 insertions(+) diff --git a/__tests__/variantsAtRule.test.js b/__tests__/variantsAtRule.test.js index 7433a90cb2ec..ed1dc210e8ee 100644 --- a/__tests__/variantsAtRule.test.js +++ b/__tests__/variantsAtRule.test.js @@ -264,6 +264,51 @@ test('group-hover variants respect any configured prefix', () => { }) }) +test('it can generate group-focus variants', () => { + const input = ` + @variants group-focus { + .banana { color: yellow; } + .chocolate { color: brown; } + } + ` + + const output = ` + .banana { color: yellow; } + .chocolate { color: brown; } + .group:focus .group-focus\\:banana { color: yellow; } + .group:focus .group-focus\\:chocolate { color: brown; } + ` + + return run(input).then(result => { + expect(result.css).toMatchCss(output) + expect(result.warnings().length).toBe(0) + }) +}) + +test('group-focus variants respect any configured prefix', () => { + const input = ` + @variants group-focus { + .tw-banana { color: yellow; } + .tw-chocolate { color: brown; } + } + ` + + const output = ` + .tw-banana { color: yellow; } + .tw-chocolate { color: brown; } + .tw-group:focus .group-focus\\:tw-banana { color: yellow; } + .tw-group:focus .group-focus\\:tw-chocolate { color: brown; } + ` + + return run(input, { + ...config, + prefix: 'tw-', + }).then(result => { + expect(result.css).toMatchCss(output) + expect(result.warnings().length).toBe(0) + }) +}) + test('it can generate hover, active and focus variants', () => { const input = ` @variants group-hover, hover, focus, active { diff --git a/src/lib/substituteVariantsAtRules.js b/src/lib/substituteVariantsAtRules.js index 6cfca755d660..931ebacfcaa6 100644 --- a/src/lib/substituteVariantsAtRules.js +++ b/src/lib/substituteVariantsAtRules.js @@ -36,6 +36,19 @@ const defaultVariantGenerators = config => ({ }).processSync(selector) }) }), + 'group-focus': generateVariantFunction(({ modifySelectors, separator }) => { + return modifySelectors(({ selector }) => { + return selectorParser(selectors => { + selectors.walkClasses(sel => { + sel.value = `group-focus${separator}${sel.value}` + sel.parent.insertBefore( + sel, + selectorParser().astSync(prefixSelector(config.prefix, '.group:focus ')) + ) + }) + }).processSync(selector) + }) + }), hover: generatePseudoClassVariant('hover'), 'focus-within': generatePseudoClassVariant('focus-within'), focus: generatePseudoClassVariant('focus'), From b7e0f11d5d1b3ec74152be990e455eeebafb5aa0 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 16 Apr 2020 16:05:20 -0400 Subject: [PATCH 43/52] Switch to not(last-child) instead of owl For Alpine.js compatibility, sad because it increases the specificity but I don't think it will actually be a problem at all in real projects. --- .../fixtures/tailwind-output-important.css | 380 +++++++++--------- __tests__/fixtures/tailwind-output.css | 380 +++++++++--------- src/plugins/divideColor.js | 2 +- src/plugins/divideWidth.js | 4 +- src/plugins/space.js | 4 +- 5 files changed, 385 insertions(+), 385 deletions(-) diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index 871f9d18aade..fdfb075c6390 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -606,571 +606,571 @@ video { } } -.space-y-0 > * + * { - margin-top: 0 !important; +.space-y-0 > :not(:last-child) { + margin-bottom: 0 !important; } -.space-x-0 > * + * { - margin-left: 0 !important; +.space-x-0 > :not(:last-child) { + margin-right: 0 !important; } -.space-y-1 > * + * { - margin-top: 0.25rem !important; +.space-y-1 > :not(:last-child) { + margin-bottom: 0.25rem !important; } -.space-x-1 > * + * { - margin-left: 0.25rem !important; +.space-x-1 > :not(:last-child) { + margin-right: 0.25rem !important; } -.space-y-2 > * + * { - margin-top: 0.5rem !important; +.space-y-2 > :not(:last-child) { + margin-bottom: 0.5rem !important; } -.space-x-2 > * + * { - margin-left: 0.5rem !important; +.space-x-2 > :not(:last-child) { + margin-right: 0.5rem !important; } -.space-y-3 > * + * { - margin-top: 0.75rem !important; +.space-y-3 > :not(:last-child) { + margin-bottom: 0.75rem !important; } -.space-x-3 > * + * { - margin-left: 0.75rem !important; +.space-x-3 > :not(:last-child) { + margin-right: 0.75rem !important; } -.space-y-4 > * + * { - margin-top: 1rem !important; +.space-y-4 > :not(:last-child) { + margin-bottom: 1rem !important; } -.space-x-4 > * + * { - margin-left: 1rem !important; +.space-x-4 > :not(:last-child) { + margin-right: 1rem !important; } -.space-y-5 > * + * { - margin-top: 1.25rem !important; +.space-y-5 > :not(:last-child) { + margin-bottom: 1.25rem !important; } -.space-x-5 > * + * { - margin-left: 1.25rem !important; +.space-x-5 > :not(:last-child) { + margin-right: 1.25rem !important; } -.space-y-6 > * + * { - margin-top: 1.5rem !important; +.space-y-6 > :not(:last-child) { + margin-bottom: 1.5rem !important; } -.space-x-6 > * + * { - margin-left: 1.5rem !important; +.space-x-6 > :not(:last-child) { + margin-right: 1.5rem !important; } -.space-y-8 > * + * { - margin-top: 2rem !important; +.space-y-8 > :not(:last-child) { + margin-bottom: 2rem !important; } -.space-x-8 > * + * { - margin-left: 2rem !important; +.space-x-8 > :not(:last-child) { + margin-right: 2rem !important; } -.space-y-10 > * + * { - margin-top: 2.5rem !important; +.space-y-10 > :not(:last-child) { + margin-bottom: 2.5rem !important; } -.space-x-10 > * + * { - margin-left: 2.5rem !important; +.space-x-10 > :not(:last-child) { + margin-right: 2.5rem !important; } -.space-y-12 > * + * { - margin-top: 3rem !important; +.space-y-12 > :not(:last-child) { + margin-bottom: 3rem !important; } -.space-x-12 > * + * { - margin-left: 3rem !important; +.space-x-12 > :not(:last-child) { + margin-right: 3rem !important; } -.space-y-16 > * + * { - margin-top: 4rem !important; +.space-y-16 > :not(:last-child) { + margin-bottom: 4rem !important; } -.space-x-16 > * + * { - margin-left: 4rem !important; +.space-x-16 > :not(:last-child) { + margin-right: 4rem !important; } -.space-y-20 > * + * { - margin-top: 5rem !important; +.space-y-20 > :not(:last-child) { + margin-bottom: 5rem !important; } -.space-x-20 > * + * { - margin-left: 5rem !important; +.space-x-20 > :not(:last-child) { + margin-right: 5rem !important; } -.space-y-24 > * + * { - margin-top: 6rem !important; +.space-y-24 > :not(:last-child) { + margin-bottom: 6rem !important; } -.space-x-24 > * + * { - margin-left: 6rem !important; +.space-x-24 > :not(:last-child) { + margin-right: 6rem !important; } -.space-y-32 > * + * { - margin-top: 8rem !important; +.space-y-32 > :not(:last-child) { + margin-bottom: 8rem !important; } -.space-x-32 > * + * { - margin-left: 8rem !important; +.space-x-32 > :not(:last-child) { + margin-right: 8rem !important; } -.space-y-40 > * + * { - margin-top: 10rem !important; +.space-y-40 > :not(:last-child) { + margin-bottom: 10rem !important; } -.space-x-40 > * + * { - margin-left: 10rem !important; +.space-x-40 > :not(:last-child) { + margin-right: 10rem !important; } -.space-y-48 > * + * { - margin-top: 12rem !important; +.space-y-48 > :not(:last-child) { + margin-bottom: 12rem !important; } -.space-x-48 > * + * { - margin-left: 12rem !important; +.space-x-48 > :not(:last-child) { + margin-right: 12rem !important; } -.space-y-56 > * + * { - margin-top: 14rem !important; +.space-y-56 > :not(:last-child) { + margin-bottom: 14rem !important; } -.space-x-56 > * + * { - margin-left: 14rem !important; +.space-x-56 > :not(:last-child) { + margin-right: 14rem !important; } -.space-y-64 > * + * { - margin-top: 16rem !important; +.space-y-64 > :not(:last-child) { + margin-bottom: 16rem !important; } -.space-x-64 > * + * { - margin-left: 16rem !important; +.space-x-64 > :not(:last-child) { + margin-right: 16rem !important; } -.space-y-px > * + * { - margin-top: 1px !important; +.space-y-px > :not(:last-child) { + margin-bottom: 1px !important; } -.space-x-px > * + * { - margin-left: 1px !important; +.space-x-px > :not(:last-child) { + margin-right: 1px !important; } -.divide-y-0 > * + * { - border-top-width: 0 !important; +.divide-y-0 > :not(:last-child) { + border-bottom-width: 0 !important; } -.divide-x-0 > * + * { - border-left-width: 0 !important; +.divide-x-0 > :not(:last-child) { + border-right-width: 0 !important; } -.divide-y-2 > * + * { - border-top-width: 2px !important; +.divide-y-2 > :not(:last-child) { + border-bottom-width: 2px !important; } -.divide-x-2 > * + * { - border-left-width: 2px !important; +.divide-x-2 > :not(:last-child) { + border-right-width: 2px !important; } -.divide-y-4 > * + * { - border-top-width: 4px !important; +.divide-y-4 > :not(:last-child) { + border-bottom-width: 4px !important; } -.divide-x-4 > * + * { - border-left-width: 4px !important; +.divide-x-4 > :not(:last-child) { + border-right-width: 4px !important; } -.divide-y-8 > * + * { - border-top-width: 8px !important; +.divide-y-8 > :not(:last-child) { + border-bottom-width: 8px !important; } -.divide-x-8 > * + * { - border-left-width: 8px !important; +.divide-x-8 > :not(:last-child) { + border-right-width: 8px !important; } -.divide-y > * + * { - border-top-width: 1px !important; +.divide-y > :not(:last-child) { + border-bottom-width: 1px !important; } -.divide-x > * + * { - border-left-width: 1px !important; +.divide-x > :not(:last-child) { + border-right-width: 1px !important; } -.divide-transparent > * + * { +.divide-transparent > :not(:last-child) { border-color: transparent !important; } -.divide-current > * + * { +.divide-current > :not(:last-child) { border-color: currentColor !important; } -.divide-black > * + * { +.divide-black > :not(:last-child) { border-color: #000 !important; } -.divide-white > * + * { +.divide-white > :not(:last-child) { border-color: #fff !important; } -.divide-gray-100 > * + * { +.divide-gray-100 > :not(:last-child) { border-color: #f7fafc !important; } -.divide-gray-200 > * + * { +.divide-gray-200 > :not(:last-child) { border-color: #edf2f7 !important; } -.divide-gray-300 > * + * { +.divide-gray-300 > :not(:last-child) { border-color: #e2e8f0 !important; } -.divide-gray-400 > * + * { +.divide-gray-400 > :not(:last-child) { border-color: #cbd5e0 !important; } -.divide-gray-500 > * + * { +.divide-gray-500 > :not(:last-child) { border-color: #a0aec0 !important; } -.divide-gray-600 > * + * { +.divide-gray-600 > :not(:last-child) { border-color: #718096 !important; } -.divide-gray-700 > * + * { +.divide-gray-700 > :not(:last-child) { border-color: #4a5568 !important; } -.divide-gray-800 > * + * { +.divide-gray-800 > :not(:last-child) { border-color: #2d3748 !important; } -.divide-gray-900 > * + * { +.divide-gray-900 > :not(:last-child) { border-color: #1a202c !important; } -.divide-red-100 > * + * { +.divide-red-100 > :not(:last-child) { border-color: #fff5f5 !important; } -.divide-red-200 > * + * { +.divide-red-200 > :not(:last-child) { border-color: #fed7d7 !important; } -.divide-red-300 > * + * { +.divide-red-300 > :not(:last-child) { border-color: #feb2b2 !important; } -.divide-red-400 > * + * { +.divide-red-400 > :not(:last-child) { border-color: #fc8181 !important; } -.divide-red-500 > * + * { +.divide-red-500 > :not(:last-child) { border-color: #f56565 !important; } -.divide-red-600 > * + * { +.divide-red-600 > :not(:last-child) { border-color: #e53e3e !important; } -.divide-red-700 > * + * { +.divide-red-700 > :not(:last-child) { border-color: #c53030 !important; } -.divide-red-800 > * + * { +.divide-red-800 > :not(:last-child) { border-color: #9b2c2c !important; } -.divide-red-900 > * + * { +.divide-red-900 > :not(:last-child) { border-color: #742a2a !important; } -.divide-orange-100 > * + * { +.divide-orange-100 > :not(:last-child) { border-color: #fffaf0 !important; } -.divide-orange-200 > * + * { +.divide-orange-200 > :not(:last-child) { border-color: #feebc8 !important; } -.divide-orange-300 > * + * { +.divide-orange-300 > :not(:last-child) { border-color: #fbd38d !important; } -.divide-orange-400 > * + * { +.divide-orange-400 > :not(:last-child) { border-color: #f6ad55 !important; } -.divide-orange-500 > * + * { +.divide-orange-500 > :not(:last-child) { border-color: #ed8936 !important; } -.divide-orange-600 > * + * { +.divide-orange-600 > :not(:last-child) { border-color: #dd6b20 !important; } -.divide-orange-700 > * + * { +.divide-orange-700 > :not(:last-child) { border-color: #c05621 !important; } -.divide-orange-800 > * + * { +.divide-orange-800 > :not(:last-child) { border-color: #9c4221 !important; } -.divide-orange-900 > * + * { +.divide-orange-900 > :not(:last-child) { border-color: #7b341e !important; } -.divide-yellow-100 > * + * { +.divide-yellow-100 > :not(:last-child) { border-color: #fffff0 !important; } -.divide-yellow-200 > * + * { +.divide-yellow-200 > :not(:last-child) { border-color: #fefcbf !important; } -.divide-yellow-300 > * + * { +.divide-yellow-300 > :not(:last-child) { border-color: #faf089 !important; } -.divide-yellow-400 > * + * { +.divide-yellow-400 > :not(:last-child) { border-color: #f6e05e !important; } -.divide-yellow-500 > * + * { +.divide-yellow-500 > :not(:last-child) { border-color: #ecc94b !important; } -.divide-yellow-600 > * + * { +.divide-yellow-600 > :not(:last-child) { border-color: #d69e2e !important; } -.divide-yellow-700 > * + * { +.divide-yellow-700 > :not(:last-child) { border-color: #b7791f !important; } -.divide-yellow-800 > * + * { +.divide-yellow-800 > :not(:last-child) { border-color: #975a16 !important; } -.divide-yellow-900 > * + * { +.divide-yellow-900 > :not(:last-child) { border-color: #744210 !important; } -.divide-green-100 > * + * { +.divide-green-100 > :not(:last-child) { border-color: #f0fff4 !important; } -.divide-green-200 > * + * { +.divide-green-200 > :not(:last-child) { border-color: #c6f6d5 !important; } -.divide-green-300 > * + * { +.divide-green-300 > :not(:last-child) { border-color: #9ae6b4 !important; } -.divide-green-400 > * + * { +.divide-green-400 > :not(:last-child) { border-color: #68d391 !important; } -.divide-green-500 > * + * { +.divide-green-500 > :not(:last-child) { border-color: #48bb78 !important; } -.divide-green-600 > * + * { +.divide-green-600 > :not(:last-child) { border-color: #38a169 !important; } -.divide-green-700 > * + * { +.divide-green-700 > :not(:last-child) { border-color: #2f855a !important; } -.divide-green-800 > * + * { +.divide-green-800 > :not(:last-child) { border-color: #276749 !important; } -.divide-green-900 > * + * { +.divide-green-900 > :not(:last-child) { border-color: #22543d !important; } -.divide-teal-100 > * + * { +.divide-teal-100 > :not(:last-child) { border-color: #e6fffa !important; } -.divide-teal-200 > * + * { +.divide-teal-200 > :not(:last-child) { border-color: #b2f5ea !important; } -.divide-teal-300 > * + * { +.divide-teal-300 > :not(:last-child) { border-color: #81e6d9 !important; } -.divide-teal-400 > * + * { +.divide-teal-400 > :not(:last-child) { border-color: #4fd1c5 !important; } -.divide-teal-500 > * + * { +.divide-teal-500 > :not(:last-child) { border-color: #38b2ac !important; } -.divide-teal-600 > * + * { +.divide-teal-600 > :not(:last-child) { border-color: #319795 !important; } -.divide-teal-700 > * + * { +.divide-teal-700 > :not(:last-child) { border-color: #2c7a7b !important; } -.divide-teal-800 > * + * { +.divide-teal-800 > :not(:last-child) { border-color: #285e61 !important; } -.divide-teal-900 > * + * { +.divide-teal-900 > :not(:last-child) { border-color: #234e52 !important; } -.divide-blue-100 > * + * { +.divide-blue-100 > :not(:last-child) { border-color: #ebf8ff !important; } -.divide-blue-200 > * + * { +.divide-blue-200 > :not(:last-child) { border-color: #bee3f8 !important; } -.divide-blue-300 > * + * { +.divide-blue-300 > :not(:last-child) { border-color: #90cdf4 !important; } -.divide-blue-400 > * + * { +.divide-blue-400 > :not(:last-child) { border-color: #63b3ed !important; } -.divide-blue-500 > * + * { +.divide-blue-500 > :not(:last-child) { border-color: #4299e1 !important; } -.divide-blue-600 > * + * { +.divide-blue-600 > :not(:last-child) { border-color: #3182ce !important; } -.divide-blue-700 > * + * { +.divide-blue-700 > :not(:last-child) { border-color: #2b6cb0 !important; } -.divide-blue-800 > * + * { +.divide-blue-800 > :not(:last-child) { border-color: #2c5282 !important; } -.divide-blue-900 > * + * { +.divide-blue-900 > :not(:last-child) { border-color: #2a4365 !important; } -.divide-indigo-100 > * + * { +.divide-indigo-100 > :not(:last-child) { border-color: #ebf4ff !important; } -.divide-indigo-200 > * + * { +.divide-indigo-200 > :not(:last-child) { border-color: #c3dafe !important; } -.divide-indigo-300 > * + * { +.divide-indigo-300 > :not(:last-child) { border-color: #a3bffa !important; } -.divide-indigo-400 > * + * { +.divide-indigo-400 > :not(:last-child) { border-color: #7f9cf5 !important; } -.divide-indigo-500 > * + * { +.divide-indigo-500 > :not(:last-child) { border-color: #667eea !important; } -.divide-indigo-600 > * + * { +.divide-indigo-600 > :not(:last-child) { border-color: #5a67d8 !important; } -.divide-indigo-700 > * + * { +.divide-indigo-700 > :not(:last-child) { border-color: #4c51bf !important; } -.divide-indigo-800 > * + * { +.divide-indigo-800 > :not(:last-child) { border-color: #434190 !important; } -.divide-indigo-900 > * + * { +.divide-indigo-900 > :not(:last-child) { border-color: #3c366b !important; } -.divide-purple-100 > * + * { +.divide-purple-100 > :not(:last-child) { border-color: #faf5ff !important; } -.divide-purple-200 > * + * { +.divide-purple-200 > :not(:last-child) { border-color: #e9d8fd !important; } -.divide-purple-300 > * + * { +.divide-purple-300 > :not(:last-child) { border-color: #d6bcfa !important; } -.divide-purple-400 > * + * { +.divide-purple-400 > :not(:last-child) { border-color: #b794f4 !important; } -.divide-purple-500 > * + * { +.divide-purple-500 > :not(:last-child) { border-color: #9f7aea !important; } -.divide-purple-600 > * + * { +.divide-purple-600 > :not(:last-child) { border-color: #805ad5 !important; } -.divide-purple-700 > * + * { +.divide-purple-700 > :not(:last-child) { border-color: #6b46c1 !important; } -.divide-purple-800 > * + * { +.divide-purple-800 > :not(:last-child) { border-color: #553c9a !important; } -.divide-purple-900 > * + * { +.divide-purple-900 > :not(:last-child) { border-color: #44337a !important; } -.divide-pink-100 > * + * { +.divide-pink-100 > :not(:last-child) { border-color: #fff5f7 !important; } -.divide-pink-200 > * + * { +.divide-pink-200 > :not(:last-child) { border-color: #fed7e2 !important; } -.divide-pink-300 > * + * { +.divide-pink-300 > :not(:last-child) { border-color: #fbb6ce !important; } -.divide-pink-400 > * + * { +.divide-pink-400 > :not(:last-child) { border-color: #f687b3 !important; } -.divide-pink-500 > * + * { +.divide-pink-500 > :not(:last-child) { border-color: #ed64a6 !important; } -.divide-pink-600 > * + * { +.divide-pink-600 > :not(:last-child) { border-color: #d53f8c !important; } -.divide-pink-700 > * + * { +.divide-pink-700 > :not(:last-child) { border-color: #b83280 !important; } -.divide-pink-800 > * + * { +.divide-pink-800 > :not(:last-child) { border-color: #97266d !important; } -.divide-pink-900 > * + * { +.divide-pink-900 > :not(:last-child) { border-color: #702459 !important; } diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index 29e2e031e10c..a2e9ce46b5eb 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -606,571 +606,571 @@ video { } } -.space-y-0 > * + * { - margin-top: 0; +.space-y-0 > :not(:last-child) { + margin-bottom: 0; } -.space-x-0 > * + * { - margin-left: 0; +.space-x-0 > :not(:last-child) { + margin-right: 0; } -.space-y-1 > * + * { - margin-top: 0.25rem; +.space-y-1 > :not(:last-child) { + margin-bottom: 0.25rem; } -.space-x-1 > * + * { - margin-left: 0.25rem; +.space-x-1 > :not(:last-child) { + margin-right: 0.25rem; } -.space-y-2 > * + * { - margin-top: 0.5rem; +.space-y-2 > :not(:last-child) { + margin-bottom: 0.5rem; } -.space-x-2 > * + * { - margin-left: 0.5rem; +.space-x-2 > :not(:last-child) { + margin-right: 0.5rem; } -.space-y-3 > * + * { - margin-top: 0.75rem; +.space-y-3 > :not(:last-child) { + margin-bottom: 0.75rem; } -.space-x-3 > * + * { - margin-left: 0.75rem; +.space-x-3 > :not(:last-child) { + margin-right: 0.75rem; } -.space-y-4 > * + * { - margin-top: 1rem; +.space-y-4 > :not(:last-child) { + margin-bottom: 1rem; } -.space-x-4 > * + * { - margin-left: 1rem; +.space-x-4 > :not(:last-child) { + margin-right: 1rem; } -.space-y-5 > * + * { - margin-top: 1.25rem; +.space-y-5 > :not(:last-child) { + margin-bottom: 1.25rem; } -.space-x-5 > * + * { - margin-left: 1.25rem; +.space-x-5 > :not(:last-child) { + margin-right: 1.25rem; } -.space-y-6 > * + * { - margin-top: 1.5rem; +.space-y-6 > :not(:last-child) { + margin-bottom: 1.5rem; } -.space-x-6 > * + * { - margin-left: 1.5rem; +.space-x-6 > :not(:last-child) { + margin-right: 1.5rem; } -.space-y-8 > * + * { - margin-top: 2rem; +.space-y-8 > :not(:last-child) { + margin-bottom: 2rem; } -.space-x-8 > * + * { - margin-left: 2rem; +.space-x-8 > :not(:last-child) { + margin-right: 2rem; } -.space-y-10 > * + * { - margin-top: 2.5rem; +.space-y-10 > :not(:last-child) { + margin-bottom: 2.5rem; } -.space-x-10 > * + * { - margin-left: 2.5rem; +.space-x-10 > :not(:last-child) { + margin-right: 2.5rem; } -.space-y-12 > * + * { - margin-top: 3rem; +.space-y-12 > :not(:last-child) { + margin-bottom: 3rem; } -.space-x-12 > * + * { - margin-left: 3rem; +.space-x-12 > :not(:last-child) { + margin-right: 3rem; } -.space-y-16 > * + * { - margin-top: 4rem; +.space-y-16 > :not(:last-child) { + margin-bottom: 4rem; } -.space-x-16 > * + * { - margin-left: 4rem; +.space-x-16 > :not(:last-child) { + margin-right: 4rem; } -.space-y-20 > * + * { - margin-top: 5rem; +.space-y-20 > :not(:last-child) { + margin-bottom: 5rem; } -.space-x-20 > * + * { - margin-left: 5rem; +.space-x-20 > :not(:last-child) { + margin-right: 5rem; } -.space-y-24 > * + * { - margin-top: 6rem; +.space-y-24 > :not(:last-child) { + margin-bottom: 6rem; } -.space-x-24 > * + * { - margin-left: 6rem; +.space-x-24 > :not(:last-child) { + margin-right: 6rem; } -.space-y-32 > * + * { - margin-top: 8rem; +.space-y-32 > :not(:last-child) { + margin-bottom: 8rem; } -.space-x-32 > * + * { - margin-left: 8rem; +.space-x-32 > :not(:last-child) { + margin-right: 8rem; } -.space-y-40 > * + * { - margin-top: 10rem; +.space-y-40 > :not(:last-child) { + margin-bottom: 10rem; } -.space-x-40 > * + * { - margin-left: 10rem; +.space-x-40 > :not(:last-child) { + margin-right: 10rem; } -.space-y-48 > * + * { - margin-top: 12rem; +.space-y-48 > :not(:last-child) { + margin-bottom: 12rem; } -.space-x-48 > * + * { - margin-left: 12rem; +.space-x-48 > :not(:last-child) { + margin-right: 12rem; } -.space-y-56 > * + * { - margin-top: 14rem; +.space-y-56 > :not(:last-child) { + margin-bottom: 14rem; } -.space-x-56 > * + * { - margin-left: 14rem; +.space-x-56 > :not(:last-child) { + margin-right: 14rem; } -.space-y-64 > * + * { - margin-top: 16rem; +.space-y-64 > :not(:last-child) { + margin-bottom: 16rem; } -.space-x-64 > * + * { - margin-left: 16rem; +.space-x-64 > :not(:last-child) { + margin-right: 16rem; } -.space-y-px > * + * { - margin-top: 1px; +.space-y-px > :not(:last-child) { + margin-bottom: 1px; } -.space-x-px > * + * { - margin-left: 1px; +.space-x-px > :not(:last-child) { + margin-right: 1px; } -.divide-y-0 > * + * { - border-top-width: 0; +.divide-y-0 > :not(:last-child) { + border-bottom-width: 0; } -.divide-x-0 > * + * { - border-left-width: 0; +.divide-x-0 > :not(:last-child) { + border-right-width: 0; } -.divide-y-2 > * + * { - border-top-width: 2px; +.divide-y-2 > :not(:last-child) { + border-bottom-width: 2px; } -.divide-x-2 > * + * { - border-left-width: 2px; +.divide-x-2 > :not(:last-child) { + border-right-width: 2px; } -.divide-y-4 > * + * { - border-top-width: 4px; +.divide-y-4 > :not(:last-child) { + border-bottom-width: 4px; } -.divide-x-4 > * + * { - border-left-width: 4px; +.divide-x-4 > :not(:last-child) { + border-right-width: 4px; } -.divide-y-8 > * + * { - border-top-width: 8px; +.divide-y-8 > :not(:last-child) { + border-bottom-width: 8px; } -.divide-x-8 > * + * { - border-left-width: 8px; +.divide-x-8 > :not(:last-child) { + border-right-width: 8px; } -.divide-y > * + * { - border-top-width: 1px; +.divide-y > :not(:last-child) { + border-bottom-width: 1px; } -.divide-x > * + * { - border-left-width: 1px; +.divide-x > :not(:last-child) { + border-right-width: 1px; } -.divide-transparent > * + * { +.divide-transparent > :not(:last-child) { border-color: transparent; } -.divide-current > * + * { +.divide-current > :not(:last-child) { border-color: currentColor; } -.divide-black > * + * { +.divide-black > :not(:last-child) { border-color: #000; } -.divide-white > * + * { +.divide-white > :not(:last-child) { border-color: #fff; } -.divide-gray-100 > * + * { +.divide-gray-100 > :not(:last-child) { border-color: #f7fafc; } -.divide-gray-200 > * + * { +.divide-gray-200 > :not(:last-child) { border-color: #edf2f7; } -.divide-gray-300 > * + * { +.divide-gray-300 > :not(:last-child) { border-color: #e2e8f0; } -.divide-gray-400 > * + * { +.divide-gray-400 > :not(:last-child) { border-color: #cbd5e0; } -.divide-gray-500 > * + * { +.divide-gray-500 > :not(:last-child) { border-color: #a0aec0; } -.divide-gray-600 > * + * { +.divide-gray-600 > :not(:last-child) { border-color: #718096; } -.divide-gray-700 > * + * { +.divide-gray-700 > :not(:last-child) { border-color: #4a5568; } -.divide-gray-800 > * + * { +.divide-gray-800 > :not(:last-child) { border-color: #2d3748; } -.divide-gray-900 > * + * { +.divide-gray-900 > :not(:last-child) { border-color: #1a202c; } -.divide-red-100 > * + * { +.divide-red-100 > :not(:last-child) { border-color: #fff5f5; } -.divide-red-200 > * + * { +.divide-red-200 > :not(:last-child) { border-color: #fed7d7; } -.divide-red-300 > * + * { +.divide-red-300 > :not(:last-child) { border-color: #feb2b2; } -.divide-red-400 > * + * { +.divide-red-400 > :not(:last-child) { border-color: #fc8181; } -.divide-red-500 > * + * { +.divide-red-500 > :not(:last-child) { border-color: #f56565; } -.divide-red-600 > * + * { +.divide-red-600 > :not(:last-child) { border-color: #e53e3e; } -.divide-red-700 > * + * { +.divide-red-700 > :not(:last-child) { border-color: #c53030; } -.divide-red-800 > * + * { +.divide-red-800 > :not(:last-child) { border-color: #9b2c2c; } -.divide-red-900 > * + * { +.divide-red-900 > :not(:last-child) { border-color: #742a2a; } -.divide-orange-100 > * + * { +.divide-orange-100 > :not(:last-child) { border-color: #fffaf0; } -.divide-orange-200 > * + * { +.divide-orange-200 > :not(:last-child) { border-color: #feebc8; } -.divide-orange-300 > * + * { +.divide-orange-300 > :not(:last-child) { border-color: #fbd38d; } -.divide-orange-400 > * + * { +.divide-orange-400 > :not(:last-child) { border-color: #f6ad55; } -.divide-orange-500 > * + * { +.divide-orange-500 > :not(:last-child) { border-color: #ed8936; } -.divide-orange-600 > * + * { +.divide-orange-600 > :not(:last-child) { border-color: #dd6b20; } -.divide-orange-700 > * + * { +.divide-orange-700 > :not(:last-child) { border-color: #c05621; } -.divide-orange-800 > * + * { +.divide-orange-800 > :not(:last-child) { border-color: #9c4221; } -.divide-orange-900 > * + * { +.divide-orange-900 > :not(:last-child) { border-color: #7b341e; } -.divide-yellow-100 > * + * { +.divide-yellow-100 > :not(:last-child) { border-color: #fffff0; } -.divide-yellow-200 > * + * { +.divide-yellow-200 > :not(:last-child) { border-color: #fefcbf; } -.divide-yellow-300 > * + * { +.divide-yellow-300 > :not(:last-child) { border-color: #faf089; } -.divide-yellow-400 > * + * { +.divide-yellow-400 > :not(:last-child) { border-color: #f6e05e; } -.divide-yellow-500 > * + * { +.divide-yellow-500 > :not(:last-child) { border-color: #ecc94b; } -.divide-yellow-600 > * + * { +.divide-yellow-600 > :not(:last-child) { border-color: #d69e2e; } -.divide-yellow-700 > * + * { +.divide-yellow-700 > :not(:last-child) { border-color: #b7791f; } -.divide-yellow-800 > * + * { +.divide-yellow-800 > :not(:last-child) { border-color: #975a16; } -.divide-yellow-900 > * + * { +.divide-yellow-900 > :not(:last-child) { border-color: #744210; } -.divide-green-100 > * + * { +.divide-green-100 > :not(:last-child) { border-color: #f0fff4; } -.divide-green-200 > * + * { +.divide-green-200 > :not(:last-child) { border-color: #c6f6d5; } -.divide-green-300 > * + * { +.divide-green-300 > :not(:last-child) { border-color: #9ae6b4; } -.divide-green-400 > * + * { +.divide-green-400 > :not(:last-child) { border-color: #68d391; } -.divide-green-500 > * + * { +.divide-green-500 > :not(:last-child) { border-color: #48bb78; } -.divide-green-600 > * + * { +.divide-green-600 > :not(:last-child) { border-color: #38a169; } -.divide-green-700 > * + * { +.divide-green-700 > :not(:last-child) { border-color: #2f855a; } -.divide-green-800 > * + * { +.divide-green-800 > :not(:last-child) { border-color: #276749; } -.divide-green-900 > * + * { +.divide-green-900 > :not(:last-child) { border-color: #22543d; } -.divide-teal-100 > * + * { +.divide-teal-100 > :not(:last-child) { border-color: #e6fffa; } -.divide-teal-200 > * + * { +.divide-teal-200 > :not(:last-child) { border-color: #b2f5ea; } -.divide-teal-300 > * + * { +.divide-teal-300 > :not(:last-child) { border-color: #81e6d9; } -.divide-teal-400 > * + * { +.divide-teal-400 > :not(:last-child) { border-color: #4fd1c5; } -.divide-teal-500 > * + * { +.divide-teal-500 > :not(:last-child) { border-color: #38b2ac; } -.divide-teal-600 > * + * { +.divide-teal-600 > :not(:last-child) { border-color: #319795; } -.divide-teal-700 > * + * { +.divide-teal-700 > :not(:last-child) { border-color: #2c7a7b; } -.divide-teal-800 > * + * { +.divide-teal-800 > :not(:last-child) { border-color: #285e61; } -.divide-teal-900 > * + * { +.divide-teal-900 > :not(:last-child) { border-color: #234e52; } -.divide-blue-100 > * + * { +.divide-blue-100 > :not(:last-child) { border-color: #ebf8ff; } -.divide-blue-200 > * + * { +.divide-blue-200 > :not(:last-child) { border-color: #bee3f8; } -.divide-blue-300 > * + * { +.divide-blue-300 > :not(:last-child) { border-color: #90cdf4; } -.divide-blue-400 > * + * { +.divide-blue-400 > :not(:last-child) { border-color: #63b3ed; } -.divide-blue-500 > * + * { +.divide-blue-500 > :not(:last-child) { border-color: #4299e1; } -.divide-blue-600 > * + * { +.divide-blue-600 > :not(:last-child) { border-color: #3182ce; } -.divide-blue-700 > * + * { +.divide-blue-700 > :not(:last-child) { border-color: #2b6cb0; } -.divide-blue-800 > * + * { +.divide-blue-800 > :not(:last-child) { border-color: #2c5282; } -.divide-blue-900 > * + * { +.divide-blue-900 > :not(:last-child) { border-color: #2a4365; } -.divide-indigo-100 > * + * { +.divide-indigo-100 > :not(:last-child) { border-color: #ebf4ff; } -.divide-indigo-200 > * + * { +.divide-indigo-200 > :not(:last-child) { border-color: #c3dafe; } -.divide-indigo-300 > * + * { +.divide-indigo-300 > :not(:last-child) { border-color: #a3bffa; } -.divide-indigo-400 > * + * { +.divide-indigo-400 > :not(:last-child) { border-color: #7f9cf5; } -.divide-indigo-500 > * + * { +.divide-indigo-500 > :not(:last-child) { border-color: #667eea; } -.divide-indigo-600 > * + * { +.divide-indigo-600 > :not(:last-child) { border-color: #5a67d8; } -.divide-indigo-700 > * + * { +.divide-indigo-700 > :not(:last-child) { border-color: #4c51bf; } -.divide-indigo-800 > * + * { +.divide-indigo-800 > :not(:last-child) { border-color: #434190; } -.divide-indigo-900 > * + * { +.divide-indigo-900 > :not(:last-child) { border-color: #3c366b; } -.divide-purple-100 > * + * { +.divide-purple-100 > :not(:last-child) { border-color: #faf5ff; } -.divide-purple-200 > * + * { +.divide-purple-200 > :not(:last-child) { border-color: #e9d8fd; } -.divide-purple-300 > * + * { +.divide-purple-300 > :not(:last-child) { border-color: #d6bcfa; } -.divide-purple-400 > * + * { +.divide-purple-400 > :not(:last-child) { border-color: #b794f4; } -.divide-purple-500 > * + * { +.divide-purple-500 > :not(:last-child) { border-color: #9f7aea; } -.divide-purple-600 > * + * { +.divide-purple-600 > :not(:last-child) { border-color: #805ad5; } -.divide-purple-700 > * + * { +.divide-purple-700 > :not(:last-child) { border-color: #6b46c1; } -.divide-purple-800 > * + * { +.divide-purple-800 > :not(:last-child) { border-color: #553c9a; } -.divide-purple-900 > * + * { +.divide-purple-900 > :not(:last-child) { border-color: #44337a; } -.divide-pink-100 > * + * { +.divide-pink-100 > :not(:last-child) { border-color: #fff5f7; } -.divide-pink-200 > * + * { +.divide-pink-200 > :not(:last-child) { border-color: #fed7e2; } -.divide-pink-300 > * + * { +.divide-pink-300 > :not(:last-child) { border-color: #fbb6ce; } -.divide-pink-400 > * + * { +.divide-pink-400 > :not(:last-child) { border-color: #f687b3; } -.divide-pink-500 > * + * { +.divide-pink-500 > :not(:last-child) { border-color: #ed64a6; } -.divide-pink-600 > * + * { +.divide-pink-600 > :not(:last-child) { border-color: #d53f8c; } -.divide-pink-700 > * + * { +.divide-pink-700 > :not(:last-child) { border-color: #b83280; } -.divide-pink-800 > * + * { +.divide-pink-800 > :not(:last-child) { border-color: #97266d; } -.divide-pink-900 > * + * { +.divide-pink-900 > :not(:last-child) { border-color: #702459; } diff --git a/src/plugins/divideColor.js b/src/plugins/divideColor.js index e76c8f65353c..5260774dd79e 100644 --- a/src/plugins/divideColor.js +++ b/src/plugins/divideColor.js @@ -8,7 +8,7 @@ export default function() { const utilities = _.fromPairs( _.map(_.omit(colors, 'default'), (value, modifier) => { return [ - `.${e(`divide-${modifier}`)} > * + *`, + `.${e(`divide-${modifier}`)} > :not(:last-child)`, { 'border-color': value, }, diff --git a/src/plugins/divideWidth.js b/src/plugins/divideWidth.js index 52a36047a645..254bc5cbb930 100644 --- a/src/plugins/divideWidth.js +++ b/src/plugins/divideWidth.js @@ -4,8 +4,8 @@ export default function() { return function({ addUtilities, e, theme, variants }) { const generators = [ (value, modifier) => ({ - [`.${e(`divide-y${modifier}`)} > * + *`]: { 'border-top-width': `${value}` }, - [`.${e(`divide-x${modifier}`)} > * + *`]: { 'border-left-width': `${value}` }, + [`.${e(`divide-y${modifier}`)} > :not(:last-child)`]: { 'border-bottom-width': `${value}` }, + [`.${e(`divide-x${modifier}`)} > :not(:last-child)`]: { 'border-right-width': `${value}` }, }), ] diff --git a/src/plugins/space.js b/src/plugins/space.js index 618dd2797fc2..8fae0d97015b 100644 --- a/src/plugins/space.js +++ b/src/plugins/space.js @@ -4,8 +4,8 @@ export default function() { return function({ addUtilities, e, theme, variants }) { const generators = [ (size, modifier) => ({ - [`.${e(`space-y-${modifier}`)} > * + *`]: { 'margin-top': `${size}` }, - [`.${e(`space-x-${modifier}`)} > * + *`]: { 'margin-left': `${size}` }, + [`.${e(`space-y-${modifier}`)} > :not(:last-child)`]: { 'margin-bottom': `${size}` }, + [`.${e(`space-x-${modifier}`)} > :not(:last-child)`]: { 'margin-right': `${size}` }, }), ] From 0f54a60d055111df0745a43d6cc3f01124b0477b Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Fri, 17 Apr 2020 09:49:16 -0400 Subject: [PATCH 44/52] Switch from :not(:last-child) to :not(template) ~ :not(template) --- .../fixtures/tailwind-output-important.css | 380 +++++++++--------- __tests__/fixtures/tailwind-output.css | 380 +++++++++--------- __tests__/plugins/divideColor.test.js | 56 ++- __tests__/plugins/divideWidth.test.js | 16 +- __tests__/plugins/space.test.js | 16 +- src/plugins/divideColor.js | 2 +- src/plugins/divideWidth.js | 8 +- src/plugins/space.js | 8 +- 8 files changed, 451 insertions(+), 415 deletions(-) diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index fdfb075c6390..b18d9ed71d05 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -606,571 +606,571 @@ video { } } -.space-y-0 > :not(:last-child) { - margin-bottom: 0 !important; +.space-y-0 > :not(template) ~ :not(template) { + margin-top: 0 !important; } -.space-x-0 > :not(:last-child) { - margin-right: 0 !important; +.space-x-0 > :not(template) ~ :not(template) { + margin-left: 0 !important; } -.space-y-1 > :not(:last-child) { - margin-bottom: 0.25rem !important; +.space-y-1 > :not(template) ~ :not(template) { + margin-top: 0.25rem !important; } -.space-x-1 > :not(:last-child) { - margin-right: 0.25rem !important; +.space-x-1 > :not(template) ~ :not(template) { + margin-left: 0.25rem !important; } -.space-y-2 > :not(:last-child) { - margin-bottom: 0.5rem !important; +.space-y-2 > :not(template) ~ :not(template) { + margin-top: 0.5rem !important; } -.space-x-2 > :not(:last-child) { - margin-right: 0.5rem !important; +.space-x-2 > :not(template) ~ :not(template) { + margin-left: 0.5rem !important; } -.space-y-3 > :not(:last-child) { - margin-bottom: 0.75rem !important; +.space-y-3 > :not(template) ~ :not(template) { + margin-top: 0.75rem !important; } -.space-x-3 > :not(:last-child) { - margin-right: 0.75rem !important; +.space-x-3 > :not(template) ~ :not(template) { + margin-left: 0.75rem !important; } -.space-y-4 > :not(:last-child) { - margin-bottom: 1rem !important; +.space-y-4 > :not(template) ~ :not(template) { + margin-top: 1rem !important; } -.space-x-4 > :not(:last-child) { - margin-right: 1rem !important; +.space-x-4 > :not(template) ~ :not(template) { + margin-left: 1rem !important; } -.space-y-5 > :not(:last-child) { - margin-bottom: 1.25rem !important; +.space-y-5 > :not(template) ~ :not(template) { + margin-top: 1.25rem !important; } -.space-x-5 > :not(:last-child) { - margin-right: 1.25rem !important; +.space-x-5 > :not(template) ~ :not(template) { + margin-left: 1.25rem !important; } -.space-y-6 > :not(:last-child) { - margin-bottom: 1.5rem !important; +.space-y-6 > :not(template) ~ :not(template) { + margin-top: 1.5rem !important; } -.space-x-6 > :not(:last-child) { - margin-right: 1.5rem !important; +.space-x-6 > :not(template) ~ :not(template) { + margin-left: 1.5rem !important; } -.space-y-8 > :not(:last-child) { - margin-bottom: 2rem !important; +.space-y-8 > :not(template) ~ :not(template) { + margin-top: 2rem !important; } -.space-x-8 > :not(:last-child) { - margin-right: 2rem !important; +.space-x-8 > :not(template) ~ :not(template) { + margin-left: 2rem !important; } -.space-y-10 > :not(:last-child) { - margin-bottom: 2.5rem !important; +.space-y-10 > :not(template) ~ :not(template) { + margin-top: 2.5rem !important; } -.space-x-10 > :not(:last-child) { - margin-right: 2.5rem !important; +.space-x-10 > :not(template) ~ :not(template) { + margin-left: 2.5rem !important; } -.space-y-12 > :not(:last-child) { - margin-bottom: 3rem !important; +.space-y-12 > :not(template) ~ :not(template) { + margin-top: 3rem !important; } -.space-x-12 > :not(:last-child) { - margin-right: 3rem !important; +.space-x-12 > :not(template) ~ :not(template) { + margin-left: 3rem !important; } -.space-y-16 > :not(:last-child) { - margin-bottom: 4rem !important; +.space-y-16 > :not(template) ~ :not(template) { + margin-top: 4rem !important; } -.space-x-16 > :not(:last-child) { - margin-right: 4rem !important; +.space-x-16 > :not(template) ~ :not(template) { + margin-left: 4rem !important; } -.space-y-20 > :not(:last-child) { - margin-bottom: 5rem !important; +.space-y-20 > :not(template) ~ :not(template) { + margin-top: 5rem !important; } -.space-x-20 > :not(:last-child) { - margin-right: 5rem !important; +.space-x-20 > :not(template) ~ :not(template) { + margin-left: 5rem !important; } -.space-y-24 > :not(:last-child) { - margin-bottom: 6rem !important; +.space-y-24 > :not(template) ~ :not(template) { + margin-top: 6rem !important; } -.space-x-24 > :not(:last-child) { - margin-right: 6rem !important; +.space-x-24 > :not(template) ~ :not(template) { + margin-left: 6rem !important; } -.space-y-32 > :not(:last-child) { - margin-bottom: 8rem !important; +.space-y-32 > :not(template) ~ :not(template) { + margin-top: 8rem !important; } -.space-x-32 > :not(:last-child) { - margin-right: 8rem !important; +.space-x-32 > :not(template) ~ :not(template) { + margin-left: 8rem !important; } -.space-y-40 > :not(:last-child) { - margin-bottom: 10rem !important; +.space-y-40 > :not(template) ~ :not(template) { + margin-top: 10rem !important; } -.space-x-40 > :not(:last-child) { - margin-right: 10rem !important; +.space-x-40 > :not(template) ~ :not(template) { + margin-left: 10rem !important; } -.space-y-48 > :not(:last-child) { - margin-bottom: 12rem !important; +.space-y-48 > :not(template) ~ :not(template) { + margin-top: 12rem !important; } -.space-x-48 > :not(:last-child) { - margin-right: 12rem !important; +.space-x-48 > :not(template) ~ :not(template) { + margin-left: 12rem !important; } -.space-y-56 > :not(:last-child) { - margin-bottom: 14rem !important; +.space-y-56 > :not(template) ~ :not(template) { + margin-top: 14rem !important; } -.space-x-56 > :not(:last-child) { - margin-right: 14rem !important; +.space-x-56 > :not(template) ~ :not(template) { + margin-left: 14rem !important; } -.space-y-64 > :not(:last-child) { - margin-bottom: 16rem !important; +.space-y-64 > :not(template) ~ :not(template) { + margin-top: 16rem !important; } -.space-x-64 > :not(:last-child) { - margin-right: 16rem !important; +.space-x-64 > :not(template) ~ :not(template) { + margin-left: 16rem !important; } -.space-y-px > :not(:last-child) { - margin-bottom: 1px !important; +.space-y-px > :not(template) ~ :not(template) { + margin-top: 1px !important; } -.space-x-px > :not(:last-child) { - margin-right: 1px !important; +.space-x-px > :not(template) ~ :not(template) { + margin-left: 1px !important; } -.divide-y-0 > :not(:last-child) { - border-bottom-width: 0 !important; +.divide-y-0 > :not(template) ~ :not(template) { + border-top-width: 0 !important; } -.divide-x-0 > :not(:last-child) { - border-right-width: 0 !important; +.divide-x-0 > :not(template) ~ :not(template) { + border-left-width: 0 !important; } -.divide-y-2 > :not(:last-child) { - border-bottom-width: 2px !important; +.divide-y-2 > :not(template) ~ :not(template) { + border-top-width: 2px !important; } -.divide-x-2 > :not(:last-child) { - border-right-width: 2px !important; +.divide-x-2 > :not(template) ~ :not(template) { + border-left-width: 2px !important; } -.divide-y-4 > :not(:last-child) { - border-bottom-width: 4px !important; +.divide-y-4 > :not(template) ~ :not(template) { + border-top-width: 4px !important; } -.divide-x-4 > :not(:last-child) { - border-right-width: 4px !important; +.divide-x-4 > :not(template) ~ :not(template) { + border-left-width: 4px !important; } -.divide-y-8 > :not(:last-child) { - border-bottom-width: 8px !important; +.divide-y-8 > :not(template) ~ :not(template) { + border-top-width: 8px !important; } -.divide-x-8 > :not(:last-child) { - border-right-width: 8px !important; +.divide-x-8 > :not(template) ~ :not(template) { + border-left-width: 8px !important; } -.divide-y > :not(:last-child) { - border-bottom-width: 1px !important; +.divide-y > :not(template) ~ :not(template) { + border-top-width: 1px !important; } -.divide-x > :not(:last-child) { - border-right-width: 1px !important; +.divide-x > :not(template) ~ :not(template) { + border-left-width: 1px !important; } -.divide-transparent > :not(:last-child) { +.divide-transparent > :not(template) ~ :not(template) { border-color: transparent !important; } -.divide-current > :not(:last-child) { +.divide-current > :not(template) ~ :not(template) { border-color: currentColor !important; } -.divide-black > :not(:last-child) { +.divide-black > :not(template) ~ :not(template) { border-color: #000 !important; } -.divide-white > :not(:last-child) { +.divide-white > :not(template) ~ :not(template) { border-color: #fff !important; } -.divide-gray-100 > :not(:last-child) { +.divide-gray-100 > :not(template) ~ :not(template) { border-color: #f7fafc !important; } -.divide-gray-200 > :not(:last-child) { +.divide-gray-200 > :not(template) ~ :not(template) { border-color: #edf2f7 !important; } -.divide-gray-300 > :not(:last-child) { +.divide-gray-300 > :not(template) ~ :not(template) { border-color: #e2e8f0 !important; } -.divide-gray-400 > :not(:last-child) { +.divide-gray-400 > :not(template) ~ :not(template) { border-color: #cbd5e0 !important; } -.divide-gray-500 > :not(:last-child) { +.divide-gray-500 > :not(template) ~ :not(template) { border-color: #a0aec0 !important; } -.divide-gray-600 > :not(:last-child) { +.divide-gray-600 > :not(template) ~ :not(template) { border-color: #718096 !important; } -.divide-gray-700 > :not(:last-child) { +.divide-gray-700 > :not(template) ~ :not(template) { border-color: #4a5568 !important; } -.divide-gray-800 > :not(:last-child) { +.divide-gray-800 > :not(template) ~ :not(template) { border-color: #2d3748 !important; } -.divide-gray-900 > :not(:last-child) { +.divide-gray-900 > :not(template) ~ :not(template) { border-color: #1a202c !important; } -.divide-red-100 > :not(:last-child) { +.divide-red-100 > :not(template) ~ :not(template) { border-color: #fff5f5 !important; } -.divide-red-200 > :not(:last-child) { +.divide-red-200 > :not(template) ~ :not(template) { border-color: #fed7d7 !important; } -.divide-red-300 > :not(:last-child) { +.divide-red-300 > :not(template) ~ :not(template) { border-color: #feb2b2 !important; } -.divide-red-400 > :not(:last-child) { +.divide-red-400 > :not(template) ~ :not(template) { border-color: #fc8181 !important; } -.divide-red-500 > :not(:last-child) { +.divide-red-500 > :not(template) ~ :not(template) { border-color: #f56565 !important; } -.divide-red-600 > :not(:last-child) { +.divide-red-600 > :not(template) ~ :not(template) { border-color: #e53e3e !important; } -.divide-red-700 > :not(:last-child) { +.divide-red-700 > :not(template) ~ :not(template) { border-color: #c53030 !important; } -.divide-red-800 > :not(:last-child) { +.divide-red-800 > :not(template) ~ :not(template) { border-color: #9b2c2c !important; } -.divide-red-900 > :not(:last-child) { +.divide-red-900 > :not(template) ~ :not(template) { border-color: #742a2a !important; } -.divide-orange-100 > :not(:last-child) { +.divide-orange-100 > :not(template) ~ :not(template) { border-color: #fffaf0 !important; } -.divide-orange-200 > :not(:last-child) { +.divide-orange-200 > :not(template) ~ :not(template) { border-color: #feebc8 !important; } -.divide-orange-300 > :not(:last-child) { +.divide-orange-300 > :not(template) ~ :not(template) { border-color: #fbd38d !important; } -.divide-orange-400 > :not(:last-child) { +.divide-orange-400 > :not(template) ~ :not(template) { border-color: #f6ad55 !important; } -.divide-orange-500 > :not(:last-child) { +.divide-orange-500 > :not(template) ~ :not(template) { border-color: #ed8936 !important; } -.divide-orange-600 > :not(:last-child) { +.divide-orange-600 > :not(template) ~ :not(template) { border-color: #dd6b20 !important; } -.divide-orange-700 > :not(:last-child) { +.divide-orange-700 > :not(template) ~ :not(template) { border-color: #c05621 !important; } -.divide-orange-800 > :not(:last-child) { +.divide-orange-800 > :not(template) ~ :not(template) { border-color: #9c4221 !important; } -.divide-orange-900 > :not(:last-child) { +.divide-orange-900 > :not(template) ~ :not(template) { border-color: #7b341e !important; } -.divide-yellow-100 > :not(:last-child) { +.divide-yellow-100 > :not(template) ~ :not(template) { border-color: #fffff0 !important; } -.divide-yellow-200 > :not(:last-child) { +.divide-yellow-200 > :not(template) ~ :not(template) { border-color: #fefcbf !important; } -.divide-yellow-300 > :not(:last-child) { +.divide-yellow-300 > :not(template) ~ :not(template) { border-color: #faf089 !important; } -.divide-yellow-400 > :not(:last-child) { +.divide-yellow-400 > :not(template) ~ :not(template) { border-color: #f6e05e !important; } -.divide-yellow-500 > :not(:last-child) { +.divide-yellow-500 > :not(template) ~ :not(template) { border-color: #ecc94b !important; } -.divide-yellow-600 > :not(:last-child) { +.divide-yellow-600 > :not(template) ~ :not(template) { border-color: #d69e2e !important; } -.divide-yellow-700 > :not(:last-child) { +.divide-yellow-700 > :not(template) ~ :not(template) { border-color: #b7791f !important; } -.divide-yellow-800 > :not(:last-child) { +.divide-yellow-800 > :not(template) ~ :not(template) { border-color: #975a16 !important; } -.divide-yellow-900 > :not(:last-child) { +.divide-yellow-900 > :not(template) ~ :not(template) { border-color: #744210 !important; } -.divide-green-100 > :not(:last-child) { +.divide-green-100 > :not(template) ~ :not(template) { border-color: #f0fff4 !important; } -.divide-green-200 > :not(:last-child) { +.divide-green-200 > :not(template) ~ :not(template) { border-color: #c6f6d5 !important; } -.divide-green-300 > :not(:last-child) { +.divide-green-300 > :not(template) ~ :not(template) { border-color: #9ae6b4 !important; } -.divide-green-400 > :not(:last-child) { +.divide-green-400 > :not(template) ~ :not(template) { border-color: #68d391 !important; } -.divide-green-500 > :not(:last-child) { +.divide-green-500 > :not(template) ~ :not(template) { border-color: #48bb78 !important; } -.divide-green-600 > :not(:last-child) { +.divide-green-600 > :not(template) ~ :not(template) { border-color: #38a169 !important; } -.divide-green-700 > :not(:last-child) { +.divide-green-700 > :not(template) ~ :not(template) { border-color: #2f855a !important; } -.divide-green-800 > :not(:last-child) { +.divide-green-800 > :not(template) ~ :not(template) { border-color: #276749 !important; } -.divide-green-900 > :not(:last-child) { +.divide-green-900 > :not(template) ~ :not(template) { border-color: #22543d !important; } -.divide-teal-100 > :not(:last-child) { +.divide-teal-100 > :not(template) ~ :not(template) { border-color: #e6fffa !important; } -.divide-teal-200 > :not(:last-child) { +.divide-teal-200 > :not(template) ~ :not(template) { border-color: #b2f5ea !important; } -.divide-teal-300 > :not(:last-child) { +.divide-teal-300 > :not(template) ~ :not(template) { border-color: #81e6d9 !important; } -.divide-teal-400 > :not(:last-child) { +.divide-teal-400 > :not(template) ~ :not(template) { border-color: #4fd1c5 !important; } -.divide-teal-500 > :not(:last-child) { +.divide-teal-500 > :not(template) ~ :not(template) { border-color: #38b2ac !important; } -.divide-teal-600 > :not(:last-child) { +.divide-teal-600 > :not(template) ~ :not(template) { border-color: #319795 !important; } -.divide-teal-700 > :not(:last-child) { +.divide-teal-700 > :not(template) ~ :not(template) { border-color: #2c7a7b !important; } -.divide-teal-800 > :not(:last-child) { +.divide-teal-800 > :not(template) ~ :not(template) { border-color: #285e61 !important; } -.divide-teal-900 > :not(:last-child) { +.divide-teal-900 > :not(template) ~ :not(template) { border-color: #234e52 !important; } -.divide-blue-100 > :not(:last-child) { +.divide-blue-100 > :not(template) ~ :not(template) { border-color: #ebf8ff !important; } -.divide-blue-200 > :not(:last-child) { +.divide-blue-200 > :not(template) ~ :not(template) { border-color: #bee3f8 !important; } -.divide-blue-300 > :not(:last-child) { +.divide-blue-300 > :not(template) ~ :not(template) { border-color: #90cdf4 !important; } -.divide-blue-400 > :not(:last-child) { +.divide-blue-400 > :not(template) ~ :not(template) { border-color: #63b3ed !important; } -.divide-blue-500 > :not(:last-child) { +.divide-blue-500 > :not(template) ~ :not(template) { border-color: #4299e1 !important; } -.divide-blue-600 > :not(:last-child) { +.divide-blue-600 > :not(template) ~ :not(template) { border-color: #3182ce !important; } -.divide-blue-700 > :not(:last-child) { +.divide-blue-700 > :not(template) ~ :not(template) { border-color: #2b6cb0 !important; } -.divide-blue-800 > :not(:last-child) { +.divide-blue-800 > :not(template) ~ :not(template) { border-color: #2c5282 !important; } -.divide-blue-900 > :not(:last-child) { +.divide-blue-900 > :not(template) ~ :not(template) { border-color: #2a4365 !important; } -.divide-indigo-100 > :not(:last-child) { +.divide-indigo-100 > :not(template) ~ :not(template) { border-color: #ebf4ff !important; } -.divide-indigo-200 > :not(:last-child) { +.divide-indigo-200 > :not(template) ~ :not(template) { border-color: #c3dafe !important; } -.divide-indigo-300 > :not(:last-child) { +.divide-indigo-300 > :not(template) ~ :not(template) { border-color: #a3bffa !important; } -.divide-indigo-400 > :not(:last-child) { +.divide-indigo-400 > :not(template) ~ :not(template) { border-color: #7f9cf5 !important; } -.divide-indigo-500 > :not(:last-child) { +.divide-indigo-500 > :not(template) ~ :not(template) { border-color: #667eea !important; } -.divide-indigo-600 > :not(:last-child) { +.divide-indigo-600 > :not(template) ~ :not(template) { border-color: #5a67d8 !important; } -.divide-indigo-700 > :not(:last-child) { +.divide-indigo-700 > :not(template) ~ :not(template) { border-color: #4c51bf !important; } -.divide-indigo-800 > :not(:last-child) { +.divide-indigo-800 > :not(template) ~ :not(template) { border-color: #434190 !important; } -.divide-indigo-900 > :not(:last-child) { +.divide-indigo-900 > :not(template) ~ :not(template) { border-color: #3c366b !important; } -.divide-purple-100 > :not(:last-child) { +.divide-purple-100 > :not(template) ~ :not(template) { border-color: #faf5ff !important; } -.divide-purple-200 > :not(:last-child) { +.divide-purple-200 > :not(template) ~ :not(template) { border-color: #e9d8fd !important; } -.divide-purple-300 > :not(:last-child) { +.divide-purple-300 > :not(template) ~ :not(template) { border-color: #d6bcfa !important; } -.divide-purple-400 > :not(:last-child) { +.divide-purple-400 > :not(template) ~ :not(template) { border-color: #b794f4 !important; } -.divide-purple-500 > :not(:last-child) { +.divide-purple-500 > :not(template) ~ :not(template) { border-color: #9f7aea !important; } -.divide-purple-600 > :not(:last-child) { +.divide-purple-600 > :not(template) ~ :not(template) { border-color: #805ad5 !important; } -.divide-purple-700 > :not(:last-child) { +.divide-purple-700 > :not(template) ~ :not(template) { border-color: #6b46c1 !important; } -.divide-purple-800 > :not(:last-child) { +.divide-purple-800 > :not(template) ~ :not(template) { border-color: #553c9a !important; } -.divide-purple-900 > :not(:last-child) { +.divide-purple-900 > :not(template) ~ :not(template) { border-color: #44337a !important; } -.divide-pink-100 > :not(:last-child) { +.divide-pink-100 > :not(template) ~ :not(template) { border-color: #fff5f7 !important; } -.divide-pink-200 > :not(:last-child) { +.divide-pink-200 > :not(template) ~ :not(template) { border-color: #fed7e2 !important; } -.divide-pink-300 > :not(:last-child) { +.divide-pink-300 > :not(template) ~ :not(template) { border-color: #fbb6ce !important; } -.divide-pink-400 > :not(:last-child) { +.divide-pink-400 > :not(template) ~ :not(template) { border-color: #f687b3 !important; } -.divide-pink-500 > :not(:last-child) { +.divide-pink-500 > :not(template) ~ :not(template) { border-color: #ed64a6 !important; } -.divide-pink-600 > :not(:last-child) { +.divide-pink-600 > :not(template) ~ :not(template) { border-color: #d53f8c !important; } -.divide-pink-700 > :not(:last-child) { +.divide-pink-700 > :not(template) ~ :not(template) { border-color: #b83280 !important; } -.divide-pink-800 > :not(:last-child) { +.divide-pink-800 > :not(template) ~ :not(template) { border-color: #97266d !important; } -.divide-pink-900 > :not(:last-child) { +.divide-pink-900 > :not(template) ~ :not(template) { border-color: #702459 !important; } diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index a2e9ce46b5eb..81a8b5c51b60 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -606,571 +606,571 @@ video { } } -.space-y-0 > :not(:last-child) { - margin-bottom: 0; +.space-y-0 > :not(template) ~ :not(template) { + margin-top: 0; } -.space-x-0 > :not(:last-child) { - margin-right: 0; +.space-x-0 > :not(template) ~ :not(template) { + margin-left: 0; } -.space-y-1 > :not(:last-child) { - margin-bottom: 0.25rem; +.space-y-1 > :not(template) ~ :not(template) { + margin-top: 0.25rem; } -.space-x-1 > :not(:last-child) { - margin-right: 0.25rem; +.space-x-1 > :not(template) ~ :not(template) { + margin-left: 0.25rem; } -.space-y-2 > :not(:last-child) { - margin-bottom: 0.5rem; +.space-y-2 > :not(template) ~ :not(template) { + margin-top: 0.5rem; } -.space-x-2 > :not(:last-child) { - margin-right: 0.5rem; +.space-x-2 > :not(template) ~ :not(template) { + margin-left: 0.5rem; } -.space-y-3 > :not(:last-child) { - margin-bottom: 0.75rem; +.space-y-3 > :not(template) ~ :not(template) { + margin-top: 0.75rem; } -.space-x-3 > :not(:last-child) { - margin-right: 0.75rem; +.space-x-3 > :not(template) ~ :not(template) { + margin-left: 0.75rem; } -.space-y-4 > :not(:last-child) { - margin-bottom: 1rem; +.space-y-4 > :not(template) ~ :not(template) { + margin-top: 1rem; } -.space-x-4 > :not(:last-child) { - margin-right: 1rem; +.space-x-4 > :not(template) ~ :not(template) { + margin-left: 1rem; } -.space-y-5 > :not(:last-child) { - margin-bottom: 1.25rem; +.space-y-5 > :not(template) ~ :not(template) { + margin-top: 1.25rem; } -.space-x-5 > :not(:last-child) { - margin-right: 1.25rem; +.space-x-5 > :not(template) ~ :not(template) { + margin-left: 1.25rem; } -.space-y-6 > :not(:last-child) { - margin-bottom: 1.5rem; +.space-y-6 > :not(template) ~ :not(template) { + margin-top: 1.5rem; } -.space-x-6 > :not(:last-child) { - margin-right: 1.5rem; +.space-x-6 > :not(template) ~ :not(template) { + margin-left: 1.5rem; } -.space-y-8 > :not(:last-child) { - margin-bottom: 2rem; +.space-y-8 > :not(template) ~ :not(template) { + margin-top: 2rem; } -.space-x-8 > :not(:last-child) { - margin-right: 2rem; +.space-x-8 > :not(template) ~ :not(template) { + margin-left: 2rem; } -.space-y-10 > :not(:last-child) { - margin-bottom: 2.5rem; +.space-y-10 > :not(template) ~ :not(template) { + margin-top: 2.5rem; } -.space-x-10 > :not(:last-child) { - margin-right: 2.5rem; +.space-x-10 > :not(template) ~ :not(template) { + margin-left: 2.5rem; } -.space-y-12 > :not(:last-child) { - margin-bottom: 3rem; +.space-y-12 > :not(template) ~ :not(template) { + margin-top: 3rem; } -.space-x-12 > :not(:last-child) { - margin-right: 3rem; +.space-x-12 > :not(template) ~ :not(template) { + margin-left: 3rem; } -.space-y-16 > :not(:last-child) { - margin-bottom: 4rem; +.space-y-16 > :not(template) ~ :not(template) { + margin-top: 4rem; } -.space-x-16 > :not(:last-child) { - margin-right: 4rem; +.space-x-16 > :not(template) ~ :not(template) { + margin-left: 4rem; } -.space-y-20 > :not(:last-child) { - margin-bottom: 5rem; +.space-y-20 > :not(template) ~ :not(template) { + margin-top: 5rem; } -.space-x-20 > :not(:last-child) { - margin-right: 5rem; +.space-x-20 > :not(template) ~ :not(template) { + margin-left: 5rem; } -.space-y-24 > :not(:last-child) { - margin-bottom: 6rem; +.space-y-24 > :not(template) ~ :not(template) { + margin-top: 6rem; } -.space-x-24 > :not(:last-child) { - margin-right: 6rem; +.space-x-24 > :not(template) ~ :not(template) { + margin-left: 6rem; } -.space-y-32 > :not(:last-child) { - margin-bottom: 8rem; +.space-y-32 > :not(template) ~ :not(template) { + margin-top: 8rem; } -.space-x-32 > :not(:last-child) { - margin-right: 8rem; +.space-x-32 > :not(template) ~ :not(template) { + margin-left: 8rem; } -.space-y-40 > :not(:last-child) { - margin-bottom: 10rem; +.space-y-40 > :not(template) ~ :not(template) { + margin-top: 10rem; } -.space-x-40 > :not(:last-child) { - margin-right: 10rem; +.space-x-40 > :not(template) ~ :not(template) { + margin-left: 10rem; } -.space-y-48 > :not(:last-child) { - margin-bottom: 12rem; +.space-y-48 > :not(template) ~ :not(template) { + margin-top: 12rem; } -.space-x-48 > :not(:last-child) { - margin-right: 12rem; +.space-x-48 > :not(template) ~ :not(template) { + margin-left: 12rem; } -.space-y-56 > :not(:last-child) { - margin-bottom: 14rem; +.space-y-56 > :not(template) ~ :not(template) { + margin-top: 14rem; } -.space-x-56 > :not(:last-child) { - margin-right: 14rem; +.space-x-56 > :not(template) ~ :not(template) { + margin-left: 14rem; } -.space-y-64 > :not(:last-child) { - margin-bottom: 16rem; +.space-y-64 > :not(template) ~ :not(template) { + margin-top: 16rem; } -.space-x-64 > :not(:last-child) { - margin-right: 16rem; +.space-x-64 > :not(template) ~ :not(template) { + margin-left: 16rem; } -.space-y-px > :not(:last-child) { - margin-bottom: 1px; +.space-y-px > :not(template) ~ :not(template) { + margin-top: 1px; } -.space-x-px > :not(:last-child) { - margin-right: 1px; +.space-x-px > :not(template) ~ :not(template) { + margin-left: 1px; } -.divide-y-0 > :not(:last-child) { - border-bottom-width: 0; +.divide-y-0 > :not(template) ~ :not(template) { + border-top-width: 0; } -.divide-x-0 > :not(:last-child) { - border-right-width: 0; +.divide-x-0 > :not(template) ~ :not(template) { + border-left-width: 0; } -.divide-y-2 > :not(:last-child) { - border-bottom-width: 2px; +.divide-y-2 > :not(template) ~ :not(template) { + border-top-width: 2px; } -.divide-x-2 > :not(:last-child) { - border-right-width: 2px; +.divide-x-2 > :not(template) ~ :not(template) { + border-left-width: 2px; } -.divide-y-4 > :not(:last-child) { - border-bottom-width: 4px; +.divide-y-4 > :not(template) ~ :not(template) { + border-top-width: 4px; } -.divide-x-4 > :not(:last-child) { - border-right-width: 4px; +.divide-x-4 > :not(template) ~ :not(template) { + border-left-width: 4px; } -.divide-y-8 > :not(:last-child) { - border-bottom-width: 8px; +.divide-y-8 > :not(template) ~ :not(template) { + border-top-width: 8px; } -.divide-x-8 > :not(:last-child) { - border-right-width: 8px; +.divide-x-8 > :not(template) ~ :not(template) { + border-left-width: 8px; } -.divide-y > :not(:last-child) { - border-bottom-width: 1px; +.divide-y > :not(template) ~ :not(template) { + border-top-width: 1px; } -.divide-x > :not(:last-child) { - border-right-width: 1px; +.divide-x > :not(template) ~ :not(template) { + border-left-width: 1px; } -.divide-transparent > :not(:last-child) { +.divide-transparent > :not(template) ~ :not(template) { border-color: transparent; } -.divide-current > :not(:last-child) { +.divide-current > :not(template) ~ :not(template) { border-color: currentColor; } -.divide-black > :not(:last-child) { +.divide-black > :not(template) ~ :not(template) { border-color: #000; } -.divide-white > :not(:last-child) { +.divide-white > :not(template) ~ :not(template) { border-color: #fff; } -.divide-gray-100 > :not(:last-child) { +.divide-gray-100 > :not(template) ~ :not(template) { border-color: #f7fafc; } -.divide-gray-200 > :not(:last-child) { +.divide-gray-200 > :not(template) ~ :not(template) { border-color: #edf2f7; } -.divide-gray-300 > :not(:last-child) { +.divide-gray-300 > :not(template) ~ :not(template) { border-color: #e2e8f0; } -.divide-gray-400 > :not(:last-child) { +.divide-gray-400 > :not(template) ~ :not(template) { border-color: #cbd5e0; } -.divide-gray-500 > :not(:last-child) { +.divide-gray-500 > :not(template) ~ :not(template) { border-color: #a0aec0; } -.divide-gray-600 > :not(:last-child) { +.divide-gray-600 > :not(template) ~ :not(template) { border-color: #718096; } -.divide-gray-700 > :not(:last-child) { +.divide-gray-700 > :not(template) ~ :not(template) { border-color: #4a5568; } -.divide-gray-800 > :not(:last-child) { +.divide-gray-800 > :not(template) ~ :not(template) { border-color: #2d3748; } -.divide-gray-900 > :not(:last-child) { +.divide-gray-900 > :not(template) ~ :not(template) { border-color: #1a202c; } -.divide-red-100 > :not(:last-child) { +.divide-red-100 > :not(template) ~ :not(template) { border-color: #fff5f5; } -.divide-red-200 > :not(:last-child) { +.divide-red-200 > :not(template) ~ :not(template) { border-color: #fed7d7; } -.divide-red-300 > :not(:last-child) { +.divide-red-300 > :not(template) ~ :not(template) { border-color: #feb2b2; } -.divide-red-400 > :not(:last-child) { +.divide-red-400 > :not(template) ~ :not(template) { border-color: #fc8181; } -.divide-red-500 > :not(:last-child) { +.divide-red-500 > :not(template) ~ :not(template) { border-color: #f56565; } -.divide-red-600 > :not(:last-child) { +.divide-red-600 > :not(template) ~ :not(template) { border-color: #e53e3e; } -.divide-red-700 > :not(:last-child) { +.divide-red-700 > :not(template) ~ :not(template) { border-color: #c53030; } -.divide-red-800 > :not(:last-child) { +.divide-red-800 > :not(template) ~ :not(template) { border-color: #9b2c2c; } -.divide-red-900 > :not(:last-child) { +.divide-red-900 > :not(template) ~ :not(template) { border-color: #742a2a; } -.divide-orange-100 > :not(:last-child) { +.divide-orange-100 > :not(template) ~ :not(template) { border-color: #fffaf0; } -.divide-orange-200 > :not(:last-child) { +.divide-orange-200 > :not(template) ~ :not(template) { border-color: #feebc8; } -.divide-orange-300 > :not(:last-child) { +.divide-orange-300 > :not(template) ~ :not(template) { border-color: #fbd38d; } -.divide-orange-400 > :not(:last-child) { +.divide-orange-400 > :not(template) ~ :not(template) { border-color: #f6ad55; } -.divide-orange-500 > :not(:last-child) { +.divide-orange-500 > :not(template) ~ :not(template) { border-color: #ed8936; } -.divide-orange-600 > :not(:last-child) { +.divide-orange-600 > :not(template) ~ :not(template) { border-color: #dd6b20; } -.divide-orange-700 > :not(:last-child) { +.divide-orange-700 > :not(template) ~ :not(template) { border-color: #c05621; } -.divide-orange-800 > :not(:last-child) { +.divide-orange-800 > :not(template) ~ :not(template) { border-color: #9c4221; } -.divide-orange-900 > :not(:last-child) { +.divide-orange-900 > :not(template) ~ :not(template) { border-color: #7b341e; } -.divide-yellow-100 > :not(:last-child) { +.divide-yellow-100 > :not(template) ~ :not(template) { border-color: #fffff0; } -.divide-yellow-200 > :not(:last-child) { +.divide-yellow-200 > :not(template) ~ :not(template) { border-color: #fefcbf; } -.divide-yellow-300 > :not(:last-child) { +.divide-yellow-300 > :not(template) ~ :not(template) { border-color: #faf089; } -.divide-yellow-400 > :not(:last-child) { +.divide-yellow-400 > :not(template) ~ :not(template) { border-color: #f6e05e; } -.divide-yellow-500 > :not(:last-child) { +.divide-yellow-500 > :not(template) ~ :not(template) { border-color: #ecc94b; } -.divide-yellow-600 > :not(:last-child) { +.divide-yellow-600 > :not(template) ~ :not(template) { border-color: #d69e2e; } -.divide-yellow-700 > :not(:last-child) { +.divide-yellow-700 > :not(template) ~ :not(template) { border-color: #b7791f; } -.divide-yellow-800 > :not(:last-child) { +.divide-yellow-800 > :not(template) ~ :not(template) { border-color: #975a16; } -.divide-yellow-900 > :not(:last-child) { +.divide-yellow-900 > :not(template) ~ :not(template) { border-color: #744210; } -.divide-green-100 > :not(:last-child) { +.divide-green-100 > :not(template) ~ :not(template) { border-color: #f0fff4; } -.divide-green-200 > :not(:last-child) { +.divide-green-200 > :not(template) ~ :not(template) { border-color: #c6f6d5; } -.divide-green-300 > :not(:last-child) { +.divide-green-300 > :not(template) ~ :not(template) { border-color: #9ae6b4; } -.divide-green-400 > :not(:last-child) { +.divide-green-400 > :not(template) ~ :not(template) { border-color: #68d391; } -.divide-green-500 > :not(:last-child) { +.divide-green-500 > :not(template) ~ :not(template) { border-color: #48bb78; } -.divide-green-600 > :not(:last-child) { +.divide-green-600 > :not(template) ~ :not(template) { border-color: #38a169; } -.divide-green-700 > :not(:last-child) { +.divide-green-700 > :not(template) ~ :not(template) { border-color: #2f855a; } -.divide-green-800 > :not(:last-child) { +.divide-green-800 > :not(template) ~ :not(template) { border-color: #276749; } -.divide-green-900 > :not(:last-child) { +.divide-green-900 > :not(template) ~ :not(template) { border-color: #22543d; } -.divide-teal-100 > :not(:last-child) { +.divide-teal-100 > :not(template) ~ :not(template) { border-color: #e6fffa; } -.divide-teal-200 > :not(:last-child) { +.divide-teal-200 > :not(template) ~ :not(template) { border-color: #b2f5ea; } -.divide-teal-300 > :not(:last-child) { +.divide-teal-300 > :not(template) ~ :not(template) { border-color: #81e6d9; } -.divide-teal-400 > :not(:last-child) { +.divide-teal-400 > :not(template) ~ :not(template) { border-color: #4fd1c5; } -.divide-teal-500 > :not(:last-child) { +.divide-teal-500 > :not(template) ~ :not(template) { border-color: #38b2ac; } -.divide-teal-600 > :not(:last-child) { +.divide-teal-600 > :not(template) ~ :not(template) { border-color: #319795; } -.divide-teal-700 > :not(:last-child) { +.divide-teal-700 > :not(template) ~ :not(template) { border-color: #2c7a7b; } -.divide-teal-800 > :not(:last-child) { +.divide-teal-800 > :not(template) ~ :not(template) { border-color: #285e61; } -.divide-teal-900 > :not(:last-child) { +.divide-teal-900 > :not(template) ~ :not(template) { border-color: #234e52; } -.divide-blue-100 > :not(:last-child) { +.divide-blue-100 > :not(template) ~ :not(template) { border-color: #ebf8ff; } -.divide-blue-200 > :not(:last-child) { +.divide-blue-200 > :not(template) ~ :not(template) { border-color: #bee3f8; } -.divide-blue-300 > :not(:last-child) { +.divide-blue-300 > :not(template) ~ :not(template) { border-color: #90cdf4; } -.divide-blue-400 > :not(:last-child) { +.divide-blue-400 > :not(template) ~ :not(template) { border-color: #63b3ed; } -.divide-blue-500 > :not(:last-child) { +.divide-blue-500 > :not(template) ~ :not(template) { border-color: #4299e1; } -.divide-blue-600 > :not(:last-child) { +.divide-blue-600 > :not(template) ~ :not(template) { border-color: #3182ce; } -.divide-blue-700 > :not(:last-child) { +.divide-blue-700 > :not(template) ~ :not(template) { border-color: #2b6cb0; } -.divide-blue-800 > :not(:last-child) { +.divide-blue-800 > :not(template) ~ :not(template) { border-color: #2c5282; } -.divide-blue-900 > :not(:last-child) { +.divide-blue-900 > :not(template) ~ :not(template) { border-color: #2a4365; } -.divide-indigo-100 > :not(:last-child) { +.divide-indigo-100 > :not(template) ~ :not(template) { border-color: #ebf4ff; } -.divide-indigo-200 > :not(:last-child) { +.divide-indigo-200 > :not(template) ~ :not(template) { border-color: #c3dafe; } -.divide-indigo-300 > :not(:last-child) { +.divide-indigo-300 > :not(template) ~ :not(template) { border-color: #a3bffa; } -.divide-indigo-400 > :not(:last-child) { +.divide-indigo-400 > :not(template) ~ :not(template) { border-color: #7f9cf5; } -.divide-indigo-500 > :not(:last-child) { +.divide-indigo-500 > :not(template) ~ :not(template) { border-color: #667eea; } -.divide-indigo-600 > :not(:last-child) { +.divide-indigo-600 > :not(template) ~ :not(template) { border-color: #5a67d8; } -.divide-indigo-700 > :not(:last-child) { +.divide-indigo-700 > :not(template) ~ :not(template) { border-color: #4c51bf; } -.divide-indigo-800 > :not(:last-child) { +.divide-indigo-800 > :not(template) ~ :not(template) { border-color: #434190; } -.divide-indigo-900 > :not(:last-child) { +.divide-indigo-900 > :not(template) ~ :not(template) { border-color: #3c366b; } -.divide-purple-100 > :not(:last-child) { +.divide-purple-100 > :not(template) ~ :not(template) { border-color: #faf5ff; } -.divide-purple-200 > :not(:last-child) { +.divide-purple-200 > :not(template) ~ :not(template) { border-color: #e9d8fd; } -.divide-purple-300 > :not(:last-child) { +.divide-purple-300 > :not(template) ~ :not(template) { border-color: #d6bcfa; } -.divide-purple-400 > :not(:last-child) { +.divide-purple-400 > :not(template) ~ :not(template) { border-color: #b794f4; } -.divide-purple-500 > :not(:last-child) { +.divide-purple-500 > :not(template) ~ :not(template) { border-color: #9f7aea; } -.divide-purple-600 > :not(:last-child) { +.divide-purple-600 > :not(template) ~ :not(template) { border-color: #805ad5; } -.divide-purple-700 > :not(:last-child) { +.divide-purple-700 > :not(template) ~ :not(template) { border-color: #6b46c1; } -.divide-purple-800 > :not(:last-child) { +.divide-purple-800 > :not(template) ~ :not(template) { border-color: #553c9a; } -.divide-purple-900 > :not(:last-child) { +.divide-purple-900 > :not(template) ~ :not(template) { border-color: #44337a; } -.divide-pink-100 > :not(:last-child) { +.divide-pink-100 > :not(template) ~ :not(template) { border-color: #fff5f7; } -.divide-pink-200 > :not(:last-child) { +.divide-pink-200 > :not(template) ~ :not(template) { border-color: #fed7e2; } -.divide-pink-300 > :not(:last-child) { +.divide-pink-300 > :not(template) ~ :not(template) { border-color: #fbb6ce; } -.divide-pink-400 > :not(:last-child) { +.divide-pink-400 > :not(template) ~ :not(template) { border-color: #f687b3; } -.divide-pink-500 > :not(:last-child) { +.divide-pink-500 > :not(template) ~ :not(template) { border-color: #ed64a6; } -.divide-pink-600 > :not(:last-child) { +.divide-pink-600 > :not(template) ~ :not(template) { border-color: #d53f8c; } -.divide-pink-700 > :not(:last-child) { +.divide-pink-700 > :not(template) ~ :not(template) { border-color: #b83280; } -.divide-pink-800 > :not(:last-child) { +.divide-pink-800 > :not(template) ~ :not(template) { border-color: #97266d; } -.divide-pink-900 > :not(:last-child) { +.divide-pink-900 > :not(template) ~ :not(template) { border-color: #702459; } diff --git a/__tests__/plugins/divideColor.test.js b/__tests__/plugins/divideColor.test.js index 8d73795400a2..21c0bba34131 100644 --- a/__tests__/plugins/divideColor.test.js +++ b/__tests__/plugins/divideColor.test.js @@ -40,20 +40,48 @@ test('generating divide color utilities', () => { expect(utilities).toEqual([ [ { - '.divide-purple > * + *': { 'border-color': 'purple' }, - '.divide-white-25 > * + *': { 'border-color': 'rgba(255,255,255,.25)' }, - '.divide-white-50 > * + *': { 'border-color': 'rgba(255,255,255,.5)' }, - '.divide-white-75 > * + *': { 'border-color': 'rgba(255,255,255,.75)' }, - '.divide-white > * + *': { 'border-color': '#fff' }, - '.divide-red-1 > * + *': { 'border-color': 'rgb(33,0,0)' }, - '.divide-red-2 > * + *': { 'border-color': 'rgb(67,0,0)' }, - '.divide-red-3 > * + *': { 'border-color': 'rgb(100,0,0)' }, - '.divide-green-1 > * + *': { 'border-color': 'rgb(0,33,0)' }, - '.divide-green-2 > * + *': { 'border-color': 'rgb(0,67,0)' }, - '.divide-green-3 > * + *': { 'border-color': 'rgb(0,100,0)' }, - '.divide-blue-1 > * + *': { 'border-color': 'rgb(0,0,33)' }, - '.divide-blue-2 > * + *': { 'border-color': 'rgb(0,0,67)' }, - '.divide-blue-3 > * + *': { 'border-color': 'rgb(0,0,100)' }, + '.divide-purple > :not(template) ~ :not(template)': { + 'border-color': 'purple', + }, + '.divide-white-25 > :not(template) ~ :not(template)': { + 'border-color': 'rgba(255,255,255,.25)', + }, + '.divide-white-50 > :not(template) ~ :not(template)': { + 'border-color': 'rgba(255,255,255,.5)', + }, + '.divide-white-75 > :not(template) ~ :not(template)': { + 'border-color': 'rgba(255,255,255,.75)', + }, + '.divide-white > :not(template) ~ :not(template)': { + 'border-color': '#fff', + }, + '.divide-red-1 > :not(template) ~ :not(template)': { + 'border-color': 'rgb(33,0,0)', + }, + '.divide-red-2 > :not(template) ~ :not(template)': { + 'border-color': 'rgb(67,0,0)', + }, + '.divide-red-3 > :not(template) ~ :not(template)': { + 'border-color': 'rgb(100,0,0)', + }, + '.divide-green-1 > :not(template) ~ :not(template)': { + 'border-color': 'rgb(0,33,0)', + }, + '.divide-green-2 > :not(template) ~ :not(template)': { + 'border-color': 'rgb(0,67,0)', + }, + '.divide-green-3 > :not(template) ~ :not(template)': { + 'border-color': 'rgb(0,100,0)', + }, + '.divide-blue-1 > :not(template) ~ :not(template)': { + 'border-color': 'rgb(0,0,33)', + }, + '.divide-blue-2 > :not(template) ~ :not(template)': { + 'border-color': 'rgb(0,0,67)', + }, + '.divide-blue-3 > :not(template) ~ :not(template)': { + 'border-color': 'rgb(0,0,100)', + }, }, ['responsive'], ], diff --git a/__tests__/plugins/divideWidth.test.js b/__tests__/plugins/divideWidth.test.js index b9f9b9b06ce3..af1723b6a7b5 100644 --- a/__tests__/plugins/divideWidth.test.js +++ b/__tests__/plugins/divideWidth.test.js @@ -21,14 +21,14 @@ test('generating divide width utilities', () => { expect(utilities).toEqual([ [ { - '.divide-y-2 > * + *': { 'border-top-width': '2px' }, - '.divide-x-2 > * + *': { 'border-left-width': '2px' }, - '.divide-y-4 > * + *': { 'border-top-width': '4px' }, - '.divide-x-4 > * + *': { 'border-left-width': '4px' }, - '.divide-y-8 > * + *': { 'border-top-width': '8px' }, - '.divide-x-8 > * + *': { 'border-left-width': '8px' }, - '.divide-y > * + *': { 'border-top-width': '1px' }, - '.divide-x > * + *': { 'border-left-width': '1px' }, + '.divide-y-2 > :not(template) ~ :not(template)': { 'border-top-width': '2px' }, + '.divide-x-2 > :not(template) ~ :not(template)': { 'border-left-width': '2px' }, + '.divide-y-4 > :not(template) ~ :not(template)': { 'border-top-width': '4px' }, + '.divide-x-4 > :not(template) ~ :not(template)': { 'border-left-width': '4px' }, + '.divide-y-8 > :not(template) ~ :not(template)': { 'border-top-width': '8px' }, + '.divide-x-8 > :not(template) ~ :not(template)': { 'border-left-width': '8px' }, + '.divide-y > :not(template) ~ :not(template)': { 'border-top-width': '1px' }, + '.divide-x > :not(template) ~ :not(template)': { 'border-left-width': '1px' }, }, ['responsive'], ], diff --git a/__tests__/plugins/space.test.js b/__tests__/plugins/space.test.js index 2b8d70f580eb..e77277d0eac0 100644 --- a/__tests__/plugins/space.test.js +++ b/__tests__/plugins/space.test.js @@ -21,14 +21,14 @@ test('generating space utilities', () => { expect(utilities).toEqual([ [ { - '.space-y-1 > * + *': { 'margin-top': '1px' }, - '.space-x-1 > * + *': { 'margin-left': '1px' }, - '.space-y-2 > * + *': { 'margin-top': '2px' }, - '.space-x-2 > * + *': { 'margin-left': '2px' }, - '.space-y-4 > * + *': { 'margin-top': '4px' }, - '.space-x-4 > * + *': { 'margin-left': '4px' }, - '.space-y-8 > * + *': { 'margin-top': '8px' }, - '.space-x-8 > * + *': { 'margin-left': '8px' }, + '.space-y-1 > :not(template) ~ :not(template)': { 'margin-top': '1px' }, + '.space-x-1 > :not(template) ~ :not(template)': { 'margin-left': '1px' }, + '.space-y-2 > :not(template) ~ :not(template)': { 'margin-top': '2px' }, + '.space-x-2 > :not(template) ~ :not(template)': { 'margin-left': '2px' }, + '.space-y-4 > :not(template) ~ :not(template)': { 'margin-top': '4px' }, + '.space-x-4 > :not(template) ~ :not(template)': { 'margin-left': '4px' }, + '.space-y-8 > :not(template) ~ :not(template)': { 'margin-top': '8px' }, + '.space-x-8 > :not(template) ~ :not(template)': { 'margin-left': '8px' }, }, ['responsive'], ], diff --git a/src/plugins/divideColor.js b/src/plugins/divideColor.js index 5260774dd79e..9877263c48aa 100644 --- a/src/plugins/divideColor.js +++ b/src/plugins/divideColor.js @@ -8,7 +8,7 @@ export default function() { const utilities = _.fromPairs( _.map(_.omit(colors, 'default'), (value, modifier) => { return [ - `.${e(`divide-${modifier}`)} > :not(:last-child)`, + `.${e(`divide-${modifier}`)} > :not(template) ~ :not(template)`, { 'border-color': value, }, diff --git a/src/plugins/divideWidth.js b/src/plugins/divideWidth.js index 254bc5cbb930..f1fdb7f94924 100644 --- a/src/plugins/divideWidth.js +++ b/src/plugins/divideWidth.js @@ -4,8 +4,12 @@ export default function() { return function({ addUtilities, e, theme, variants }) { const generators = [ (value, modifier) => ({ - [`.${e(`divide-y${modifier}`)} > :not(:last-child)`]: { 'border-bottom-width': `${value}` }, - [`.${e(`divide-x${modifier}`)} > :not(:last-child)`]: { 'border-right-width': `${value}` }, + [`.${e(`divide-y${modifier}`)} > :not(template) ~ :not(template)`]: { + 'border-top-width': `${value}`, + }, + [`.${e(`divide-x${modifier}`)} > :not(template) ~ :not(template)`]: { + 'border-left-width': `${value}`, + }, }), ] diff --git a/src/plugins/space.js b/src/plugins/space.js index 8fae0d97015b..c7c674631109 100644 --- a/src/plugins/space.js +++ b/src/plugins/space.js @@ -4,8 +4,12 @@ export default function() { return function({ addUtilities, e, theme, variants }) { const generators = [ (size, modifier) => ({ - [`.${e(`space-y-${modifier}`)} > :not(:last-child)`]: { 'margin-bottom': `${size}` }, - [`.${e(`space-x-${modifier}`)} > :not(:last-child)`]: { 'margin-right': `${size}` }, + [`.${e(`space-y-${modifier}`)} > :not(template) ~ :not(template)`]: { + 'margin-top': `${size}`, + }, + [`.${e(`space-x-${modifier}`)} > :not(template) ~ :not(template)`]: { + 'margin-left': `${size}`, + }, }), ] From be76d63d0b5a972082f7e19444558b04bb61b93a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Apr 2020 06:50:06 +0000 Subject: [PATCH 45/52] Bump jest from 25.3.0 to 25.4.0 Bumps [jest](https://github.com/facebook/jest) from 25.3.0 to 25.4.0. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/compare/v25.3.0...v25.4.0) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 736 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 479 insertions(+), 257 deletions(-) diff --git a/yarn.lock b/yarn.lock index 0e90c3446986..d3a5859dc58e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -860,43 +860,44 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -"@jest/console@^25.3.0": - version "25.3.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-25.3.0.tgz#33b56b81238427bf3ebe3f7b3378d2f79cdbd409" - integrity sha512-LvSDNqpmZIZyweFaEQ6wKY7CbexPitlsLHGJtcooNECo0An/w49rFhjCJzu6efeb6+a3ee946xss1Jcd9r03UQ== +"@jest/console@^25.4.0": + version "25.4.0" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-25.4.0.tgz#e2760b532701137801ba824dcff6bc822c961bac" + integrity sha512-CfE0erx4hdJ6t7RzAcE1wLG6ZzsHSmybvIBQDoCkDM1QaSeWL9wJMzID/2BbHHa7ll9SsbbK43HjbERbBaFX2A== dependencies: - "@jest/source-map" "^25.2.6" + "@jest/types" "^25.4.0" chalk "^3.0.0" - jest-util "^25.3.0" + jest-message-util "^25.4.0" + jest-util "^25.4.0" slash "^3.0.0" -"@jest/core@^25.3.0": - version "25.3.0" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-25.3.0.tgz#80f97a7a8b59dde741a24f30871cc26d0197d426" - integrity sha512-+D5a/tFf6pA/Gqft2DLBp/yeSRgXhlJ+Wpst0X/ZkfTRP54qDR3C61VfHwaex+GzZBiTcE9vQeoZ2v5T10+Mqw== +"@jest/core@^25.4.0": + version "25.4.0" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-25.4.0.tgz#cc1fe078df69b8f0fbb023bb0bcee23ef3b89411" + integrity sha512-h1x9WSVV0+TKVtATGjyQIMJENs8aF6eUjnCoi4jyRemYZmekLr8EJOGQqTWEX8W6SbZ6Skesy9pGXrKeAolUJw== dependencies: - "@jest/console" "^25.3.0" - "@jest/reporters" "^25.3.0" - "@jest/test-result" "^25.3.0" - "@jest/transform" "^25.3.0" - "@jest/types" "^25.3.0" + "@jest/console" "^25.4.0" + "@jest/reporters" "^25.4.0" + "@jest/test-result" "^25.4.0" + "@jest/transform" "^25.4.0" + "@jest/types" "^25.4.0" ansi-escapes "^4.2.1" chalk "^3.0.0" exit "^0.1.2" graceful-fs "^4.2.3" - jest-changed-files "^25.3.0" - jest-config "^25.3.0" - jest-haste-map "^25.3.0" - jest-message-util "^25.3.0" + jest-changed-files "^25.4.0" + jest-config "^25.4.0" + jest-haste-map "^25.4.0" + jest-message-util "^25.4.0" jest-regex-util "^25.2.6" - jest-resolve "^25.3.0" - jest-resolve-dependencies "^25.3.0" - jest-runner "^25.3.0" - jest-runtime "^25.3.0" - jest-snapshot "^25.3.0" - jest-util "^25.3.0" - jest-validate "^25.3.0" - jest-watcher "^25.3.0" + jest-resolve "^25.4.0" + jest-resolve-dependencies "^25.4.0" + jest-runner "^25.4.0" + jest-runtime "^25.4.0" + jest-snapshot "^25.4.0" + jest-util "^25.4.0" + jest-validate "^25.4.0" + jest-watcher "^25.4.0" micromatch "^4.0.2" p-each-series "^2.1.0" realpath-native "^2.0.0" @@ -904,36 +905,36 @@ slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^25.3.0": - version "25.3.0" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-25.3.0.tgz#587f28ddb4b0dfe97404d3d4a4c9dbfa0245fb2e" - integrity sha512-vgooqwJTHLLak4fE+TaCGeYP7Tz1Y3CKOsNxR1sE0V3nx3KRUHn3NUnt+wbcfd5yQWKZQKAfW6wqbuwQLrXo3g== +"@jest/environment@^25.4.0": + version "25.4.0" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-25.4.0.tgz#45071f525f0d8c5a51ed2b04fd42b55a8f0c7cb3" + integrity sha512-KDctiak4mu7b4J6BIoN/+LUL3pscBzoUCP+EtSPd2tK9fqyDY5OF+CmkBywkFWezS9tyH5ACOQNtpjtueEDH6Q== dependencies: - "@jest/fake-timers" "^25.3.0" - "@jest/types" "^25.3.0" - jest-mock "^25.3.0" + "@jest/fake-timers" "^25.4.0" + "@jest/types" "^25.4.0" + jest-mock "^25.4.0" -"@jest/fake-timers@^25.3.0": - version "25.3.0" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.3.0.tgz#995aad36d5c8984165ca5db12e740ab8dbf7042a" - integrity sha512-NHAj7WbsyR3qBJPpBwSwqaq2WluIvUQsyzpJTN7XDVk7VnlC/y1BAnaYZL3vbPIP8Nhm0Ae5DJe0KExr/SdMJQ== +"@jest/fake-timers@^25.4.0": + version "25.4.0" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.4.0.tgz#3a9a4289ba836abd084953dca406389a57e00fbd" + integrity sha512-lI9z+VOmVX4dPPFzyj0vm+UtaB8dCJJ852lcDnY0uCPRvZAaVGnMwBBc1wxtf+h7Vz6KszoOvKAt4QijDnHDkg== dependencies: - "@jest/types" "^25.3.0" - jest-message-util "^25.3.0" - jest-mock "^25.3.0" - jest-util "^25.3.0" + "@jest/types" "^25.4.0" + jest-message-util "^25.4.0" + jest-mock "^25.4.0" + jest-util "^25.4.0" lolex "^5.0.0" -"@jest/reporters@^25.3.0": - version "25.3.0" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-25.3.0.tgz#7f39f0e6911561cc5112a1b54656de18faee269b" - integrity sha512-1u0ZBygs0C9DhdYgLCrRfZfNKQa+9+J7Uo+Z9z0RWLHzgsxhoG32lrmMOtUw48yR6bLNELdvzormwUqSk4H4Vg== +"@jest/reporters@^25.4.0": + version "25.4.0" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-25.4.0.tgz#836093433b32ce4e866298af2d6fcf6ed351b0b0" + integrity sha512-bhx/buYbZgLZm4JWLcRJ/q9Gvmd3oUh7k2V7gA4ZYBx6J28pIuykIouclRdiAC6eGVX1uRZT+GK4CQJLd/PwPg== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^25.3.0" - "@jest/test-result" "^25.3.0" - "@jest/transform" "^25.3.0" - "@jest/types" "^25.3.0" + "@jest/console" "^25.4.0" + "@jest/test-result" "^25.4.0" + "@jest/transform" "^25.4.0" + "@jest/types" "^25.4.0" chalk "^3.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" @@ -943,15 +944,15 @@ istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.0.2" - jest-haste-map "^25.3.0" - jest-resolve "^25.3.0" - jest-util "^25.3.0" - jest-worker "^25.2.6" + jest-haste-map "^25.4.0" + jest-resolve "^25.4.0" + jest-util "^25.4.0" + jest-worker "^25.4.0" slash "^3.0.0" source-map "^0.6.0" string-length "^3.1.0" terminal-link "^2.0.0" - v8-to-istanbul "^4.0.1" + v8-to-istanbul "^4.1.3" optionalDependencies: node-notifier "^6.0.0" @@ -964,25 +965,25 @@ graceful-fs "^4.2.3" source-map "^0.6.0" -"@jest/test-result@^25.3.0": - version "25.3.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.3.0.tgz#137fab5e5c6fed36e5d40735d1eb029325e3bf06" - integrity sha512-mqrGuiiPXl1ap09Mydg4O782F3ouDQfsKqtQzIjitpwv3t1cHDwCto21jThw6WRRE+dKcWQvLG70GpyLJICfGw== +"@jest/test-result@^25.4.0": + version "25.4.0" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.4.0.tgz#6f2ec2c8da9981ef013ad8651c1c6f0cb20c6324" + integrity sha512-8BAKPaMCHlL941eyfqhWbmp3MebtzywlxzV+qtngQ3FH+RBqnoSAhNEPj4MG7d2NVUrMOVfrwuzGpVIK+QnMAA== dependencies: - "@jest/console" "^25.3.0" - "@jest/types" "^25.3.0" + "@jest/console" "^25.4.0" + "@jest/types" "^25.4.0" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^25.3.0": - version "25.3.0" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-25.3.0.tgz#271ad5f2b8f8137d092ccedc87e16a50f8676209" - integrity sha512-Xvns3xbji7JCvVcDGvqJ/pf4IpmohPODumoPEZJ0/VgC5gI4XaNVIBET2Dq5Czu6Gk3xFcmhtthh/MBOTljdNg== +"@jest/test-sequencer@^25.4.0": + version "25.4.0" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-25.4.0.tgz#2b96f9d37f18dc3336b28e3c8070f97f9f55f43b" + integrity sha512-240cI+nsM3attx2bMp9uGjjHrwrpvxxrZi8Tyqp/cfOzl98oZXVakXBgxODGyBYAy/UGXPKXLvNc2GaqItrsJg== dependencies: - "@jest/test-result" "^25.3.0" - jest-haste-map "^25.3.0" - jest-runner "^25.3.0" - jest-runtime "^25.3.0" + "@jest/test-result" "^25.4.0" + jest-haste-map "^25.4.0" + jest-runner "^25.4.0" + jest-runtime "^25.4.0" "@jest/transform@^25.3.0": version "25.3.0" @@ -1006,6 +1007,28 @@ source-map "^0.6.1" write-file-atomic "^3.0.0" +"@jest/transform@^25.4.0": + version "25.4.0" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.4.0.tgz#eef36f0367d639e2fd93dccd758550377fbb9962" + integrity sha512-t1w2S6V1sk++1HHsxboWxPEuSpN8pxEvNrZN+Ud/knkROWtf8LeUmz73A4ezE8476a5AM00IZr9a8FO9x1+j3g== + dependencies: + "@babel/core" "^7.1.0" + "@jest/types" "^25.4.0" + babel-plugin-istanbul "^6.0.0" + chalk "^3.0.0" + convert-source-map "^1.4.0" + fast-json-stable-stringify "^2.0.0" + graceful-fs "^4.2.3" + jest-haste-map "^25.4.0" + jest-regex-util "^25.2.6" + jest-util "^25.4.0" + micromatch "^4.0.2" + pirates "^4.0.1" + realpath-native "^2.0.0" + slash "^3.0.0" + source-map "^0.6.1" + write-file-atomic "^3.0.0" + "@jest/types@^25.3.0": version "25.3.0" resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.3.0.tgz#88f94b277a1d028fd7117bc1f74451e0fc2131e7" @@ -1016,6 +1039,16 @@ "@types/yargs" "^15.0.0" chalk "^3.0.0" +"@jest/types@^25.4.0": + version "25.4.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.4.0.tgz#5afeb8f7e1cba153a28e5ac3c9fe3eede7206d59" + integrity sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^1.1.1" + "@types/yargs" "^15.0.0" + chalk "^3.0.0" + "@sinonjs/commons@^1.7.0": version "1.7.0" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.0.tgz#f90ffc52a2e519f018b13b6c4da03cbff36ebed6" @@ -1081,6 +1114,11 @@ "@types/istanbul-lib-coverage" "*" "@types/istanbul-lib-report" "*" +"@types/normalize-package-data@^2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" + integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== + "@types/prettier@^1.19.0": version "1.19.1" resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-1.19.1.tgz#33509849f8e679e4add158959fdb086440e9553f" @@ -1333,7 +1371,7 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== -babel-jest@^25.1.0, babel-jest@^25.3.0: +babel-jest@^25.1.0: version "25.3.0" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.3.0.tgz#999d0c19e8427f66b796bf9ea233eedf087b957c" integrity sha512-qiXeX1Cmw4JZ5yQ4H57WpkO0MZ61Qj+YnsVUwAMnDV5ls+yHon11XjarDdgP7H8lTmiEi6biiZA8y3Tmvx6pCg== @@ -1346,6 +1384,19 @@ babel-jest@^25.1.0, babel-jest@^25.3.0: chalk "^3.0.0" slash "^3.0.0" +babel-jest@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.4.0.tgz#409eb3e2ddc2ad9a92afdbb00991f1633f8018d0" + integrity sha512-p+epx4K0ypmHuCnd8BapfyOwWwosNCYhedetQey1awddtfmEX0MmdxctGl956uwUmjwXR5VSS5xJcGX9DvdIog== + dependencies: + "@jest/transform" "^25.4.0" + "@jest/types" "^25.4.0" + "@types/babel__core" "^7.1.7" + babel-plugin-istanbul "^6.0.0" + babel-preset-jest "^25.4.0" + chalk "^3.0.0" + slash "^3.0.0" + babel-plugin-dynamic-import-node@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" @@ -1371,6 +1422,13 @@ babel-plugin-jest-hoist@^25.2.6: dependencies: "@types/babel__traverse" "^7.0.6" +babel-plugin-jest-hoist@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.4.0.tgz#0c122c1b93fb76f52d2465be2e8069e798e9d442" + integrity sha512-M3a10JCtTyKevb0MjuH6tU+cP/NVQZ82QPADqI1RQYY1OphztsCeIeQmTsHmF/NS6m0E51Zl4QNsI3odXSQF5w== + dependencies: + "@types/babel__traverse" "^7.0.6" + babel-preset-current-node-syntax@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz#fb4a4c51fe38ca60fede1dc74ab35eb843cb41d6" @@ -1395,6 +1453,14 @@ babel-preset-jest@^25.3.0: babel-plugin-jest-hoist "^25.2.6" babel-preset-current-node-syntax "^0.1.2" +babel-preset-jest@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.4.0.tgz#10037cc32b751b994b260964629e49dc479abf4c" + integrity sha512-PwFiEWflHdu3JCeTr0Pb9NcHHE34qWFnPQRVPvqQITx4CsDCzs6o05923I10XvLvn9nNsRHuiVgB72wG/90ZHQ== + dependencies: + babel-plugin-jest-hoist "^25.4.0" + babel-preset-current-node-syntax "^0.1.2" + balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -1969,6 +2035,13 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + es-abstract@^1.5.1: version "1.13.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9" @@ -2179,16 +2252,16 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" -expect@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-25.3.0.tgz#5fd36e51befd05afb7184bc954f8a4792d184c71" - integrity sha512-buboTXML2h/L0Kh44Ys2Cx49mX20ISc5KDirkxIs3Q9AJv0kazweUAbukegr+nHDOvFRKmxdojjIHCjqAceYfg== +expect@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/expect/-/expect-25.4.0.tgz#0b16c17401906d1679d173e59f0d4580b22f8dc8" + integrity sha512-7BDIX99BTi12/sNGJXA9KMRcby4iAmu1xccBOhyKCyEhjcVKS3hPmHdA/4nSI9QGIOkUropKqr3vv7WMDM5lvQ== dependencies: - "@jest/types" "^25.3.0" + "@jest/types" "^25.4.0" ansi-styles "^4.0.0" jest-get-type "^25.2.6" - jest-matcher-utils "^25.3.0" - jest-message-util "^25.3.0" + jest-matcher-utils "^25.4.0" + jest-message-util "^25.4.0" jest-regex-util "^25.2.6" extend-shallow@^2.0.1: @@ -2605,6 +2678,11 @@ homedir-polyfill@^1.0.1: dependencies: parse-passwd "^1.0.0" +hosted-git-info@^2.1.4: + version "2.8.8" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" + integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== + html-encoding-sniffer@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8" @@ -2739,6 +2817,11 @@ is-accessor-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + is-binary-path@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" @@ -2987,67 +3070,67 @@ istanbul-reports@^3.0.2: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -jest-changed-files@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-25.3.0.tgz#85d8de6f4bd13dafda9d7f1e3f2565fc0e183c78" - integrity sha512-eqd5hyLbUjIVvLlJ3vQ/MoPxsxfESVXG9gvU19XXjKzxr+dXmZIqCXiY0OiYaibwlHZBJl2Vebkc0ADEMzCXew== +jest-changed-files@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-25.4.0.tgz#e573db32c2fd47d2b90357ea2eda0622c5c5cbd6" + integrity sha512-VR/rfJsEs4BVMkwOTuStRyS630fidFVekdw/lBaBQjx9KK3VZFOZ2c0fsom2fRp8pMCrCTP6LGna00o/DXGlqA== dependencies: - "@jest/types" "^25.3.0" + "@jest/types" "^25.4.0" execa "^3.2.0" throat "^5.0.0" -jest-cli@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-25.3.0.tgz#d9e11f5700cc5946583cf0d01a9bdebceed448d2" - integrity sha512-XpNQPlW1tzpP7RGG8dxpkRegYDuLjzSiENu92+CYM87nEbmEPb3b4+yo8xcsHOnj0AG7DUt9b3uG8LuHI3MDzw== +jest-cli@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-25.4.0.tgz#5dac8be0fece6ce39f0d671395a61d1357322bab" + integrity sha512-usyrj1lzCJZMRN1r3QEdnn8e6E6yCx/QN7+B1sLoA68V7f3WlsxSSQfy0+BAwRiF4Hz2eHauf11GZG3PIfWTXQ== dependencies: - "@jest/core" "^25.3.0" - "@jest/test-result" "^25.3.0" - "@jest/types" "^25.3.0" + "@jest/core" "^25.4.0" + "@jest/test-result" "^25.4.0" + "@jest/types" "^25.4.0" chalk "^3.0.0" exit "^0.1.2" import-local "^3.0.2" is-ci "^2.0.0" - jest-config "^25.3.0" - jest-util "^25.3.0" - jest-validate "^25.3.0" + jest-config "^25.4.0" + jest-util "^25.4.0" + jest-validate "^25.4.0" prompts "^2.0.1" realpath-native "^2.0.0" yargs "^15.3.1" -jest-config@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-25.3.0.tgz#112b5e2f2e57dec4501dd2fe979044c06fb1317e" - integrity sha512-CmF1JnNWFmoCSPC4tnU52wnVBpuxHjilA40qH/03IHxIevkjUInSMwaDeE6ACfxMPTLidBGBCO3EbxvzPbo8wA== +jest-config@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-25.4.0.tgz#56e5df3679a96ff132114b44fb147389c8c0a774" + integrity sha512-egT9aKYxMyMSQV1aqTgam0SkI5/I2P9qrKexN5r2uuM2+68ypnc+zPGmfUxK7p1UhE7dYH9SLBS7yb+TtmT1AA== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^25.3.0" - "@jest/types" "^25.3.0" - babel-jest "^25.3.0" + "@jest/test-sequencer" "^25.4.0" + "@jest/types" "^25.4.0" + babel-jest "^25.4.0" chalk "^3.0.0" deepmerge "^4.2.2" glob "^7.1.1" - jest-environment-jsdom "^25.3.0" - jest-environment-node "^25.3.0" + jest-environment-jsdom "^25.4.0" + jest-environment-node "^25.4.0" jest-get-type "^25.2.6" - jest-jasmine2 "^25.3.0" + jest-jasmine2 "^25.4.0" jest-regex-util "^25.2.6" - jest-resolve "^25.3.0" - jest-util "^25.3.0" - jest-validate "^25.3.0" + jest-resolve "^25.4.0" + jest-util "^25.4.0" + jest-validate "^25.4.0" micromatch "^4.0.2" - pretty-format "^25.3.0" + pretty-format "^25.4.0" realpath-native "^2.0.0" -jest-diff@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.3.0.tgz#0d7d6f5d6171e5dacde9e05be47b3615e147c26f" - integrity sha512-vyvs6RPoVdiwARwY4kqFWd4PirPLm2dmmkNzKqo38uZOzJvLee87yzDjIZLmY1SjM3XR5DwsUH+cdQ12vgqi1w== +jest-diff@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.4.0.tgz#260b70f19a46c283adcad7f081cae71eb784a634" + integrity sha512-kklLbJVXW0y8UKOWOdYhI6TH5MG6QAxrWiBMgQaPIuhj3dNFGirKCd+/xfplBXICQ7fI+3QcqHm9p9lWu1N6ug== dependencies: chalk "^3.0.0" diff-sequences "^25.2.6" jest-get-type "^25.2.6" - pretty-format "^25.3.0" + pretty-format "^25.4.0" jest-docblock@^25.3.0: version "25.3.0" @@ -3056,39 +3139,39 @@ jest-docblock@^25.3.0: dependencies: detect-newline "^3.0.0" -jest-each@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-25.3.0.tgz#a319eecf1f6076164ab86f99ca166a55b96c0bd4" - integrity sha512-aBfS4VOf/Qs95yUlX6d6WBv0szvOcTkTTyCIaLuQGj4bSHsT+Wd9dDngVHrCe5uytxpN8VM+NAloI6nbPjXfXw== +jest-each@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-25.4.0.tgz#ad4e46164764e8e77058f169a0076a7f86f6b7d4" + integrity sha512-lwRIJ8/vQU/6vq3nnSSUw1Y3nz5tkYSFIywGCZpUBd6WcRgpn8NmJoQICojbpZmsJOJNHm0BKdyuJ6Xdx+eDQQ== dependencies: - "@jest/types" "^25.3.0" + "@jest/types" "^25.4.0" chalk "^3.0.0" jest-get-type "^25.2.6" - jest-util "^25.3.0" - pretty-format "^25.3.0" - -jest-environment-jsdom@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-25.3.0.tgz#c493ab8c41f28001520c70ef67dd88b88be6af05" - integrity sha512-jdE4bQN+k2QEZ9sWOxsqDJvMzbdFSCN/4tw8X0TQaCqyzKz58PyEf41oIr4WO7ERdp7WaJGBSUKF7imR3UW1lg== - dependencies: - "@jest/environment" "^25.3.0" - "@jest/fake-timers" "^25.3.0" - "@jest/types" "^25.3.0" - jest-mock "^25.3.0" - jest-util "^25.3.0" + jest-util "^25.4.0" + pretty-format "^25.4.0" + +jest-environment-jsdom@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-25.4.0.tgz#bbfc7f85bb6ade99089062a830c79cb454565cf0" + integrity sha512-KTitVGMDrn2+pt7aZ8/yUTuS333w3pWt1Mf88vMntw7ZSBNDkRS6/4XLbFpWXYfWfp1FjcjQTOKzbK20oIehWQ== + dependencies: + "@jest/environment" "^25.4.0" + "@jest/fake-timers" "^25.4.0" + "@jest/types" "^25.4.0" + jest-mock "^25.4.0" + jest-util "^25.4.0" jsdom "^15.2.1" -jest-environment-node@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-25.3.0.tgz#9845f0e63991e8498448cb0ae804935689533db9" - integrity sha512-XO09S29Nx1NU7TiMPHMoDIkxoGBuKSTbE+sHp0gXbeLDXhIdhysUI25kOqFFSD9AuDgvPvxWCXrvNqiFsOH33g== +jest-environment-node@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-25.4.0.tgz#188aef01ae6418e001c03fdd1c299961e1439082" + integrity sha512-wryZ18vsxEAKFH7Z74zi/y/SyI1j6UkVZ6QsllBuT/bWlahNfQjLNwFsgh/5u7O957dYFoXj4yfma4n4X6kU9A== dependencies: - "@jest/environment" "^25.3.0" - "@jest/fake-timers" "^25.3.0" - "@jest/types" "^25.3.0" - jest-mock "^25.3.0" - jest-util "^25.3.0" + "@jest/environment" "^25.4.0" + "@jest/fake-timers" "^25.4.0" + "@jest/types" "^25.4.0" + jest-mock "^25.4.0" + jest-util "^25.4.0" semver "^6.3.0" jest-get-type@^25.2.6: @@ -3115,66 +3198,85 @@ jest-haste-map@^25.3.0: optionalDependencies: fsevents "^2.1.2" -jest-jasmine2@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-25.3.0.tgz#16ae4f68adef65fb45001b26c864bcbcbf972830" - integrity sha512-NCYOGE6+HNzYFSui52SefgpsnIzvxjn6KAgqw66BdRp37xpMD/4kujDHLNW5bS5i53os5TcMn6jYrzQRO8VPrQ== +jest-haste-map@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.4.0.tgz#da7c309dd7071e0a80c953ba10a0ec397efb1ae2" + integrity sha512-5EoCe1gXfGC7jmXbKzqxESrgRcaO3SzWXGCnvp9BcT0CFMyrB1Q6LIsjl9RmvmJGQgW297TCfrdgiy574Rl9HQ== + dependencies: + "@jest/types" "^25.4.0" + anymatch "^3.0.3" + fb-watchman "^2.0.0" + graceful-fs "^4.2.3" + jest-serializer "^25.2.6" + jest-util "^25.4.0" + jest-worker "^25.4.0" + micromatch "^4.0.2" + sane "^4.0.3" + walker "^1.0.7" + which "^2.0.2" + optionalDependencies: + fsevents "^2.1.2" + +jest-jasmine2@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-25.4.0.tgz#3d3d19514022e2326e836c2b66d68b4cb63c5861" + integrity sha512-QccxnozujVKYNEhMQ1vREiz859fPN/XklOzfQjm2j9IGytAkUbSwjFRBtQbHaNZ88cItMpw02JnHGsIdfdpwxQ== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^25.3.0" + "@jest/environment" "^25.4.0" "@jest/source-map" "^25.2.6" - "@jest/test-result" "^25.3.0" - "@jest/types" "^25.3.0" + "@jest/test-result" "^25.4.0" + "@jest/types" "^25.4.0" chalk "^3.0.0" co "^4.6.0" - expect "^25.3.0" + expect "^25.4.0" is-generator-fn "^2.0.0" - jest-each "^25.3.0" - jest-matcher-utils "^25.3.0" - jest-message-util "^25.3.0" - jest-runtime "^25.3.0" - jest-snapshot "^25.3.0" - jest-util "^25.3.0" - pretty-format "^25.3.0" + jest-each "^25.4.0" + jest-matcher-utils "^25.4.0" + jest-message-util "^25.4.0" + jest-runtime "^25.4.0" + jest-snapshot "^25.4.0" + jest-util "^25.4.0" + pretty-format "^25.4.0" throat "^5.0.0" -jest-leak-detector@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-25.3.0.tgz#5b6bf04903b35be56038915a55f47291771f769f" - integrity sha512-jk7k24dMIfk8LUSQQGN8PyOy9+J0NAfHZWiDmUDYVMctY8FLJQ1eQ8+PjMoN8PgwhLIggUqgYJnyRFvUz3jLRw== +jest-leak-detector@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-25.4.0.tgz#cf94a160c78e53d810e7b2f40b5fd7ee263375b3" + integrity sha512-7Y6Bqfv2xWsB+7w44dvZuLs5SQ//fzhETgOGG7Gq3TTGFdYvAgXGwV8z159RFZ6fXiCPm/szQ90CyfVos9JIFQ== dependencies: jest-get-type "^25.2.6" - pretty-format "^25.3.0" + pretty-format "^25.4.0" -jest-matcher-utils@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.3.0.tgz#76765788a26edaa8bc5f0100aea52ae383559648" - integrity sha512-ZBUJ2fchNIZt+fyzkuCFBb8SKaU//Rln45augfUtbHaGyVxCO++ANARdBK9oPGXU3hEDgyy7UHnOP/qNOJXFUg== +jest-matcher-utils@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.4.0.tgz#dc3e7aec402a1e567ed80b572b9ad285878895e6" + integrity sha512-yPMdtj7YDgXhnGbc66bowk8AkQ0YwClbbwk3Kzhn5GVDrciiCr27U4NJRbrqXbTdtxjImONITg2LiRIw650k5A== dependencies: chalk "^3.0.0" - jest-diff "^25.3.0" + jest-diff "^25.4.0" jest-get-type "^25.2.6" - pretty-format "^25.3.0" + pretty-format "^25.4.0" -jest-message-util@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.3.0.tgz#e3836826fe5ca538a337b87d9bd2648190867f85" - integrity sha512-5QNy9Id4WxJbRITEbA1T1kem9bk7y2fD0updZMSTNHtbEDnYOGLDPAuFBhFgVmOZpv0n6OMdVkK+WhyXEPCcOw== +jest-message-util@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.4.0.tgz#2899e8bc43f5317acf8dfdfe89ea237d354fcdab" + integrity sha512-LYY9hRcVGgMeMwmdfh9tTjeux1OjZHMusq/E5f3tJN+dAoVVkJtq5ZUEPIcB7bpxDUt2zjUsrwg0EGgPQ+OhXQ== dependencies: "@babel/code-frame" "^7.0.0" - "@jest/types" "^25.3.0" + "@jest/types" "^25.4.0" "@types/stack-utils" "^1.0.1" chalk "^3.0.0" micromatch "^4.0.2" slash "^3.0.0" stack-utils "^1.0.1" -jest-mock@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.3.0.tgz#d72644509e40987a732a9a2534a1054f4649402c" - integrity sha512-yRn6GbuqB4j3aYu+Z1ezwRiZfp0o9om5uOcBovVtkcRLeBCNP5mT0ysdenUsxAHnQUgGwPOE1wwhtQYe6NKirQ== +jest-mock@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.4.0.tgz#ded7d64b5328d81d78d2138c825d3a45e30ec8ca" + integrity sha512-MdazSfcYAUjJjuVTTnusLPzE0pE4VXpOUzWdj8sbM+q6abUjm3bATVPXFqTXrxSieR8ocpvQ9v/QaQCftioQFg== dependencies: - "@jest/types" "^25.3.0" + "@jest/types" "^25.4.0" jest-pnp-resolver@^1.2.1: version "1.2.1" @@ -3186,78 +3288,80 @@ jest-regex-util@^25.2.6: resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.2.6.tgz#d847d38ba15d2118d3b06390056028d0f2fd3964" integrity sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw== -jest-resolve-dependencies@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-25.3.0.tgz#b0e4ae053dd44ddacc18c6ee12b5b7c28e445a90" - integrity sha512-bDUlLYmHW+f7J7KgcY2lkq8EMRqKonRl0XoD4Wp5SJkgAxKJnsaIOlrrVNTfXYf+YOu3VCjm/Ac2hPF2nfsCIA== +jest-resolve-dependencies@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-25.4.0.tgz#783937544cfc40afcc7c569aa54748c4b3f83f5a" + integrity sha512-A0eoZXx6kLiuG1Ui7wITQPl04HwjLErKIJTt8GR3c7UoDAtzW84JtCrgrJ6Tkw6c6MwHEyAaLk7dEPml5pf48A== dependencies: - "@jest/types" "^25.3.0" + "@jest/types" "^25.4.0" jest-regex-util "^25.2.6" - jest-snapshot "^25.3.0" + jest-snapshot "^25.4.0" -jest-resolve@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-25.3.0.tgz#cb90a5bbea54a02eccdbbf4126a819595dcf91d6" - integrity sha512-IHoQAAybulsJ+ZgWis+ekYKDAoFkVH5Nx/znpb41zRtpxj4fr2WNV9iDqavdSm8GIpMlsfZxbC/fV9DhW0q9VQ== +jest-resolve@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-25.4.0.tgz#6f4540ce0d419c4c720e791e871da32ba4da7a60" + integrity sha512-wOsKqVDFWUiv8BtLMCC6uAJ/pHZkfFgoBTgPtmYlsprAjkxrr2U++ZnB3l5ykBMd2O24lXvf30SMAjJIW6k2aA== dependencies: - "@jest/types" "^25.3.0" + "@jest/types" "^25.4.0" browser-resolve "^1.11.3" chalk "^3.0.0" jest-pnp-resolver "^1.2.1" + read-pkg-up "^7.0.1" realpath-native "^2.0.0" resolve "^1.15.1" + slash "^3.0.0" -jest-runner@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-25.3.0.tgz#673ef2ac79d2810eb6b2c1a3f82398375a3d1174" - integrity sha512-csDqSC9qGHYWDrzrElzEgFbteztFeZJmKhSgY5jlCIcN0+PhActzRNku0DA1Xa1HxGOb0/AfbP1EGJlP4fGPtA== +jest-runner@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-25.4.0.tgz#6ca4a3d52e692bbc081228fa68f750012f1f29e5" + integrity sha512-wWQSbVgj2e/1chFdMRKZdvlmA6p1IPujhpLT7TKNtCSl1B0PGBGvJjCaiBal/twaU2yfk8VKezHWexM8IliBfA== dependencies: - "@jest/console" "^25.3.0" - "@jest/environment" "^25.3.0" - "@jest/test-result" "^25.3.0" - "@jest/types" "^25.3.0" + "@jest/console" "^25.4.0" + "@jest/environment" "^25.4.0" + "@jest/test-result" "^25.4.0" + "@jest/types" "^25.4.0" chalk "^3.0.0" exit "^0.1.2" graceful-fs "^4.2.3" - jest-config "^25.3.0" + jest-config "^25.4.0" jest-docblock "^25.3.0" - jest-haste-map "^25.3.0" - jest-jasmine2 "^25.3.0" - jest-leak-detector "^25.3.0" - jest-message-util "^25.3.0" - jest-resolve "^25.3.0" - jest-runtime "^25.3.0" - jest-util "^25.3.0" - jest-worker "^25.2.6" + jest-haste-map "^25.4.0" + jest-jasmine2 "^25.4.0" + jest-leak-detector "^25.4.0" + jest-message-util "^25.4.0" + jest-resolve "^25.4.0" + jest-runtime "^25.4.0" + jest-util "^25.4.0" + jest-worker "^25.4.0" source-map-support "^0.5.6" throat "^5.0.0" -jest-runtime@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-25.3.0.tgz#af4d40dbcc590fa5de9910cb6a120a13d131050b" - integrity sha512-gn5KYB1wxXRM3nfw8fVpthFu60vxQUCr+ShGq41+ZBFF3DRHZRKj3HDWVAVB4iTNBj2y04QeAo5cZ/boYaPg0w== +jest-runtime@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-25.4.0.tgz#1e5227a9e2159d26ae27dcd426ca6bc041983439" + integrity sha512-lgNJlCDULtXu9FumnwCyWlOub8iytijwsPNa30BKrSNtgoT6NUMXOPrZvsH06U6v0wgD/Igwz13nKA2wEKU2VA== dependencies: - "@jest/console" "^25.3.0" - "@jest/environment" "^25.3.0" + "@jest/console" "^25.4.0" + "@jest/environment" "^25.4.0" "@jest/source-map" "^25.2.6" - "@jest/test-result" "^25.3.0" - "@jest/transform" "^25.3.0" - "@jest/types" "^25.3.0" + "@jest/test-result" "^25.4.0" + "@jest/transform" "^25.4.0" + "@jest/types" "^25.4.0" "@types/yargs" "^15.0.0" chalk "^3.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.3" - jest-config "^25.3.0" - jest-haste-map "^25.3.0" - jest-message-util "^25.3.0" - jest-mock "^25.3.0" + jest-config "^25.4.0" + jest-haste-map "^25.4.0" + jest-message-util "^25.4.0" + jest-mock "^25.4.0" jest-regex-util "^25.2.6" - jest-resolve "^25.3.0" - jest-snapshot "^25.3.0" - jest-util "^25.3.0" - jest-validate "^25.3.0" + jest-resolve "^25.4.0" + jest-snapshot "^25.4.0" + jest-util "^25.4.0" + jest-validate "^25.4.0" realpath-native "^2.0.0" slash "^3.0.0" strip-bom "^4.0.0" @@ -3268,24 +3372,24 @@ jest-serializer@^25.2.6: resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.2.6.tgz#3bb4cc14fe0d8358489dbbefbb8a4e708ce039b7" integrity sha512-RMVCfZsezQS2Ww4kB5HJTMaMJ0asmC0BHlnobQC6yEtxiFKIxohFA4QSXSabKwSggaNkqxn6Z2VwdFCjhUWuiQ== -jest-snapshot@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-25.3.0.tgz#d4feb457494f4aaedcc83fbbf1ca21808fc3df71" - integrity sha512-GGpR6Oro2htJPKh5RX4PR1xwo5jCEjtvSPLW1IS7N85y+2bWKbiknHpJJRKSdGXghElb5hWaeQASJI4IiRayGg== +jest-snapshot@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-25.4.0.tgz#e0b26375e2101413fd2ccb4278a5711b1922545c" + integrity sha512-J4CJ0X2SaGheYRZdLz9CRHn9jUknVmlks4UBeu270hPAvdsauFXOhx9SQP2JtRzhnR3cvro/9N9KP83/uvFfRg== dependencies: "@babel/types" "^7.0.0" - "@jest/types" "^25.3.0" + "@jest/types" "^25.4.0" "@types/prettier" "^1.19.0" chalk "^3.0.0" - expect "^25.3.0" - jest-diff "^25.3.0" + expect "^25.4.0" + jest-diff "^25.4.0" jest-get-type "^25.2.6" - jest-matcher-utils "^25.3.0" - jest-message-util "^25.3.0" - jest-resolve "^25.3.0" + jest-matcher-utils "^25.4.0" + jest-message-util "^25.4.0" + jest-resolve "^25.4.0" make-dir "^3.0.0" natural-compare "^1.4.0" - pretty-format "^25.3.0" + pretty-format "^25.4.0" semver "^6.3.0" jest-util@^25.3.0: @@ -3298,28 +3402,38 @@ jest-util@^25.3.0: is-ci "^2.0.0" make-dir "^3.0.0" -jest-validate@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-25.3.0.tgz#eb95fdee0039647bcd5d4be641b21e4a142a880c" - integrity sha512-3WuXgIZ4HXUvW6gk9twFFkT9j6zUorKnF2oEY8VEsHb7x5LGvVlN3WUsbqazVKuyXwvikO2zFJ/YTySMsMje2w== +jest-util@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.4.0.tgz#6a093d09d86d2b41ef583e5fe7dd3976346e1acd" + integrity sha512-WSZD59sBtAUjLv1hMeKbNZXmMcrLRWcYqpO8Dz8b4CeCTZpfNQw2q9uwrYAD+BbJoLJlu4ezVPwtAmM/9/SlZA== dependencies: - "@jest/types" "^25.3.0" + "@jest/types" "^25.4.0" + chalk "^3.0.0" + is-ci "^2.0.0" + make-dir "^3.0.0" + +jest-validate@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-25.4.0.tgz#2e177a93b716a137110eaf2768f3d9095abd3f38" + integrity sha512-hvjmes/EFVJSoeP1yOl8qR8mAtMR3ToBkZeXrD/ZS9VxRyWDqQ/E1C5ucMTeSmEOGLipvdlyipiGbHJ+R1MQ0g== + dependencies: + "@jest/types" "^25.4.0" camelcase "^5.3.1" chalk "^3.0.0" jest-get-type "^25.2.6" leven "^3.1.0" - pretty-format "^25.3.0" + pretty-format "^25.4.0" -jest-watcher@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-25.3.0.tgz#fd03fd5ca52f02bd3161ab177466bf1bfdd34e5c" - integrity sha512-dtFkfidFCS9Ucv8azOg2hkiY3sgJEHeTLtGFHS+jfBEE7eRtrO6+2r1BokyDkaG2FOD7485r/SgpC1MFAENfeA== +jest-watcher@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-25.4.0.tgz#63ec0cd5c83bb9c9d1ac95be7558dd61c995ff05" + integrity sha512-36IUfOSRELsKLB7k25j/wutx0aVuHFN6wO94gPNjQtQqFPa2rkOymmx9rM5EzbF3XBZZ2oqD9xbRVoYa2w86gw== dependencies: - "@jest/test-result" "^25.3.0" - "@jest/types" "^25.3.0" + "@jest/test-result" "^25.4.0" + "@jest/types" "^25.4.0" ansi-escapes "^4.2.1" chalk "^3.0.0" - jest-util "^25.3.0" + jest-util "^25.4.0" string-length "^3.1.0" jest-worker@^25.2.6: @@ -3330,14 +3444,22 @@ jest-worker@^25.2.6: merge-stream "^2.0.0" supports-color "^7.0.0" +jest-worker@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.4.0.tgz#ee0e2ceee5a36ecddf5172d6d7e0ab00df157384" + integrity sha512-ghAs/1FtfYpMmYQ0AHqxV62XPvKdUDIBBApMZfly+E9JEmYh2K45G0R5dWxx986RN12pRCxsViwQVtGl+N4whw== + dependencies: + merge-stream "^2.0.0" + supports-color "^7.0.0" + jest@^25.1.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest/-/jest-25.3.0.tgz#7a5e59741d94b8662664c77a9f346246d6bf228b" - integrity sha512-iKd5ShQSHzFT5IL/6h5RZJhApgqXSoPxhp5HEi94v6OAw9QkF8T7X+liEU2eEHJ1eMFYTHmeWLrpBWulsDpaUg== + version "25.4.0" + resolved "https://registry.yarnpkg.com/jest/-/jest-25.4.0.tgz#fb96892c5c4e4a6b9bcb12068849cddf4c5f8cc7" + integrity sha512-XWipOheGB4wai5JfCYXd6vwsWNwM/dirjRoZgAa7H2wd8ODWbli2AiKjqG8AYhyx+8+5FBEdpO92VhGlBydzbw== dependencies: - "@jest/core" "^25.3.0" + "@jest/core" "^25.4.0" import-local "^3.0.2" - jest-cli "^25.3.0" + jest-cli "^25.4.0" "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" @@ -3399,6 +3521,11 @@ jsesc@~0.5.0: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= +json-parse-better-errors@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" + integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== + json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -3494,6 +3621,11 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" +lines-and-columns@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" + integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -3802,6 +3934,16 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" +normalize-package-data@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== + dependencies: + hosted-git-info "^2.1.4" + resolve "^1.10.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + normalize-path@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" @@ -4050,6 +4192,16 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" +parse-json@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f" + integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-better-errors "^1.0.1" + lines-and-columns "^1.1.6" + parse-passwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" @@ -4233,12 +4385,12 @@ prettier@^1.7.4: resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== -pretty-format@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.3.0.tgz#d0a4f988ff4a6cd350342fdabbb809aeb4d49ad5" - integrity sha512-wToHwF8bkQknIcFkBqNfKu4+UZqnrLn/Vr+wwKQwwvPzkBfDDKp/qIabFqdgtoi5PEnM8LFByVsOrHoa3SpTVA== +pretty-format@^25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.4.0.tgz#c58801bb5c4926ff4a677fe43f9b8b99812c7830" + integrity sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ== dependencies: - "@jest/types" "^25.3.0" + "@jest/types" "^25.4.0" ansi-regex "^5.0.0" ansi-styles "^4.0.0" react-is "^16.12.0" @@ -4314,6 +4466,25 @@ react-is@^16.12.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c" integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q== +read-pkg-up@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" + integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg== + dependencies: + find-up "^4.1.0" + read-pkg "^5.2.0" + type-fest "^0.8.1" + +read-pkg@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" + integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== + dependencies: + "@types/normalize-package-data" "^2.4.0" + normalize-package-data "^2.5.0" + parse-json "^5.0.0" + type-fest "^0.6.0" + readable-stream@^2.0.2, readable-stream@^2.0.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" @@ -4536,6 +4707,13 @@ resolve@1.1.7: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= +resolve@^1.10.0: + version "1.16.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.16.1.tgz#49fac5d8bacf1fd53f200fa51247ae736175832c" + integrity sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig== + dependencies: + path-parse "^1.0.6" + resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.3.2: version "1.16.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.16.0.tgz#063dc704fa3413e13ac1d0d1756a7cbfe95dd1a7" @@ -4638,6 +4816,11 @@ saxes@^3.1.9: dependencies: xmlchars "^2.1.1" +"semver@2 || 3 || 4 || 5": + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + semver@7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" @@ -4803,6 +4986,32 @@ source-map@^0.7.3: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== +spdx-correct@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4" + integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q== + dependencies: + spdx-expression-parse "^3.0.0" + spdx-license-ids "^3.0.0" + +spdx-exceptions@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977" + integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA== + +spdx-expression-parse@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" + integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg== + dependencies: + spdx-exceptions "^2.1.0" + spdx-license-ids "^3.0.0" + +spdx-license-ids@^3.0.0: + version "3.0.5" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654" + integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q== + split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" @@ -5164,6 +5373,11 @@ type-fest@^0.5.2: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.5.2.tgz#d6ef42a0356c6cd45f49485c3b6281fc148e48a2" integrity sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw== +type-fest@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" + integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== + type-fest@^0.8.1: version "0.8.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" @@ -5269,10 +5483,10 @@ v8-compile-cache@^2.0.3: resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe" integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w== -v8-to-istanbul@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.0.1.tgz#d6a2a3823b8ff49bdf2167ff2a45d82dff81d02f" - integrity sha512-x0yZvZAkjJwdD3fPiJzYP37aod0ati4LlmD2RmpKjqewjKAov/u/ytZ8ViIZb07cN4cePKzl9ijiUi7C1LQ8hQ== +v8-to-istanbul@^4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.1.3.tgz#22fe35709a64955f49a08a7c7c959f6520ad6f20" + integrity sha512-sAjOC+Kki6aJVbUOXJbcR0MnbfjvBzwKZazEJymA2IX49uoOdEdk+4fBq5cXgYgiyKtAyrrJNtBZdOeDIF+Fng== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" @@ -5285,6 +5499,14 @@ v8flags@^3.1.1: dependencies: homedir-polyfill "^1.0.1" +validate-npm-package-license@^3.0.1: + version "3.0.4" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" + integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== + dependencies: + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" + verror@1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" From 6aa0510bb3093b4037a0c6ae464dae1d05839697 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Apr 2020 06:54:28 +0000 Subject: [PATCH 46/52] Bump babel-jest from 25.3.0 to 25.4.0 Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 25.3.0 to 25.4.0. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v25.4.0/packages/babel-jest) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 99 +------------------------------------------------------ 1 file changed, 1 insertion(+), 98 deletions(-) diff --git a/yarn.lock b/yarn.lock index d3a5859dc58e..9c79fc0b0faf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -985,28 +985,6 @@ jest-runner "^25.4.0" jest-runtime "^25.4.0" -"@jest/transform@^25.3.0": - version "25.3.0" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.3.0.tgz#083c5447d5307d9b9494d6968115b647460e71f1" - integrity sha512-W01p8kTDvvEX6kd0tJc7Y5VdYyFaKwNWy1HQz6Jqlhu48z/8Gxp+yFCDVj+H8Rc7ezl3Mg0hDaGuFVkmHOqirg== - dependencies: - "@babel/core" "^7.1.0" - "@jest/types" "^25.3.0" - babel-plugin-istanbul "^6.0.0" - chalk "^3.0.0" - convert-source-map "^1.4.0" - fast-json-stable-stringify "^2.0.0" - graceful-fs "^4.2.3" - jest-haste-map "^25.3.0" - jest-regex-util "^25.2.6" - jest-util "^25.3.0" - micromatch "^4.0.2" - pirates "^4.0.1" - realpath-native "^2.0.0" - slash "^3.0.0" - source-map "^0.6.1" - write-file-atomic "^3.0.0" - "@jest/transform@^25.4.0": version "25.4.0" resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.4.0.tgz#eef36f0367d639e2fd93dccd758550377fbb9962" @@ -1029,16 +1007,6 @@ source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/types@^25.3.0": - version "25.3.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.3.0.tgz#88f94b277a1d028fd7117bc1f74451e0fc2131e7" - integrity sha512-UkaDNewdqXAmCDbN2GlUM6amDKS78eCqiw/UmF5nE0mmLTd6moJkiZJML/X52Ke3LH7Swhw883IRXq8o9nWjVw== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^1.1.1" - "@types/yargs" "^15.0.0" - chalk "^3.0.0" - "@jest/types@^25.4.0": version "25.4.0" resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.4.0.tgz#5afeb8f7e1cba153a28e5ac3c9fe3eede7206d59" @@ -1371,20 +1339,7 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== -babel-jest@^25.1.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.3.0.tgz#999d0c19e8427f66b796bf9ea233eedf087b957c" - integrity sha512-qiXeX1Cmw4JZ5yQ4H57WpkO0MZ61Qj+YnsVUwAMnDV5ls+yHon11XjarDdgP7H8lTmiEi6biiZA8y3Tmvx6pCg== - dependencies: - "@jest/transform" "^25.3.0" - "@jest/types" "^25.3.0" - "@types/babel__core" "^7.1.7" - babel-plugin-istanbul "^6.0.0" - babel-preset-jest "^25.3.0" - chalk "^3.0.0" - slash "^3.0.0" - -babel-jest@^25.4.0: +babel-jest@^25.1.0, babel-jest@^25.4.0: version "25.4.0" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.4.0.tgz#409eb3e2ddc2ad9a92afdbb00991f1633f8018d0" integrity sha512-p+epx4K0ypmHuCnd8BapfyOwWwosNCYhedetQey1awddtfmEX0MmdxctGl956uwUmjwXR5VSS5xJcGX9DvdIog== @@ -1415,13 +1370,6 @@ babel-plugin-istanbul@^6.0.0: istanbul-lib-instrument "^4.0.0" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^25.2.6: - version "25.2.6" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.2.6.tgz#2af07632b8ac7aad7d414c1e58425d5fc8e84909" - integrity sha512-qE2xjMathybYxjiGFJg0mLFrz0qNp83aNZycWDY/SuHiZNq+vQfRQtuINqyXyue1ELd8Rd+1OhFSLjms8msMbw== - dependencies: - "@types/babel__traverse" "^7.0.6" - babel-plugin-jest-hoist@^25.4.0: version "25.4.0" resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.4.0.tgz#0c122c1b93fb76f52d2465be2e8069e798e9d442" @@ -1445,14 +1393,6 @@ babel-preset-current-node-syntax@^0.1.2: "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -babel-preset-jest@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.3.0.tgz#9ab40aee52a19bdc52b8b1ec2403d5914ac3d86b" - integrity sha512-tjdvLKNMwDI9r+QWz9sZUQGTq1dpoxjUqFUpEasAc7MOtHg9XuLT2fx0udFG+k1nvMV0WvHHVAN7VmCZ+1Zxbw== - dependencies: - babel-plugin-jest-hoist "^25.2.6" - babel-preset-current-node-syntax "^0.1.2" - babel-preset-jest@^25.4.0: version "25.4.0" resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.4.0.tgz#10037cc32b751b994b260964629e49dc479abf4c" @@ -3179,25 +3119,6 @@ jest-get-type@^25.2.6: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877" integrity sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig== -jest-haste-map@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.3.0.tgz#b7683031c9c9ddc0521d311564108b244b11e4c6" - integrity sha512-LjXaRa+F8wwtSxo9G+hHD/Cp63PPQzvaBL9XCVoJD2rrcJO0Zr2+YYzAFWWYJ5GlPUkoaJFJtOuk0sL6MJY80A== - dependencies: - "@jest/types" "^25.3.0" - anymatch "^3.0.3" - fb-watchman "^2.0.0" - graceful-fs "^4.2.3" - jest-serializer "^25.2.6" - jest-util "^25.3.0" - jest-worker "^25.2.6" - micromatch "^4.0.2" - sane "^4.0.3" - walker "^1.0.7" - which "^2.0.2" - optionalDependencies: - fsevents "^2.1.2" - jest-haste-map@^25.4.0: version "25.4.0" resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.4.0.tgz#da7c309dd7071e0a80c953ba10a0ec397efb1ae2" @@ -3392,16 +3313,6 @@ jest-snapshot@^25.4.0: pretty-format "^25.4.0" semver "^6.3.0" -jest-util@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.3.0.tgz#e3b0064165818f10d78514696fd25efba82cf049" - integrity sha512-dc625P/KS/CpWTJJJxKc4bA3A6c+PJGBAqS8JTJqx4HqPoKNqXg/Ec8biL2Z1TabwK7E7Ilf0/ukSEXM1VwzNA== - dependencies: - "@jest/types" "^25.3.0" - chalk "^3.0.0" - is-ci "^2.0.0" - make-dir "^3.0.0" - jest-util@^25.4.0: version "25.4.0" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.4.0.tgz#6a093d09d86d2b41ef583e5fe7dd3976346e1acd" @@ -3436,14 +3347,6 @@ jest-watcher@^25.4.0: jest-util "^25.4.0" string-length "^3.1.0" -jest-worker@^25.2.6: - version "25.2.6" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.2.6.tgz#d1292625326794ce187c38f51109faced3846c58" - integrity sha512-FJn9XDUSxcOR4cwDzRfL1z56rUofNTFs539FGASpd50RHdb6EVkhxQqktodW2mI49l+W3H+tFJDotCHUQF6dmA== - dependencies: - merge-stream "^2.0.0" - supports-color "^7.0.0" - jest-worker@^25.4.0: version "25.4.0" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.4.0.tgz#ee0e2ceee5a36ecddf5172d6d7e0ab00df157384" From 013345da498f73dd2627604ca6c9d61ec53835e8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Apr 2020 06:58:23 +0000 Subject: [PATCH 47/52] Bump resolve from 1.16.0 to 1.16.1 Bumps [resolve](https://github.com/browserify/resolve) from 1.16.0 to 1.16.1. - [Release notes](https://github.com/browserify/resolve/releases) - [Commits](https://github.com/browserify/resolve/compare/v1.16.0...v1.16.1) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index 9c79fc0b0faf..baafdec50307 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4610,20 +4610,13 @@ resolve@1.1.7: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= -resolve@^1.10.0: +resolve@^1.10.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.3.2: version "1.16.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.16.1.tgz#49fac5d8bacf1fd53f200fa51247ae736175832c" integrity sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig== dependencies: path-parse "^1.0.6" -resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.3.2: - version "1.16.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.16.0.tgz#063dc704fa3413e13ac1d0d1756a7cbfe95dd1a7" - integrity sha512-LarL/PIKJvc09k1jaeT4kQb/8/7P+qV4qSnN2K80AES+OHdfZELAKVOBjxsvtToT/uLOfFbvYvKfZmV8cee7nA== - dependencies: - path-parse "^1.0.6" - restore-cursor@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" From a75b6901aa4c8f245b62b959ef5f3fcdf47ba07e Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Mon, 20 Apr 2020 13:34:00 -0400 Subject: [PATCH 48/52] Support reverse order for space and divide utilities --- __tests__/plugins/divideWidth.test.js | 45 +++++++++++++++++++++------ __tests__/plugins/space.test.js | 45 +++++++++++++++++++++------ src/plugins/divideWidth.js | 26 ++++++++++++---- src/plugins/space.js | 20 ++++++++++-- 4 files changed, 109 insertions(+), 27 deletions(-) diff --git a/__tests__/plugins/divideWidth.test.js b/__tests__/plugins/divideWidth.test.js index af1723b6a7b5..92a7f522a89b 100644 --- a/__tests__/plugins/divideWidth.test.js +++ b/__tests__/plugins/divideWidth.test.js @@ -8,7 +8,6 @@ test('generating divide width utilities', () => { default: '1px', '2': '2px', '4': '4px', - '8': '8px', }, }, variants: { @@ -21,14 +20,42 @@ test('generating divide width utilities', () => { expect(utilities).toEqual([ [ { - '.divide-y-2 > :not(template) ~ :not(template)': { 'border-top-width': '2px' }, - '.divide-x-2 > :not(template) ~ :not(template)': { 'border-left-width': '2px' }, - '.divide-y-4 > :not(template) ~ :not(template)': { 'border-top-width': '4px' }, - '.divide-x-4 > :not(template) ~ :not(template)': { 'border-left-width': '4px' }, - '.divide-y-8 > :not(template) ~ :not(template)': { 'border-top-width': '8px' }, - '.divide-x-8 > :not(template) ~ :not(template)': { 'border-left-width': '8px' }, - '.divide-y > :not(template) ~ :not(template)': { 'border-top-width': '1px' }, - '.divide-x > :not(template) ~ :not(template)': { 'border-left-width': '1px' }, + '.divide-y > :not(template) ~ :not(template)': { + '--divide-y-reverse': '0', + 'border-top': 'calc(1px * calc(1 - var(--divide-y-reverse)))', + 'border-bottom': 'calc(1px * var(--divide-y-reverse))', + }, + '.divide-x > :not(template) ~ :not(template)': { + '--divide-x-reverse': '0', + 'border-right': 'calc(1px * var(--divide-y-reverse))', + 'border-left': 'calc(1px * calc(1 - var(--divide-y-reverse)))', + }, + '.divide-y-2 > :not(template) ~ :not(template)': { + '--divide-y-reverse': '0', + 'border-top': 'calc(2px * calc(1 - var(--divide-y-reverse)))', + 'border-bottom': 'calc(2px * var(--divide-y-reverse))', + }, + '.divide-x-2 > :not(template) ~ :not(template)': { + '--divide-x-reverse': '0', + 'border-right': 'calc(2px * var(--divide-y-reverse))', + 'border-left': 'calc(2px * calc(1 - var(--divide-y-reverse)))', + }, + '.divide-y-4 > :not(template) ~ :not(template)': { + '--divide-y-reverse': '0', + 'border-top': 'calc(4px * calc(1 - var(--divide-y-reverse)))', + 'border-bottom': 'calc(4px * var(--divide-y-reverse))', + }, + '.divide-x-4 > :not(template) ~ :not(template)': { + '--divide-x-reverse': '0', + 'border-right': 'calc(4px * var(--divide-y-reverse))', + 'border-left': 'calc(4px * calc(1 - var(--divide-y-reverse)))', + }, + '.divide-y-reverse > :not(template) ~ :not(template)': { + '--divide-y-reverse': '1', + }, + '.divide-x-reverse > :not(template) ~ :not(template)': { + '--divide-x-reverse': '1', + }, }, ['responsive'], ], diff --git a/__tests__/plugins/space.test.js b/__tests__/plugins/space.test.js index e77277d0eac0..b4c2e55402fa 100644 --- a/__tests__/plugins/space.test.js +++ b/__tests__/plugins/space.test.js @@ -8,7 +8,6 @@ test('generating space utilities', () => { '1': '1px', '2': '2px', '4': '4px', - '8': '8px', }, }, variants: { @@ -21,14 +20,42 @@ test('generating space utilities', () => { expect(utilities).toEqual([ [ { - '.space-y-1 > :not(template) ~ :not(template)': { 'margin-top': '1px' }, - '.space-x-1 > :not(template) ~ :not(template)': { 'margin-left': '1px' }, - '.space-y-2 > :not(template) ~ :not(template)': { 'margin-top': '2px' }, - '.space-x-2 > :not(template) ~ :not(template)': { 'margin-left': '2px' }, - '.space-y-4 > :not(template) ~ :not(template)': { 'margin-top': '4px' }, - '.space-x-4 > :not(template) ~ :not(template)': { 'margin-left': '4px' }, - '.space-y-8 > :not(template) ~ :not(template)': { 'margin-top': '8px' }, - '.space-x-8 > :not(template) ~ :not(template)': { 'margin-left': '8px' }, + '.space-y-1 > :not(template) ~ :not(template)': { + '--space-y-reverse': '0', + 'margin-top': 'calc(1px * calc(1 - var(--space-y-reverse)))', + 'margin-bottom': 'calc(1px * var(--space-y-reverse))', + }, + '.space-x-1 > :not(template) ~ :not(template)': { + '--space-x-reverse': '0', + 'margin-right': 'calc(1px * var(--space-y-reverse))', + 'margin-left': 'calc(1px * calc(1 - var(--space-y-reverse)))', + }, + '.space-y-2 > :not(template) ~ :not(template)': { + '--space-y-reverse': '0', + 'margin-top': 'calc(2px * calc(1 - var(--space-y-reverse)))', + 'margin-bottom': 'calc(2px * var(--space-y-reverse))', + }, + '.space-x-2 > :not(template) ~ :not(template)': { + '--space-x-reverse': '0', + 'margin-right': 'calc(2px * var(--space-y-reverse))', + 'margin-left': 'calc(2px * calc(1 - var(--space-y-reverse)))', + }, + '.space-y-4 > :not(template) ~ :not(template)': { + '--space-y-reverse': '0', + 'margin-top': 'calc(4px * calc(1 - var(--space-y-reverse)))', + 'margin-bottom': 'calc(4px * var(--space-y-reverse))', + }, + '.space-x-4 > :not(template) ~ :not(template)': { + '--space-x-reverse': '0', + 'margin-right': 'calc(4px * var(--space-y-reverse))', + 'margin-left': 'calc(4px * calc(1 - var(--space-y-reverse)))', + }, + '.space-y-reverse > :not(template) ~ :not(template)': { + '--space-y-reverse': '1', + }, + '.space-x-reverse > :not(template) ~ :not(template)': { + '--space-x-reverse': '1', + }, }, ['responsive'], ], diff --git a/src/plugins/divideWidth.js b/src/plugins/divideWidth.js index f1fdb7f94924..23ecfa602ca5 100644 --- a/src/plugins/divideWidth.js +++ b/src/plugins/divideWidth.js @@ -3,20 +3,34 @@ import _ from 'lodash' export default function() { return function({ addUtilities, e, theme, variants }) { const generators = [ - (value, modifier) => ({ + (size, modifier) => ({ [`.${e(`divide-y${modifier}`)} > :not(template) ~ :not(template)`]: { - 'border-top-width': `${value}`, + '--divide-y-reverse': '0', + 'border-top': `calc(${size} * calc(1 - var(--divide-y-reverse)))`, + 'border-bottom': `calc(${size} * var(--divide-y-reverse))`, }, [`.${e(`divide-x${modifier}`)} > :not(template) ~ :not(template)`]: { - 'border-left-width': `${value}`, + '--divide-x-reverse': '0', + 'border-right': `calc(${size} * var(--divide-y-reverse))`, + 'border-left': `calc(${size} * calc(1 - var(--divide-y-reverse)))`, }, }), ] const utilities = _.flatMap(generators, generator => { - return _.flatMap(theme('divideWidth'), (value, modifier) => { - return generator(value, modifier === 'default' ? '' : `-${modifier}`) - }) + return [ + ..._.flatMap(theme('divideWidth'), (value, modifier) => { + return generator(value, modifier === 'default' ? '' : `-${modifier}`) + }), + { + '.divide-y-reverse > :not(template) ~ :not(template)': { + '--divide-y-reverse': '1', + }, + '.divide-x-reverse > :not(template) ~ :not(template)': { + '--divide-x-reverse': '1', + }, + }, + ] }) addUtilities(utilities, variants('divideWidth')) diff --git a/src/plugins/space.js b/src/plugins/space.js index c7c674631109..a9d0c02f5d2e 100644 --- a/src/plugins/space.js +++ b/src/plugins/space.js @@ -5,16 +5,30 @@ export default function() { const generators = [ (size, modifier) => ({ [`.${e(`space-y-${modifier}`)} > :not(template) ~ :not(template)`]: { - 'margin-top': `${size}`, + '--space-y-reverse': '0', + 'margin-top': `calc(${size} * calc(1 - var(--space-y-reverse)))`, + 'margin-bottom': `calc(${size} * var(--space-y-reverse))`, }, [`.${e(`space-x-${modifier}`)} > :not(template) ~ :not(template)`]: { - 'margin-left': `${size}`, + '--space-x-reverse': '0', + 'margin-right': `calc(${size} * var(--space-y-reverse))`, + 'margin-left': `calc(${size} * calc(1 - var(--space-y-reverse)))`, }, }), ] const utilities = _.flatMap(generators, generator => { - return _.flatMap(theme('space'), generator) + return [ + ..._.flatMap(theme('space'), generator), + { + '.space-y-reverse > :not(template) ~ :not(template)': { + '--space-y-reverse': '1', + }, + '.space-x-reverse > :not(template) ~ :not(template)': { + '--space-x-reverse': '1', + }, + }, + ] }) addUtilities(utilities, variants('space')) From 06536597fb0a15293abdc314dbf98aee72818d6e Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Mon, 20 Apr 2020 13:49:55 -0400 Subject: [PATCH 49/52] Update fixtures --- .../fixtures/tailwind-output-important.css | 208 ++++++++++++++---- __tests__/fixtures/tailwind-output.css | 208 ++++++++++++++---- 2 files changed, 320 insertions(+), 96 deletions(-) diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index b18d9ed71d05..ef3f715edea7 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -607,195 +607,307 @@ video { } .space-y-0 > :not(template) ~ :not(template) { - margin-top: 0 !important; + --space-y-reverse: 0 !important; + margin-top: calc(0 * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(0 * var(--space-y-reverse)) !important; } .space-x-0 > :not(template) ~ :not(template) { - margin-left: 0 !important; + --space-x-reverse: 0 !important; + margin-right: calc(0 * var(--space-y-reverse)) !important; + margin-left: calc(0 * calc(1 - var(--space-y-reverse))) !important; } .space-y-1 > :not(template) ~ :not(template) { - margin-top: 0.25rem !important; + --space-y-reverse: 0 !important; + margin-top: calc(0.25rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(0.25rem * var(--space-y-reverse)) !important; } .space-x-1 > :not(template) ~ :not(template) { - margin-left: 0.25rem !important; + --space-x-reverse: 0 !important; + margin-right: calc(0.25rem * var(--space-y-reverse)) !important; + margin-left: calc(0.25rem * calc(1 - var(--space-y-reverse))) !important; } .space-y-2 > :not(template) ~ :not(template) { - margin-top: 0.5rem !important; + --space-y-reverse: 0 !important; + margin-top: calc(0.5rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(0.5rem * var(--space-y-reverse)) !important; } .space-x-2 > :not(template) ~ :not(template) { - margin-left: 0.5rem !important; + --space-x-reverse: 0 !important; + margin-right: calc(0.5rem * var(--space-y-reverse)) !important; + margin-left: calc(0.5rem * calc(1 - var(--space-y-reverse))) !important; } .space-y-3 > :not(template) ~ :not(template) { - margin-top: 0.75rem !important; + --space-y-reverse: 0 !important; + margin-top: calc(0.75rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(0.75rem * var(--space-y-reverse)) !important; } .space-x-3 > :not(template) ~ :not(template) { - margin-left: 0.75rem !important; + --space-x-reverse: 0 !important; + margin-right: calc(0.75rem * var(--space-y-reverse)) !important; + margin-left: calc(0.75rem * calc(1 - var(--space-y-reverse))) !important; } .space-y-4 > :not(template) ~ :not(template) { - margin-top: 1rem !important; + --space-y-reverse: 0 !important; + margin-top: calc(1rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(1rem * var(--space-y-reverse)) !important; } .space-x-4 > :not(template) ~ :not(template) { - margin-left: 1rem !important; + --space-x-reverse: 0 !important; + margin-right: calc(1rem * var(--space-y-reverse)) !important; + margin-left: calc(1rem * calc(1 - var(--space-y-reverse))) !important; } .space-y-5 > :not(template) ~ :not(template) { - margin-top: 1.25rem !important; + --space-y-reverse: 0 !important; + margin-top: calc(1.25rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(1.25rem * var(--space-y-reverse)) !important; } .space-x-5 > :not(template) ~ :not(template) { - margin-left: 1.25rem !important; + --space-x-reverse: 0 !important; + margin-right: calc(1.25rem * var(--space-y-reverse)) !important; + margin-left: calc(1.25rem * calc(1 - var(--space-y-reverse))) !important; } .space-y-6 > :not(template) ~ :not(template) { - margin-top: 1.5rem !important; + --space-y-reverse: 0 !important; + margin-top: calc(1.5rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(1.5rem * var(--space-y-reverse)) !important; } .space-x-6 > :not(template) ~ :not(template) { - margin-left: 1.5rem !important; + --space-x-reverse: 0 !important; + margin-right: calc(1.5rem * var(--space-y-reverse)) !important; + margin-left: calc(1.5rem * calc(1 - var(--space-y-reverse))) !important; } .space-y-8 > :not(template) ~ :not(template) { - margin-top: 2rem !important; + --space-y-reverse: 0 !important; + margin-top: calc(2rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(2rem * var(--space-y-reverse)) !important; } .space-x-8 > :not(template) ~ :not(template) { - margin-left: 2rem !important; + --space-x-reverse: 0 !important; + margin-right: calc(2rem * var(--space-y-reverse)) !important; + margin-left: calc(2rem * calc(1 - var(--space-y-reverse))) !important; } .space-y-10 > :not(template) ~ :not(template) { - margin-top: 2.5rem !important; + --space-y-reverse: 0 !important; + margin-top: calc(2.5rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(2.5rem * var(--space-y-reverse)) !important; } .space-x-10 > :not(template) ~ :not(template) { - margin-left: 2.5rem !important; + --space-x-reverse: 0 !important; + margin-right: calc(2.5rem * var(--space-y-reverse)) !important; + margin-left: calc(2.5rem * calc(1 - var(--space-y-reverse))) !important; } .space-y-12 > :not(template) ~ :not(template) { - margin-top: 3rem !important; + --space-y-reverse: 0 !important; + margin-top: calc(3rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(3rem * var(--space-y-reverse)) !important; } .space-x-12 > :not(template) ~ :not(template) { - margin-left: 3rem !important; + --space-x-reverse: 0 !important; + margin-right: calc(3rem * var(--space-y-reverse)) !important; + margin-left: calc(3rem * calc(1 - var(--space-y-reverse))) !important; } .space-y-16 > :not(template) ~ :not(template) { - margin-top: 4rem !important; + --space-y-reverse: 0 !important; + margin-top: calc(4rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(4rem * var(--space-y-reverse)) !important; } .space-x-16 > :not(template) ~ :not(template) { - margin-left: 4rem !important; + --space-x-reverse: 0 !important; + margin-right: calc(4rem * var(--space-y-reverse)) !important; + margin-left: calc(4rem * calc(1 - var(--space-y-reverse))) !important; } .space-y-20 > :not(template) ~ :not(template) { - margin-top: 5rem !important; + --space-y-reverse: 0 !important; + margin-top: calc(5rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(5rem * var(--space-y-reverse)) !important; } .space-x-20 > :not(template) ~ :not(template) { - margin-left: 5rem !important; + --space-x-reverse: 0 !important; + margin-right: calc(5rem * var(--space-y-reverse)) !important; + margin-left: calc(5rem * calc(1 - var(--space-y-reverse))) !important; } .space-y-24 > :not(template) ~ :not(template) { - margin-top: 6rem !important; + --space-y-reverse: 0 !important; + margin-top: calc(6rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(6rem * var(--space-y-reverse)) !important; } .space-x-24 > :not(template) ~ :not(template) { - margin-left: 6rem !important; + --space-x-reverse: 0 !important; + margin-right: calc(6rem * var(--space-y-reverse)) !important; + margin-left: calc(6rem * calc(1 - var(--space-y-reverse))) !important; } .space-y-32 > :not(template) ~ :not(template) { - margin-top: 8rem !important; + --space-y-reverse: 0 !important; + margin-top: calc(8rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(8rem * var(--space-y-reverse)) !important; } .space-x-32 > :not(template) ~ :not(template) { - margin-left: 8rem !important; + --space-x-reverse: 0 !important; + margin-right: calc(8rem * var(--space-y-reverse)) !important; + margin-left: calc(8rem * calc(1 - var(--space-y-reverse))) !important; } .space-y-40 > :not(template) ~ :not(template) { - margin-top: 10rem !important; + --space-y-reverse: 0 !important; + margin-top: calc(10rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(10rem * var(--space-y-reverse)) !important; } .space-x-40 > :not(template) ~ :not(template) { - margin-left: 10rem !important; + --space-x-reverse: 0 !important; + margin-right: calc(10rem * var(--space-y-reverse)) !important; + margin-left: calc(10rem * calc(1 - var(--space-y-reverse))) !important; } .space-y-48 > :not(template) ~ :not(template) { - margin-top: 12rem !important; + --space-y-reverse: 0 !important; + margin-top: calc(12rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(12rem * var(--space-y-reverse)) !important; } .space-x-48 > :not(template) ~ :not(template) { - margin-left: 12rem !important; + --space-x-reverse: 0 !important; + margin-right: calc(12rem * var(--space-y-reverse)) !important; + margin-left: calc(12rem * calc(1 - var(--space-y-reverse))) !important; } .space-y-56 > :not(template) ~ :not(template) { - margin-top: 14rem !important; + --space-y-reverse: 0 !important; + margin-top: calc(14rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(14rem * var(--space-y-reverse)) !important; } .space-x-56 > :not(template) ~ :not(template) { - margin-left: 14rem !important; + --space-x-reverse: 0 !important; + margin-right: calc(14rem * var(--space-y-reverse)) !important; + margin-left: calc(14rem * calc(1 - var(--space-y-reverse))) !important; } .space-y-64 > :not(template) ~ :not(template) { - margin-top: 16rem !important; + --space-y-reverse: 0 !important; + margin-top: calc(16rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(16rem * var(--space-y-reverse)) !important; } .space-x-64 > :not(template) ~ :not(template) { - margin-left: 16rem !important; + --space-x-reverse: 0 !important; + margin-right: calc(16rem * var(--space-y-reverse)) !important; + margin-left: calc(16rem * calc(1 - var(--space-y-reverse))) !important; } .space-y-px > :not(template) ~ :not(template) { - margin-top: 1px !important; + --space-y-reverse: 0 !important; + margin-top: calc(1px * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(1px * var(--space-y-reverse)) !important; } .space-x-px > :not(template) ~ :not(template) { - margin-left: 1px !important; + --space-x-reverse: 0 !important; + margin-right: calc(1px * var(--space-y-reverse)) !important; + margin-left: calc(1px * calc(1 - var(--space-y-reverse))) !important; +} + +.space-y-reverse > :not(template) ~ :not(template) { + --space-y-reverse: 1 !important; +} + +.space-x-reverse > :not(template) ~ :not(template) { + --space-x-reverse: 1 !important; } .divide-y-0 > :not(template) ~ :not(template) { - border-top-width: 0 !important; + --divide-y-reverse: 0 !important; + border-top: calc(0 * calc(1 - var(--divide-y-reverse))) !important; + border-bottom: calc(0 * var(--divide-y-reverse)) !important; } .divide-x-0 > :not(template) ~ :not(template) { - border-left-width: 0 !important; + --divide-x-reverse: 0 !important; + border-right: calc(0 * var(--divide-y-reverse)) !important; + border-left: calc(0 * calc(1 - var(--divide-y-reverse))) !important; } .divide-y-2 > :not(template) ~ :not(template) { - border-top-width: 2px !important; + --divide-y-reverse: 0 !important; + border-top: calc(2px * calc(1 - var(--divide-y-reverse))) !important; + border-bottom: calc(2px * var(--divide-y-reverse)) !important; } .divide-x-2 > :not(template) ~ :not(template) { - border-left-width: 2px !important; + --divide-x-reverse: 0 !important; + border-right: calc(2px * var(--divide-y-reverse)) !important; + border-left: calc(2px * calc(1 - var(--divide-y-reverse))) !important; } .divide-y-4 > :not(template) ~ :not(template) { - border-top-width: 4px !important; + --divide-y-reverse: 0 !important; + border-top: calc(4px * calc(1 - var(--divide-y-reverse))) !important; + border-bottom: calc(4px * var(--divide-y-reverse)) !important; } .divide-x-4 > :not(template) ~ :not(template) { - border-left-width: 4px !important; + --divide-x-reverse: 0 !important; + border-right: calc(4px * var(--divide-y-reverse)) !important; + border-left: calc(4px * calc(1 - var(--divide-y-reverse))) !important; } .divide-y-8 > :not(template) ~ :not(template) { - border-top-width: 8px !important; + --divide-y-reverse: 0 !important; + border-top: calc(8px * calc(1 - var(--divide-y-reverse))) !important; + border-bottom: calc(8px * var(--divide-y-reverse)) !important; } .divide-x-8 > :not(template) ~ :not(template) { - border-left-width: 8px !important; + --divide-x-reverse: 0 !important; + border-right: calc(8px * var(--divide-y-reverse)) !important; + border-left: calc(8px * calc(1 - var(--divide-y-reverse))) !important; } .divide-y > :not(template) ~ :not(template) { - border-top-width: 1px !important; + --divide-y-reverse: 0 !important; + border-top: calc(1px * calc(1 - var(--divide-y-reverse))) !important; + border-bottom: calc(1px * var(--divide-y-reverse)) !important; } .divide-x > :not(template) ~ :not(template) { - border-left-width: 1px !important; + --divide-x-reverse: 0 !important; + border-right: calc(1px * var(--divide-y-reverse)) !important; + border-left: calc(1px * calc(1 - var(--divide-y-reverse))) !important; +} + +.divide-y-reverse > :not(template) ~ :not(template) { + --divide-y-reverse: 1 !important; +} + +.divide-x-reverse > :not(template) ~ :not(template) { + --divide-x-reverse: 1 !important; } .divide-transparent > :not(template) ~ :not(template) { diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index 81a8b5c51b60..e0f8e2770ca7 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -607,195 +607,307 @@ video { } .space-y-0 > :not(template) ~ :not(template) { - margin-top: 0; + --space-y-reverse: 0; + margin-top: calc(0 * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(0 * var(--space-y-reverse)); } .space-x-0 > :not(template) ~ :not(template) { - margin-left: 0; + --space-x-reverse: 0; + margin-right: calc(0 * var(--space-y-reverse)); + margin-left: calc(0 * calc(1 - var(--space-y-reverse))); } .space-y-1 > :not(template) ~ :not(template) { - margin-top: 0.25rem; + --space-y-reverse: 0; + margin-top: calc(0.25rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(0.25rem * var(--space-y-reverse)); } .space-x-1 > :not(template) ~ :not(template) { - margin-left: 0.25rem; + --space-x-reverse: 0; + margin-right: calc(0.25rem * var(--space-y-reverse)); + margin-left: calc(0.25rem * calc(1 - var(--space-y-reverse))); } .space-y-2 > :not(template) ~ :not(template) { - margin-top: 0.5rem; + --space-y-reverse: 0; + margin-top: calc(0.5rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(0.5rem * var(--space-y-reverse)); } .space-x-2 > :not(template) ~ :not(template) { - margin-left: 0.5rem; + --space-x-reverse: 0; + margin-right: calc(0.5rem * var(--space-y-reverse)); + margin-left: calc(0.5rem * calc(1 - var(--space-y-reverse))); } .space-y-3 > :not(template) ~ :not(template) { - margin-top: 0.75rem; + --space-y-reverse: 0; + margin-top: calc(0.75rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(0.75rem * var(--space-y-reverse)); } .space-x-3 > :not(template) ~ :not(template) { - margin-left: 0.75rem; + --space-x-reverse: 0; + margin-right: calc(0.75rem * var(--space-y-reverse)); + margin-left: calc(0.75rem * calc(1 - var(--space-y-reverse))); } .space-y-4 > :not(template) ~ :not(template) { - margin-top: 1rem; + --space-y-reverse: 0; + margin-top: calc(1rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(1rem * var(--space-y-reverse)); } .space-x-4 > :not(template) ~ :not(template) { - margin-left: 1rem; + --space-x-reverse: 0; + margin-right: calc(1rem * var(--space-y-reverse)); + margin-left: calc(1rem * calc(1 - var(--space-y-reverse))); } .space-y-5 > :not(template) ~ :not(template) { - margin-top: 1.25rem; + --space-y-reverse: 0; + margin-top: calc(1.25rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(1.25rem * var(--space-y-reverse)); } .space-x-5 > :not(template) ~ :not(template) { - margin-left: 1.25rem; + --space-x-reverse: 0; + margin-right: calc(1.25rem * var(--space-y-reverse)); + margin-left: calc(1.25rem * calc(1 - var(--space-y-reverse))); } .space-y-6 > :not(template) ~ :not(template) { - margin-top: 1.5rem; + --space-y-reverse: 0; + margin-top: calc(1.5rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(1.5rem * var(--space-y-reverse)); } .space-x-6 > :not(template) ~ :not(template) { - margin-left: 1.5rem; + --space-x-reverse: 0; + margin-right: calc(1.5rem * var(--space-y-reverse)); + margin-left: calc(1.5rem * calc(1 - var(--space-y-reverse))); } .space-y-8 > :not(template) ~ :not(template) { - margin-top: 2rem; + --space-y-reverse: 0; + margin-top: calc(2rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(2rem * var(--space-y-reverse)); } .space-x-8 > :not(template) ~ :not(template) { - margin-left: 2rem; + --space-x-reverse: 0; + margin-right: calc(2rem * var(--space-y-reverse)); + margin-left: calc(2rem * calc(1 - var(--space-y-reverse))); } .space-y-10 > :not(template) ~ :not(template) { - margin-top: 2.5rem; + --space-y-reverse: 0; + margin-top: calc(2.5rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(2.5rem * var(--space-y-reverse)); } .space-x-10 > :not(template) ~ :not(template) { - margin-left: 2.5rem; + --space-x-reverse: 0; + margin-right: calc(2.5rem * var(--space-y-reverse)); + margin-left: calc(2.5rem * calc(1 - var(--space-y-reverse))); } .space-y-12 > :not(template) ~ :not(template) { - margin-top: 3rem; + --space-y-reverse: 0; + margin-top: calc(3rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(3rem * var(--space-y-reverse)); } .space-x-12 > :not(template) ~ :not(template) { - margin-left: 3rem; + --space-x-reverse: 0; + margin-right: calc(3rem * var(--space-y-reverse)); + margin-left: calc(3rem * calc(1 - var(--space-y-reverse))); } .space-y-16 > :not(template) ~ :not(template) { - margin-top: 4rem; + --space-y-reverse: 0; + margin-top: calc(4rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(4rem * var(--space-y-reverse)); } .space-x-16 > :not(template) ~ :not(template) { - margin-left: 4rem; + --space-x-reverse: 0; + margin-right: calc(4rem * var(--space-y-reverse)); + margin-left: calc(4rem * calc(1 - var(--space-y-reverse))); } .space-y-20 > :not(template) ~ :not(template) { - margin-top: 5rem; + --space-y-reverse: 0; + margin-top: calc(5rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(5rem * var(--space-y-reverse)); } .space-x-20 > :not(template) ~ :not(template) { - margin-left: 5rem; + --space-x-reverse: 0; + margin-right: calc(5rem * var(--space-y-reverse)); + margin-left: calc(5rem * calc(1 - var(--space-y-reverse))); } .space-y-24 > :not(template) ~ :not(template) { - margin-top: 6rem; + --space-y-reverse: 0; + margin-top: calc(6rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(6rem * var(--space-y-reverse)); } .space-x-24 > :not(template) ~ :not(template) { - margin-left: 6rem; + --space-x-reverse: 0; + margin-right: calc(6rem * var(--space-y-reverse)); + margin-left: calc(6rem * calc(1 - var(--space-y-reverse))); } .space-y-32 > :not(template) ~ :not(template) { - margin-top: 8rem; + --space-y-reverse: 0; + margin-top: calc(8rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(8rem * var(--space-y-reverse)); } .space-x-32 > :not(template) ~ :not(template) { - margin-left: 8rem; + --space-x-reverse: 0; + margin-right: calc(8rem * var(--space-y-reverse)); + margin-left: calc(8rem * calc(1 - var(--space-y-reverse))); } .space-y-40 > :not(template) ~ :not(template) { - margin-top: 10rem; + --space-y-reverse: 0; + margin-top: calc(10rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(10rem * var(--space-y-reverse)); } .space-x-40 > :not(template) ~ :not(template) { - margin-left: 10rem; + --space-x-reverse: 0; + margin-right: calc(10rem * var(--space-y-reverse)); + margin-left: calc(10rem * calc(1 - var(--space-y-reverse))); } .space-y-48 > :not(template) ~ :not(template) { - margin-top: 12rem; + --space-y-reverse: 0; + margin-top: calc(12rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(12rem * var(--space-y-reverse)); } .space-x-48 > :not(template) ~ :not(template) { - margin-left: 12rem; + --space-x-reverse: 0; + margin-right: calc(12rem * var(--space-y-reverse)); + margin-left: calc(12rem * calc(1 - var(--space-y-reverse))); } .space-y-56 > :not(template) ~ :not(template) { - margin-top: 14rem; + --space-y-reverse: 0; + margin-top: calc(14rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(14rem * var(--space-y-reverse)); } .space-x-56 > :not(template) ~ :not(template) { - margin-left: 14rem; + --space-x-reverse: 0; + margin-right: calc(14rem * var(--space-y-reverse)); + margin-left: calc(14rem * calc(1 - var(--space-y-reverse))); } .space-y-64 > :not(template) ~ :not(template) { - margin-top: 16rem; + --space-y-reverse: 0; + margin-top: calc(16rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(16rem * var(--space-y-reverse)); } .space-x-64 > :not(template) ~ :not(template) { - margin-left: 16rem; + --space-x-reverse: 0; + margin-right: calc(16rem * var(--space-y-reverse)); + margin-left: calc(16rem * calc(1 - var(--space-y-reverse))); } .space-y-px > :not(template) ~ :not(template) { - margin-top: 1px; + --space-y-reverse: 0; + margin-top: calc(1px * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(1px * var(--space-y-reverse)); } .space-x-px > :not(template) ~ :not(template) { - margin-left: 1px; + --space-x-reverse: 0; + margin-right: calc(1px * var(--space-y-reverse)); + margin-left: calc(1px * calc(1 - var(--space-y-reverse))); +} + +.space-y-reverse > :not(template) ~ :not(template) { + --space-y-reverse: 1; +} + +.space-x-reverse > :not(template) ~ :not(template) { + --space-x-reverse: 1; } .divide-y-0 > :not(template) ~ :not(template) { - border-top-width: 0; + --divide-y-reverse: 0; + border-top: calc(0 * calc(1 - var(--divide-y-reverse))); + border-bottom: calc(0 * var(--divide-y-reverse)); } .divide-x-0 > :not(template) ~ :not(template) { - border-left-width: 0; + --divide-x-reverse: 0; + border-right: calc(0 * var(--divide-y-reverse)); + border-left: calc(0 * calc(1 - var(--divide-y-reverse))); } .divide-y-2 > :not(template) ~ :not(template) { - border-top-width: 2px; + --divide-y-reverse: 0; + border-top: calc(2px * calc(1 - var(--divide-y-reverse))); + border-bottom: calc(2px * var(--divide-y-reverse)); } .divide-x-2 > :not(template) ~ :not(template) { - border-left-width: 2px; + --divide-x-reverse: 0; + border-right: calc(2px * var(--divide-y-reverse)); + border-left: calc(2px * calc(1 - var(--divide-y-reverse))); } .divide-y-4 > :not(template) ~ :not(template) { - border-top-width: 4px; + --divide-y-reverse: 0; + border-top: calc(4px * calc(1 - var(--divide-y-reverse))); + border-bottom: calc(4px * var(--divide-y-reverse)); } .divide-x-4 > :not(template) ~ :not(template) { - border-left-width: 4px; + --divide-x-reverse: 0; + border-right: calc(4px * var(--divide-y-reverse)); + border-left: calc(4px * calc(1 - var(--divide-y-reverse))); } .divide-y-8 > :not(template) ~ :not(template) { - border-top-width: 8px; + --divide-y-reverse: 0; + border-top: calc(8px * calc(1 - var(--divide-y-reverse))); + border-bottom: calc(8px * var(--divide-y-reverse)); } .divide-x-8 > :not(template) ~ :not(template) { - border-left-width: 8px; + --divide-x-reverse: 0; + border-right: calc(8px * var(--divide-y-reverse)); + border-left: calc(8px * calc(1 - var(--divide-y-reverse))); } .divide-y > :not(template) ~ :not(template) { - border-top-width: 1px; + --divide-y-reverse: 0; + border-top: calc(1px * calc(1 - var(--divide-y-reverse))); + border-bottom: calc(1px * var(--divide-y-reverse)); } .divide-x > :not(template) ~ :not(template) { - border-left-width: 1px; + --divide-x-reverse: 0; + border-right: calc(1px * var(--divide-y-reverse)); + border-left: calc(1px * calc(1 - var(--divide-y-reverse))); +} + +.divide-y-reverse > :not(template) ~ :not(template) { + --divide-y-reverse: 1; +} + +.divide-x-reverse > :not(template) ~ :not(template) { + --divide-x-reverse: 1; } .divide-transparent > :not(template) ~ :not(template) { From a14ea02ff0d04d386488be4fd3bafb71e3182743 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Mon, 20 Apr 2020 14:18:04 -0400 Subject: [PATCH 50/52] Use border-width for divide, not border --- .../fixtures/tailwind-output-important.css | 40 +++++++++---------- __tests__/fixtures/tailwind-output.css | 40 +++++++++---------- __tests__/plugins/divideWidth.test.js | 24 +++++------ src/plugins/divideWidth.js | 8 ++-- 4 files changed, 56 insertions(+), 56 deletions(-) diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index ef3f715edea7..bcb215a2f3af 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -844,62 +844,62 @@ video { .divide-y-0 > :not(template) ~ :not(template) { --divide-y-reverse: 0 !important; - border-top: calc(0 * calc(1 - var(--divide-y-reverse))) !important; - border-bottom: calc(0 * var(--divide-y-reverse)) !important; + border-top-width: calc(0 * calc(1 - var(--divide-y-reverse))) !important; + border-bottom-width: calc(0 * var(--divide-y-reverse)) !important; } .divide-x-0 > :not(template) ~ :not(template) { --divide-x-reverse: 0 !important; - border-right: calc(0 * var(--divide-y-reverse)) !important; - border-left: calc(0 * calc(1 - var(--divide-y-reverse))) !important; + border-right-width: calc(0 * var(--divide-y-reverse)) !important; + border-left-width: calc(0 * calc(1 - var(--divide-y-reverse))) !important; } .divide-y-2 > :not(template) ~ :not(template) { --divide-y-reverse: 0 !important; - border-top: calc(2px * calc(1 - var(--divide-y-reverse))) !important; - border-bottom: calc(2px * var(--divide-y-reverse)) !important; + border-top-width: calc(2px * calc(1 - var(--divide-y-reverse))) !important; + border-bottom-width: calc(2px * var(--divide-y-reverse)) !important; } .divide-x-2 > :not(template) ~ :not(template) { --divide-x-reverse: 0 !important; - border-right: calc(2px * var(--divide-y-reverse)) !important; - border-left: calc(2px * calc(1 - var(--divide-y-reverse))) !important; + border-right-width: calc(2px * var(--divide-y-reverse)) !important; + border-left-width: calc(2px * calc(1 - var(--divide-y-reverse))) !important; } .divide-y-4 > :not(template) ~ :not(template) { --divide-y-reverse: 0 !important; - border-top: calc(4px * calc(1 - var(--divide-y-reverse))) !important; - border-bottom: calc(4px * var(--divide-y-reverse)) !important; + border-top-width: calc(4px * calc(1 - var(--divide-y-reverse))) !important; + border-bottom-width: calc(4px * var(--divide-y-reverse)) !important; } .divide-x-4 > :not(template) ~ :not(template) { --divide-x-reverse: 0 !important; - border-right: calc(4px * var(--divide-y-reverse)) !important; - border-left: calc(4px * calc(1 - var(--divide-y-reverse))) !important; + border-right-width: calc(4px * var(--divide-y-reverse)) !important; + border-left-width: calc(4px * calc(1 - var(--divide-y-reverse))) !important; } .divide-y-8 > :not(template) ~ :not(template) { --divide-y-reverse: 0 !important; - border-top: calc(8px * calc(1 - var(--divide-y-reverse))) !important; - border-bottom: calc(8px * var(--divide-y-reverse)) !important; + border-top-width: calc(8px * calc(1 - var(--divide-y-reverse))) !important; + border-bottom-width: calc(8px * var(--divide-y-reverse)) !important; } .divide-x-8 > :not(template) ~ :not(template) { --divide-x-reverse: 0 !important; - border-right: calc(8px * var(--divide-y-reverse)) !important; - border-left: calc(8px * calc(1 - var(--divide-y-reverse))) !important; + border-right-width: calc(8px * var(--divide-y-reverse)) !important; + border-left-width: calc(8px * calc(1 - var(--divide-y-reverse))) !important; } .divide-y > :not(template) ~ :not(template) { --divide-y-reverse: 0 !important; - border-top: calc(1px * calc(1 - var(--divide-y-reverse))) !important; - border-bottom: calc(1px * var(--divide-y-reverse)) !important; + border-top-width: calc(1px * calc(1 - var(--divide-y-reverse))) !important; + border-bottom-width: calc(1px * var(--divide-y-reverse)) !important; } .divide-x > :not(template) ~ :not(template) { --divide-x-reverse: 0 !important; - border-right: calc(1px * var(--divide-y-reverse)) !important; - border-left: calc(1px * calc(1 - var(--divide-y-reverse))) !important; + border-right-width: calc(1px * var(--divide-y-reverse)) !important; + border-left-width: calc(1px * calc(1 - var(--divide-y-reverse))) !important; } .divide-y-reverse > :not(template) ~ :not(template) { diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index e0f8e2770ca7..0e5aebe781fe 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -844,62 +844,62 @@ video { .divide-y-0 > :not(template) ~ :not(template) { --divide-y-reverse: 0; - border-top: calc(0 * calc(1 - var(--divide-y-reverse))); - border-bottom: calc(0 * var(--divide-y-reverse)); + border-top-width: calc(0 * calc(1 - var(--divide-y-reverse))); + border-bottom-width: calc(0 * var(--divide-y-reverse)); } .divide-x-0 > :not(template) ~ :not(template) { --divide-x-reverse: 0; - border-right: calc(0 * var(--divide-y-reverse)); - border-left: calc(0 * calc(1 - var(--divide-y-reverse))); + border-right-width: calc(0 * var(--divide-y-reverse)); + border-left-width: calc(0 * calc(1 - var(--divide-y-reverse))); } .divide-y-2 > :not(template) ~ :not(template) { --divide-y-reverse: 0; - border-top: calc(2px * calc(1 - var(--divide-y-reverse))); - border-bottom: calc(2px * var(--divide-y-reverse)); + border-top-width: calc(2px * calc(1 - var(--divide-y-reverse))); + border-bottom-width: calc(2px * var(--divide-y-reverse)); } .divide-x-2 > :not(template) ~ :not(template) { --divide-x-reverse: 0; - border-right: calc(2px * var(--divide-y-reverse)); - border-left: calc(2px * calc(1 - var(--divide-y-reverse))); + border-right-width: calc(2px * var(--divide-y-reverse)); + border-left-width: calc(2px * calc(1 - var(--divide-y-reverse))); } .divide-y-4 > :not(template) ~ :not(template) { --divide-y-reverse: 0; - border-top: calc(4px * calc(1 - var(--divide-y-reverse))); - border-bottom: calc(4px * var(--divide-y-reverse)); + border-top-width: calc(4px * calc(1 - var(--divide-y-reverse))); + border-bottom-width: calc(4px * var(--divide-y-reverse)); } .divide-x-4 > :not(template) ~ :not(template) { --divide-x-reverse: 0; - border-right: calc(4px * var(--divide-y-reverse)); - border-left: calc(4px * calc(1 - var(--divide-y-reverse))); + border-right-width: calc(4px * var(--divide-y-reverse)); + border-left-width: calc(4px * calc(1 - var(--divide-y-reverse))); } .divide-y-8 > :not(template) ~ :not(template) { --divide-y-reverse: 0; - border-top: calc(8px * calc(1 - var(--divide-y-reverse))); - border-bottom: calc(8px * var(--divide-y-reverse)); + border-top-width: calc(8px * calc(1 - var(--divide-y-reverse))); + border-bottom-width: calc(8px * var(--divide-y-reverse)); } .divide-x-8 > :not(template) ~ :not(template) { --divide-x-reverse: 0; - border-right: calc(8px * var(--divide-y-reverse)); - border-left: calc(8px * calc(1 - var(--divide-y-reverse))); + border-right-width: calc(8px * var(--divide-y-reverse)); + border-left-width: calc(8px * calc(1 - var(--divide-y-reverse))); } .divide-y > :not(template) ~ :not(template) { --divide-y-reverse: 0; - border-top: calc(1px * calc(1 - var(--divide-y-reverse))); - border-bottom: calc(1px * var(--divide-y-reverse)); + border-top-width: calc(1px * calc(1 - var(--divide-y-reverse))); + border-bottom-width: calc(1px * var(--divide-y-reverse)); } .divide-x > :not(template) ~ :not(template) { --divide-x-reverse: 0; - border-right: calc(1px * var(--divide-y-reverse)); - border-left: calc(1px * calc(1 - var(--divide-y-reverse))); + border-right-width: calc(1px * var(--divide-y-reverse)); + border-left-width: calc(1px * calc(1 - var(--divide-y-reverse))); } .divide-y-reverse > :not(template) ~ :not(template) { diff --git a/__tests__/plugins/divideWidth.test.js b/__tests__/plugins/divideWidth.test.js index 92a7f522a89b..2fe77a238e18 100644 --- a/__tests__/plugins/divideWidth.test.js +++ b/__tests__/plugins/divideWidth.test.js @@ -22,33 +22,33 @@ test('generating divide width utilities', () => { { '.divide-y > :not(template) ~ :not(template)': { '--divide-y-reverse': '0', - 'border-top': 'calc(1px * calc(1 - var(--divide-y-reverse)))', - 'border-bottom': 'calc(1px * var(--divide-y-reverse))', + 'border-top-width': 'calc(1px * calc(1 - var(--divide-y-reverse)))', + 'border-bottom-width': 'calc(1px * var(--divide-y-reverse))', }, '.divide-x > :not(template) ~ :not(template)': { '--divide-x-reverse': '0', - 'border-right': 'calc(1px * var(--divide-y-reverse))', - 'border-left': 'calc(1px * calc(1 - var(--divide-y-reverse)))', + 'border-right-width': 'calc(1px * var(--divide-y-reverse))', + 'border-left-width': 'calc(1px * calc(1 - var(--divide-y-reverse)))', }, '.divide-y-2 > :not(template) ~ :not(template)': { '--divide-y-reverse': '0', - 'border-top': 'calc(2px * calc(1 - var(--divide-y-reverse)))', - 'border-bottom': 'calc(2px * var(--divide-y-reverse))', + 'border-top-width': 'calc(2px * calc(1 - var(--divide-y-reverse)))', + 'border-bottom-width': 'calc(2px * var(--divide-y-reverse))', }, '.divide-x-2 > :not(template) ~ :not(template)': { '--divide-x-reverse': '0', - 'border-right': 'calc(2px * var(--divide-y-reverse))', - 'border-left': 'calc(2px * calc(1 - var(--divide-y-reverse)))', + 'border-right-width': 'calc(2px * var(--divide-y-reverse))', + 'border-left-width': 'calc(2px * calc(1 - var(--divide-y-reverse)))', }, '.divide-y-4 > :not(template) ~ :not(template)': { '--divide-y-reverse': '0', - 'border-top': 'calc(4px * calc(1 - var(--divide-y-reverse)))', - 'border-bottom': 'calc(4px * var(--divide-y-reverse))', + 'border-top-width': 'calc(4px * calc(1 - var(--divide-y-reverse)))', + 'border-bottom-width': 'calc(4px * var(--divide-y-reverse))', }, '.divide-x-4 > :not(template) ~ :not(template)': { '--divide-x-reverse': '0', - 'border-right': 'calc(4px * var(--divide-y-reverse))', - 'border-left': 'calc(4px * calc(1 - var(--divide-y-reverse)))', + 'border-right-width': 'calc(4px * var(--divide-y-reverse))', + 'border-left-width': 'calc(4px * calc(1 - var(--divide-y-reverse)))', }, '.divide-y-reverse > :not(template) ~ :not(template)': { '--divide-y-reverse': '1', diff --git a/src/plugins/divideWidth.js b/src/plugins/divideWidth.js index 23ecfa602ca5..7e11dbb8abbe 100644 --- a/src/plugins/divideWidth.js +++ b/src/plugins/divideWidth.js @@ -6,13 +6,13 @@ export default function() { (size, modifier) => ({ [`.${e(`divide-y${modifier}`)} > :not(template) ~ :not(template)`]: { '--divide-y-reverse': '0', - 'border-top': `calc(${size} * calc(1 - var(--divide-y-reverse)))`, - 'border-bottom': `calc(${size} * var(--divide-y-reverse))`, + 'border-top-width': `calc(${size} * calc(1 - var(--divide-y-reverse)))`, + 'border-bottom-width': `calc(${size} * var(--divide-y-reverse))`, }, [`.${e(`divide-x${modifier}`)} > :not(template) ~ :not(template)`]: { '--divide-x-reverse': '0', - 'border-right': `calc(${size} * var(--divide-y-reverse))`, - 'border-left': `calc(${size} * calc(1 - var(--divide-y-reverse)))`, + 'border-right-width': `calc(${size} * var(--divide-y-reverse))`, + 'border-left-width': `calc(${size} * calc(1 - var(--divide-y-reverse)))`, }, }), ] From b3b06e8d55b046994401ff3d58eccfbb1d171dd9 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Mon, 20 Apr 2020 14:54:31 -0400 Subject: [PATCH 51/52] Add negative `space` utility support --- .../fixtures/tailwind-output-important.css | 216 ++++++++++++++++++ __tests__/fixtures/tailwind-output.css | 216 ++++++++++++++++++ __tests__/plugins/space.test.js | 22 ++ src/plugins/space.js | 5 +- stubs/defaultConfig.stub.js | 5 +- 5 files changed, 461 insertions(+), 3 deletions(-) diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index 27010b9d3217..0887cd0bbc0a 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -834,6 +834,222 @@ video { margin-left: calc(1px * calc(1 - var(--space-y-reverse))) !important; } +.-space-y-1 > :not(template) ~ :not(template) { + --space-y-reverse: 0 !important; + margin-top: calc(-0.25rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(-0.25rem * var(--space-y-reverse)) !important; +} + +.-space-x-1 > :not(template) ~ :not(template) { + --space-x-reverse: 0 !important; + margin-right: calc(-0.25rem * var(--space-y-reverse)) !important; + margin-left: calc(-0.25rem * calc(1 - var(--space-y-reverse))) !important; +} + +.-space-y-2 > :not(template) ~ :not(template) { + --space-y-reverse: 0 !important; + margin-top: calc(-0.5rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(-0.5rem * var(--space-y-reverse)) !important; +} + +.-space-x-2 > :not(template) ~ :not(template) { + --space-x-reverse: 0 !important; + margin-right: calc(-0.5rem * var(--space-y-reverse)) !important; + margin-left: calc(-0.5rem * calc(1 - var(--space-y-reverse))) !important; +} + +.-space-y-3 > :not(template) ~ :not(template) { + --space-y-reverse: 0 !important; + margin-top: calc(-0.75rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(-0.75rem * var(--space-y-reverse)) !important; +} + +.-space-x-3 > :not(template) ~ :not(template) { + --space-x-reverse: 0 !important; + margin-right: calc(-0.75rem * var(--space-y-reverse)) !important; + margin-left: calc(-0.75rem * calc(1 - var(--space-y-reverse))) !important; +} + +.-space-y-4 > :not(template) ~ :not(template) { + --space-y-reverse: 0 !important; + margin-top: calc(-1rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(-1rem * var(--space-y-reverse)) !important; +} + +.-space-x-4 > :not(template) ~ :not(template) { + --space-x-reverse: 0 !important; + margin-right: calc(-1rem * var(--space-y-reverse)) !important; + margin-left: calc(-1rem * calc(1 - var(--space-y-reverse))) !important; +} + +.-space-y-5 > :not(template) ~ :not(template) { + --space-y-reverse: 0 !important; + margin-top: calc(-1.25rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(-1.25rem * var(--space-y-reverse)) !important; +} + +.-space-x-5 > :not(template) ~ :not(template) { + --space-x-reverse: 0 !important; + margin-right: calc(-1.25rem * var(--space-y-reverse)) !important; + margin-left: calc(-1.25rem * calc(1 - var(--space-y-reverse))) !important; +} + +.-space-y-6 > :not(template) ~ :not(template) { + --space-y-reverse: 0 !important; + margin-top: calc(-1.5rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(-1.5rem * var(--space-y-reverse)) !important; +} + +.-space-x-6 > :not(template) ~ :not(template) { + --space-x-reverse: 0 !important; + margin-right: calc(-1.5rem * var(--space-y-reverse)) !important; + margin-left: calc(-1.5rem * calc(1 - var(--space-y-reverse))) !important; +} + +.-space-y-8 > :not(template) ~ :not(template) { + --space-y-reverse: 0 !important; + margin-top: calc(-2rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(-2rem * var(--space-y-reverse)) !important; +} + +.-space-x-8 > :not(template) ~ :not(template) { + --space-x-reverse: 0 !important; + margin-right: calc(-2rem * var(--space-y-reverse)) !important; + margin-left: calc(-2rem * calc(1 - var(--space-y-reverse))) !important; +} + +.-space-y-10 > :not(template) ~ :not(template) { + --space-y-reverse: 0 !important; + margin-top: calc(-2.5rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(-2.5rem * var(--space-y-reverse)) !important; +} + +.-space-x-10 > :not(template) ~ :not(template) { + --space-x-reverse: 0 !important; + margin-right: calc(-2.5rem * var(--space-y-reverse)) !important; + margin-left: calc(-2.5rem * calc(1 - var(--space-y-reverse))) !important; +} + +.-space-y-12 > :not(template) ~ :not(template) { + --space-y-reverse: 0 !important; + margin-top: calc(-3rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(-3rem * var(--space-y-reverse)) !important; +} + +.-space-x-12 > :not(template) ~ :not(template) { + --space-x-reverse: 0 !important; + margin-right: calc(-3rem * var(--space-y-reverse)) !important; + margin-left: calc(-3rem * calc(1 - var(--space-y-reverse))) !important; +} + +.-space-y-16 > :not(template) ~ :not(template) { + --space-y-reverse: 0 !important; + margin-top: calc(-4rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(-4rem * var(--space-y-reverse)) !important; +} + +.-space-x-16 > :not(template) ~ :not(template) { + --space-x-reverse: 0 !important; + margin-right: calc(-4rem * var(--space-y-reverse)) !important; + margin-left: calc(-4rem * calc(1 - var(--space-y-reverse))) !important; +} + +.-space-y-20 > :not(template) ~ :not(template) { + --space-y-reverse: 0 !important; + margin-top: calc(-5rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(-5rem * var(--space-y-reverse)) !important; +} + +.-space-x-20 > :not(template) ~ :not(template) { + --space-x-reverse: 0 !important; + margin-right: calc(-5rem * var(--space-y-reverse)) !important; + margin-left: calc(-5rem * calc(1 - var(--space-y-reverse))) !important; +} + +.-space-y-24 > :not(template) ~ :not(template) { + --space-y-reverse: 0 !important; + margin-top: calc(-6rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(-6rem * var(--space-y-reverse)) !important; +} + +.-space-x-24 > :not(template) ~ :not(template) { + --space-x-reverse: 0 !important; + margin-right: calc(-6rem * var(--space-y-reverse)) !important; + margin-left: calc(-6rem * calc(1 - var(--space-y-reverse))) !important; +} + +.-space-y-32 > :not(template) ~ :not(template) { + --space-y-reverse: 0 !important; + margin-top: calc(-8rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(-8rem * var(--space-y-reverse)) !important; +} + +.-space-x-32 > :not(template) ~ :not(template) { + --space-x-reverse: 0 !important; + margin-right: calc(-8rem * var(--space-y-reverse)) !important; + margin-left: calc(-8rem * calc(1 - var(--space-y-reverse))) !important; +} + +.-space-y-40 > :not(template) ~ :not(template) { + --space-y-reverse: 0 !important; + margin-top: calc(-10rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(-10rem * var(--space-y-reverse)) !important; +} + +.-space-x-40 > :not(template) ~ :not(template) { + --space-x-reverse: 0 !important; + margin-right: calc(-10rem * var(--space-y-reverse)) !important; + margin-left: calc(-10rem * calc(1 - var(--space-y-reverse))) !important; +} + +.-space-y-48 > :not(template) ~ :not(template) { + --space-y-reverse: 0 !important; + margin-top: calc(-12rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(-12rem * var(--space-y-reverse)) !important; +} + +.-space-x-48 > :not(template) ~ :not(template) { + --space-x-reverse: 0 !important; + margin-right: calc(-12rem * var(--space-y-reverse)) !important; + margin-left: calc(-12rem * calc(1 - var(--space-y-reverse))) !important; +} + +.-space-y-56 > :not(template) ~ :not(template) { + --space-y-reverse: 0 !important; + margin-top: calc(-14rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(-14rem * var(--space-y-reverse)) !important; +} + +.-space-x-56 > :not(template) ~ :not(template) { + --space-x-reverse: 0 !important; + margin-right: calc(-14rem * var(--space-y-reverse)) !important; + margin-left: calc(-14rem * calc(1 - var(--space-y-reverse))) !important; +} + +.-space-y-64 > :not(template) ~ :not(template) { + --space-y-reverse: 0 !important; + margin-top: calc(-16rem * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(-16rem * var(--space-y-reverse)) !important; +} + +.-space-x-64 > :not(template) ~ :not(template) { + --space-x-reverse: 0 !important; + margin-right: calc(-16rem * var(--space-y-reverse)) !important; + margin-left: calc(-16rem * calc(1 - var(--space-y-reverse))) !important; +} + +.-space-y-px > :not(template) ~ :not(template) { + --space-y-reverse: 0 !important; + margin-top: calc(-1px * calc(1 - var(--space-y-reverse))) !important; + margin-bottom: calc(-1px * var(--space-y-reverse)) !important; +} + +.-space-x-px > :not(template) ~ :not(template) { + --space-x-reverse: 0 !important; + margin-right: calc(-1px * var(--space-y-reverse)) !important; + margin-left: calc(-1px * calc(1 - var(--space-y-reverse))) !important; +} + .space-y-reverse > :not(template) ~ :not(template) { --space-y-reverse: 1 !important; } diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index b2424674b08b..759531bd4a3c 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -834,6 +834,222 @@ video { margin-left: calc(1px * calc(1 - var(--space-y-reverse))); } +.-space-y-1 > :not(template) ~ :not(template) { + --space-y-reverse: 0; + margin-top: calc(-0.25rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(-0.25rem * var(--space-y-reverse)); +} + +.-space-x-1 > :not(template) ~ :not(template) { + --space-x-reverse: 0; + margin-right: calc(-0.25rem * var(--space-y-reverse)); + margin-left: calc(-0.25rem * calc(1 - var(--space-y-reverse))); +} + +.-space-y-2 > :not(template) ~ :not(template) { + --space-y-reverse: 0; + margin-top: calc(-0.5rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(-0.5rem * var(--space-y-reverse)); +} + +.-space-x-2 > :not(template) ~ :not(template) { + --space-x-reverse: 0; + margin-right: calc(-0.5rem * var(--space-y-reverse)); + margin-left: calc(-0.5rem * calc(1 - var(--space-y-reverse))); +} + +.-space-y-3 > :not(template) ~ :not(template) { + --space-y-reverse: 0; + margin-top: calc(-0.75rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(-0.75rem * var(--space-y-reverse)); +} + +.-space-x-3 > :not(template) ~ :not(template) { + --space-x-reverse: 0; + margin-right: calc(-0.75rem * var(--space-y-reverse)); + margin-left: calc(-0.75rem * calc(1 - var(--space-y-reverse))); +} + +.-space-y-4 > :not(template) ~ :not(template) { + --space-y-reverse: 0; + margin-top: calc(-1rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(-1rem * var(--space-y-reverse)); +} + +.-space-x-4 > :not(template) ~ :not(template) { + --space-x-reverse: 0; + margin-right: calc(-1rem * var(--space-y-reverse)); + margin-left: calc(-1rem * calc(1 - var(--space-y-reverse))); +} + +.-space-y-5 > :not(template) ~ :not(template) { + --space-y-reverse: 0; + margin-top: calc(-1.25rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(-1.25rem * var(--space-y-reverse)); +} + +.-space-x-5 > :not(template) ~ :not(template) { + --space-x-reverse: 0; + margin-right: calc(-1.25rem * var(--space-y-reverse)); + margin-left: calc(-1.25rem * calc(1 - var(--space-y-reverse))); +} + +.-space-y-6 > :not(template) ~ :not(template) { + --space-y-reverse: 0; + margin-top: calc(-1.5rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(-1.5rem * var(--space-y-reverse)); +} + +.-space-x-6 > :not(template) ~ :not(template) { + --space-x-reverse: 0; + margin-right: calc(-1.5rem * var(--space-y-reverse)); + margin-left: calc(-1.5rem * calc(1 - var(--space-y-reverse))); +} + +.-space-y-8 > :not(template) ~ :not(template) { + --space-y-reverse: 0; + margin-top: calc(-2rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(-2rem * var(--space-y-reverse)); +} + +.-space-x-8 > :not(template) ~ :not(template) { + --space-x-reverse: 0; + margin-right: calc(-2rem * var(--space-y-reverse)); + margin-left: calc(-2rem * calc(1 - var(--space-y-reverse))); +} + +.-space-y-10 > :not(template) ~ :not(template) { + --space-y-reverse: 0; + margin-top: calc(-2.5rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(-2.5rem * var(--space-y-reverse)); +} + +.-space-x-10 > :not(template) ~ :not(template) { + --space-x-reverse: 0; + margin-right: calc(-2.5rem * var(--space-y-reverse)); + margin-left: calc(-2.5rem * calc(1 - var(--space-y-reverse))); +} + +.-space-y-12 > :not(template) ~ :not(template) { + --space-y-reverse: 0; + margin-top: calc(-3rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(-3rem * var(--space-y-reverse)); +} + +.-space-x-12 > :not(template) ~ :not(template) { + --space-x-reverse: 0; + margin-right: calc(-3rem * var(--space-y-reverse)); + margin-left: calc(-3rem * calc(1 - var(--space-y-reverse))); +} + +.-space-y-16 > :not(template) ~ :not(template) { + --space-y-reverse: 0; + margin-top: calc(-4rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(-4rem * var(--space-y-reverse)); +} + +.-space-x-16 > :not(template) ~ :not(template) { + --space-x-reverse: 0; + margin-right: calc(-4rem * var(--space-y-reverse)); + margin-left: calc(-4rem * calc(1 - var(--space-y-reverse))); +} + +.-space-y-20 > :not(template) ~ :not(template) { + --space-y-reverse: 0; + margin-top: calc(-5rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(-5rem * var(--space-y-reverse)); +} + +.-space-x-20 > :not(template) ~ :not(template) { + --space-x-reverse: 0; + margin-right: calc(-5rem * var(--space-y-reverse)); + margin-left: calc(-5rem * calc(1 - var(--space-y-reverse))); +} + +.-space-y-24 > :not(template) ~ :not(template) { + --space-y-reverse: 0; + margin-top: calc(-6rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(-6rem * var(--space-y-reverse)); +} + +.-space-x-24 > :not(template) ~ :not(template) { + --space-x-reverse: 0; + margin-right: calc(-6rem * var(--space-y-reverse)); + margin-left: calc(-6rem * calc(1 - var(--space-y-reverse))); +} + +.-space-y-32 > :not(template) ~ :not(template) { + --space-y-reverse: 0; + margin-top: calc(-8rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(-8rem * var(--space-y-reverse)); +} + +.-space-x-32 > :not(template) ~ :not(template) { + --space-x-reverse: 0; + margin-right: calc(-8rem * var(--space-y-reverse)); + margin-left: calc(-8rem * calc(1 - var(--space-y-reverse))); +} + +.-space-y-40 > :not(template) ~ :not(template) { + --space-y-reverse: 0; + margin-top: calc(-10rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(-10rem * var(--space-y-reverse)); +} + +.-space-x-40 > :not(template) ~ :not(template) { + --space-x-reverse: 0; + margin-right: calc(-10rem * var(--space-y-reverse)); + margin-left: calc(-10rem * calc(1 - var(--space-y-reverse))); +} + +.-space-y-48 > :not(template) ~ :not(template) { + --space-y-reverse: 0; + margin-top: calc(-12rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(-12rem * var(--space-y-reverse)); +} + +.-space-x-48 > :not(template) ~ :not(template) { + --space-x-reverse: 0; + margin-right: calc(-12rem * var(--space-y-reverse)); + margin-left: calc(-12rem * calc(1 - var(--space-y-reverse))); +} + +.-space-y-56 > :not(template) ~ :not(template) { + --space-y-reverse: 0; + margin-top: calc(-14rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(-14rem * var(--space-y-reverse)); +} + +.-space-x-56 > :not(template) ~ :not(template) { + --space-x-reverse: 0; + margin-right: calc(-14rem * var(--space-y-reverse)); + margin-left: calc(-14rem * calc(1 - var(--space-y-reverse))); +} + +.-space-y-64 > :not(template) ~ :not(template) { + --space-y-reverse: 0; + margin-top: calc(-16rem * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(-16rem * var(--space-y-reverse)); +} + +.-space-x-64 > :not(template) ~ :not(template) { + --space-x-reverse: 0; + margin-right: calc(-16rem * var(--space-y-reverse)); + margin-left: calc(-16rem * calc(1 - var(--space-y-reverse))); +} + +.-space-y-px > :not(template) ~ :not(template) { + --space-y-reverse: 0; + margin-top: calc(-1px * calc(1 - var(--space-y-reverse))); + margin-bottom: calc(-1px * var(--space-y-reverse)); +} + +.-space-x-px > :not(template) ~ :not(template) { + --space-x-reverse: 0; + margin-right: calc(-1px * var(--space-y-reverse)); + margin-left: calc(-1px * calc(1 - var(--space-y-reverse))); +} + .space-y-reverse > :not(template) ~ :not(template) { --space-y-reverse: 1; } diff --git a/__tests__/plugins/space.test.js b/__tests__/plugins/space.test.js index b4c2e55402fa..22b907c93074 100644 --- a/__tests__/plugins/space.test.js +++ b/__tests__/plugins/space.test.js @@ -8,6 +8,8 @@ test('generating space utilities', () => { '1': '1px', '2': '2px', '4': '4px', + '-2': '-2px', + '-1': '-1px', }, }, variants: { @@ -50,6 +52,26 @@ test('generating space utilities', () => { 'margin-right': 'calc(4px * var(--space-y-reverse))', 'margin-left': 'calc(4px * calc(1 - var(--space-y-reverse)))', }, + '.-space-y-2 > :not(template) ~ :not(template)': { + '--space-y-reverse': '0', + 'margin-top': 'calc(-2px * calc(1 - var(--space-y-reverse)))', + 'margin-bottom': 'calc(-2px * var(--space-y-reverse))', + }, + '.-space-x-2 > :not(template) ~ :not(template)': { + '--space-x-reverse': '0', + 'margin-right': 'calc(-2px * var(--space-y-reverse))', + 'margin-left': 'calc(-2px * calc(1 - var(--space-y-reverse)))', + }, + '.-space-y-1 > :not(template) ~ :not(template)': { + '--space-y-reverse': '0', + 'margin-top': 'calc(-1px * calc(1 - var(--space-y-reverse)))', + 'margin-bottom': 'calc(-1px * var(--space-y-reverse))', + }, + '.-space-x-1 > :not(template) ~ :not(template)': { + '--space-x-reverse': '0', + 'margin-right': 'calc(-1px * var(--space-y-reverse))', + 'margin-left': 'calc(-1px * calc(1 - var(--space-y-reverse)))', + }, '.space-y-reverse > :not(template) ~ :not(template)': { '--space-y-reverse': '1', }, diff --git a/src/plugins/space.js b/src/plugins/space.js index a9d0c02f5d2e..660d06a053e7 100644 --- a/src/plugins/space.js +++ b/src/plugins/space.js @@ -1,15 +1,16 @@ import _ from 'lodash' +import prefixNegativeModifiers from '../util/prefixNegativeModifiers' export default function() { return function({ addUtilities, e, theme, variants }) { const generators = [ (size, modifier) => ({ - [`.${e(`space-y-${modifier}`)} > :not(template) ~ :not(template)`]: { + [`.${e(prefixNegativeModifiers('space-y', modifier))} > :not(template) ~ :not(template)`]: { '--space-y-reverse': '0', 'margin-top': `calc(${size} * calc(1 - var(--space-y-reverse)))`, 'margin-bottom': `calc(${size} * var(--space-y-reverse))`, }, - [`.${e(`space-x-${modifier}`)} > :not(template) ~ :not(template)`]: { + [`.${e(prefixNegativeModifiers('space-x', modifier))} > :not(template) ~ :not(template)`]: { '--space-x-reverse': '0', 'margin-right': `calc(${size} * var(--space-y-reverse))`, 'margin-left': `calc(${size} * calc(1 - var(--space-y-reverse)))`, diff --git a/stubs/defaultConfig.stub.js b/stubs/defaultConfig.stub.js index acdbe7c4c13d..ebff57905e73 100644 --- a/stubs/defaultConfig.stub.js +++ b/stubs/defaultConfig.stub.js @@ -376,7 +376,10 @@ module.exports = { }, padding: theme => theme('spacing'), placeholderColor: theme => theme('colors'), - space: theme => theme('spacing'), + space: (theme, { negative }) => ({ + ...theme('spacing'), + ...negative(theme('spacing')), + }), stroke: { current: 'currentColor', }, From d710db5cc3418a784265ef5758f0bfc7db7dabf8 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Mon, 20 Apr 2020 20:36:52 -0400 Subject: [PATCH 52/52] 1.3.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6e75f9cb922a..ceaf1ab021a8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tailwindcss", - "version": "1.2.0", + "version": "1.3.0", "description": "A utility-first CSS framework for rapidly building custom user interfaces.", "license": "MIT", "main": "lib/index.js",