From 00d6ba674caabde47f99f697454a6ea477985794 Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Fri, 10 Dec 2021 12:30:47 -0800 Subject: [PATCH 01/24] tailwind 3 work --- package-lock.json | 1471 ++++------------- package.json | 6 +- .../calcite-action-menu.scss | 2 +- .../calcite-action-pad.scss | 2 +- .../calcite-block/calcite-block.scss | 2 +- .../calcite-button/calcite-button.scss | 4 +- .../calcite-color-picker.scss | 2 +- .../calcite-combobox/calcite-combobox.scss | 2 +- .../calcite-date-picker-month-header.scss | 2 +- .../calcite-modal/calcite-modal.scss | 2 +- .../calcite-panel/calcite-panel.scss | 8 +- .../calcite-pick-list-item.scss | 2 +- .../calcite-popover/calcite-popover.scss | 4 +- .../calcite-select/calcite-select.scss | 2 +- .../calcite-shell-center-row.scss | 4 +- .../calcite-shell-panel.scss | 4 +- .../calcite-shell/calcite-shell.scss | 2 +- .../calcite-tab-nav/calcite-tab-nav.scss | 1 - .../calcite-value-list-item.scss | 2 +- tailwind.config.js | 28 +- 20 files changed, 347 insertions(+), 1205 deletions(-) diff --git a/package-lock.json b/package-lock.json index cb847c0629d..21443d186b9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -50,7 +50,7 @@ "@typescript-eslint/eslint-plugin": "5.6.0", "@typescript-eslint/parser": "5.6.0", "@whitespace/storybook-addon-html": "5.0.0", - "autoprefixer": "10.3.7", + "autoprefixer": "10.4.0", "axe-core": "4.3.5", "babel-loader": "8.2.3", "chalk": "4.1.2", @@ -90,7 +90,7 @@ "storybook-rtl-addon": "0.3.3", "stylelint": "14.1.0", "stylelint-config-recommended-scss": "5.0.2", - "tailwindcss": "1.9.6", + "tailwindcss": "3.0.0", "ts-jest": "27.1.0", "ts-node": "10.4.0", "typescript": "4.2.4", @@ -2409,81 +2409,6 @@ "typescript": "^3.8.0" } }, - "node_modules/@fullhuman/postcss-purgecss": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@fullhuman/postcss-purgecss/-/postcss-purgecss-2.3.0.tgz", - "integrity": "sha512-qnKm5dIOyPGJ70kPZ5jiz0I9foVOic0j+cOzNDoo8KoCf6HjicIZ99UfO2OmE7vCYSKAAepEwJtNzpiiZAh9xw==", - "dev": true, - "dependencies": { - "postcss": "7.0.32", - "purgecss": "^2.3.0" - } - }, - "node_modules/@fullhuman/postcss-purgecss/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@fullhuman/postcss-purgecss/node_modules/chalk/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@fullhuman/postcss-purgecss/node_modules/postcss": { - "version": "7.0.32", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz", - "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==", - "dev": true, - "dependencies": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - }, - "engines": { - "node": ">=6.0.0" - }, - "funding": { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - } - }, - "node_modules/@fullhuman/postcss-purgecss/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/@fullhuman/postcss-purgecss/node_modules/supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/@gar/promisify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz", @@ -10624,16 +10549,16 @@ } }, "node_modules/autoprefixer": { - "version": "10.3.7", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.7.tgz", - "integrity": "sha512-EmGpu0nnQVmMhX8ROoJ7Mx8mKYPlcUHuxkwrRYEYMz85lu7H09v8w6R1P0JPdn/hKU32GjpLBFEOuIlDWCRWvg==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.0.tgz", + "integrity": "sha512-7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA==", "dev": true, "dependencies": { - "browserslist": "^4.17.3", - "caniuse-lite": "^1.0.30001264", + "browserslist": "^4.17.5", + "caniuse-lite": "^1.0.30001272", "fraction.js": "^4.1.1", "normalize-range": "^0.1.2", - "picocolors": "^0.2.1", + "picocolors": "^1.0.0", "postcss-value-parser": "^4.1.0" }, "bin": { @@ -10650,6 +10575,12 @@ "postcss": "^8.1.0" } }, + "node_modules/autoprefixer/node_modules/picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true + }, "node_modules/aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", @@ -13418,12 +13349,6 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, - "node_modules/colorette": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz", - "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==", - "dev": true - }, "node_modules/colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", @@ -13455,15 +13380,6 @@ "url": "https://github.com/sponsors/wooorm" } }, - "node_modules/commander": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", - "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, "node_modules/common-tags": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz", @@ -15505,12 +15421,6 @@ "url": "https://github.com/fb55/domutils?sponsor=1" } }, - "node_modules/css-unit-converter": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.2.tgz", - "integrity": "sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA==", - "dev": true - }, "node_modules/css-what": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz", @@ -16254,6 +16164,12 @@ "integrity": "sha512-33idhm54QJzf3Q7QofMgCvIVSd2o9H3kQPWaKT/fhoZh+digc+WSiMhbkeG3iN79WY4Hwr9G05NpbhEVrsOYAg==", "dev": true }, + "node_modules/didyoumean": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", + "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==", + "dev": true + }, "node_modules/diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -16301,6 +16217,12 @@ "node": ">=8" } }, + "node_modules/dlv": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", + "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", + "dev": true + }, "node_modules/doctrine": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", @@ -17766,18 +17688,6 @@ "node": ">=4.0" } }, - "node_modules/eslint/node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/eslint/node_modules/globals": { "version": "13.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", @@ -18540,22 +18450,33 @@ "dev": true }, "node_modules/fast-glob": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz", - "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", + "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.0", + "glob-parent": "^5.1.2", "merge2": "^1.3.0", - "micromatch": "^4.0.2", - "picomatch": "^2.2.1" + "micromatch": "^4.0.4" }, "engines": { "node": ">=8" } }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", @@ -19311,20 +19232,6 @@ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", "dev": true }, - "node_modules/fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, "node_modules/fs-minipass": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", @@ -20190,15 +20097,15 @@ } }, "node_modules/glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, "dependencies": { - "is-glob": "^4.0.1" + "is-glob": "^4.0.3" }, "engines": { - "node": ">= 6" + "node": ">=10.13.0" } }, "node_modules/glob-promise": { @@ -21346,6 +21253,18 @@ "url": "https://opencollective.com/immer" } }, + "node_modules/import-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz", + "integrity": "sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==", + "dev": true, + "dependencies": { + "import-from": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/import-fresh": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", @@ -21368,6 +21287,18 @@ "node": ">=4" } }, + "node_modules/import-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/import-from/-/import-from-3.0.0.tgz", + "integrity": "sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==", + "dev": true, + "dependencies": { + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/import-lazy": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", @@ -21411,12 +21342,6 @@ "node": ">=8" } }, - "node_modules/indexes-of": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", - "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", - "dev": true - }, "node_modules/infer-owner": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", @@ -24564,15 +24489,6 @@ "node": ">=6" } }, - "node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, "node_modules/jsonparse": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", @@ -25239,12 +25155,6 @@ "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", "dev": true }, - "node_modules/lodash.toarray": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz", - "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE=", - "dev": true - }, "node_modules/lodash.truncate": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", @@ -26279,15 +26189,6 @@ "node": ">= 0.10.5" } }, - "node_modules/node-emoji": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz", - "integrity": "sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==", - "dev": true, - "dependencies": { - "lodash.toarray": "^4.4.0" - } - }, "node_modules/node-fetch": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", @@ -26446,12 +26347,6 @@ "node": ">=8" } }, - "node_modules/normalize.css": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/normalize.css/-/normalize.css-8.0.1.tgz", - "integrity": "sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==", - "dev": true - }, "node_modules/npm-conf": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", @@ -27695,134 +27590,47 @@ "node": ">=0.10.0" } }, - "node_modules/postcss-functions": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-functions/-/postcss-functions-3.0.0.tgz", - "integrity": "sha1-DpTQFERwCkgd4g3k1V+yZAVkJQ4=", - "dev": true, - "dependencies": { - "glob": "^7.1.2", - "object-assign": "^4.1.1", - "postcss": "^6.0.9", - "postcss-value-parser": "^3.3.0" - } - }, - "node_modules/postcss-functions/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/postcss-functions/node_modules/postcss": { - "version": "6.0.23", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz", - "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", - "dev": true, - "dependencies": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/postcss-functions/node_modules/postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, - "node_modules/postcss-functions/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/postcss-js": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-2.0.3.tgz", - "integrity": "sha512-zS59pAk3deu6dVHyrGqmC3oDXBdNdajk4k1RyxeVXCrcEDBUBHoIhE4QTsmhxgzXxsaqFDAkUZfmMa5f/N/79w==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-3.0.3.tgz", + "integrity": "sha512-gWnoWQXKFw65Hk/mi2+WTQTHdPD5UJdDXZmX073EY/B3BWnYjO4F4t0VneTCnCGQ5E5GsCdMkzPaTXwl3r5dJw==", "dev": true, "dependencies": { "camelcase-css": "^2.0.1", - "postcss": "^7.0.18" - } - }, - "node_modules/postcss-js/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "postcss": "^8.1.6" }, "engines": { - "node": ">=4" - } - }, - "node_modules/postcss-js/node_modules/chalk/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" + "node": ">=10.0" }, - "engines": { - "node": ">=4" + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" } }, - "node_modules/postcss-js/node_modules/postcss": { - "version": "7.0.36", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", - "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", + "node_modules/postcss-load-config": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.0.tgz", + "integrity": "sha512-ipM8Ds01ZUophjDTQYSVP70slFSYg3T0/zyfII5vzhN6V57YSxMgG5syXuwi5VtS8wSf3iL30v0uBdoIVx4Q0g==", "dev": true, "dependencies": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" + "import-cwd": "^3.0.0", + "lilconfig": "^2.0.3", + "yaml": "^1.10.2" }, "engines": { - "node": ">=6.0.0" + "node": ">= 10" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" - } - }, - "node_modules/postcss-js/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/postcss-js/node_modules/supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" }, - "engines": { - "node": ">=6" + "peerDependencies": { + "ts-node": ">=9.0.0" + }, + "peerDependenciesMeta": { + "ts-node": { + "optional": true + } } }, "node_modules/postcss-loader": { @@ -28058,78 +27866,22 @@ } }, "node_modules/postcss-nested": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-4.2.3.tgz", - "integrity": "sha512-rOv0W1HquRCamWy2kFl3QazJMMe1ku6rCFoAAH+9AcxdbpDeBr6k968MLWuLjvjMcGEip01ak09hKOEgpK9hvw==", - "dev": true, - "dependencies": { - "postcss": "^7.0.32", - "postcss-selector-parser": "^6.0.2" - } - }, - "node_modules/postcss-nested/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-5.0.6.tgz", + "integrity": "sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==", "dev": true, "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "postcss-selector-parser": "^6.0.6" }, "engines": { - "node": ">=4" - } - }, - "node_modules/postcss-nested/node_modules/chalk/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/postcss-nested/node_modules/postcss": { - "version": "7.0.36", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", - "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", - "dev": true, - "dependencies": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - }, - "engines": { - "node": ">=6.0.0" + "node": ">=12.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" - } - }, - "node_modules/postcss-nested/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/postcss-nested/node_modules/supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" }, - "engines": { - "node": ">=6" + "peerDependencies": { + "postcss": "^8.2.14" } }, "node_modules/postcss-resolve-nested-selector": { @@ -28171,23 +27923,22 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz", - "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==", + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.7.tgz", + "integrity": "sha512-U+b/Deoi4I/UmE6KOVPpnhS7I7AYdKbhGcat+qTQ27gycvaACvNEw11ba6RrkwVmDVRW7sigWgLj4/KbbJjeDA==", "dev": true, "dependencies": { "cssesc": "^3.0.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" + "util-deprecate": "^1.0.2" }, "engines": { "node": ">=4" } }, "node_modules/postcss-value-parser": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", - "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", "dev": true }, "node_modules/postcss/node_modules/nanoid": { @@ -28918,86 +28669,6 @@ } } }, - "node_modules/purgecss": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/purgecss/-/purgecss-2.3.0.tgz", - "integrity": "sha512-BE5CROfVGsx2XIhxGuZAT7rTH9lLeQx/6M0P7DTXQH4IUc3BBzs9JUzt4yzGf3JrH9enkeq6YJBe9CTtkm1WmQ==", - "dev": true, - "dependencies": { - "commander": "^5.0.0", - "glob": "^7.0.0", - "postcss": "7.0.32", - "postcss-selector-parser": "^6.0.2" - }, - "bin": { - "purgecss": "bin/purgecss" - } - }, - "node_modules/purgecss/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/purgecss/node_modules/chalk/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/purgecss/node_modules/postcss": { - "version": "7.0.32", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz", - "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==", - "dev": true, - "dependencies": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - }, - "engines": { - "node": ">=6.0.0" - }, - "funding": { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - } - }, - "node_modules/purgecss/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/purgecss/node_modules/supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/q": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", @@ -29784,22 +29455,6 @@ "node": ">=8" } }, - "node_modules/reduce-css-calc": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz", - "integrity": "sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg==", - "dev": true, - "dependencies": { - "css-unit-converter": "^1.1.1", - "postcss-value-parser": "^3.3.0" - } - }, - "node_modules/reduce-css-calc/node_modules/postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, "node_modules/refractor": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.3.0.tgz", @@ -33367,19 +33022,6 @@ "stylelint": "^14.0.0" } }, - "node_modules/stylelint-scss/node_modules/postcss-selector-parser": { - "version": "6.0.6", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz", - "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==", - "dev": true, - "dependencies": { - "cssesc": "^3.0.0", - "util-deprecate": "^1.0.2" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/stylelint/node_modules/ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -33411,22 +33053,6 @@ "node": ">=10" } }, - "node_modules/stylelint/node_modules/fast-glob": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", - "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/stylelint/node_modules/get-stdin": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", @@ -33439,18 +33065,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/stylelint/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/stylelint/node_modules/globby": { "version": "11.0.4", "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", @@ -33557,19 +33171,6 @@ "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", "dev": true }, - "node_modules/stylelint/node_modules/postcss-selector-parser": { - "version": "6.0.6", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz", - "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==", - "dev": true, - "dependencies": { - "cssesc": "^3.0.0", - "util-deprecate": "^1.0.2" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/stylelint/node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -33782,137 +33383,95 @@ } }, "node_modules/tailwindcss": { - "version": "1.9.6", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-1.9.6.tgz", - "integrity": "sha512-nY8WYM/RLPqGsPEGEV2z63riyQPcHYZUJpAwdyBzVpxQHOHqHE+F/fvbCeXhdF1+TA5l72vSkZrtYCB9hRcwkQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.0.tgz", + "integrity": "sha512-UPAp2PS5vojAvGClJFIkdh2hfFyaSWo09Ma9j2vZYW+ANhTvpUHFjY85JgtrvvXXREtDvOXy2BxW1yHOz8apCg==", "dev": true, "dependencies": { - "@fullhuman/postcss-purgecss": "^2.1.2", - "autoprefixer": "^9.4.5", - "browserslist": "^4.12.0", - "bytes": "^3.0.0", - "chalk": "^3.0.0 || ^4.0.0", - "color": "^3.1.2", + "arg": "^5.0.1", + "chalk": "^4.1.2", + "chokidar": "^3.5.2", + "color-name": "^1.1.4", + "cosmiconfig": "^7.0.1", "detective": "^5.2.0", - "fs-extra": "^8.0.0", - "html-tags": "^3.1.0", - "lodash": "^4.17.20", - "node-emoji": "^1.8.1", - "normalize.css": "^8.0.1", - "object-hash": "^2.0.3", - "postcss": "^7.0.11", - "postcss-functions": "^3.0.0", - "postcss-js": "^2.0.0", - "postcss-nested": "^4.1.1", - "postcss-selector-parser": "^6.0.0", - "postcss-value-parser": "^4.1.0", - "pretty-hrtime": "^1.0.3", - "reduce-css-calc": "^2.1.6", - "resolve": "^1.14.2" + "didyoumean": "^1.2.2", + "dlv": "^1.1.3", + "fast-glob": "^3.2.7", + "glob-parent": "^6.0.2", + "is-glob": "^4.0.3", + "normalize-path": "^3.0.0", + "object-hash": "^2.2.0", + "postcss-js": "^3.0.3", + "postcss-load-config": "^3.1.0", + "postcss-nested": "5.0.6", + "postcss-selector-parser": "^6.0.6", + "postcss-value-parser": "^4.2.0", + "quick-lru": "^5.1.1", + "resolve": "^1.20.0", + "tmp": "^0.2.1" }, "bin": { "tailwind": "lib/cli.js", "tailwindcss": "lib/cli.js" }, "engines": { - "node": ">=8.9.0" - } - }, - "node_modules/tailwindcss/node_modules/autoprefixer": { - "version": "9.8.6", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz", - "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==", - "dev": true, - "dependencies": { - "browserslist": "^4.12.0", - "caniuse-lite": "^1.0.30001109", - "colorette": "^1.2.1", - "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "postcss": "^7.0.32", - "postcss-value-parser": "^4.1.0" - }, - "bin": { - "autoprefixer": "bin/autoprefixer" + "node": ">=12.13.0" }, - "funding": { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/autoprefixer" - } - }, - "node_modules/tailwindcss/node_modules/color": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", - "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.3", - "color-string": "^1.6.0" + "peerDependencies": { + "autoprefixer": "^10.0.2", + "postcss": "^8.0.9" } }, - "node_modules/tailwindcss/node_modules/postcss": { - "version": "7.0.36", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", - "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", - "dev": true, - "dependencies": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - }, - "engines": { - "node": ">=6.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - } + "node_modules/tailwindcss/node_modules/arg": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.1.tgz", + "integrity": "sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA==", + "dev": true }, - "node_modules/tailwindcss/node_modules/postcss/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } + "node_modules/tailwindcss/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, - "node_modules/tailwindcss/node_modules/postcss/node_modules/chalk/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "node_modules/tailwindcss/node_modules/cosmiconfig": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", + "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==", "dev": true, "dependencies": { - "has-flag": "^3.0.0" + "@types/parse-json": "^4.0.0", + "import-fresh": "^3.2.1", + "parse-json": "^5.0.0", + "path-type": "^4.0.0", + "yaml": "^1.10.0" }, "engines": { - "node": ">=4" + "node": ">=10" } }, - "node_modules/tailwindcss/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "node_modules/tailwindcss/node_modules/quick-lru": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", + "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", "dev": true, "engines": { - "node": ">=0.10.0" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/tailwindcss/node_modules/supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "node_modules/tailwindcss/node_modules/tmp": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", "dev": true, "dependencies": { - "has-flag": "^3.0.0" + "rimraf": "^3.0.0" }, "engines": { - "node": ">=6" + "node": ">=8.17.0" } }, "node_modules/tapable": { @@ -35231,12 +34790,6 @@ "node": ">=0.10.0" } }, - "node_modules/uniq": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", - "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", - "dev": true - }, "node_modules/unique-filename": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", @@ -35381,15 +34934,6 @@ "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==", "dev": true }, - "node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true, - "engines": { - "node": ">= 4.0.0" - } - }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -39307,66 +38851,6 @@ "uninstall": "0.0.0" } }, - "@fullhuman/postcss-purgecss": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@fullhuman/postcss-purgecss/-/postcss-purgecss-2.3.0.tgz", - "integrity": "sha512-qnKm5dIOyPGJ70kPZ5jiz0I9foVOic0j+cOzNDoo8KoCf6HjicIZ99UfO2OmE7vCYSKAAepEwJtNzpiiZAh9xw==", - "dev": true, - "requires": { - "postcss": "7.0.32", - "purgecss": "^2.3.0" - }, - "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "postcss": { - "version": "7.0.32", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz", - "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==", - "dev": true, - "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, "@gar/promisify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz", @@ -45613,17 +45097,25 @@ "dev": true }, "autoprefixer": { - "version": "10.3.7", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.7.tgz", - "integrity": "sha512-EmGpu0nnQVmMhX8ROoJ7Mx8mKYPlcUHuxkwrRYEYMz85lu7H09v8w6R1P0JPdn/hKU32GjpLBFEOuIlDWCRWvg==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.0.tgz", + "integrity": "sha512-7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA==", "dev": true, "requires": { - "browserslist": "^4.17.3", - "caniuse-lite": "^1.0.30001264", + "browserslist": "^4.17.5", + "caniuse-lite": "^1.0.30001272", "fraction.js": "^4.1.1", "normalize-range": "^0.1.2", - "picocolors": "^0.2.1", + "picocolors": "^1.0.0", "postcss-value-parser": "^4.1.0" + }, + "dependencies": { + "picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true + } } }, "aws-sign2": { @@ -47820,12 +47312,6 @@ "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", "dev": true }, - "colorette": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz", - "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==", - "dev": true - }, "colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", @@ -47847,12 +47333,6 @@ "integrity": "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==", "dev": true }, - "commander": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", - "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", - "dev": true - }, "common-tags": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz", @@ -49480,12 +48960,6 @@ } } }, - "css-unit-converter": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.2.tgz", - "integrity": "sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA==", - "dev": true - }, "css-what": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz", @@ -50082,6 +49556,12 @@ "integrity": "sha512-33idhm54QJzf3Q7QofMgCvIVSd2o9H3kQPWaKT/fhoZh+digc+WSiMhbkeG3iN79WY4Hwr9G05NpbhEVrsOYAg==", "dev": true }, + "didyoumean": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", + "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==", + "dev": true + }, "diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -50122,6 +49602,12 @@ "path-type": "^4.0.0" } }, + "dlv": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", + "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", + "dev": true + }, "doctrine": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", @@ -51039,15 +50525,6 @@ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true }, - "glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "requires": { - "is-glob": "^4.0.3" - } - }, "globals": { "version": "13.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", @@ -51837,17 +51314,27 @@ "dev": true }, "fast-glob": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz", - "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", + "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", "dev": true, "requires": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.0", + "glob-parent": "^5.1.2", "merge2": "^1.3.0", - "micromatch": "^4.0.2", - "picomatch": "^2.2.1" + "micromatch": "^4.0.4" + }, + "dependencies": { + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + } } }, "fast-json-stable-stringify": { @@ -52454,17 +51941,6 @@ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", "dev": true }, - "fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, "fs-minipass": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", @@ -53136,12 +52612,12 @@ } }, "glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, "requires": { - "is-glob": "^4.0.1" + "is-glob": "^4.0.3" } }, "glob-promise": { @@ -54024,6 +53500,15 @@ "integrity": "sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA==", "dev": true }, + "import-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz", + "integrity": "sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==", + "dev": true, + "requires": { + "import-from": "^3.0.0" + } + }, "import-fresh": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", @@ -54042,6 +53527,15 @@ } } }, + "import-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/import-from/-/import-from-3.0.0.tgz", + "integrity": "sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==", + "dev": true, + "requires": { + "resolve-from": "^5.0.0" + } + }, "import-lazy": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", @@ -54070,12 +53564,6 @@ "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", "dev": true }, - "indexes-of": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", - "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", - "dev": true - }, "infer-owner": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", @@ -56524,15 +56012,6 @@ "minimist": "^1.2.5" } }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6" - } - }, "jsonparse": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", @@ -57042,12 +56521,6 @@ "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", "dev": true }, - "lodash.toarray": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz", - "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE=", - "dev": true - }, "lodash.truncate": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", @@ -57882,15 +57355,6 @@ "minimatch": "^3.0.2" } }, - "node-emoji": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz", - "integrity": "sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==", - "dev": true, - "requires": { - "lodash.toarray": "^4.4.0" - } - }, "node-fetch": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", @@ -58031,12 +57495,6 @@ "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==", "dev": true }, - "normalize.css": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/normalize.css/-/normalize.css-8.0.1.tgz", - "integrity": "sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==", - "dev": true - }, "npm-conf": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", @@ -59026,112 +58484,25 @@ } } }, - "postcss-functions": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-functions/-/postcss-functions-3.0.0.tgz", - "integrity": "sha1-DpTQFERwCkgd4g3k1V+yZAVkJQ4=", + "postcss-js": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-3.0.3.tgz", + "integrity": "sha512-gWnoWQXKFw65Hk/mi2+WTQTHdPD5UJdDXZmX073EY/B3BWnYjO4F4t0VneTCnCGQ5E5GsCdMkzPaTXwl3r5dJw==", "dev": true, "requires": { - "glob": "^7.1.2", - "object-assign": "^4.1.1", - "postcss": "^6.0.9", - "postcss-value-parser": "^3.3.0" - }, - "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "postcss": { - "version": "6.0.23", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz", - "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", - "dev": true, - "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" - } - }, - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } + "camelcase-css": "^2.0.1", + "postcss": "^8.1.6" } }, - "postcss-js": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-2.0.3.tgz", - "integrity": "sha512-zS59pAk3deu6dVHyrGqmC3oDXBdNdajk4k1RyxeVXCrcEDBUBHoIhE4QTsmhxgzXxsaqFDAkUZfmMa5f/N/79w==", + "postcss-load-config": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.0.tgz", + "integrity": "sha512-ipM8Ds01ZUophjDTQYSVP70slFSYg3T0/zyfII5vzhN6V57YSxMgG5syXuwi5VtS8wSf3iL30v0uBdoIVx4Q0g==", "dev": true, "requires": { - "camelcase-css": "^2.0.1", - "postcss": "^7.0.18" - }, - "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "postcss": { - "version": "7.0.36", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", - "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", - "dev": true, - "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } + "import-cwd": "^3.0.0", + "lilconfig": "^2.0.3", + "yaml": "^1.10.2" } }, "postcss-loader": { @@ -59304,63 +58675,12 @@ } }, "postcss-nested": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-4.2.3.tgz", - "integrity": "sha512-rOv0W1HquRCamWy2kFl3QazJMMe1ku6rCFoAAH+9AcxdbpDeBr6k968MLWuLjvjMcGEip01ak09hKOEgpK9hvw==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-5.0.6.tgz", + "integrity": "sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==", "dev": true, "requires": { - "postcss": "^7.0.32", - "postcss-selector-parser": "^6.0.2" - }, - "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "postcss": { - "version": "7.0.36", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", - "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", - "dev": true, - "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } + "postcss-selector-parser": "^6.0.6" } }, "postcss-resolve-nested-selector": { @@ -59384,20 +58704,19 @@ "requires": {} }, "postcss-selector-parser": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz", - "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==", + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.7.tgz", + "integrity": "sha512-U+b/Deoi4I/UmE6KOVPpnhS7I7AYdKbhGcat+qTQ27gycvaACvNEw11ba6RrkwVmDVRW7sigWgLj4/KbbJjeDA==", "dev": true, "requires": { "cssesc": "^3.0.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" + "util-deprecate": "^1.0.2" } }, "postcss-value-parser": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", - "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", "dev": true }, "posthtml": { @@ -59937,68 +59256,6 @@ } } }, - "purgecss": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/purgecss/-/purgecss-2.3.0.tgz", - "integrity": "sha512-BE5CROfVGsx2XIhxGuZAT7rTH9lLeQx/6M0P7DTXQH4IUc3BBzs9JUzt4yzGf3JrH9enkeq6YJBe9CTtkm1WmQ==", - "dev": true, - "requires": { - "commander": "^5.0.0", - "glob": "^7.0.0", - "postcss": "7.0.32", - "postcss-selector-parser": "^6.0.2" - }, - "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "postcss": { - "version": "7.0.32", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz", - "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==", - "dev": true, - "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, "q": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", @@ -60608,24 +59865,6 @@ "strip-indent": "^3.0.0" } }, - "reduce-css-calc": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz", - "integrity": "sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg==", - "dev": true, - "requires": { - "css-unit-converter": "^1.1.1", - "postcss-value-parser": "^3.3.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - } - } - }, "refractor": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.3.0.tgz", @@ -63423,34 +62662,12 @@ "yaml": "^1.10.0" } }, - "fast-glob": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", - "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - } - }, "get-stdin": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", "dev": true }, - "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, "globby": { "version": "11.0.4", "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", @@ -63530,16 +62747,6 @@ "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", "dev": true }, - "postcss-selector-parser": { - "version": "6.0.6", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz", - "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==", - "dev": true, - "requires": { - "cssesc": "^3.0.0", - "util-deprecate": "^1.0.2" - } - }, "string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -63603,18 +62810,6 @@ "postcss-resolve-nested-selector": "^0.1.1", "postcss-selector-parser": "^6.0.6", "postcss-value-parser": "^4.1.0" - }, - "dependencies": { - "postcss-selector-parser": { - "version": "6.0.6", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz", - "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==", - "dev": true, - "requires": { - "cssesc": "^3.0.0", - "util-deprecate": "^1.0.2" - } - } } }, "supports-color": { @@ -63749,108 +62944,72 @@ } }, "tailwindcss": { - "version": "1.9.6", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-1.9.6.tgz", - "integrity": "sha512-nY8WYM/RLPqGsPEGEV2z63riyQPcHYZUJpAwdyBzVpxQHOHqHE+F/fvbCeXhdF1+TA5l72vSkZrtYCB9hRcwkQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.0.tgz", + "integrity": "sha512-UPAp2PS5vojAvGClJFIkdh2hfFyaSWo09Ma9j2vZYW+ANhTvpUHFjY85JgtrvvXXREtDvOXy2BxW1yHOz8apCg==", "dev": true, "requires": { - "@fullhuman/postcss-purgecss": "^2.1.2", - "autoprefixer": "^9.4.5", - "browserslist": "^4.12.0", - "bytes": "^3.0.0", - "chalk": "^3.0.0 || ^4.0.0", - "color": "^3.1.2", + "arg": "^5.0.1", + "chalk": "^4.1.2", + "chokidar": "^3.5.2", + "color-name": "^1.1.4", + "cosmiconfig": "^7.0.1", "detective": "^5.2.0", - "fs-extra": "^8.0.0", - "html-tags": "^3.1.0", - "lodash": "^4.17.20", - "node-emoji": "^1.8.1", - "normalize.css": "^8.0.1", - "object-hash": "^2.0.3", - "postcss": "^7.0.11", - "postcss-functions": "^3.0.0", - "postcss-js": "^2.0.0", - "postcss-nested": "^4.1.1", - "postcss-selector-parser": "^6.0.0", - "postcss-value-parser": "^4.1.0", - "pretty-hrtime": "^1.0.3", - "reduce-css-calc": "^2.1.6", - "resolve": "^1.14.2" + "didyoumean": "^1.2.2", + "dlv": "^1.1.3", + "fast-glob": "^3.2.7", + "glob-parent": "^6.0.2", + "is-glob": "^4.0.3", + "normalize-path": "^3.0.0", + "object-hash": "^2.2.0", + "postcss-js": "^3.0.3", + "postcss-load-config": "^3.1.0", + "postcss-nested": "5.0.6", + "postcss-selector-parser": "^6.0.6", + "postcss-value-parser": "^4.2.0", + "quick-lru": "^5.1.1", + "resolve": "^1.20.0", + "tmp": "^0.2.1" }, "dependencies": { - "autoprefixer": { - "version": "9.8.6", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz", - "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==", - "dev": true, - "requires": { - "browserslist": "^4.12.0", - "caniuse-lite": "^1.0.30001109", - "colorette": "^1.2.1", - "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "postcss": "^7.0.32", - "postcss-value-parser": "^4.1.0" - } + "arg": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.1.tgz", + "integrity": "sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA==", + "dev": true }, - "color": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", - "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", - "dev": true, - "requires": { - "color-convert": "^1.9.3", - "color-string": "^1.6.0" - } + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, - "postcss": { - "version": "7.0.36", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", - "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", + "cosmiconfig": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", + "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==", "dev": true, "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - }, - "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - } + "@types/parse-json": "^4.0.0", + "import-fresh": "^3.2.1", + "parse-json": "^5.0.0", + "path-type": "^4.0.0", + "yaml": "^1.10.0" } }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "quick-lru": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", + "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", "dev": true }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "tmp": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "rimraf": "^3.0.0" } } } @@ -64826,12 +63985,6 @@ "set-value": "^2.0.1" } }, - "uniq": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", - "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", - "dev": true - }, "unique-filename": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", @@ -64937,12 +64090,6 @@ "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==", "dev": true }, - "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true - }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", diff --git a/package.json b/package.json index 055412cff2d..b9c648c6f09 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "build": "npm run util:copy-icons && stencil build", "build:watch": "npm run util:copy-icons && stencil build --watch", "build:watch-dev": "npm run util:copy-icons && stencil build --dev --watch", - "deps:update": "updtr --exclude chalk typescript tailwindcss @types/jest jest jest-cli puppeteer && git add package*.json && git commit -q -m \"build(deps): bump versions\"", + "deps:update": "updtr --exclude chalk typescript @types/jest jest jest-cli puppeteer && git add package*.json && git commit -q -m \"build(deps): bump versions\"", "docs": "concurrently --kill-others --raw \"npm:util:build-docs && build-storybook --static-dir ./__docs-temp__ --output-dir ./docs\" \"ts-node ./support/cleanOnProcessExit.ts --path ./__docs-temp__\"", "docs:preview": "concurrently --raw \"npm:util:build-docs && start-storybook --static-dir ./__docs-temp__\" \"ts-node ./support/cleanOnProcessExit.ts --path ./__docs-temp__\"", "lint": "concurrently npm:lint:*", @@ -99,7 +99,7 @@ "@typescript-eslint/eslint-plugin": "5.6.0", "@typescript-eslint/parser": "5.6.0", "@whitespace/storybook-addon-html": "5.0.0", - "autoprefixer": "10.3.7", + "autoprefixer": "10.4.0", "axe-core": "4.3.5", "babel-loader": "8.2.3", "chalk": "4.1.2", @@ -139,7 +139,7 @@ "storybook-rtl-addon": "0.3.3", "stylelint": "14.1.0", "stylelint-config-recommended-scss": "5.0.2", - "tailwindcss": "1.9.6", + "tailwindcss": "3.0.0", "ts-jest": "27.1.0", "ts-node": "10.4.0", "typescript": "4.2.4", diff --git a/src/components/calcite-action-menu/calcite-action-menu.scss b/src/components/calcite-action-menu/calcite-action-menu.scss index cfd1899698e..98898f7e3f0 100755 --- a/src/components/calcite-action-menu/calcite-action-menu.scss +++ b/src/components/calcite-action-menu/calcite-action-menu.scss @@ -33,5 +33,5 @@ } .menu { - @apply flex-col flex-no-wrap outline-none; + @apply flex-col flex-nowrap outline-none; } diff --git a/src/components/calcite-action-pad/calcite-action-pad.scss b/src/components/calcite-action-pad/calcite-action-pad.scss index 71ec6ad0687..3b2a41273a2 100755 --- a/src/components/calcite-action-pad/calcite-action-pad.scss +++ b/src/components/calcite-action-pad/calcite-action-pad.scss @@ -39,7 +39,7 @@ ::slotted(calcite-action-group) { @apply border-0 p-0; - border-inline-end-width: theme("borderWidth.default"); + border-inline-end-width: theme("borderWidth.DEFAULT"); } } } diff --git a/src/components/calcite-block/calcite-block.scss b/src/components/calcite-block/calcite-block.scss index 5d232f82f22..244c215fff7 100644 --- a/src/components/calcite-block/calcite-block.scss +++ b/src/components/calcite-block/calcite-block.scss @@ -42,7 +42,7 @@ .toggle { @apply flex - flex-no-wrap + flex-nowrap justify-between font-inherit items-center diff --git a/src/components/calcite-button/calcite-button.scss b/src/components/calcite-button/calcite-button.scss index c2448346abe..52e6da0bb03 100644 --- a/src/components/calcite-button/calcite-button.scss +++ b/src/components/calcite-button/calcite-button.scss @@ -503,13 +503,13 @@ :host([appearance="outline"][split-child="primary"]) button, :host([appearance="clear"][split-child="primary"]) button { border-inline-end-width: 0; - border-inline-start-width: theme("borderWidth.default"); + border-inline-start-width: theme("borderWidth.DEFAULT"); } :host([appearance="outline"][split-child="secondary"]) button, :host([appearance="clear"][split-child="secondary"]) button { border-inline-start-width: 0; - border-inline-end-width: theme("borderWidth.default"); + border-inline-end-width: theme("borderWidth.DEFAULT"); } // transparent diff --git a/src/components/calcite-color-picker/calcite-color-picker.scss b/src/components/calcite-color-picker/calcite-color-picker.scss index a5031496505..ed97eb67c64 100644 --- a/src/components/calcite-color-picker/calcite-color-picker.scss +++ b/src/components/calcite-color-picker/calcite-color-picker.scss @@ -69,7 +69,7 @@ $gap--large: 12px; } .control-section { - @apply flex-no-wrap items-baseline; + @apply flex-nowrap items-baseline; > :nth-child(2) { margin-inline-start: $gap--large; diff --git a/src/components/calcite-combobox/calcite-combobox.scss b/src/components/calcite-combobox/calcite-combobox.scss index 2b30db5e4d9..69af25ad855 100644 --- a/src/components/calcite-combobox/calcite-combobox.scss +++ b/src/components/calcite-combobox/calcite-combobox.scss @@ -51,7 +51,7 @@ .wrapper--single { padding: 0 var(--calcite-combobox-item-spacing-unit-l); - @apply cursor-pointer flex-no-wrap; + @apply cursor-pointer flex-nowrap; } .grid-input { diff --git a/src/components/calcite-date-picker-month-header/calcite-date-picker-month-header.scss b/src/components/calcite-date-picker-month-header/calcite-date-picker-month-header.scss index fd7cf6878d2..49e5126087d 100644 --- a/src/components/calcite-date-picker-month-header/calcite-date-picker-month-header.scss +++ b/src/components/calcite-date-picker-month-header/calcite-date-picker-month-header.scss @@ -130,7 +130,7 @@ .suffix { @apply absolute w-16 - whitespace-no-wrap + whitespace-nowrap text-left top-0 left-0; diff --git a/src/components/calcite-modal/calcite-modal.scss b/src/components/calcite-modal/calcite-modal.scss index c924bc06111..9e7f150842a 100644 --- a/src/components/calcite-modal/calcite-modal.scss +++ b/src/components/calcite-modal/calcite-modal.scss @@ -109,7 +109,7 @@ cursor-pointer bg-transparent focus-base; - border-start-end-radius: theme("borderRadius.default"); + border-start-end-radius: theme("borderRadius.DEFAULT"); padding: var(--calcite-modal-padding); flex: 0 0 auto; transition: all 0.15s ease-in-out; diff --git a/src/components/calcite-panel/calcite-panel.scss b/src/components/calcite-panel/calcite-panel.scss index fb3fc2f9589..5fd4a427a31 100644 --- a/src/components/calcite-panel/calcite-panel.scss +++ b/src/components/calcite-panel/calcite-panel.scss @@ -97,7 +97,7 @@ @apply p-0 block overflow-hidden - whitespace-no-wrap + whitespace-nowrap w-full; text-overflow: ellipsis; } @@ -116,14 +116,14 @@ @apply border-color-3 border-solid border-0; - border-inline-end-width: theme("borderWidth.default"); + border-inline-end-width: theme("borderWidth.DEFAULT"); } .header-actions { @apply flex items-stretch flex-row - flex-no-wrap; + flex-nowrap; } .header-actions--end, @@ -155,7 +155,7 @@ bg-background flex flex-auto - flex-no-wrap + flex-nowrap flex-col; } diff --git a/src/components/calcite-pick-list-item/calcite-pick-list-item.scss b/src/components/calcite-pick-list-item/calcite-pick-list-item.scss index 7bbc741920d..3efb2bb1501 100644 --- a/src/components/calcite-pick-list-item/calcite-pick-list-item.scss +++ b/src/components/calcite-pick-list-item/calcite-pick-list-item.scss @@ -79,7 +79,7 @@ text--2-wrap word-break flex-col - flex-no-wrap; + flex-nowrap; } .title { diff --git a/src/components/calcite-popover/calcite-popover.scss b/src/components/calcite-popover/calcite-popover.scss index 29eaeb841ad..15dcb39af05 100644 --- a/src/components/calcite-popover/calcite-popover.scss +++ b/src/components/calcite-popover/calcite-popover.scss @@ -52,7 +52,7 @@ relative flex overflow-hidden - flex-no-wrap + flex-nowrap flex-row h-full text-color-1 @@ -65,7 +65,7 @@ .content { @apply flex flex-col - flex-no-wrap + flex-nowrap self-center overflow-hidden h-full diff --git a/src/components/calcite-select/calcite-select.scss b/src/components/calcite-select/calcite-select.scss index a21e00b62d6..accb7fcd350 100644 --- a/src/components/calcite-select/calcite-select.scss +++ b/src/components/calcite-select/calcite-select.scss @@ -104,7 +104,7 @@ select:disabled { absolute inset-y-0; inset-inline-end: theme("inset.0"); - border-inline-width: theme("borderWidth.0") theme("borderWidth.default"); + border-inline-width: theme("borderWidth.0") theme("borderWidth.DEFAULT"); } .select:focus ~ .icon-container { diff --git a/src/components/calcite-shell-center-row/calcite-shell-center-row.scss b/src/components/calcite-shell-center-row/calcite-shell-center-row.scss index bdbc988d178..e70725bc911 100644 --- a/src/components/calcite-shell-center-row/calcite-shell-center-row.scss +++ b/src/components/calcite-shell-center-row/calcite-shell-center-row.scss @@ -57,9 +57,9 @@ ::slotted(calcite-action-bar) { @apply border-solid border-color-3; - border-inline-end-width: theme("borderWidth.default"); + border-inline-end-width: theme("borderWidth.DEFAULT"); } ::slotted(calcite-action-bar[position="end"]) { @apply border-solid border-color-3; - border-inline-width: theme("borderWidth.0") theme("borderWidth.default"); + border-inline-width: theme("borderWidth.0") theme("borderWidth.DEFAULT"); } diff --git a/src/components/calcite-shell-panel/calcite-shell-panel.scss b/src/components/calcite-shell-panel/calcite-shell-panel.scss index 2cb49e011db..7de602ac75f 100755 --- a/src/components/calcite-shell-panel/calcite-shell-panel.scss +++ b/src/components/calcite-shell-panel/calcite-shell-panel.scss @@ -79,7 +79,7 @@ p-0 pointer-events-auto flex-col - flex-no-wrap; + flex-nowrap; width: var(--calcite-shell-panel-width); max-width: var(--calcite-shell-panel-max-width); @@ -91,7 +91,7 @@ @apply flex flex-col flex-initial - flex-no-wrap + flex-nowrap items-stretch; } diff --git a/src/components/calcite-shell/calcite-shell.scss b/src/components/calcite-shell/calcite-shell.scss index 7a6c7ba3750..fb42ca5ad0f 100755 --- a/src/components/calcite-shell/calcite-shell.scss +++ b/src/components/calcite-shell/calcite-shell.scss @@ -36,7 +36,7 @@ .content { @apply flex flex-col - flex-no-wrap + flex-nowrap h-full overflow-auto w-full; diff --git a/src/components/calcite-tab-nav/calcite-tab-nav.scss b/src/components/calcite-tab-nav/calcite-tab-nav.scss index 0c1581e1b1e..f58c9832d5d 100644 --- a/src/components/calcite-tab-nav/calcite-tab-nav.scss +++ b/src/components/calcite-tab-nav/calcite-tab-nav.scss @@ -19,7 +19,6 @@ w-full overflow-auto justify-start - scrolling-touch p-1 -m-1; } diff --git a/src/components/calcite-value-list-item/calcite-value-list-item.scss b/src/components/calcite-value-list-item/calcite-value-list-item.scss index d75ea70cffe..a06ead716e1 100644 --- a/src/components/calcite-value-list-item/calcite-value-list-item.scss +++ b/src/components/calcite-value-list-item/calcite-value-list-item.scss @@ -21,7 +21,7 @@ calcite-pick-list-item { :host([active]), :host([selected]) { - @apply shadow-outline-active; + @apply ring; } .handle { diff --git a/tailwind.config.js b/tailwind.config.js index f2f482946c4..883291afc85 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,9 +1,12 @@ // eslint-disable-next-line @typescript-eslint/no-var-requires -var flattenColorPalette = require("tailwindcss/lib/util/flattenColorPalette").default; +const flattenColorPalette = require("tailwindcss/lib/util/flattenColorPalette").default; + +// eslint-disable-next-line @typescript-eslint/no-var-requires +const plugin = require("tailwindcss/plugin"); module.exports = { theme: { - borderColor: (theme) => ({ + borderColor: ({ theme }) => ({ color: { 1: "var(--calcite-ui-border-1)", 2: "var(--calcite-ui-border-2)", @@ -109,10 +112,10 @@ module.exports = { l: "1024px", xl: "1440px" }, - textColor: (theme) => ({ + textColor: ({ theme }) => ({ color: theme("colors.text") }), - backgroundColor: (theme) => ({ + backgroundColor: ({ theme }) => ({ ...theme("colors.background"), transparent: theme("colors.transparent"), brand: theme("colors.brand"), @@ -210,7 +213,7 @@ module.exports = { } }, plugins: [ - ({ addUtilities }) => { + plugin(({ addUtilities }) => { const newUtilities = { ".word-break": { "word-wrap": "break-word", @@ -245,8 +248,8 @@ module.exports = { } }; addUtilities(newUtilities); - }, - ({ addUtilities, theme, variants }) => { + }), + plugin(({ addUtilities, theme, variants }) => { const colors = flattenColorPalette(theme("borderColor")); delete colors["default"]; @@ -259,13 +262,6 @@ module.exports = { const utilities = Object.assign({}, ...colorMap); addUtilities(utilities, variants("borderColor")); - } - ], - future: { - removeDeprecatedGapUtilities: true - }, - variants: { - boxShadow: ["responsive", "hover", "focus", "active"], - borderWidth: ["responsive", "hover", "focus", "active"] - } + }) + ] }; From 634fde682bcd257d0d2067233314a2369fd682f7 Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Fri, 10 Dec 2021 14:12:11 -0800 Subject: [PATCH 02/24] WIP --- .../calcite-accordion-item/calcite-accordion-item.scss | 4 ++-- src/components/calcite-checkbox/calcite-checkbox.scss | 4 ++-- src/components/calcite-input/calcite-input.scss | 6 +++--- src/components/calcite-loader/calcite-loader.scss | 4 ++-- src/components/calcite-notice/calcite-notice.scss | 6 +++--- .../calcite-shell-center-row.scss | 2 +- tailwind.config.js | 9 +-------- 7 files changed, 14 insertions(+), 21 deletions(-) diff --git a/src/components/calcite-accordion-item/calcite-accordion-item.scss b/src/components/calcite-accordion-item/calcite-accordion-item.scss index 9e62aace4f9..05d5a93aa7f 100644 --- a/src/components/calcite-accordion-item/calcite-accordion-item.scss +++ b/src/components/calcite-accordion-item/calcite-accordion-item.scss @@ -1,6 +1,6 @@ %icon-position { /* icon rotation variables */ - --calcite-accordion-item-icon-rotation: theme("rotate.-90"); + --calcite-accordion-item-icon-rotation: -theme("rotate.90"); --calcite-accordion-item-active-icon-rotation: theme("rotate.0"); --calcite-accordion-item-icon-rotation-rtl: theme("rotate.90"); --calcite-accordion-item-active-icon-rotation-rtl: theme("rotate.0"); @@ -25,7 +25,7 @@ --calcite-accordion-item-icon-rotation: theme("rotate.0"); --calcite-accordion-item-active-icon-rotation: theme("rotate.180"); --calcite-accordion-item-icon-rotation-rtl: theme("rotate.0"); - --calcite-accordion-item-active-icon-rotation-rtl: theme("rotate.-180"); + --calcite-accordion-item-active-icon-rotation-rtl: -theme("rotate.180"); } :host { diff --git a/src/components/calcite-checkbox/calcite-checkbox.scss b/src/components/calcite-checkbox/calcite-checkbox.scss index 028e736182e..f86ec9a5bfa 100644 --- a/src/components/calcite-checkbox/calcite-checkbox.scss +++ b/src/components/calcite-checkbox/calcite-checkbox.scss @@ -30,9 +30,9 @@ transition-all duration-150 ease-in-out - stroke-current + stroke-brand stroke-1 - fill-current; + fill-brand; width: var(--calcite-checkbox-size); height: var(--calcite-checkbox-size); box-shadow: inset 0 0 0 1px var(--calcite-ui-border-input); diff --git a/src/components/calcite-input/calcite-input.scss b/src/components/calcite-input/calcite-input.scss index f4b5fe2805b..3a6e3fb3360 100755 --- a/src/components/calcite-input/calcite-input.scss +++ b/src/components/calcite-input/calcite-input.scss @@ -377,10 +377,10 @@ input[type="time"]::-webkit-clear-button { :host([number-button-type="horizontal"]) .calcite--rtl { & .number-button-item[data-adjustment="down"] calcite-icon { - transform: rotate(-90deg); + transform: -rotate(90deg); } & .number-button-item[data-adjustment="up"] calcite-icon { - transform: rotate(-90deg); + transform: -rotate(90deg); } } @@ -511,7 +511,7 @@ input[type="time"]::-webkit-clear-button { & calcite-icon { bottom: theme("spacing.1"); inset-inline-end: theme("spacing.1"); - transform: rotate(-45deg); + transform: -rotate(45deg); } } diff --git a/src/components/calcite-loader/calcite-loader.scss b/src/components/calcite-loader/calcite-loader.scss index 8290e8a438e..355a6ce5bdc 100644 --- a/src/components/calcite-loader/calcite-loader.scss +++ b/src/components/calcite-loader/calcite-loader.scss @@ -105,13 +105,13 @@ $loader-circumference: ($loader-scale - (2 * $stroke-width)) * 3.14159; @apply animate-none; stroke: var(--calcite-ui-brand); stroke-dasharray: $loader-circumference; - transform: rotate(-90deg); + transform: -rotate(90deg); transition: all 100ms linear; } } :host([inline]) { - @apply relative m-0 py-0 animate-none stroke-current stroke-2; + @apply relative m-0 py-0 animate-none stroke-brand stroke-2; height: var(--calcite-loader-size-inline); min-height: var(--calcite-loader-size-inline); width: var(--calcite-loader-size-inline); diff --git a/src/components/calcite-notice/calcite-notice.scss b/src/components/calcite-notice/calcite-notice.scss index 4d7a79cf99a..753bc99210d 100644 --- a/src/components/calcite-notice/calcite-notice.scss +++ b/src/components/calcite-notice/calcite-notice.scss @@ -54,15 +54,15 @@ } :host([width="auto"]) { - --calcite-notice-width: theme("width[auto]"); + --calcite-notice-width: theme("width.auto"); } :host([width="half"]) { - --calcite-notice-width: theme("width[1/2]"); + --calcite-notice-width: theme("width.1/2"); } :host([width="full"]) { - --calcite-notice-width: theme("width[full]"); + --calcite-notice-width: theme("width.full"); } :host { diff --git a/src/components/calcite-shell-center-row/calcite-shell-center-row.scss b/src/components/calcite-shell-center-row/calcite-shell-center-row.scss index e70725bc911..6c6ba687168 100644 --- a/src/components/calcite-shell-center-row/calcite-shell-center-row.scss +++ b/src/components/calcite-shell-center-row/calcite-shell-center-row.scss @@ -36,7 +36,7 @@ } :host([height-scale="s"]) { - height: theme("width[1/3]"); + height: theme("width.1/3"); } :host([height-scale="m"]) { diff --git a/tailwind.config.js b/tailwind.config.js index 883291afc85..c4590278d10 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -113,7 +113,7 @@ module.exports = { xl: "1440px" }, textColor: ({ theme }) => ({ - color: theme("colors.text") + ...theme("colors.text") }), backgroundColor: ({ theme }) => ({ ...theme("colors.background"), @@ -196,13 +196,6 @@ module.exports = { opacity: { disabled: "var(--calcite-ui-opacity-disabled)" }, - spacing: { - 0.5: "0.125rem", - 2.5: "0.625rem", - 3.5: "0.875rem", - 9: "2.25rem", - 11: "2.75rem" - }, transitionProperty: { margin: "margin", color: "color" From 9a2a13922da93fe22654a4a4ac4b7e274a119148 Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Mon, 13 Dec 2021 14:42:35 -0800 Subject: [PATCH 03/24] cleanup --- src/components/calcite-tip-manager/calcite-tip-manager.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/calcite-tip-manager/calcite-tip-manager.scss b/src/components/calcite-tip-manager/calcite-tip-manager.scss index 2eaa7652117..52b19679a8e 100644 --- a/src/components/calcite-tip-manager/calcite-tip-manager.scss +++ b/src/components/calcite-tip-manager/calcite-tip-manager.scss @@ -56,8 +56,7 @@ } .tip-container { - @apply mt-0 - overflow-auto + @apply overflow-auto flex justify-center items-start From cb98925308c3042d712accebcd693f6a8a45ed12 Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Tue, 14 Dec 2021 13:18:28 -0800 Subject: [PATCH 04/24] WIP --- package-lock.json | 28 ++++++++++++++-------------- package.json | 4 ++-- stencil.config.ts | 4 ++-- tailwind.config.js | 9 ++++++++- 4 files changed, 26 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index 21443d186b9..818d3195ae2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -75,7 +75,7 @@ "jest-cli": "26.6.3", "lint-staged": "12.1.2", "pify": "5.0.0", - "postcss": "8.4.4", + "postcss": "8.4.5", "posthtml": "0.16.5", "prettier": "2.5.1", "puppeteer": "10.0.0", @@ -90,7 +90,7 @@ "storybook-rtl-addon": "0.3.3", "stylelint": "14.1.0", "stylelint-config-recommended-scss": "5.0.2", - "tailwindcss": "3.0.0", + "tailwindcss": "3.0.2", "ts-jest": "27.1.0", "ts-node": "10.4.0", "typescript": "4.2.4", @@ -27538,9 +27538,9 @@ } }, "node_modules/postcss": { - "version": "8.4.4", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.4.tgz", - "integrity": "sha512-joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q==", + "version": "8.4.5", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz", + "integrity": "sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==", "dev": true, "dependencies": { "nanoid": "^3.1.30", @@ -33383,9 +33383,9 @@ } }, "node_modules/tailwindcss": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.0.tgz", - "integrity": "sha512-UPAp2PS5vojAvGClJFIkdh2hfFyaSWo09Ma9j2vZYW+ANhTvpUHFjY85JgtrvvXXREtDvOXy2BxW1yHOz8apCg==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.2.tgz", + "integrity": "sha512-i1KpjYnGYftjzdAth6jA5iMPjhxpUkk5L6DafhfnQs+KiiWaThYxmk47Weh4oFH1mZqP6MuiQNHxtoRVPOraLg==", "dev": true, "dependencies": { "arg": "^5.0.1", @@ -58433,9 +58433,9 @@ "dev": true }, "postcss": { - "version": "8.4.4", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.4.tgz", - "integrity": "sha512-joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q==", + "version": "8.4.5", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz", + "integrity": "sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==", "dev": true, "requires": { "nanoid": "^3.1.30", @@ -62944,9 +62944,9 @@ } }, "tailwindcss": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.0.tgz", - "integrity": "sha512-UPAp2PS5vojAvGClJFIkdh2hfFyaSWo09Ma9j2vZYW+ANhTvpUHFjY85JgtrvvXXREtDvOXy2BxW1yHOz8apCg==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.2.tgz", + "integrity": "sha512-i1KpjYnGYftjzdAth6jA5iMPjhxpUkk5L6DafhfnQs+KiiWaThYxmk47Weh4oFH1mZqP6MuiQNHxtoRVPOraLg==", "dev": true, "requires": { "arg": "^5.0.1", diff --git a/package.json b/package.json index b9c648c6f09..695a362ab73 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,7 @@ "jest-cli": "26.6.3", "lint-staged": "12.1.2", "pify": "5.0.0", - "postcss": "8.4.4", + "postcss": "8.4.5", "posthtml": "0.16.5", "prettier": "2.5.1", "puppeteer": "10.0.0", @@ -139,7 +139,7 @@ "storybook-rtl-addon": "0.3.3", "stylelint": "14.1.0", "stylelint-config-recommended-scss": "5.0.2", - "tailwindcss": "3.0.0", + "tailwindcss": "3.0.2", "ts-jest": "27.1.0", "ts-node": "10.4.0", "typescript": "4.2.4", diff --git a/stencil.config.ts b/stencil.config.ts index 466dc43e6c0..6c7b733dc0c 100644 --- a/stencil.config.ts +++ b/stencil.config.ts @@ -3,7 +3,7 @@ import { postcss } from "@stencil/postcss"; import { sass } from "@stencil/sass"; import babel from "@rollup/plugin-babel"; import autoprefixer from "autoprefixer"; -import tailwind from "tailwindcss"; +import tailwindcss from "tailwindcss"; import { generatePreactTypes } from "./support/preact"; export const create: () => Config = () => ({ @@ -99,7 +99,7 @@ export const create: () => Config = () => ({ injectGlobalPaths: ["src/assets/styles/includes.scss"] }), postcss({ - plugins: [tailwind(), autoprefixer()] + plugins: [tailwindcss(), autoprefixer()] }) ], rollupPlugins: { diff --git a/tailwind.config.js b/tailwind.config.js index c4590278d10..8ef300584b8 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -47,7 +47,14 @@ module.exports = { 2: "var(--calcite-ui-text-2)", 3: "var(--calcite-ui-text-3)", inverse: "var(--calcite-ui-text-inverse)", - link: "var(--calcite-ui-text-link)" + link: "var(--calcite-ui-text-link)", + color: { + 1: "var(--calcite-ui-text-1)", + 2: "var(--calcite-ui-text-2)", + 3: "var(--calcite-ui-text-3)", + inverse: "var(--calcite-ui-text-inverse)", + link: "var(--calcite-ui-text-link)" + } }, transparent: "transparent" }, From b06e2b1c3d3d4e46c12b170e0b5a4ad6e29b8115 Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Tue, 14 Dec 2021 15:00:32 -0800 Subject: [PATCH 05/24] cleanup --- .../calcite-accordion-item/calcite-accordion-item.scss | 4 ++-- src/components/calcite-input/calcite-input.scss | 6 +++--- src/components/calcite-loader/calcite-loader.scss | 2 +- tailwind.config.js | 4 ++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/components/calcite-accordion-item/calcite-accordion-item.scss b/src/components/calcite-accordion-item/calcite-accordion-item.scss index 05d5a93aa7f..9e62aace4f9 100644 --- a/src/components/calcite-accordion-item/calcite-accordion-item.scss +++ b/src/components/calcite-accordion-item/calcite-accordion-item.scss @@ -1,6 +1,6 @@ %icon-position { /* icon rotation variables */ - --calcite-accordion-item-icon-rotation: -theme("rotate.90"); + --calcite-accordion-item-icon-rotation: theme("rotate.-90"); --calcite-accordion-item-active-icon-rotation: theme("rotate.0"); --calcite-accordion-item-icon-rotation-rtl: theme("rotate.90"); --calcite-accordion-item-active-icon-rotation-rtl: theme("rotate.0"); @@ -25,7 +25,7 @@ --calcite-accordion-item-icon-rotation: theme("rotate.0"); --calcite-accordion-item-active-icon-rotation: theme("rotate.180"); --calcite-accordion-item-icon-rotation-rtl: theme("rotate.0"); - --calcite-accordion-item-active-icon-rotation-rtl: -theme("rotate.180"); + --calcite-accordion-item-active-icon-rotation-rtl: theme("rotate.-180"); } :host { diff --git a/src/components/calcite-input/calcite-input.scss b/src/components/calcite-input/calcite-input.scss index 3a6e3fb3360..f4b5fe2805b 100755 --- a/src/components/calcite-input/calcite-input.scss +++ b/src/components/calcite-input/calcite-input.scss @@ -377,10 +377,10 @@ input[type="time"]::-webkit-clear-button { :host([number-button-type="horizontal"]) .calcite--rtl { & .number-button-item[data-adjustment="down"] calcite-icon { - transform: -rotate(90deg); + transform: rotate(-90deg); } & .number-button-item[data-adjustment="up"] calcite-icon { - transform: -rotate(90deg); + transform: rotate(-90deg); } } @@ -511,7 +511,7 @@ input[type="time"]::-webkit-clear-button { & calcite-icon { bottom: theme("spacing.1"); inset-inline-end: theme("spacing.1"); - transform: -rotate(45deg); + transform: rotate(-45deg); } } diff --git a/src/components/calcite-loader/calcite-loader.scss b/src/components/calcite-loader/calcite-loader.scss index 355a6ce5bdc..de4cc8e649d 100644 --- a/src/components/calcite-loader/calcite-loader.scss +++ b/src/components/calcite-loader/calcite-loader.scss @@ -105,7 +105,7 @@ $loader-circumference: ($loader-scale - (2 * $stroke-width)) * 3.14159; @apply animate-none; stroke: var(--calcite-ui-brand); stroke-dasharray: $loader-circumference; - transform: -rotate(90deg); + transform: rotate(-90deg); transition: all 100ms linear; } } diff --git a/tailwind.config.js b/tailwind.config.js index f95d2cffb37..565190c0948 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -209,6 +209,10 @@ module.exports = { }, transitionTimingFunction: { cubic: "cubic-bezier(0.215, 0.440, 0.420, 0.880)" + }, + rotate: { + "-90": "-90deg", + "-180": "-180deg" } } }, From 2c33f4faef5c60b49e745403edaa76ce454e20f3 Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Tue, 14 Dec 2021 16:16:26 -0800 Subject: [PATCH 06/24] get things running --- src/assets/styles/_spacing.scss | 2 +- .../calcite-button/calcite-button.scss | 8 +++--- .../calcite-input-date-picker.tsx | 2 +- .../calcite-input/calcite-input.scss | 2 +- .../calcite-pick-list/calcite-pick-list.scss | 2 +- src/components/calcite-pick-list/resources.ts | 2 +- .../calcite-slider/calcite-slider.scss | 4 +-- src/components/calcite-tip/calcite-tip.scss | 2 +- .../calcite-value-list.scss | 2 +- stencil.config.ts | 3 ++- tailwind.config.js => tailwind.config.ts | 26 +++++++++++-------- 11 files changed, 30 insertions(+), 25 deletions(-) rename tailwind.config.js => tailwind.config.ts (95%) diff --git a/src/assets/styles/_spacing.scss b/src/assets/styles/_spacing.scss index 2a8682e1ffe..4bd5689c62f 100644 --- a/src/assets/styles/_spacing.scss +++ b/src/assets/styles/_spacing.scss @@ -3,7 +3,7 @@ --calcite-icon-size: 1rem; - --calcite-spacing-eighth: theme("spacing[0.5]"); + --calcite-spacing-eighth: config("theme.spacing[0.5]"); --calcite-spacing-quarter: theme("spacing.1"); diff --git a/src/components/calcite-button/calcite-button.scss b/src/components/calcite-button/calcite-button.scss index 3fbd8da025b..c83c64854a4 100644 --- a/src/components/calcite-button/calcite-button.scss +++ b/src/components/calcite-button/calcite-button.scss @@ -665,7 +665,7 @@ // generate fab scales (scenario: 1 icon, ie., should be square) :host([scale="s"]) button:not(.content--slotted), :host([scale="s"]) a:not(.content--slotted) { - --calcite-button-padding-x: theme("padding[0.5]"); + --calcite-button-padding-x: config("theme.padding[0.5]"); --calcite-button-padding-y: 3px; @apply text-0h w-6; min-height: theme("height.6"); @@ -677,7 +677,7 @@ } :host([scale="m"]) button:not(.content--slotted), :host([scale="m"]) a:not(.content--slotted) { - --calcite-button-padding-x: theme("padding[0.5]"); + --calcite-button-padding-x: config("theme.padding[0.5]"); --calcite-button-padding-y: 7px; @apply text-0h w-8; min-height: theme("height.8"); @@ -689,7 +689,7 @@ } :host([scale="l"]) button:not(.content--slotted), :host([scale="l"]) a:not(.content--slotted) { - --calcite-button-padding-x: theme("padding[0.5]"); + --calcite-button-padding-x: config("theme.padding[0.5]"); --calcite-button-padding-y: 9px; @apply text-0h w-11; min-height: theme("height.11"); @@ -697,7 +697,7 @@ // accommodate for transparent buttons not having borders :host([scale="l"][appearance="transparent"]) button:not(.content--slotted), :host([scale="l"][appearance="transparent"]) a:not(.content--slotted) { - --calcite-button-padding-y: theme("padding[2.5]"); + --calcite-button-padding-y: config("theme.padding[2.5]"); } // generate fab scales (scenario: 2 icons, ie., should not be square) diff --git a/src/components/calcite-input-date-picker/calcite-input-date-picker.tsx b/src/components/calcite-input-date-picker/calcite-input-date-picker.tsx index fa1323b93b8..18573deb1ff 100644 --- a/src/components/calcite-input-date-picker/calcite-input-date-picker.tsx +++ b/src/components/calcite-input-date-picker/calcite-input-date-picker.tsx @@ -393,7 +393,7 @@ export class CalciteInputDatePicker implements LabelableComponent, FormComponent Config = () => ({ @@ -99,7 +100,7 @@ export const create: () => Config = () => ({ injectGlobalPaths: ["src/assets/styles/includes.scss"] }), postcss({ - plugins: [tailwindcss(), autoprefixer()] + plugins: [tailwindcss(tailwindConfig), autoprefixer()] }) ], rollupPlugins: { diff --git a/tailwind.config.js b/tailwind.config.ts similarity index 95% rename from tailwind.config.js rename to tailwind.config.ts index 565190c0948..d6cb50ded7f 100644 --- a/tailwind.config.js +++ b/tailwind.config.ts @@ -1,12 +1,9 @@ -// eslint-disable-next-line @typescript-eslint/no-var-requires -const flattenColorPalette = require("tailwindcss/lib/util/flattenColorPalette").default; +import flattenColorPalette from "tailwindcss/lib/util/flattenColorPalette"; +import plugin from "tailwindcss/plugin"; -// eslint-disable-next-line @typescript-eslint/no-var-requires -const plugin = require("tailwindcss/plugin"); - -module.exports = { +export default { theme: { - borderColor: ({ theme }) => ({ + borderColor: ({ theme }): any => ({ color: { 1: "var(--calcite-ui-border-1)", 2: "var(--calcite-ui-border-2)", @@ -119,10 +116,10 @@ module.exports = { l: "1024px", xl: "1440px" }, - textColor: ({ theme }) => ({ + textColor: ({ theme }): any => ({ ...theme("colors.text") }), - backgroundColor: ({ theme }) => ({ + backgroundColor: ({ theme }): any => ({ ...theme("colors.background"), transparent: theme("colors.transparent"), brand: theme("colors.brand"), @@ -157,8 +154,8 @@ module.exports = { "outline-active": "0 0 0 1px var(--calcite-ui-brand)", none: "none" }, - fill: (theme) => ({ - color: theme("colors.text") + fill: ({ theme }): any => ({ + ...theme("colors.text") }), keyframes: { in: { @@ -203,6 +200,13 @@ module.exports = { opacity: { disabled: "var(--calcite-ui-opacity-disabled)" }, + spacing: { + 0.5: "0.125rem", + 2.5: "0.625rem", + 3.5: "0.875rem", + 9: "2.25rem", + 11: "2.75rem" + }, transitionProperty: { margin: "margin", color: "color" From b00d9c66a7bcda492e54b3e94231f0e54f9fafce Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Tue, 14 Dec 2021 16:36:34 -0800 Subject: [PATCH 07/24] cleanup --- src/components/calcite-checkbox/calcite-checkbox.scss | 4 ++-- src/components/calcite-loader/calcite-loader.scss | 2 +- tailwind.config.ts | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/calcite-checkbox/calcite-checkbox.scss b/src/components/calcite-checkbox/calcite-checkbox.scss index f86ec9a5bfa..028e736182e 100644 --- a/src/components/calcite-checkbox/calcite-checkbox.scss +++ b/src/components/calcite-checkbox/calcite-checkbox.scss @@ -30,9 +30,9 @@ transition-all duration-150 ease-in-out - stroke-brand + stroke-current stroke-1 - fill-brand; + fill-current; width: var(--calcite-checkbox-size); height: var(--calcite-checkbox-size); box-shadow: inset 0 0 0 1px var(--calcite-ui-border-input); diff --git a/src/components/calcite-loader/calcite-loader.scss b/src/components/calcite-loader/calcite-loader.scss index de4cc8e649d..8290e8a438e 100644 --- a/src/components/calcite-loader/calcite-loader.scss +++ b/src/components/calcite-loader/calcite-loader.scss @@ -111,7 +111,7 @@ $loader-circumference: ($loader-scale - (2 * $stroke-width)) * 3.14159; } :host([inline]) { - @apply relative m-0 py-0 animate-none stroke-brand stroke-2; + @apply relative m-0 py-0 animate-none stroke-current stroke-2; height: var(--calcite-loader-size-inline); min-height: var(--calcite-loader-size-inline); width: var(--calcite-loader-size-inline); diff --git a/tailwind.config.ts b/tailwind.config.ts index d6cb50ded7f..805412b814f 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -22,6 +22,7 @@ export default { "color-danger-press": theme("colors.danger-press") }), colors: { + current: "currentColor", brand: "var(--calcite-ui-brand)", "brand-hover": "var(--calcite-ui-brand-hover)", "brand-press": "var(--calcite-ui-brand-press)", From 5852bd6d67ceb8d256bad093623794f0afe863e1 Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Tue, 14 Dec 2021 17:08:28 -0800 Subject: [PATCH 08/24] test compressed to remove comments? --- stencil.config.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/stencil.config.ts b/stencil.config.ts index 7b667b2a8a9..8d2aeea565f 100644 --- a/stencil.config.ts +++ b/stencil.config.ts @@ -97,6 +97,7 @@ export const create: () => Config = () => ({ globalStyle: "src/assets/styles/global.scss", plugins: [ sass({ + outputStyle: "compressed", injectGlobalPaths: ["src/assets/styles/includes.scss"] }), postcss({ From b480f70bcc38ba14eb2fcd507bc501c9c987ffe9 Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Tue, 14 Dec 2021 17:39:27 -0800 Subject: [PATCH 09/24] revert --- stencil.config.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/stencil.config.ts b/stencil.config.ts index 8d2aeea565f..7b667b2a8a9 100644 --- a/stencil.config.ts +++ b/stencil.config.ts @@ -97,7 +97,6 @@ export const create: () => Config = () => ({ globalStyle: "src/assets/styles/global.scss", plugins: [ sass({ - outputStyle: "compressed", injectGlobalPaths: ["src/assets/styles/includes.scss"] }), postcss({ From 1221063f4cd2b4d9a647c8746ee771347c00dda2 Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Wed, 15 Dec 2021 09:13:44 -0800 Subject: [PATCH 10/24] cssnano test --- package-lock.json | 1099 +++++++++++++++++++++++++++++++++++++++++++++ package.json | 1 + stencil.config.ts | 3 +- 3 files changed, 1102 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 560c3ef754a..e810dbd1fce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -59,6 +59,7 @@ "concurrently": "6.4.0", "conventional-changelog-cli": "2.1.1", "cpy-cli": "^3.1.1", + "cssnano": "5.0.12", "dedent": "0.7.0", "eslint": "8.4.1", "eslint-config-prettier": "8.3.0", @@ -6227,6 +6228,15 @@ "node": ">=6" } }, + "node_modules/@trysound/sax": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", + "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==", + "dev": true, + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/@tsconfig/node10": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", @@ -7484,6 +7494,12 @@ "ajv": "^6.9.1" } }, + "node_modules/alphanum-sort": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", + "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", + "dev": true + }, "node_modules/ansi-align": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", @@ -9925,6 +9941,18 @@ "node": ">=6" } }, + "node_modules/caniuse-api": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", + "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", + "dev": true, + "dependencies": { + "browserslist": "^4.0.0", + "caniuse-lite": "^1.0.0", + "lodash.memoize": "^4.1.2", + "lodash.uniq": "^4.5.0" + } + }, "node_modules/caniuse-lite": { "version": "1.0.30001284", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001284.tgz", @@ -11024,6 +11052,12 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, + "node_modules/colord": { + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.1.tgz", + "integrity": "sha512-4LBMSt09vR0uLnPVkOUBnmxgoaeN4ewRbx801wY/bXcltXfpR/G46OdWn96XpYmCWuYvO46aBZP4NgX8HpNAcw==", + "dev": true + }, "node_modules/colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", @@ -11055,6 +11089,15 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "dev": true, + "engines": { + "node": ">= 10" + } + }, "node_modules/common-tags": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz", @@ -12959,6 +13002,21 @@ "node": ">=8" } }, + "node_modules/css-declaration-sorter": { + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz", + "integrity": "sha512-SvjQjNRZgh4ULK1LDJ2AduPKUKxIqmtU7ZAyi47BTV+M90Qvxr9AB6lKlLbDUfXqI9IQeYA8LbAsCZPpJEV3aA==", + "dev": true, + "dependencies": { + "timsort": "^0.3.0" + }, + "engines": { + "node": ">= 10" + }, + "peerDependencies": { + "postcss": "^8.0.9" + } + }, "node_modules/css-loader": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz", @@ -13096,6 +13154,28 @@ "url": "https://github.com/fb55/domutils?sponsor=1" } }, + "node_modules/css-tree": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", + "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==", + "dev": true, + "dependencies": { + "mdn-data": "2.0.14", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/css-tree/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/css-what": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz", @@ -13120,6 +13200,95 @@ "node": ">=4" } }, + "node_modules/cssnano": { + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.12.tgz", + "integrity": "sha512-U38V4x2iJ3ijPdeWqUrEr4eKBB5PbEKsNP5T8xcik2Au3LeMtiMHX0i2Hu9k51FcKofNZumbrcdC6+a521IUHg==", + "dev": true, + "dependencies": { + "cssnano-preset-default": "^5.1.8", + "is-resolvable": "^1.1.0", + "lilconfig": "^2.0.3", + "yaml": "^1.10.2" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/cssnano" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/cssnano-preset-default": { + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.8.tgz", + "integrity": "sha512-zWMlP0+AMPBVE852SqTrP0DnhTcTA2C1wAF92TKZ3Va+aUVqLIhkqKlnJIXXdqXD7RN+S1ujuWmNpvrJBiM/vg==", + "dev": true, + "dependencies": { + "css-declaration-sorter": "^6.0.3", + "cssnano-utils": "^2.0.1", + "postcss-calc": "^8.0.0", + "postcss-colormin": "^5.2.1", + "postcss-convert-values": "^5.0.2", + "postcss-discard-comments": "^5.0.1", + "postcss-discard-duplicates": "^5.0.1", + "postcss-discard-empty": "^5.0.1", + "postcss-discard-overridden": "^5.0.1", + "postcss-merge-longhand": "^5.0.4", + "postcss-merge-rules": "^5.0.3", + "postcss-minify-font-values": "^5.0.1", + "postcss-minify-gradients": "^5.0.3", + "postcss-minify-params": "^5.0.2", + "postcss-minify-selectors": "^5.1.0", + "postcss-normalize-charset": "^5.0.1", + "postcss-normalize-display-values": "^5.0.1", + "postcss-normalize-positions": "^5.0.1", + "postcss-normalize-repeat-style": "^5.0.1", + "postcss-normalize-string": "^5.0.1", + "postcss-normalize-timing-functions": "^5.0.1", + "postcss-normalize-unicode": "^5.0.1", + "postcss-normalize-url": "^5.0.3", + "postcss-normalize-whitespace": "^5.0.1", + "postcss-ordered-values": "^5.0.2", + "postcss-reduce-initial": "^5.0.2", + "postcss-reduce-transforms": "^5.0.1", + "postcss-svgo": "^5.0.3", + "postcss-unique-selectors": "^5.0.2" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/cssnano-utils": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-2.0.1.tgz", + "integrity": "sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ==", + "dev": true, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/csso": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz", + "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==", + "dev": true, + "dependencies": { + "css-tree": "^1.1.2" + }, + "engines": { + "node": ">=8.0.0" + } + }, "node_modules/cssom": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", @@ -19790,6 +19959,12 @@ "node": ">=0.10.0" } }, + "node_modules/is-resolvable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", + "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", + "dev": true + }, "node_modules/is-retry-allowed": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", @@ -23249,6 +23424,12 @@ "url": "https://opencollective.com/unified" } }, + "node_modules/mdn-data": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", + "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", + "dev": true + }, "node_modules/mdurl": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", @@ -25237,6 +25418,100 @@ "url": "https://opencollective.com/postcss/" } }, + "node_modules/postcss-calc": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.0.0.tgz", + "integrity": "sha512-5NglwDrcbiy8XXfPM11F3HeC6hoT9W7GUH/Zi5U/p7u3Irv4rHhdDcIZwG0llHXV4ftsBjpfWMXAnXNl4lnt8g==", + "dev": true, + "dependencies": { + "postcss-selector-parser": "^6.0.2", + "postcss-value-parser": "^4.0.2" + }, + "peerDependencies": { + "postcss": "^8.2.2" + } + }, + "node_modules/postcss-colormin": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.1.tgz", + "integrity": "sha512-VVwMrEYLcHYePUYV99Ymuoi7WhKrMGy/V9/kTS0DkCoJYmmjdOMneyhzYUxcNgteKDVbrewOkSM7Wje/MFwxzA==", + "dev": true, + "dependencies": { + "browserslist": "^4.16.6", + "caniuse-api": "^3.0.0", + "colord": "^2.9.1", + "postcss-value-parser": "^4.1.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-convert-values": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.0.2.tgz", + "integrity": "sha512-KQ04E2yadmfa1LqXm7UIDwW1ftxU/QWZmz6NKnHnUvJ3LEYbbcX6i329f/ig+WnEByHegulocXrECaZGLpL8Zg==", + "dev": true, + "dependencies": { + "postcss-value-parser": "^4.1.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-discard-comments": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz", + "integrity": "sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg==", + "dev": true, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-discard-duplicates": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz", + "integrity": "sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA==", + "dev": true, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-discard-empty": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz", + "integrity": "sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw==", + "dev": true, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-discard-overridden": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz", + "integrity": "sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q==", + "dev": true, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, "node_modules/postcss-flexbugs-fixes": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz", @@ -25393,6 +25668,106 @@ "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=", "dev": true }, + "node_modules/postcss-merge-longhand": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.4.tgz", + "integrity": "sha512-2lZrOVD+d81aoYkZDpWu6+3dTAAGkCKbV5DoRhnIR7KOULVrI/R7bcMjhrH9KTRy6iiHKqmtG+n/MMj1WmqHFw==", + "dev": true, + "dependencies": { + "postcss-value-parser": "^4.1.0", + "stylehacks": "^5.0.1" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-merge-rules": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.3.tgz", + "integrity": "sha512-cEKTMEbWazVa5NXd8deLdCnXl+6cYG7m2am+1HzqH0EnTdy8fRysatkaXb2dEnR+fdaDxTvuZ5zoBdv6efF6hg==", + "dev": true, + "dependencies": { + "browserslist": "^4.16.6", + "caniuse-api": "^3.0.0", + "cssnano-utils": "^2.0.1", + "postcss-selector-parser": "^6.0.5" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-minify-font-values": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz", + "integrity": "sha512-7JS4qIsnqaxk+FXY1E8dHBDmraYFWmuL6cgt0T1SWGRO5bzJf8sUoelwa4P88LEWJZweHevAiDKxHlofuvtIoA==", + "dev": true, + "dependencies": { + "postcss-value-parser": "^4.1.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-minify-gradients": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.3.tgz", + "integrity": "sha512-Z91Ol22nB6XJW+5oe31+YxRsYooxOdFKcbOqY/V8Fxse1Y3vqlNRpi1cxCqoACZTQEhl+xvt4hsbWiV5R+XI9Q==", + "dev": true, + "dependencies": { + "colord": "^2.9.1", + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-minify-params": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.2.tgz", + "integrity": "sha512-qJAPuBzxO1yhLad7h2Dzk/F7n1vPyfHfCCh5grjGfjhi1ttCnq4ZXGIW77GSrEbh9Hus9Lc/e/+tB4vh3/GpDg==", + "dev": true, + "dependencies": { + "alphanum-sort": "^1.0.2", + "browserslist": "^4.16.6", + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-minify-selectors": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz", + "integrity": "sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og==", + "dev": true, + "dependencies": { + "alphanum-sort": "^1.0.2", + "postcss-selector-parser": "^6.0.5" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, "node_modules/postcss-modules-extract-imports": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz", @@ -25566,6 +25941,204 @@ "postcss": "^8.2.14" } }, + "node_modules/postcss-normalize-charset": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz", + "integrity": "sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg==", + "dev": true, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-display-values": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz", + "integrity": "sha512-uupdvWk88kLDXi5HEyI9IaAJTE3/Djbcrqq8YgjvAVuzgVuqIk3SuJWUisT2gaJbZm1H9g5k2w1xXilM3x8DjQ==", + "dev": true, + "dependencies": { + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-positions": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz", + "integrity": "sha512-rvzWAJai5xej9yWqlCb1OWLd9JjW2Ex2BCPzUJrbaXmtKtgfL8dBMOOMTX6TnvQMtjk3ei1Lswcs78qKO1Skrg==", + "dev": true, + "dependencies": { + "postcss-value-parser": "^4.1.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-repeat-style": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz", + "integrity": "sha512-syZ2itq0HTQjj4QtXZOeefomckiV5TaUO6ReIEabCh3wgDs4Mr01pkif0MeVwKyU/LHEkPJnpwFKRxqWA/7O3w==", + "dev": true, + "dependencies": { + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-string": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz", + "integrity": "sha512-Ic8GaQ3jPMVl1OEn2U//2pm93AXUcF3wz+OriskdZ1AOuYV25OdgS7w9Xu2LO5cGyhHCgn8dMXh9bO7vi3i9pA==", + "dev": true, + "dependencies": { + "postcss-value-parser": "^4.1.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-timing-functions": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz", + "integrity": "sha512-cPcBdVN5OsWCNEo5hiXfLUnXfTGtSFiBU9SK8k7ii8UD7OLuznzgNRYkLZow11BkQiiqMcgPyh4ZqXEEUrtQ1Q==", + "dev": true, + "dependencies": { + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-unicode": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz", + "integrity": "sha512-kAtYD6V3pK0beqrU90gpCQB7g6AOfP/2KIPCVBKJM2EheVsBQmx/Iof+9zR9NFKLAx4Pr9mDhogB27pmn354nA==", + "dev": true, + "dependencies": { + "browserslist": "^4.16.0", + "postcss-value-parser": "^4.1.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-url": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.3.tgz", + "integrity": "sha512-qWiUMbvkRx3kc1Dp5opzUwc7MBWZcSDK2yofCmdvFBCpx+zFPkxBC1FASQ59Pt+flYfj/nTZSkmF56+XG5elSg==", + "dev": true, + "dependencies": { + "is-absolute-url": "^3.0.3", + "normalize-url": "^6.0.1", + "postcss-value-parser": "^4.1.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-url/node_modules/normalize-url": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", + "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/postcss-normalize-whitespace": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz", + "integrity": "sha512-iPklmI5SBnRvwceb/XH568yyzK0qRVuAG+a1HFUsFRf11lEJTiQQa03a4RSCQvLKdcpX7XsI1Gen9LuLoqwiqA==", + "dev": true, + "dependencies": { + "postcss-value-parser": "^4.1.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-ordered-values": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz", + "integrity": "sha512-8AFYDSOYWebJYLyJi3fyjl6CqMEG/UVworjiyK1r573I56kb3e879sCJLGvR3merj+fAdPpVplXKQZv+ey6CgQ==", + "dev": true, + "dependencies": { + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-reduce-initial": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.0.2.tgz", + "integrity": "sha512-v/kbAAQ+S1V5v9TJvbGkV98V2ERPdU6XvMcKMjqAlYiJ2NtsHGlKYLPjWWcXlaTKNxooId7BGxeraK8qXvzKtw==", + "dev": true, + "dependencies": { + "browserslist": "^4.16.6", + "caniuse-api": "^3.0.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-reduce-transforms": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz", + "integrity": "sha512-a//FjoPeFkRuAguPscTVmRQUODP+f3ke2HqFNgGPwdYnpeC29RZdCBvGRGTsKpMURb/I3p6jdKoBQ2zI+9Q7kA==", + "dev": true, + "dependencies": { + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, "node_modules/postcss-resolve-nested-selector": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz", @@ -25617,6 +26190,38 @@ "node": ">=4" } }, + "node_modules/postcss-svgo": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.0.3.tgz", + "integrity": "sha512-41XZUA1wNDAZrQ3XgWREL/M2zSw8LJPvb5ZWivljBsUQAGoEKMYm6okHsTjJxKYI4M75RQEH4KYlEM52VwdXVA==", + "dev": true, + "dependencies": { + "postcss-value-parser": "^4.1.0", + "svgo": "^2.7.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-unique-selectors": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.2.tgz", + "integrity": "sha512-w3zBVlrtZm7loQWRPVC0yjUwwpty7OM6DnEHkxcSQXO1bMS3RJ+JUS5LFMSDZHJcvGsRwhZinCWVqn8Kej4EDA==", + "dev": true, + "dependencies": { + "alphanum-sort": "^1.0.2", + "postcss-selector-parser": "^6.0.5" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, "node_modules/postcss-value-parser": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", @@ -30609,6 +31214,22 @@ "inline-style-parser": "0.1.1" } }, + "node_modules/stylehacks": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.0.1.tgz", + "integrity": "sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA==", + "dev": true, + "dependencies": { + "browserslist": "^4.16.0", + "postcss-selector-parser": "^6.0.4" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, "node_modules/stylelint": { "version": "14.1.0", "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.1.0.tgz", @@ -30952,6 +31573,33 @@ "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=", "dev": true }, + "node_modules/svgo": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz", + "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==", + "dev": true, + "dependencies": { + "@trysound/sax": "0.2.0", + "commander": "^7.2.0", + "css-select": "^4.1.3", + "css-tree": "^1.1.3", + "csso": "^4.2.0", + "picocolors": "^1.0.0", + "stable": "^0.1.8" + }, + "bin": { + "svgo": "bin/svgo" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/svgo/node_modules/picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true + }, "node_modules/symbol-tree": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", @@ -31716,6 +32364,12 @@ "node": ">=0.6.0" } }, + "node_modules/timsort": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", + "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", + "dev": true + }, "node_modules/tiny-emitter": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", @@ -39399,6 +40053,12 @@ "defer-to-connect": "^1.0.1" } }, + "@trysound/sax": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", + "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==", + "dev": true + }, "@tsconfig/node10": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", @@ -40505,6 +41165,12 @@ "dev": true, "requires": {} }, + "alphanum-sort": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", + "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", + "dev": true + }, "ansi-align": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", @@ -42466,6 +43132,18 @@ } } }, + "caniuse-api": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", + "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", + "dev": true, + "requires": { + "browserslist": "^4.0.0", + "caniuse-lite": "^1.0.0", + "lodash.memoize": "^4.1.2", + "lodash.uniq": "^4.5.0" + } + }, "caniuse-lite": { "version": "1.0.30001284", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001284.tgz", @@ -43300,6 +43978,12 @@ "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", "dev": true }, + "colord": { + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.1.tgz", + "integrity": "sha512-4LBMSt09vR0uLnPVkOUBnmxgoaeN4ewRbx801wY/bXcltXfpR/G46OdWn96XpYmCWuYvO46aBZP4NgX8HpNAcw==", + "dev": true + }, "colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", @@ -43321,6 +44005,12 @@ "integrity": "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==", "dev": true }, + "commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "dev": true + }, "common-tags": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz", @@ -44851,6 +45541,15 @@ "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", "dev": true }, + "css-declaration-sorter": { + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz", + "integrity": "sha512-SvjQjNRZgh4ULK1LDJ2AduPKUKxIqmtU7ZAyi47BTV+M90Qvxr9AB6lKlLbDUfXqI9IQeYA8LbAsCZPpJEV3aA==", + "dev": true, + "requires": { + "timsort": "^0.3.0" + } + }, "css-loader": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz", @@ -44948,6 +45647,24 @@ } } }, + "css-tree": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", + "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==", + "dev": true, + "requires": { + "mdn-data": "2.0.14", + "source-map": "^0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "css-what": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz", @@ -44960,6 +45677,71 @@ "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", "dev": true }, + "cssnano": { + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.12.tgz", + "integrity": "sha512-U38V4x2iJ3ijPdeWqUrEr4eKBB5PbEKsNP5T8xcik2Au3LeMtiMHX0i2Hu9k51FcKofNZumbrcdC6+a521IUHg==", + "dev": true, + "requires": { + "cssnano-preset-default": "^5.1.8", + "is-resolvable": "^1.1.0", + "lilconfig": "^2.0.3", + "yaml": "^1.10.2" + } + }, + "cssnano-preset-default": { + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.8.tgz", + "integrity": "sha512-zWMlP0+AMPBVE852SqTrP0DnhTcTA2C1wAF92TKZ3Va+aUVqLIhkqKlnJIXXdqXD7RN+S1ujuWmNpvrJBiM/vg==", + "dev": true, + "requires": { + "css-declaration-sorter": "^6.0.3", + "cssnano-utils": "^2.0.1", + "postcss-calc": "^8.0.0", + "postcss-colormin": "^5.2.1", + "postcss-convert-values": "^5.0.2", + "postcss-discard-comments": "^5.0.1", + "postcss-discard-duplicates": "^5.0.1", + "postcss-discard-empty": "^5.0.1", + "postcss-discard-overridden": "^5.0.1", + "postcss-merge-longhand": "^5.0.4", + "postcss-merge-rules": "^5.0.3", + "postcss-minify-font-values": "^5.0.1", + "postcss-minify-gradients": "^5.0.3", + "postcss-minify-params": "^5.0.2", + "postcss-minify-selectors": "^5.1.0", + "postcss-normalize-charset": "^5.0.1", + "postcss-normalize-display-values": "^5.0.1", + "postcss-normalize-positions": "^5.0.1", + "postcss-normalize-repeat-style": "^5.0.1", + "postcss-normalize-string": "^5.0.1", + "postcss-normalize-timing-functions": "^5.0.1", + "postcss-normalize-unicode": "^5.0.1", + "postcss-normalize-url": "^5.0.3", + "postcss-normalize-whitespace": "^5.0.1", + "postcss-ordered-values": "^5.0.2", + "postcss-reduce-initial": "^5.0.2", + "postcss-reduce-transforms": "^5.0.1", + "postcss-svgo": "^5.0.3", + "postcss-unique-selectors": "^5.0.2" + } + }, + "cssnano-utils": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-2.0.1.tgz", + "integrity": "sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ==", + "dev": true, + "requires": {} + }, + "csso": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz", + "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==", + "dev": true, + "requires": { + "css-tree": "^1.1.2" + } + }, "cssom": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", @@ -50119,6 +50901,12 @@ "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=", "dev": true }, + "is-resolvable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", + "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", + "dev": true + }, "is-retry-allowed": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", @@ -52840,6 +53628,12 @@ "integrity": "sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==", "dev": true }, + "mdn-data": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", + "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", + "dev": true + }, "mdurl": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", @@ -54455,6 +55249,65 @@ } } }, + "postcss-calc": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.0.0.tgz", + "integrity": "sha512-5NglwDrcbiy8XXfPM11F3HeC6hoT9W7GUH/Zi5U/p7u3Irv4rHhdDcIZwG0llHXV4ftsBjpfWMXAnXNl4lnt8g==", + "dev": true, + "requires": { + "postcss-selector-parser": "^6.0.2", + "postcss-value-parser": "^4.0.2" + } + }, + "postcss-colormin": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.1.tgz", + "integrity": "sha512-VVwMrEYLcHYePUYV99Ymuoi7WhKrMGy/V9/kTS0DkCoJYmmjdOMneyhzYUxcNgteKDVbrewOkSM7Wje/MFwxzA==", + "dev": true, + "requires": { + "browserslist": "^4.16.6", + "caniuse-api": "^3.0.0", + "colord": "^2.9.1", + "postcss-value-parser": "^4.1.0" + } + }, + "postcss-convert-values": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.0.2.tgz", + "integrity": "sha512-KQ04E2yadmfa1LqXm7UIDwW1ftxU/QWZmz6NKnHnUvJ3LEYbbcX6i329f/ig+WnEByHegulocXrECaZGLpL8Zg==", + "dev": true, + "requires": { + "postcss-value-parser": "^4.1.0" + } + }, + "postcss-discard-comments": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz", + "integrity": "sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg==", + "dev": true, + "requires": {} + }, + "postcss-discard-duplicates": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz", + "integrity": "sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA==", + "dev": true, + "requires": {} + }, + "postcss-discard-empty": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz", + "integrity": "sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw==", + "dev": true, + "requires": {} + }, + "postcss-discard-overridden": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz", + "integrity": "sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q==", + "dev": true, + "requires": {} + }, "postcss-flexbugs-fixes": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz", @@ -54559,6 +55412,70 @@ "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=", "dev": true }, + "postcss-merge-longhand": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.4.tgz", + "integrity": "sha512-2lZrOVD+d81aoYkZDpWu6+3dTAAGkCKbV5DoRhnIR7KOULVrI/R7bcMjhrH9KTRy6iiHKqmtG+n/MMj1WmqHFw==", + "dev": true, + "requires": { + "postcss-value-parser": "^4.1.0", + "stylehacks": "^5.0.1" + } + }, + "postcss-merge-rules": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.3.tgz", + "integrity": "sha512-cEKTMEbWazVa5NXd8deLdCnXl+6cYG7m2am+1HzqH0EnTdy8fRysatkaXb2dEnR+fdaDxTvuZ5zoBdv6efF6hg==", + "dev": true, + "requires": { + "browserslist": "^4.16.6", + "caniuse-api": "^3.0.0", + "cssnano-utils": "^2.0.1", + "postcss-selector-parser": "^6.0.5" + } + }, + "postcss-minify-font-values": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz", + "integrity": "sha512-7JS4qIsnqaxk+FXY1E8dHBDmraYFWmuL6cgt0T1SWGRO5bzJf8sUoelwa4P88LEWJZweHevAiDKxHlofuvtIoA==", + "dev": true, + "requires": { + "postcss-value-parser": "^4.1.0" + } + }, + "postcss-minify-gradients": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.3.tgz", + "integrity": "sha512-Z91Ol22nB6XJW+5oe31+YxRsYooxOdFKcbOqY/V8Fxse1Y3vqlNRpi1cxCqoACZTQEhl+xvt4hsbWiV5R+XI9Q==", + "dev": true, + "requires": { + "colord": "^2.9.1", + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" + } + }, + "postcss-minify-params": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.2.tgz", + "integrity": "sha512-qJAPuBzxO1yhLad7h2Dzk/F7n1vPyfHfCCh5grjGfjhi1ttCnq4ZXGIW77GSrEbh9Hus9Lc/e/+tB4vh3/GpDg==", + "dev": true, + "requires": { + "alphanum-sort": "^1.0.2", + "browserslist": "^4.16.6", + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" + } + }, + "postcss-minify-selectors": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz", + "integrity": "sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og==", + "dev": true, + "requires": { + "alphanum-sort": "^1.0.2", + "postcss-selector-parser": "^6.0.5" + } + }, "postcss-modules-extract-imports": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz", @@ -54681,6 +55598,129 @@ "postcss-selector-parser": "^6.0.6" } }, + "postcss-normalize-charset": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz", + "integrity": "sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg==", + "dev": true, + "requires": {} + }, + "postcss-normalize-display-values": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz", + "integrity": "sha512-uupdvWk88kLDXi5HEyI9IaAJTE3/Djbcrqq8YgjvAVuzgVuqIk3SuJWUisT2gaJbZm1H9g5k2w1xXilM3x8DjQ==", + "dev": true, + "requires": { + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" + } + }, + "postcss-normalize-positions": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz", + "integrity": "sha512-rvzWAJai5xej9yWqlCb1OWLd9JjW2Ex2BCPzUJrbaXmtKtgfL8dBMOOMTX6TnvQMtjk3ei1Lswcs78qKO1Skrg==", + "dev": true, + "requires": { + "postcss-value-parser": "^4.1.0" + } + }, + "postcss-normalize-repeat-style": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz", + "integrity": "sha512-syZ2itq0HTQjj4QtXZOeefomckiV5TaUO6ReIEabCh3wgDs4Mr01pkif0MeVwKyU/LHEkPJnpwFKRxqWA/7O3w==", + "dev": true, + "requires": { + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" + } + }, + "postcss-normalize-string": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz", + "integrity": "sha512-Ic8GaQ3jPMVl1OEn2U//2pm93AXUcF3wz+OriskdZ1AOuYV25OdgS7w9Xu2LO5cGyhHCgn8dMXh9bO7vi3i9pA==", + "dev": true, + "requires": { + "postcss-value-parser": "^4.1.0" + } + }, + "postcss-normalize-timing-functions": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz", + "integrity": "sha512-cPcBdVN5OsWCNEo5hiXfLUnXfTGtSFiBU9SK8k7ii8UD7OLuznzgNRYkLZow11BkQiiqMcgPyh4ZqXEEUrtQ1Q==", + "dev": true, + "requires": { + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" + } + }, + "postcss-normalize-unicode": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz", + "integrity": "sha512-kAtYD6V3pK0beqrU90gpCQB7g6AOfP/2KIPCVBKJM2EheVsBQmx/Iof+9zR9NFKLAx4Pr9mDhogB27pmn354nA==", + "dev": true, + "requires": { + "browserslist": "^4.16.0", + "postcss-value-parser": "^4.1.0" + } + }, + "postcss-normalize-url": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.3.tgz", + "integrity": "sha512-qWiUMbvkRx3kc1Dp5opzUwc7MBWZcSDK2yofCmdvFBCpx+zFPkxBC1FASQ59Pt+flYfj/nTZSkmF56+XG5elSg==", + "dev": true, + "requires": { + "is-absolute-url": "^3.0.3", + "normalize-url": "^6.0.1", + "postcss-value-parser": "^4.1.0" + }, + "dependencies": { + "normalize-url": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", + "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", + "dev": true + } + } + }, + "postcss-normalize-whitespace": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz", + "integrity": "sha512-iPklmI5SBnRvwceb/XH568yyzK0qRVuAG+a1HFUsFRf11lEJTiQQa03a4RSCQvLKdcpX7XsI1Gen9LuLoqwiqA==", + "dev": true, + "requires": { + "postcss-value-parser": "^4.1.0" + } + }, + "postcss-ordered-values": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz", + "integrity": "sha512-8AFYDSOYWebJYLyJi3fyjl6CqMEG/UVworjiyK1r573I56kb3e879sCJLGvR3merj+fAdPpVplXKQZv+ey6CgQ==", + "dev": true, + "requires": { + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" + } + }, + "postcss-reduce-initial": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.0.2.tgz", + "integrity": "sha512-v/kbAAQ+S1V5v9TJvbGkV98V2ERPdU6XvMcKMjqAlYiJ2NtsHGlKYLPjWWcXlaTKNxooId7BGxeraK8qXvzKtw==", + "dev": true, + "requires": { + "browserslist": "^4.16.6", + "caniuse-api": "^3.0.0" + } + }, + "postcss-reduce-transforms": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz", + "integrity": "sha512-a//FjoPeFkRuAguPscTVmRQUODP+f3ke2HqFNgGPwdYnpeC29RZdCBvGRGTsKpMURb/I3p6jdKoBQ2zI+9Q7kA==", + "dev": true, + "requires": { + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" + } + }, "postcss-resolve-nested-selector": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz", @@ -54711,6 +55751,26 @@ "util-deprecate": "^1.0.2" } }, + "postcss-svgo": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.0.3.tgz", + "integrity": "sha512-41XZUA1wNDAZrQ3XgWREL/M2zSw8LJPvb5ZWivljBsUQAGoEKMYm6okHsTjJxKYI4M75RQEH4KYlEM52VwdXVA==", + "dev": true, + "requires": { + "postcss-value-parser": "^4.1.0", + "svgo": "^2.7.0" + } + }, + "postcss-unique-selectors": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.2.tgz", + "integrity": "sha512-w3zBVlrtZm7loQWRPVC0yjUwwpty7OM6DnEHkxcSQXO1bMS3RJ+JUS5LFMSDZHJcvGsRwhZinCWVqn8Kej4EDA==", + "dev": true, + "requires": { + "alphanum-sort": "^1.0.2", + "postcss-selector-parser": "^6.0.5" + } + }, "postcss-value-parser": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", @@ -58589,6 +59649,16 @@ "inline-style-parser": "0.1.1" } }, + "stylehacks": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.0.1.tgz", + "integrity": "sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA==", + "dev": true, + "requires": { + "browserslist": "^4.16.0", + "postcss-selector-parser": "^6.0.4" + } + }, "stylelint": { "version": "14.1.0", "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.1.0.tgz", @@ -58852,6 +59922,29 @@ "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=", "dev": true }, + "svgo": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz", + "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==", + "dev": true, + "requires": { + "@trysound/sax": "0.2.0", + "commander": "^7.2.0", + "css-select": "^4.1.3", + "css-tree": "^1.1.3", + "csso": "^4.2.0", + "picocolors": "^1.0.0", + "stable": "^0.1.8" + }, + "dependencies": { + "picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true + } + } + }, "symbol-tree": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", @@ -59434,6 +60527,12 @@ "setimmediate": "^1.0.4" } }, + "timsort": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", + "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", + "dev": true + }, "tiny-emitter": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", diff --git a/package.json b/package.json index 3916451ff2d..1e1afcecb1b 100644 --- a/package.json +++ b/package.json @@ -108,6 +108,7 @@ "concurrently": "6.4.0", "conventional-changelog-cli": "2.1.1", "cpy-cli": "^3.1.1", + "cssnano": "5.0.12", "dedent": "0.7.0", "eslint": "8.4.1", "eslint-config-prettier": "8.3.0", diff --git a/stencil.config.ts b/stencil.config.ts index 7b667b2a8a9..c92c6d640b4 100644 --- a/stencil.config.ts +++ b/stencil.config.ts @@ -5,6 +5,7 @@ import babel from "@rollup/plugin-babel"; import autoprefixer from "autoprefixer"; import tailwindcss from "tailwindcss"; import tailwindConfig from "./tailwind.config"; +import cssnano from "cssnano"; import { generatePreactTypes } from "./support/preact"; export const create: () => Config = () => ({ @@ -100,7 +101,7 @@ export const create: () => Config = () => ({ injectGlobalPaths: ["src/assets/styles/includes.scss"] }), postcss({ - plugins: [tailwindcss(tailwindConfig), autoprefixer()] + plugins: [tailwindcss(tailwindConfig), autoprefixer(), cssnano()] }) ], rollupPlugins: { From c41087b0bbedeb6568b2300d93f79b51dec74b3b Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Wed, 15 Dec 2021 10:05:16 -0800 Subject: [PATCH 11/24] lite preset --- package-lock.json | 31 +++++++++++++++++++++++++++++++ package.json | 1 + stencil.config.ts | 2 +- 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index e810dbd1fce..ab033f92255 100644 --- a/package-lock.json +++ b/package-lock.json @@ -60,6 +60,7 @@ "conventional-changelog-cli": "2.1.1", "cpy-cli": "^3.1.1", "cssnano": "5.0.12", + "cssnano-preset-lite": "2.0.1", "dedent": "0.7.0", "eslint": "8.4.1", "eslint-config-prettier": "8.3.0", @@ -13265,6 +13266,24 @@ "postcss": "^8.2.15" } }, + "node_modules/cssnano-preset-lite": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/cssnano-preset-lite/-/cssnano-preset-lite-2.0.1.tgz", + "integrity": "sha512-PDLB+Zm/Sj3bOmkd471bfN2JAlXBOJAQ+r1GrWjlODdaQyMLJCqPRTvGbqSLbbfMKNsOCG/8SKryZnsSlA9zCA==", + "dev": true, + "dependencies": { + "cssnano-utils": "^2.0.1", + "postcss-discard-comments": "^5.0.1", + "postcss-discard-empty": "^5.0.1", + "postcss-normalize-whitespace": "^5.0.1" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, "node_modules/cssnano-utils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-2.0.1.tgz", @@ -45726,6 +45745,18 @@ "postcss-unique-selectors": "^5.0.2" } }, + "cssnano-preset-lite": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/cssnano-preset-lite/-/cssnano-preset-lite-2.0.1.tgz", + "integrity": "sha512-PDLB+Zm/Sj3bOmkd471bfN2JAlXBOJAQ+r1GrWjlODdaQyMLJCqPRTvGbqSLbbfMKNsOCG/8SKryZnsSlA9zCA==", + "dev": true, + "requires": { + "cssnano-utils": "^2.0.1", + "postcss-discard-comments": "^5.0.1", + "postcss-discard-empty": "^5.0.1", + "postcss-normalize-whitespace": "^5.0.1" + } + }, "cssnano-utils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-2.0.1.tgz", diff --git a/package.json b/package.json index 1e1afcecb1b..174f423804d 100644 --- a/package.json +++ b/package.json @@ -109,6 +109,7 @@ "conventional-changelog-cli": "2.1.1", "cpy-cli": "^3.1.1", "cssnano": "5.0.12", + "cssnano-preset-lite": "2.0.1", "dedent": "0.7.0", "eslint": "8.4.1", "eslint-config-prettier": "8.3.0", diff --git a/stencil.config.ts b/stencil.config.ts index c92c6d640b4..7d45a3c284f 100644 --- a/stencil.config.ts +++ b/stencil.config.ts @@ -101,7 +101,7 @@ export const create: () => Config = () => ({ injectGlobalPaths: ["src/assets/styles/includes.scss"] }), postcss({ - plugins: [tailwindcss(tailwindConfig), autoprefixer(), cssnano()] + plugins: [tailwindcss(tailwindConfig), autoprefixer(), cssnano({ preset: "lite" })] }) ], rollupPlugins: { From 4078bd8df640d2933808f3eb90c4694778402682 Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Wed, 15 Dec 2021 11:06:26 -0800 Subject: [PATCH 12/24] font size test --- src/assets/styles/global.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/assets/styles/global.scss b/src/assets/styles/global.scss index aaf65ee4cd0..73a71555e24 100644 --- a/src/assets/styles/global.scss +++ b/src/assets/styles/global.scss @@ -44,6 +44,7 @@ --calcite-ui-opacity-disabled: 0.5; --calcite-panel-width-multiplier: 1; + font-size: 14px; @apply font-sans; } From 2775f11b8408df2aaee4fce0100544dab2a5efd4 Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Wed, 15 Dec 2021 11:15:35 -0800 Subject: [PATCH 13/24] revert --- src/assets/styles/global.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/assets/styles/global.scss b/src/assets/styles/global.scss index 73a71555e24..aaf65ee4cd0 100644 --- a/src/assets/styles/global.scss +++ b/src/assets/styles/global.scss @@ -44,7 +44,6 @@ --calcite-ui-opacity-disabled: 0.5; --calcite-panel-width-multiplier: 1; - font-size: 14px; @apply font-sans; } From 73ce0828c21dd1b26e0320e01bde183495d53b63 Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Wed, 15 Dec 2021 11:27:19 -0800 Subject: [PATCH 14/24] fix test --- src/components/calcite-modal/calcite-modal.e2e.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/calcite-modal/calcite-modal.e2e.ts b/src/components/calcite-modal/calcite-modal.e2e.ts index 4724dbd5803..b4cbd707f02 100644 --- a/src/components/calcite-modal/calcite-modal.e2e.ts +++ b/src/components/calcite-modal/calcite-modal.e2e.ts @@ -346,7 +346,7 @@ describe("calcite-modal accessibility checks", () => { const scrim = document.querySelector("calcite-modal").shadowRoot.querySelector(".scrim"); return window.getComputedStyle(scrim).getPropertyValue("--calcite-scrim-background"); }); - expect(scrimStyles).toEqual("rgba(0, 0, 0, 0.75)"); + expect(scrimStyles).toEqual("rgba(0,0,0,0.75)"); }); it("correctly reflects the scale of the modal on the close button icon", async () => { From d25d5b219dc6f7bbdd707836ee8ae5d731b8d884 Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Wed, 15 Dec 2021 11:46:33 -0800 Subject: [PATCH 15/24] bump --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index ab033f92255..07719e70bf2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -92,7 +92,7 @@ "storybook-rtl-addon": "0.3.3", "stylelint": "14.1.0", "stylelint-config-recommended-scss": "5.0.2", - "tailwindcss": "3.0.2", + "tailwindcss": "3.0.5", "ts-jest": "27.1.1", "ts-node": "10.4.0", "typescript": "4.2.4", @@ -31732,9 +31732,9 @@ } }, "node_modules/tailwindcss": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.2.tgz", - "integrity": "sha512-i1KpjYnGYftjzdAth6jA5iMPjhxpUkk5L6DafhfnQs+KiiWaThYxmk47Weh4oFH1mZqP6MuiQNHxtoRVPOraLg==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.5.tgz", + "integrity": "sha512-59pNgzx2o+wkAk7IZGIH7H9eNS53gzZGrO3+NPyOEWHDbquHgiLL/c993T5t1vPSAeBxox4X5OgZwNuRvXVf+g==", "dev": true, "dependencies": { "arg": "^5.0.1", @@ -60066,9 +60066,9 @@ } }, "tailwindcss": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.2.tgz", - "integrity": "sha512-i1KpjYnGYftjzdAth6jA5iMPjhxpUkk5L6DafhfnQs+KiiWaThYxmk47Weh4oFH1mZqP6MuiQNHxtoRVPOraLg==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.5.tgz", + "integrity": "sha512-59pNgzx2o+wkAk7IZGIH7H9eNS53gzZGrO3+NPyOEWHDbquHgiLL/c993T5t1vPSAeBxox4X5OgZwNuRvXVf+g==", "dev": true, "requires": { "arg": "^5.0.1", diff --git a/package.json b/package.json index 174f423804d..a964146ab5a 100644 --- a/package.json +++ b/package.json @@ -141,7 +141,7 @@ "storybook-rtl-addon": "0.3.3", "stylelint": "14.1.0", "stylelint-config-recommended-scss": "5.0.2", - "tailwindcss": "3.0.2", + "tailwindcss": "3.0.5", "ts-jest": "27.1.1", "ts-node": "10.4.0", "typescript": "4.2.4", From a078a179e265543416cd3ec2c2413c92d058f71b Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Thu, 16 Dec 2021 13:10:01 -0800 Subject: [PATCH 16/24] bump and revert changes --- package-lock.json | 18 +++++++++--------- package.json | 2 +- src/assets/styles/_spacing.scss | 2 +- .../calcite-button/calcite-button.scss | 8 ++++---- .../calcite-slider/calcite-slider.scss | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 72934573c4d..fcc6d621155 100644 --- a/package-lock.json +++ b/package-lock.json @@ -92,7 +92,7 @@ "storybook-rtl-addon": "0.3.3", "stylelint": "14.1.0", "stylelint-config-recommended-scss": "5.0.2", - "tailwindcss": "3.0.5", + "tailwindcss": "3.0.6", "ts-jest": "27.1.1", "ts-node": "10.4.0", "typescript": "4.2.4", @@ -31732,9 +31732,9 @@ } }, "node_modules/tailwindcss": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.5.tgz", - "integrity": "sha512-59pNgzx2o+wkAk7IZGIH7H9eNS53gzZGrO3+NPyOEWHDbquHgiLL/c993T5t1vPSAeBxox4X5OgZwNuRvXVf+g==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.6.tgz", + "integrity": "sha512-+CA2f09rbHFDsdQ1iDvsOGbF1tZFmyPoRhUeaF9/5FRT5GYObtp+UjTSCdmeDcu6T90bx4WAaOkddYFPBkjbAA==", "dev": true, "dependencies": { "arg": "^5.0.1", @@ -31753,7 +31753,7 @@ "postcss-js": "^3.0.3", "postcss-load-config": "^3.1.0", "postcss-nested": "5.0.6", - "postcss-selector-parser": "^6.0.6", + "postcss-selector-parser": "^6.0.7", "postcss-value-parser": "^4.2.0", "quick-lru": "^5.1.1", "resolve": "^1.20.0", @@ -60066,9 +60066,9 @@ } }, "tailwindcss": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.5.tgz", - "integrity": "sha512-59pNgzx2o+wkAk7IZGIH7H9eNS53gzZGrO3+NPyOEWHDbquHgiLL/c993T5t1vPSAeBxox4X5OgZwNuRvXVf+g==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.6.tgz", + "integrity": "sha512-+CA2f09rbHFDsdQ1iDvsOGbF1tZFmyPoRhUeaF9/5FRT5GYObtp+UjTSCdmeDcu6T90bx4WAaOkddYFPBkjbAA==", "dev": true, "requires": { "arg": "^5.0.1", @@ -60087,7 +60087,7 @@ "postcss-js": "^3.0.3", "postcss-load-config": "^3.1.0", "postcss-nested": "5.0.6", - "postcss-selector-parser": "^6.0.6", + "postcss-selector-parser": "^6.0.7", "postcss-value-parser": "^4.2.0", "quick-lru": "^5.1.1", "resolve": "^1.20.0", diff --git a/package.json b/package.json index e9dd01b599a..cc991b5988b 100644 --- a/package.json +++ b/package.json @@ -141,7 +141,7 @@ "storybook-rtl-addon": "0.3.3", "stylelint": "14.1.0", "stylelint-config-recommended-scss": "5.0.2", - "tailwindcss": "3.0.5", + "tailwindcss": "3.0.6", "ts-jest": "27.1.1", "ts-node": "10.4.0", "typescript": "4.2.4", diff --git a/src/assets/styles/_spacing.scss b/src/assets/styles/_spacing.scss index 4bd5689c62f..2a8682e1ffe 100644 --- a/src/assets/styles/_spacing.scss +++ b/src/assets/styles/_spacing.scss @@ -3,7 +3,7 @@ --calcite-icon-size: 1rem; - --calcite-spacing-eighth: config("theme.spacing[0.5]"); + --calcite-spacing-eighth: theme("spacing[0.5]"); --calcite-spacing-quarter: theme("spacing.1"); diff --git a/src/components/calcite-button/calcite-button.scss b/src/components/calcite-button/calcite-button.scss index 0a871ae8fc1..a944a88d0f0 100644 --- a/src/components/calcite-button/calcite-button.scss +++ b/src/components/calcite-button/calcite-button.scss @@ -665,7 +665,7 @@ // generate fab scales (scenario: 1 icon, ie., should be square) :host([scale="s"]) button:not(.content--slotted), :host([scale="s"]) a:not(.content--slotted) { - --calcite-button-padding-x: config("theme.padding[0.5]"); + --calcite-button-padding-x: theme("padding[0.5]"); --calcite-button-padding-y: 3px; @apply text-0h w-6; min-height: theme("height.6"); @@ -677,7 +677,7 @@ } :host([scale="m"]) button:not(.content--slotted), :host([scale="m"]) a:not(.content--slotted) { - --calcite-button-padding-x: config("theme.padding[0.5]"); + --calcite-button-padding-x: theme("padding[0.5]"); --calcite-button-padding-y: 7px; @apply text-0h w-8; min-height: theme("height.8"); @@ -689,7 +689,7 @@ } :host([scale="l"]) button:not(.content--slotted), :host([scale="l"]) a:not(.content--slotted) { - --calcite-button-padding-x: config("theme.padding[0.5]"); + --calcite-button-padding-x: theme("padding[0.5]"); --calcite-button-padding-y: 9px; @apply text-0h w-11; min-height: theme("height.11"); @@ -697,7 +697,7 @@ // accommodate for transparent buttons not having borders :host([scale="l"][appearance="transparent"]) button:not(.content--slotted), :host([scale="l"][appearance="transparent"]) a:not(.content--slotted) { - --calcite-button-padding-y: config("theme.padding[2.5]"); + --calcite-button-padding-y: theme("padding[2.5]"); } // generate fab scales (scenario: 2 icons, ie., should not be square) diff --git a/src/components/calcite-slider/calcite-slider.scss b/src/components/calcite-slider/calcite-slider.scss index ee1729086da..a39fc4c9c29 100644 --- a/src/components/calcite-slider/calcite-slider.scss +++ b/src/components/calcite-slider/calcite-slider.scss @@ -253,7 +253,7 @@ border-color: var(--calcite-ui-foreground-1); top: -2px; pointer-events: none; - margin-inline-start: calc(-1 * config("theme.margin[0.5]")); + margin-inline-start: calc(-1 * theme("margin[0.5]")); } .tick--active { @@ -291,7 +291,7 @@ :host([label-ticks][ticks]) { .container { // match tick__label top margin + font-size - padding-bottom: calc(config("theme.margin[3.5]") + var(--calcite-slider-container-font-size)); + padding-bottom: calc(theme("margin[3.5]") + var(--calcite-slider-container-font-size)); } } :host([has-histogram]) { From 5b2ce328c83aaaf45ebbbb7f1314e1c3d5c0b505 Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Fri, 17 Dec 2021 12:05:55 -0800 Subject: [PATCH 17/24] bump --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index fcc6d621155..8dab30862ab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -92,7 +92,7 @@ "storybook-rtl-addon": "0.3.3", "stylelint": "14.1.0", "stylelint-config-recommended-scss": "5.0.2", - "tailwindcss": "3.0.6", + "tailwindcss": "3.0.7", "ts-jest": "27.1.1", "ts-node": "10.4.0", "typescript": "4.2.4", @@ -31732,9 +31732,9 @@ } }, "node_modules/tailwindcss": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.6.tgz", - "integrity": "sha512-+CA2f09rbHFDsdQ1iDvsOGbF1tZFmyPoRhUeaF9/5FRT5GYObtp+UjTSCdmeDcu6T90bx4WAaOkddYFPBkjbAA==", + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.7.tgz", + "integrity": "sha512-rZdKNHtC64jcQncLoWOuCzj4lQDTAgLtgK3WmQS88tTdpHh9OwLqULTQxI3tw9AMJsqSpCKlmcjW/8CSnni6zQ==", "dev": true, "dependencies": { "arg": "^5.0.1", @@ -60066,9 +60066,9 @@ } }, "tailwindcss": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.6.tgz", - "integrity": "sha512-+CA2f09rbHFDsdQ1iDvsOGbF1tZFmyPoRhUeaF9/5FRT5GYObtp+UjTSCdmeDcu6T90bx4WAaOkddYFPBkjbAA==", + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.7.tgz", + "integrity": "sha512-rZdKNHtC64jcQncLoWOuCzj4lQDTAgLtgK3WmQS88tTdpHh9OwLqULTQxI3tw9AMJsqSpCKlmcjW/8CSnni6zQ==", "dev": true, "requires": { "arg": "^5.0.1", diff --git a/package.json b/package.json index cc991b5988b..b31d9983a8a 100644 --- a/package.json +++ b/package.json @@ -141,7 +141,7 @@ "storybook-rtl-addon": "0.3.3", "stylelint": "14.1.0", "stylelint-config-recommended-scss": "5.0.2", - "tailwindcss": "3.0.6", + "tailwindcss": "3.0.7", "ts-jest": "27.1.1", "ts-node": "10.4.0", "typescript": "4.2.4", From eb6737c963cea2ece5cb33e0691bae5c9b1239dc Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Mon, 20 Dec 2021 09:44:23 -0800 Subject: [PATCH 18/24] revert class name changes. --- .../calcite-accordion-item/calcite-accordion-item.scss | 4 ++-- tailwind.config.ts | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/components/calcite-accordion-item/calcite-accordion-item.scss b/src/components/calcite-accordion-item/calcite-accordion-item.scss index 9e62aace4f9..d1970b629a3 100644 --- a/src/components/calcite-accordion-item/calcite-accordion-item.scss +++ b/src/components/calcite-accordion-item/calcite-accordion-item.scss @@ -1,6 +1,6 @@ %icon-position { /* icon rotation variables */ - --calcite-accordion-item-icon-rotation: theme("rotate.-90"); + --calcite-accordion-item-icon-rotation: calc(theme("rotate.90") * -1); --calcite-accordion-item-active-icon-rotation: theme("rotate.0"); --calcite-accordion-item-icon-rotation-rtl: theme("rotate.90"); --calcite-accordion-item-active-icon-rotation-rtl: theme("rotate.0"); @@ -25,7 +25,7 @@ --calcite-accordion-item-icon-rotation: theme("rotate.0"); --calcite-accordion-item-active-icon-rotation: theme("rotate.180"); --calcite-accordion-item-icon-rotation-rtl: theme("rotate.0"); - --calcite-accordion-item-active-icon-rotation-rtl: theme("rotate.-180"); + --calcite-accordion-item-active-icon-rotation-rtl: calc(theme("rotate.180") * -1); } :host { diff --git a/tailwind.config.ts b/tailwind.config.ts index 805412b814f..bcb6c103507 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -214,10 +214,6 @@ export default { }, transitionTimingFunction: { cubic: "cubic-bezier(0.215, 0.440, 0.420, 0.880)" - }, - rotate: { - "-90": "-90deg", - "-180": "-180deg" } } }, From d3a7a2c459f8d30024c632ab38a0ef64132a3353 Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Mon, 20 Dec 2021 10:13:56 -0800 Subject: [PATCH 19/24] use "n" instead of "-" for config fontSize values. --- src/assets/styles/_header.scss | 2 +- .../calcite-accordion/calcite-accordion.scss | 4 ++-- .../calcite-action/calcite-action.scss | 6 +++--- .../calcite-alert/calcite-alert.scss | 12 ++++++------ .../calcite-avatar/calcite-avatar.scss | 4 ++-- .../calcite-block-section.scss | 4 ++-- .../calcite-block/calcite-block.scss | 4 ++-- .../calcite-button/calcite-button.scss | 4 ++-- src/components/calcite-card/calcite-card.scss | 10 +++++----- .../calcite-checkbox/calcite-checkbox.scss | 2 +- src/components/calcite-chip/calcite-chip.scss | 4 ++-- .../calcite-color-picker.scss | 6 +++--- .../calcite-combobox-item-group.scss | 4 ++-- .../calcite-combobox-item.scss | 4 ++-- .../calcite-combobox/calcite-combobox.scss | 4 ++-- .../calcite-date-picker-day.scss | 6 +++--- .../calcite-date-picker-month-header.scss | 4 ++-- .../calcite-date-picker-month.scss | 6 +++--- .../calcite-dropdown-group.scss | 4 ++-- .../calcite-dropdown-item.scss | 8 ++++---- .../calcite-filter/calcite-filter.scss | 2 +- .../calcite-input-message.scss | 6 +++--- .../calcite-input/calcite-input.scss | 8 ++++---- .../calcite-label/calcite-label.scss | 4 ++-- .../calcite-list-item-group.scss | 2 +- .../calcite-list-item/calcite-list-item.scss | 2 +- .../calcite-loader/calcite-loader.scss | 4 ++-- .../calcite-modal/calcite-modal.scss | 2 +- .../calcite-notice/calcite-notice.scss | 10 +++++----- .../calcite-pagination/calcite-pagination.scss | 4 ++-- .../calcite-panel/calcite-panel.scss | 2 +- .../calcite-pick-list-group.scss | 4 ++-- .../calcite-pick-list-item.scss | 6 +++--- .../calcite-pick-list/calcite-pick-list.scss | 2 +- .../calcite-progress/calcite-progress.scss | 2 +- .../calcite-radio-button.scss | 4 ++-- .../calcite-radio-group-item.scss | 4 ++-- .../calcite-select/calcite-select.scss | 4 ++-- .../calcite-shell-panel.scss | 2 +- .../calcite-shell/calcite-shell.scss | 2 +- .../calcite-stepper-item.scss | 8 ++++---- .../calcite-tab-title/calcite-tab-title.scss | 6 +++--- src/components/calcite-tab/calcite-tab.scss | 4 ++-- src/components/calcite-tile/calcite-tile.scss | 4 ++-- .../calcite-time-picker.scss | 2 +- .../calcite-tip-group/calcite-tip-group.scss | 2 +- .../calcite-tip-manager.scss | 4 ++-- src/components/calcite-tip/calcite-tip.scss | 2 +- .../calcite-tooltip/calcite-tooltip.scss | 2 +- .../calcite-tree-item/calcite-tree-item.scss | 4 ++-- .../calcite-value-list-item.scss | 2 +- .../calcite-value-list/calcite-value-list.scss | 2 +- tailwind.config.ts | 18 +++++++++--------- 53 files changed, 119 insertions(+), 119 deletions(-) diff --git a/src/assets/styles/_header.scss b/src/assets/styles/_header.scss index 36ae9d062be..42a6943989b 100644 --- a/src/assets/styles/_header.scss +++ b/src/assets/styles/_header.scss @@ -30,5 +30,5 @@ h3.heading { } h4.heading, h5.heading { - @apply text--1h; + @apply text-n1h; } diff --git a/src/components/calcite-accordion/calcite-accordion.scss b/src/components/calcite-accordion/calcite-accordion.scss index cec3bad293e..d9560923cc5 100644 --- a/src/components/calcite-accordion/calcite-accordion.scss +++ b/src/components/calcite-accordion/calcite-accordion.scss @@ -3,14 +3,14 @@ --calcite-accordion-item-spacing-unit: theme("spacing.1"); --calcite-accordion-icon-margin: theme("spacing.2"); --calcite-accordion-item-padding: var(--calcite-accordion-item-spacing-unit) theme("spacing.2"); - @apply text--2h; + @apply text-n2h; } :host([scale="m"]) { --calcite-accordion-item-spacing-unit: theme("spacing.2"); --calcite-accordion-icon-margin: theme("spacing.3"); --calcite-accordion-item-padding: var(--calcite-accordion-item-spacing-unit) theme("spacing.3"); - @apply text--1h; + @apply text-n1h; } :host([scale="l"]) { diff --git a/src/components/calcite-action/calcite-action.scss b/src/components/calcite-action/calcite-action.scss index 08bea30fefb..a300e67f78f 100755 --- a/src/components/calcite-action/calcite-action.scss +++ b/src/components/calcite-action/calcite-action.scss @@ -18,7 +18,7 @@ justify-start m-0 relative - text--2h + text-n2h font-medium text-color-3 w-auto; @@ -66,7 +66,7 @@ :host([scale="s"]) { .button { - @apply font-normal p-2 text--2h; + @apply font-normal p-2 text-n2h; } .button--text-visible .icon-container { margin-inline-end: theme("spacing.2"); @@ -75,7 +75,7 @@ :host([scale="m"]) { .button { - @apply font-normal p-4 text--1h; + @apply font-normal p-4 text-n1h; } .button--text-visible .icon-container { margin-inline-end: theme("spacing.3"); diff --git a/src/components/calcite-alert/calcite-alert.scss b/src/components/calcite-alert/calcite-alert.scss index c4e3bd129b6..13f29f5e94e 100644 --- a/src/components/calcite-alert/calcite-alert.scss +++ b/src/components/calcite-alert/calcite-alert.scss @@ -12,13 +12,13 @@ --calcite-alert-spacing-token-small: theme("spacing.2"); --calcite-alert-spacing-token-large: theme("spacing.3"); @include slotted("title", "*") { - @apply text--1-wrap; + @apply text-n1-wrap; } @include slotted("message", "*") { - @apply text--2-wrap; + @apply text-n2-wrap; } @include slotted("link", "*") { - @apply text--2-wrap; + @apply text-n2-wrap; } .alert-queue-count { @apply mx-2; @@ -40,10 +40,10 @@ @apply text-0-wrap; } @include slotted("message", "*") { - @apply text--1-wrap; + @apply text-n1-wrap; } @include slotted("link", "*") { - @apply text--1-wrap; + @apply text-n1-wrap; } .alert-queue-count { @apply mx-3; @@ -138,7 +138,7 @@ @apply inline m-0 font-normal - text--1-wrap + text-n1-wrap text-color-2; margin-inline-end: theme("margin.2"); } diff --git a/src/components/calcite-avatar/calcite-avatar.scss b/src/components/calcite-avatar/calcite-avatar.scss index e21ff58dd99..7e894b411a4 100644 --- a/src/components/calcite-avatar/calcite-avatar.scss +++ b/src/components/calcite-avatar/calcite-avatar.scss @@ -3,11 +3,11 @@ } :host([scale="s"]) { - @apply w-6 h-6 text--3; + @apply w-6 h-6 text-n3; } :host([scale="m"]) { - @apply w-8 h-8 text--2; + @apply w-8 h-8 text-n2; } :host([scale="l"]) { diff --git a/src/components/calcite-block-section/calcite-block-section.scss b/src/components/calcite-block-section/calcite-block-section.scss index 3e6047b85ee..9d0705452fb 100644 --- a/src/components/calcite-block-section/calcite-block-section.scss +++ b/src/components/calcite-block-section/calcite-block-section.scss @@ -2,7 +2,7 @@ @apply box-border bg-foreground-1 text-color-2 - text--1 + text-n1 block; } @@ -36,7 +36,7 @@ px-0 py-2 select-none - text--1 + text-n1 focus-base; &:focus { diff --git a/src/components/calcite-block/calcite-block.scss b/src/components/calcite-block/calcite-block.scss index 244c215fff7..dd2f80f69b0 100644 --- a/src/components/calcite-block/calcite-block.scss +++ b/src/components/calcite-block/calcite-block.scss @@ -80,7 +80,7 @@ calcite-handle { .header .title .heading { @apply p-0 - text--1 + text-n1 text-color-2 font-medium word-break @@ -92,7 +92,7 @@ calcite-handle { .summary { @apply p-0 - text--2 + text-n2 text-color-3 mt-0.5 word-break; diff --git a/src/components/calcite-button/calcite-button.scss b/src/components/calcite-button/calcite-button.scss index a944a88d0f0..8188c437b0f 100644 --- a/src/components/calcite-button/calcite-button.scss +++ b/src/components/calcite-button/calcite-button.scss @@ -623,7 +623,7 @@ // generate button scales (scenario: text exists) :host([scale="s"]) button.content--slotted, :host([scale="s"]) a.content--slotted { - @apply text--2h; + @apply text-n2h; } // accommodate for transparent buttons not having borders :host([scale="s"][appearance="transparent"]) button.content--slotted, @@ -634,7 +634,7 @@ :host([scale="m"]) button.content--slotted, :host([scale="m"]) a.content--slotted { --calcite-button-padding-x: 11px; - @apply text--1h; + @apply text-n1h; } :host([scale="m"]:not([appearance="transparent"])) button.content--slotted, :host([scale="m"]:not([appearance="transparent"])) a.content--slotted { diff --git a/src/components/calcite-card/calcite-card.scss b/src/components/calcite-card/calcite-card.scss index 62292b428a0..b6ed1249097 100644 --- a/src/components/calcite-card/calcite-card.scss +++ b/src/components/calcite-card/calcite-card.scss @@ -60,7 +60,7 @@ .card-content { @apply p-3 text-color-3 - text--2-wrap; + text-n2-wrap; } // selectable and selected styles @@ -77,7 +77,7 @@ @apply font-medium text-color-1 m-0 - text--1-wrap; + text-n1-wrap; } @include slotted("subtitle", "*") { @@ -85,7 +85,7 @@ text-color-2 m-0 mt-2 - text--2-wrap; + text-n2-wrap; } @include slotted("thumbnail", "img") { @@ -93,11 +93,11 @@ } @include slotted("footer-leading", "*") { - @apply self-center text--2-wrap; + @apply self-center text-n2-wrap; margin-inline-end: auto; } @include slotted("footer-trailing", "*") { - @apply self-center text--2-wrap; + @apply self-center text-n2-wrap; } .thumbnail-wrapper { diff --git a/src/components/calcite-checkbox/calcite-checkbox.scss b/src/components/calcite-checkbox/calcite-checkbox.scss index 028e736182e..c4e42c63e29 100644 --- a/src/components/calcite-checkbox/calcite-checkbox.scss +++ b/src/components/calcite-checkbox/calcite-checkbox.scss @@ -10,7 +10,7 @@ --calcite-checkbox-size: theme("spacing.3"); } :host([scale="m"]) { - --calcite-checkbox-size: theme("fontSize.-1"); + --calcite-checkbox-size: theme("fontSize.n1"); } :host([scale="l"]) { --calcite-checkbox-size: theme("spacing.4"); diff --git a/src/components/calcite-chip/calcite-chip.scss b/src/components/calcite-chip/calcite-chip.scss index a60392ec7c0..fe9fb066946 100644 --- a/src/components/calcite-chip/calcite-chip.scss +++ b/src/components/calcite-chip/calcite-chip.scss @@ -1,7 +1,7 @@ // scale // todo update when new spacing modifiers are introduced to calcite-base :host([scale="s"]) { - @apply h-6 text--2; + @apply h-6 text-n2; --calcite-chip-spacing-unit-l: theme("spacing.2"); --calcite-chip-spacing-unit-s: theme("spacing.1"); .chip-image-container { @@ -9,7 +9,7 @@ } } :host([scale="m"]) { - @apply h-8 text--1; + @apply h-8 text-n1; --calcite-chip-spacing-unit-l: theme("spacing.3"); --calcite-chip-spacing-unit-s: 6px; .chip-image-container { diff --git a/src/components/calcite-color-picker/calcite-color-picker.scss b/src/components/calcite-color-picker/calcite-color-picker.scss index 381eeeb6b8b..fb0f5e3ee21 100644 --- a/src/components/calcite-color-picker/calcite-color-picker.scss +++ b/src/components/calcite-color-picker/calcite-color-picker.scss @@ -5,7 +5,7 @@ $gap--small: 4px; $gap--large: 12px; :host { - @apply inline-block text--2h font-normal; + @apply inline-block text-n2h font-normal; } :host([scale="s"]) { @@ -44,7 +44,7 @@ $gap--large: 12px; } :host([scale="l"]) { - @apply text--1h; + @apply text-n1h; .container { width: 464px; @@ -107,7 +107,7 @@ $gap--large: 12px; } .scope { - @apply text--1 + @apply text-n1 p-0 mb-0 mr-0 diff --git a/src/components/calcite-combobox-item-group/calcite-combobox-item-group.scss b/src/components/calcite-combobox-item-group/calcite-combobox-item-group.scss index 681c1378d59..ce37d9d43d3 100644 --- a/src/components/calcite-combobox-item-group/calcite-combobox-item-group.scss +++ b/src/components/calcite-combobox-item-group/calcite-combobox-item-group.scss @@ -1,5 +1,5 @@ .scale--s { - @apply text--2h; + @apply text-n2h; --calcite-combobox-item-spacing-unit-l: theme("spacing.2"); --calcite-combobox-item-spacing-unit-s: theme("spacing.1"); --calcite-combobox-item-spacing-indent-1: theme("spacing.2"); @@ -7,7 +7,7 @@ } .scale--m { - @apply text--1h; + @apply text-n1h; --calcite-combobox-item-spacing-unit-l: theme("spacing.3"); --calcite-combobox-item-spacing-unit-s: theme("spacing.2"); --calcite-combobox-item-spacing-indent-1: theme("spacing.3"); diff --git a/src/components/calcite-combobox-item/calcite-combobox-item.scss b/src/components/calcite-combobox-item/calcite-combobox-item.scss index 848e6725c91..0b068171123 100644 --- a/src/components/calcite-combobox-item/calcite-combobox-item.scss +++ b/src/components/calcite-combobox-item/calcite-combobox-item.scss @@ -1,12 +1,12 @@ .scale--s { - @apply text--2h; + @apply text-n2h; --calcite-combobox-item-spacing-unit-l: theme("spacing.2"); --calcite-combobox-item-spacing-unit-s: theme("spacing.1"); --calcite-combobox-item-spacing-indent: theme("spacing.2"); } .scale--m { - @apply text--1h; + @apply text-n1h; --calcite-combobox-item-spacing-unit-l: theme("spacing.3"); --calcite-combobox-item-spacing-unit-s: theme("spacing.2"); --calcite-combobox-item-spacing-indent: theme("spacing.3"); diff --git a/src/components/calcite-combobox/calcite-combobox.scss b/src/components/calcite-combobox/calcite-combobox.scss index 69af25ad855..86efa4a93f9 100644 --- a/src/components/calcite-combobox/calcite-combobox.scss +++ b/src/components/calcite-combobox/calcite-combobox.scss @@ -15,14 +15,14 @@ } :host([scale="s"]) { - @apply text--2; + @apply text-n2; --calcite-combobox-item-spacing-unit-l: theme("spacing.2"); --calcite-combobox-item-spacing-unit-s: theme("spacing.1"); --calcite-combobox-input-height: theme("spacing.6"); } :host([scale="m"]) { - @apply text--1; + @apply text-n1; --calcite-combobox-item-spacing-unit-l: theme("spacing.3"); --calcite-combobox-item-spacing-unit-s: theme("spacing.2"); --calcite-combobox-input-height: theme("spacing.8"); diff --git a/src/components/calcite-date-picker-day/calcite-date-picker-day.scss b/src/components/calcite-date-picker-day/calcite-date-picker-day.scss index 8758f4f87ea..73c65f3c737 100644 --- a/src/components/calcite-date-picker-day/calcite-date-picker-day.scss +++ b/src/components/calcite-date-picker-day/calcite-date-picker-day.scss @@ -21,7 +21,7 @@ .day { @apply flex rounded-full - text--2h + text-n2h justify-center items-center leading-none @@ -46,7 +46,7 @@ .day { height: 27px; width: 27px; - @apply text--2; + @apply text-n2; } } @@ -60,7 +60,7 @@ .day { height: 33px; width: 33px; - @apply text--1; + @apply text-n1; } } diff --git a/src/components/calcite-date-picker-month-header/calcite-date-picker-month-header.scss b/src/components/calcite-date-picker-month-header/calcite-date-picker-month-header.scss index 49e5126087d..2b6369b50b2 100644 --- a/src/components/calcite-date-picker-month-header/calcite-date-picker-month-header.scss +++ b/src/components/calcite-date-picker-month-header/calcite-date-picker-month-header.scss @@ -9,7 +9,7 @@ :host([scale="s"]) { .text { - @apply text--1h my-2; + @apply text-n1h my-2; } .chevron { @apply h-9; @@ -82,7 +82,7 @@ w-full; } -.text--reverse { +.text-nreverse { @apply flex-row-reverse; } diff --git a/src/components/calcite-date-picker-month/calcite-date-picker-month.scss b/src/components/calcite-date-picker-month/calcite-date-picker-month.scss index 870129db495..ddaba436655 100644 --- a/src/components/calcite-date-picker-month/calcite-date-picker-month.scss +++ b/src/components/calcite-date-picker-month/calcite-date-picker-month.scss @@ -20,15 +20,15 @@ } :host([scale="s"]) .week-header { - @apply text--2h pt-2 pb-3 px-0; + @apply text-n2h pt-2 pb-3 px-0; } :host([scale="m"]) .week-header { - @apply text--2h pt-3 pb-4 px-0; + @apply text-n2h pt-3 pb-4 px-0; } :host([scale="l"]) .week-header { - @apply text--1h pt-4 pb-5 px-0; + @apply text-n1h pt-4 pb-5 px-0; } .week-days { diff --git a/src/components/calcite-dropdown-group/calcite-dropdown-group.scss b/src/components/calcite-dropdown-group/calcite-dropdown-group.scss index 9680ba348c6..8e3c8402a4c 100644 --- a/src/components/calcite-dropdown-group/calcite-dropdown-group.scss +++ b/src/components/calcite-dropdown-group/calcite-dropdown-group.scss @@ -1,12 +1,12 @@ .container--s { - @apply text--2h; + @apply text-n2h; .dropdown-title { @apply p-2; } } .container--m { - @apply text--1h; + @apply text-n1h; .dropdown-title { @apply p-3; } diff --git a/src/components/calcite-dropdown-item/calcite-dropdown-item.scss b/src/components/calcite-dropdown-item/calcite-dropdown-item.scss index 8f3dbe5123d..563d103376b 100644 --- a/src/components/calcite-dropdown-item/calcite-dropdown-item.scss +++ b/src/components/calcite-dropdown-item/calcite-dropdown-item.scss @@ -1,11 +1,11 @@ .container--s { - @apply text--2h py-1; + @apply text-n2h py-1; padding-inline-end: theme("padding.2"); padding-inline-start: theme("padding.6"); } .container--m { - @apply text--1h py-2; + @apply text-n1h py-2; padding-inline-end: theme("padding.3"); padding-inline-start: theme("padding.8"); } @@ -75,13 +75,13 @@ } .container--s .dropdown-link { - @apply text--2h py-1; + @apply text-n2h py-1; padding-inline-end: theme("padding.2"); padding-inline-start: theme("padding.6"); } .container--m .dropdown-link { - @apply text--1h py-2; + @apply text-n1h py-2; padding-inline-end: theme("padding.3"); padding-inline-start: theme("padding.8"); } diff --git a/src/components/calcite-filter/calcite-filter.scss b/src/components/calcite-filter/calcite-filter.scss index b8c0af05a39..e170279fe3b 100644 --- a/src/components/calcite-filter/calcite-filter.scss +++ b/src/components/calcite-filter/calcite-filter.scss @@ -21,7 +21,7 @@ input[type="text"] { border-none font-inherit text-color-1 - text--2h + text-n2h mb-1 w-full py-1 diff --git a/src/components/calcite-input-message/calcite-input-message.scss b/src/components/calcite-input-message/calcite-input-message.scss index 182689dc20c..f62a2fe2c82 100644 --- a/src/components/calcite-input-message/calcite-input-message.scss +++ b/src/components/calcite-input-message/calcite-input-message.scss @@ -55,14 +55,14 @@ } :host([status][active][scale="s"]) { - @apply text--3h; + @apply text-n3h; } :host([status][active][scale="m"]) { - @apply text--2h + @apply text-n2h mt-1; } :host([status][active][scale="l"]) { - @apply text--1h mt-1; + @apply text-n1h mt-1; } diff --git a/src/components/calcite-input/calcite-input.scss b/src/components/calcite-input/calcite-input.scss index 3e292b95476..71e6a74f817 100755 --- a/src/components/calcite-input/calcite-input.scss +++ b/src/components/calcite-input/calcite-input.scss @@ -3,7 +3,7 @@ & input, & .prefix, & .suffix { - @apply text--2h p-2 h-6; + @apply text-n2h p-2 h-6; } & textarea { @apply h-6; @@ -22,7 +22,7 @@ min-width: theme("spacing.6"); } & textarea { - @apply text--2h + @apply text-n2h py-1 px-2 h-auto; @@ -33,7 +33,7 @@ & input, & .prefix, & .suffix { - @apply text--1h p-3 h-8; + @apply text-n1h p-3 h-8; } & textarea { min-height: theme("spacing.8"); @@ -51,7 +51,7 @@ min-width: theme("spacing.8"); } & textarea { - @apply text--1h + @apply text-n1h py-2 px-3 h-auto; diff --git a/src/components/calcite-label/calcite-label.scss b/src/components/calcite-label/calcite-label.scss index 59e0e8b1a1d..87ba02e64f6 100644 --- a/src/components/calcite-label/calcite-label.scss +++ b/src/components/calcite-label/calcite-label.scss @@ -12,12 +12,12 @@ :host([scale="s"]) { .container { - @apply text--2h mb-2; + @apply text-n2h mb-2; } } :host([scale="m"]) { .container { - @apply text--1h mb-3; + @apply text-n1h mb-3; } } :host([scale="l"]) { diff --git a/src/components/calcite-list-item-group/calcite-list-item-group.scss b/src/components/calcite-list-item-group/calcite-list-item-group.scss index 42cfff55779..fb1c0607745 100644 --- a/src/components/calcite-list-item-group/calcite-list-item-group.scss +++ b/src/components/calcite-list-item-group/calcite-list-item-group.scss @@ -3,7 +3,7 @@ } .heading { - @apply font-sans bg-foreground-2 text--1 font-bold m-0 p-3 text-color-2 flex flex-1; + @apply font-sans bg-foreground-2 text-n1 font-bold m-0 p-3 text-color-2 flex flex-1; } .container { diff --git a/src/components/calcite-list-item/calcite-list-item.scss b/src/components/calcite-list-item/calcite-list-item.scss index 9b399caf8d6..f5b761a71e3 100755 --- a/src/components/calcite-list-item/calcite-list-item.scss +++ b/src/components/calcite-list-item/calcite-list-item.scss @@ -60,7 +60,7 @@ .label, .description { - @apply font-normal font-sans text--2 word-break; + @apply font-normal font-sans text-n2 word-break; &:only-child { @apply py-1 m-0; } diff --git a/src/components/calcite-loader/calcite-loader.scss b/src/components/calcite-loader/calcite-loader.scss index 8290e8a438e..04eb63643eb 100644 --- a/src/components/calcite-loader/calcite-loader.scss +++ b/src/components/calcite-loader/calcite-loader.scss @@ -24,7 +24,7 @@ $loader-circumference: ($loader-scale - (2 * $stroke-width)) * 3.14159; } :host([scale="s"]) { - --calcite-loader-font-size: theme("fontSize.-2"); + --calcite-loader-font-size: theme("fontSize.n2"); --calcite-loader-size: theme("spacing.8"); --calcite-loader-size-inline: theme("spacing.3"); } @@ -51,7 +51,7 @@ $loader-circumference: ($loader-scale - (2 * $stroke-width)) * 3.14159; .loader__text { @apply block - text--2h + text-n2h text-center text-color-1; margin-top: calc(var(--calcite-loader-size) + theme("spacing.6")); diff --git a/src/components/calcite-modal/calcite-modal.scss b/src/components/calcite-modal/calcite-modal.scss index 9e7f150842a..a29837c8c8a 100644 --- a/src/components/calcite-modal/calcite-modal.scss +++ b/src/components/calcite-modal/calcite-modal.scss @@ -28,7 +28,7 @@ --calcite-modal-padding: theme("spacing.3"); --calcite-modal-padding-large: theme("spacing.4"); --calcite-modal-title-text: theme("fontSize.1h"); - --calcite-modal-content-text: theme("fontSize.-1"); + --calcite-modal-content-text: theme("fontSize.n1"); } :host([scale="m"]) { diff --git a/src/components/calcite-notice/calcite-notice.scss b/src/components/calcite-notice/calcite-notice.scss index 753bc99210d..51423340c96 100644 --- a/src/components/calcite-notice/calcite-notice.scss +++ b/src/components/calcite-notice/calcite-notice.scss @@ -11,13 +11,13 @@ --calcite-notice-spacing-token-small: theme("spacing.2"); --calcite-notice-spacing-token-large: theme("spacing.3"); @include slotted("title", "*", ".container") { - @apply text--1-wrap my-0.5; + @apply text-n1-wrap my-0.5; } @include slotted("message", "*", ".container") { - @apply text--2-wrap my-0.5; + @apply text-n2-wrap my-0.5; } ::slotted(calcite-link) { - @apply text--2-wrap my-0.5; + @apply text-n2-wrap my-0.5; } .notice-close { // specific padding for close button to align with calcite-action small-scale spacing @@ -32,10 +32,10 @@ @apply text-0-wrap my-0.5; } @include slotted("message", "*", ".container") { - @apply text--1-wrap my-0.5; + @apply text-n1-wrap my-0.5; } ::slotted(calcite-link) { - @apply text--1-wrap my-0.5; + @apply text-n1-wrap my-0.5; } } diff --git a/src/components/calcite-pagination/calcite-pagination.scss b/src/components/calcite-pagination/calcite-pagination.scss index 093c110d4a2..a95bb8953ee 100644 --- a/src/components/calcite-pagination/calcite-pagination.scss +++ b/src/components/calcite-pagination/calcite-pagination.scss @@ -12,7 +12,7 @@ & .previous, & .next, & .page { - @apply text--2h h-6; + @apply text-n2h h-6; } .previous, .next { @@ -25,7 +25,7 @@ & .previous, & .next, & .page { - @apply text--1h h-8; + @apply text-n1h h-8; } .previous, .next { diff --git a/src/components/calcite-panel/calcite-panel.scss b/src/components/calcite-panel/calcite-panel.scss index 5fd4a427a31..a23efcc7835 100644 --- a/src/components/calcite-panel/calcite-panel.scss +++ b/src/components/calcite-panel/calcite-panel.scss @@ -108,7 +108,7 @@ } } .summary { - @apply text-color-2 text--1h; + @apply text-color-2 text-n1h; } } diff --git a/src/components/calcite-pick-list-group/calcite-pick-list-group.scss b/src/components/calcite-pick-list-group/calcite-pick-list-group.scss index 488bf6f8def..6efaad3c97a 100644 --- a/src/components/calcite-pick-list-group/calcite-pick-list-group.scss +++ b/src/components/calcite-pick-list-group/calcite-pick-list-group.scss @@ -4,7 +4,7 @@ block mb-1 text-color-2 - text--1; + text-n1; * { @apply box-border; @@ -18,7 +18,7 @@ @import "../../assets/styles/header"; h3.heading { - @apply text--1-wrap + @apply text-n1-wrap text-color-3 my-2 mx-4; diff --git a/src/components/calcite-pick-list-item/calcite-pick-list-item.scss b/src/components/calcite-pick-list-item/calcite-pick-list-item.scss index 3efb2bb1501..d48b19ed49e 100644 --- a/src/components/calcite-pick-list-item/calcite-pick-list-item.scss +++ b/src/components/calcite-pick-list-item/calcite-pick-list-item.scss @@ -3,13 +3,13 @@ box-border items-stretch flex - text--1 + text-n1 text-color-1 shadow-border-bottom m-0 mb-px bg-foreground-1 - text--1h; + text-n1h; transition: background-color $transition; animation: calcite-fade-in $transition; @@ -76,7 +76,7 @@ pointer-events-none py-2 px-3 - text--2-wrap + text-n2-wrap word-break flex-col flex-nowrap; diff --git a/src/components/calcite-pick-list/calcite-pick-list.scss b/src/components/calcite-pick-list/calcite-pick-list.scss index 1d2c9b1e868..b6bc68355a9 100644 --- a/src/components/calcite-pick-list/calcite-pick-list.scss +++ b/src/components/calcite-pick-list/calcite-pick-list.scss @@ -8,7 +8,7 @@ flex-grow flex-shrink-0 text-color-2 - text--1h; + text-n1h; * { @apply box-border; diff --git a/src/components/calcite-progress/calcite-progress.scss b/src/components/calcite-progress/calcite-progress.scss index b37b185b51d..dd0c64aadb1 100644 --- a/src/components/calcite-progress/calcite-progress.scss +++ b/src/components/calcite-progress/calcite-progress.scss @@ -27,7 +27,7 @@ } .text { - @apply pt-4 pb-0 px-0 text-center text--2h font-medium; + @apply pt-4 pb-0 px-0 text-center text-n2h font-medium; } @keyframes looping-progress-bar-ani { diff --git a/src/components/calcite-radio-button/calcite-radio-button.scss b/src/components/calcite-radio-button/calcite-radio-button.scss index 8ce28536657..26c39be955d 100644 --- a/src/components/calcite-radio-button/calcite-radio-button.scss +++ b/src/components/calcite-radio-button/calcite-radio-button.scss @@ -30,10 +30,10 @@ } :host([scale="s"]) { - --calcite-radio-size: theme("fontSize.-2"); + --calcite-radio-size: theme("fontSize.n2"); } :host([scale="m"]) { - --calcite-radio-size: theme("fontSize.-1"); + --calcite-radio-size: theme("fontSize.n1"); } :host([scale="l"]) { --calcite-radio-size: theme("fontSize.0"); diff --git a/src/components/calcite-radio-group-item/calcite-radio-group-item.scss b/src/components/calcite-radio-group-item/calcite-radio-group-item.scss index b774c5ad913..0c948090af7 100644 --- a/src/components/calcite-radio-group-item/calcite-radio-group-item.scss +++ b/src/components/calcite-radio-group-item/calcite-radio-group-item.scss @@ -31,13 +31,13 @@ } .label--scale-s { - @apply text--2h px-2; + @apply text-n2h px-2; padding-top: 0.125rem; padding-bottom: 0.125rem; } .label--scale-m { - @apply text--1h px-3; + @apply text-n1h px-3; padding-top: 0.375rem; padding-bottom: 0.375rem; } diff --git a/src/components/calcite-select/calcite-select.scss b/src/components/calcite-select/calcite-select.scss index accb7fcd350..52b5f14a96a 100644 --- a/src/components/calcite-select/calcite-select.scss +++ b/src/components/calcite-select/calcite-select.scss @@ -18,7 +18,7 @@ :host([scale="s"]) { @apply h-6; - --calcite-select-font-size: theme("fontSize.-2h"); + --calcite-select-font-size: theme("fontSize.n2h"); --calcite-select-spacing-inline: theme("spacing.2") theme("spacing.8"); .icon-container { @apply px-2; @@ -27,7 +27,7 @@ :host([scale="m"]) { @apply h-8; - --calcite-select-font-size: theme("fontSize.-1h"); + --calcite-select-font-size: theme("fontSize.n1h"); --calcite-select-spacing-inline: theme("spacing.3") theme("spacing.10"); .icon-container { @apply px-3; diff --git a/src/components/calcite-shell-panel/calcite-shell-panel.scss b/src/components/calcite-shell-panel/calcite-shell-panel.scss index 7de602ac75f..829e5a61db5 100755 --- a/src/components/calcite-shell-panel/calcite-shell-panel.scss +++ b/src/components/calcite-shell-panel/calcite-shell-panel.scss @@ -14,7 +14,7 @@ flex-auto pointer-events-none text-color-2 - text--1; + text-n1; * { @apply box-border; diff --git a/src/components/calcite-shell/calcite-shell.scss b/src/components/calcite-shell/calcite-shell.scss index fb42ca5ad0f..0a7f2fdae44 100755 --- a/src/components/calcite-shell/calcite-shell.scss +++ b/src/components/calcite-shell/calcite-shell.scss @@ -62,7 +62,7 @@ } ::slotted(.header .heading) { - @apply font-normal text--2-wrap; + @apply font-normal text-n2-wrap; } ::slotted(calcite-shell-panel), diff --git a/src/components/calcite-stepper-item/calcite-stepper-item.scss b/src/components/calcite-stepper-item/calcite-stepper-item.scss index db5bcd5f63b..3680da4044e 100644 --- a/src/components/calcite-stepper-item/calcite-stepper-item.scss +++ b/src/components/calcite-stepper-item/calcite-stepper-item.scss @@ -2,10 +2,10 @@ --calcite-stepper-item-spacing-unit-s: theme("spacing.1"); --calcite-stepper-item-spacing-unit-m: theme("spacing.3"); --calcite-stepper-item-spacing-unit-l: theme("spacing.4"); - @apply text--1h; + @apply text-n1h; margin-inline-end: theme("margin.1"); .stepper-item-subtitle { - @apply text--2h; + @apply text-n2h; } } @@ -16,7 +16,7 @@ @apply text-0h; margin-inline-end: theme("margin.2"); .stepper-item-subtitle { - @apply text--1h; + @apply text-n1h; } } @@ -88,7 +88,7 @@ @apply flex-col w-full hidden - text--2-wrap; + text-n2-wrap; } // stepper item icon diff --git a/src/components/calcite-tab-title/calcite-tab-title.scss b/src/components/calcite-tab-title/calcite-tab-title.scss index 4282c79b851..96bbcecb0f9 100644 --- a/src/components/calcite-tab-title/calcite-tab-title.scss +++ b/src/components/calcite-tab-title/calcite-tab-title.scss @@ -48,14 +48,14 @@ margin-inline-end: 1rem; a, span { - @apply text--2h py-1; + @apply text-n2h py-1; } } :host([scale="m"]) { a, span { - @apply text--1h py-2; + @apply text-n1h py-2; } } @@ -80,7 +80,7 @@ span { flex justify-center text-color-3 - text--1h + text-n1h transition-default px-0 py-2; diff --git a/src/components/calcite-tab/calcite-tab.scss b/src/components/calcite-tab/calcite-tab.scss index 5d0619e0e54..b306c1110b1 100644 --- a/src/components/calcite-tab/calcite-tab.scss +++ b/src/components/calcite-tab/calcite-tab.scss @@ -15,11 +15,11 @@ section { } :host([scale="s"]) { - @apply text--2h py-1; + @apply text-n2h py-1; } :host([scale="m"]) { - @apply text--1h py-2; + @apply text-n1h py-2; } :host([scale="l"]) { diff --git a/src/components/calcite-tile/calcite-tile.scss b/src/components/calcite-tile/calcite-tile.scss index eb75453a61c..382593f2359 100644 --- a/src/components/calcite-tile/calcite-tile.scss +++ b/src/components/calcite-tile/calcite-tile.scss @@ -74,7 +74,7 @@ } .heading { - @apply text--1-wrap + @apply text-n1-wrap text-color-2 duration-150 ease-in-out @@ -93,7 +93,7 @@ } } .description { - @apply text--2-wrap + @apply text-n2-wrap text-color-3 duration-150 ease-in-out diff --git a/src/components/calcite-time-picker/calcite-time-picker.scss b/src/components/calcite-time-picker/calcite-time-picker.scss index 819ed5655b6..f02969fd5e0 100644 --- a/src/components/calcite-time-picker/calcite-time-picker.scss +++ b/src/components/calcite-time-picker/calcite-time-picker.scss @@ -67,7 +67,7 @@ } &.scale-s { - @apply text--1; + @apply text-n1; .button, .input { @apply px-3 diff --git a/src/components/calcite-tip-group/calcite-tip-group.scss b/src/components/calcite-tip-group/calcite-tip-group.scss index ed8488a0f59..d42fb99a420 100644 --- a/src/components/calcite-tip-group/calcite-tip-group.scss +++ b/src/components/calcite-tip-group/calcite-tip-group.scss @@ -3,7 +3,7 @@ box-border bg-foreground-1 text-color-2 - text--1h; + text-n1h; } ::slotted(calcite-tip) { diff --git a/src/components/calcite-tip-manager/calcite-tip-manager.scss b/src/components/calcite-tip-manager/calcite-tip-manager.scss index afefb434135..6e5732f57a7 100644 --- a/src/components/calcite-tip-manager/calcite-tip-manager.scss +++ b/src/components/calcite-tip-manager/calcite-tip-manager.scss @@ -12,7 +12,7 @@ box-border bg-foreground-1 text-color-2 - text--1h; + text-n1h; * { @apply box-border; @@ -94,7 +94,7 @@ } .page-position { - @apply text--2h my-0 mx-2; + @apply text-n2h my-0 mx-2; } /* @keyframes*/ diff --git a/src/components/calcite-tip/calcite-tip.scss b/src/components/calcite-tip/calcite-tip.scss index d09ae0c1909..b2bb062c337 100644 --- a/src/components/calcite-tip/calcite-tip.scss +++ b/src/components/calcite-tip/calcite-tip.scss @@ -9,7 +9,7 @@ box-border bg-foreground-1 text-color-2 - text--1h; + text-n1h; * { @apply box-border; diff --git a/src/components/calcite-tooltip/calcite-tooltip.scss b/src/components/calcite-tooltip/calcite-tooltip.scss index 9e9381af014..00bf8614abb 100644 --- a/src/components/calcite-tooltip/calcite-tooltip.scss +++ b/src/components/calcite-tooltip/calcite-tooltip.scss @@ -12,7 +12,7 @@ py-3 px-4 overflow-hidden - text--2-wrap + text-n2-wrap rounded; max-width: 20rem; max-height: 20rem; diff --git a/src/components/calcite-tree-item/calcite-tree-item.scss b/src/components/calcite-tree-item/calcite-tree-item.scss index 6d147a05949..1253e514f9a 100644 --- a/src/components/calcite-tree-item/calcite-tree-item.scss +++ b/src/components/calcite-tree-item/calcite-tree-item.scss @@ -7,7 +7,7 @@ } :host([scale="s"]) { - @apply text--2h; + @apply text-n2h; .node-container { --calcite-tree-padding-y: theme("padding.1"); @@ -21,7 +21,7 @@ } :host([scale="m"]) { - @apply text--1h; + @apply text-n1h; .node-container { --calcite-tree-padding-y: theme("padding.2"); diff --git a/src/components/calcite-value-list-item/calcite-value-list-item.scss b/src/components/calcite-value-list-item/calcite-value-list-item.scss index a06ead716e1..0e99f4d16fe 100644 --- a/src/components/calcite-value-list-item/calcite-value-list-item.scss +++ b/src/components/calcite-value-list-item/calcite-value-list-item.scss @@ -2,7 +2,7 @@ @apply box-border bg-foreground-1 text-color-2 - text--1 + text-n1 mb-px flex shadow-border-bottom; diff --git a/src/components/calcite-value-list/calcite-value-list.scss b/src/components/calcite-value-list/calcite-value-list.scss index ab42f38c361..ac2357185f8 100644 --- a/src/components/calcite-value-list/calcite-value-list.scss +++ b/src/components/calcite-value-list/calcite-value-list.scss @@ -8,7 +8,7 @@ flex-shrink-0 flex-grow-0 text-color-2 - text--1; + text-n1; * { @apply box-border; } diff --git a/tailwind.config.ts b/tailwind.config.ts index bcb6c103507..167b9f39f68 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -64,9 +64,9 @@ export default { }, fontSize: { // assets/styles/_type - "-3": "var(--calcite-font-size--3)", // 10px - "-2": "var(--calcite-font-size--2)", // 12px - "-1": "var(--calcite-font-size--1)", // 14px + n3: "var(--calcite-font-size--3)", // 10px + n2: "var(--calcite-font-size--2)", // 12px + n1: "var(--calcite-font-size--1)", // 14px 0: "var(--calcite-font-size-0)", // 16px 1: "var(--calcite-font-size-1)", // 18px 2: "var(--calcite-font-size-2)", // 20px @@ -79,9 +79,9 @@ export default { // TODO: temp selectors to be renamed before closing https://github.com/Esri/calcite-components/issues/1500. // at this point all existing instances of text-N should be replaced with either text-Nh or text-N-wrap and we // should be able to safely drop the "h" suffix. - "-3h": ["var(--calcite-font-size--3)", { lineHeight: "0.75rem" }], // 10px (0.625rem) - "-2h": ["var(--calcite-font-size--2)", { lineHeight: "1rem" }], // 12px (0.75rem) - "-1h": ["var(--calcite-font-size--1)", { lineHeight: "1rem" }], // 14px (0.875rem) + n3h: ["var(--calcite-font-size--3)", { lineHeight: "0.75rem" }], // 10px (0.625rem) + n2h: ["var(--calcite-font-size--2)", { lineHeight: "1rem" }], // 12px (0.75rem) + n1h: ["var(--calcite-font-size--1)", { lineHeight: "1rem" }], // 14px (0.875rem) "0h": ["var(--calcite-font-size-0)", { lineHeight: "1.25rem" }], // 16px (1rem) "1h": ["var(--calcite-font-size-1)", { lineHeight: "1.5rem" }], // 18px (1.125rem) "2h": ["var(--calcite-font-size-2)", { lineHeight: "1.5rem" }], // 20px (1.25rem) @@ -91,9 +91,9 @@ export default { "6h": ["var(--calcite-font-size-6)", { lineHeight: "4rem" }], // 48px (3rem) "7h": ["var(--calcite-font-size-7)", { lineHeight: "4rem" }], // 56px (3.5rem) "8h": ["var(--calcite-font-size-8)", { lineHeight: "5rem" }], // 64px (4rem) - "-3-wrap": ["var(--calcite-font-size--3)", { lineHeight: "1.375" }], - "-2-wrap": ["var(--calcite-font-size--2)", { lineHeight: "1.375" }], - "-1-wrap": ["var(--calcite-font-size--1)", { lineHeight: "1.375" }], + "n3-wrap": ["var(--calcite-font-size--3)", { lineHeight: "1.375" }], + "n2-wrap": ["var(--calcite-font-size--2)", { lineHeight: "1.375" }], + "n1-wrap": ["var(--calcite-font-size--1)", { lineHeight: "1.375" }], "0-wrap": ["var(--calcite-font-size-0)", { lineHeight: "1.375" }], "1-wrap": ["var(--calcite-font-size-1)", { lineHeight: "1.375" }], "2-wrap": ["var(--calcite-font-size-2)", { lineHeight: "1.375" }], From f9723d500630275714fd7f79ddf3a474506743c3 Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Mon, 20 Dec 2021 10:24:16 -0800 Subject: [PATCH 20/24] fix class --- src/components/calcite-tab-nav/calcite-tab-nav.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/calcite-tab-nav/calcite-tab-nav.scss b/src/components/calcite-tab-nav/calcite-tab-nav.scss index b4581c92980..3fb8ad77f79 100644 --- a/src/components/calcite-tab-nav/calcite-tab-nav.scss +++ b/src/components/calcite-tab-nav/calcite-tab-nav.scss @@ -18,8 +18,7 @@ @apply flex w-full overflow-auto - justify-start - scrolling-touch; + justify-start; } :host([layout="center"]) .tab-nav { From 2d0ed782e0c81af57a1210de1381994256458f96 Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Mon, 20 Dec 2021 11:05:45 -0800 Subject: [PATCH 21/24] remove cssnano --- package-lock.json | 1130 ----------------- package.json | 2 - .../calcite-modal/calcite-modal.e2e.ts | 2 +- stencil.config.ts | 3 +- 4 files changed, 2 insertions(+), 1135 deletions(-) diff --git a/package-lock.json b/package-lock.json index b53a1d77615..d0838f3a274 100644 --- a/package-lock.json +++ b/package-lock.json @@ -59,8 +59,6 @@ "concurrently": "6.4.0", "conventional-changelog-cli": "2.1.1", "cpy-cli": "^3.1.1", - "cssnano": "5.0.12", - "cssnano-preset-lite": "2.0.1", "dedent": "0.7.0", "eslint": "8.4.1", "eslint-config-prettier": "8.3.0", @@ -6229,15 +6227,6 @@ "node": ">=6" } }, - "node_modules/@trysound/sax": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", - "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==", - "dev": true, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/@tsconfig/node10": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", @@ -7495,12 +7484,6 @@ "ajv": "^6.9.1" } }, - "node_modules/alphanum-sort": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", - "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", - "dev": true - }, "node_modules/ansi-align": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", @@ -9942,18 +9925,6 @@ "node": ">=6" } }, - "node_modules/caniuse-api": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", - "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", - "dev": true, - "dependencies": { - "browserslist": "^4.0.0", - "caniuse-lite": "^1.0.0", - "lodash.memoize": "^4.1.2", - "lodash.uniq": "^4.5.0" - } - }, "node_modules/caniuse-lite": { "version": "1.0.30001291", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001291.tgz", @@ -11053,12 +11024,6 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, - "node_modules/colord": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.1.tgz", - "integrity": "sha512-4LBMSt09vR0uLnPVkOUBnmxgoaeN4ewRbx801wY/bXcltXfpR/G46OdWn96XpYmCWuYvO46aBZP4NgX8HpNAcw==", - "dev": true - }, "node_modules/colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", @@ -11090,15 +11055,6 @@ "url": "https://github.com/sponsors/wooorm" } }, - "node_modules/commander": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", - "dev": true, - "engines": { - "node": ">= 10" - } - }, "node_modules/common-tags": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz", @@ -13003,21 +12959,6 @@ "node": ">=8" } }, - "node_modules/css-declaration-sorter": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz", - "integrity": "sha512-SvjQjNRZgh4ULK1LDJ2AduPKUKxIqmtU7ZAyi47BTV+M90Qvxr9AB6lKlLbDUfXqI9IQeYA8LbAsCZPpJEV3aA==", - "dev": true, - "dependencies": { - "timsort": "^0.3.0" - }, - "engines": { - "node": ">= 10" - }, - "peerDependencies": { - "postcss": "^8.0.9" - } - }, "node_modules/css-loader": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz", @@ -13155,28 +13096,6 @@ "url": "https://github.com/fb55/domutils?sponsor=1" } }, - "node_modules/css-tree": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", - "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==", - "dev": true, - "dependencies": { - "mdn-data": "2.0.14", - "source-map": "^0.6.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/css-tree/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/css-what": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz", @@ -13201,113 +13120,6 @@ "node": ">=4" } }, - "node_modules/cssnano": { - "version": "5.0.12", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.12.tgz", - "integrity": "sha512-U38V4x2iJ3ijPdeWqUrEr4eKBB5PbEKsNP5T8xcik2Au3LeMtiMHX0i2Hu9k51FcKofNZumbrcdC6+a521IUHg==", - "dev": true, - "dependencies": { - "cssnano-preset-default": "^5.1.8", - "is-resolvable": "^1.1.0", - "lilconfig": "^2.0.3", - "yaml": "^1.10.2" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/cssnano" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/cssnano-preset-default": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.8.tgz", - "integrity": "sha512-zWMlP0+AMPBVE852SqTrP0DnhTcTA2C1wAF92TKZ3Va+aUVqLIhkqKlnJIXXdqXD7RN+S1ujuWmNpvrJBiM/vg==", - "dev": true, - "dependencies": { - "css-declaration-sorter": "^6.0.3", - "cssnano-utils": "^2.0.1", - "postcss-calc": "^8.0.0", - "postcss-colormin": "^5.2.1", - "postcss-convert-values": "^5.0.2", - "postcss-discard-comments": "^5.0.1", - "postcss-discard-duplicates": "^5.0.1", - "postcss-discard-empty": "^5.0.1", - "postcss-discard-overridden": "^5.0.1", - "postcss-merge-longhand": "^5.0.4", - "postcss-merge-rules": "^5.0.3", - "postcss-minify-font-values": "^5.0.1", - "postcss-minify-gradients": "^5.0.3", - "postcss-minify-params": "^5.0.2", - "postcss-minify-selectors": "^5.1.0", - "postcss-normalize-charset": "^5.0.1", - "postcss-normalize-display-values": "^5.0.1", - "postcss-normalize-positions": "^5.0.1", - "postcss-normalize-repeat-style": "^5.0.1", - "postcss-normalize-string": "^5.0.1", - "postcss-normalize-timing-functions": "^5.0.1", - "postcss-normalize-unicode": "^5.0.1", - "postcss-normalize-url": "^5.0.3", - "postcss-normalize-whitespace": "^5.0.1", - "postcss-ordered-values": "^5.0.2", - "postcss-reduce-initial": "^5.0.2", - "postcss-reduce-transforms": "^5.0.1", - "postcss-svgo": "^5.0.3", - "postcss-unique-selectors": "^5.0.2" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/cssnano-preset-lite": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/cssnano-preset-lite/-/cssnano-preset-lite-2.0.1.tgz", - "integrity": "sha512-PDLB+Zm/Sj3bOmkd471bfN2JAlXBOJAQ+r1GrWjlODdaQyMLJCqPRTvGbqSLbbfMKNsOCG/8SKryZnsSlA9zCA==", - "dev": true, - "dependencies": { - "cssnano-utils": "^2.0.1", - "postcss-discard-comments": "^5.0.1", - "postcss-discard-empty": "^5.0.1", - "postcss-normalize-whitespace": "^5.0.1" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/cssnano-utils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-2.0.1.tgz", - "integrity": "sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ==", - "dev": true, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/csso": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz", - "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==", - "dev": true, - "dependencies": { - "css-tree": "^1.1.2" - }, - "engines": { - "node": ">=8.0.0" - } - }, "node_modules/cssom": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", @@ -19978,12 +19790,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-resolvable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", - "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", - "dev": true - }, "node_modules/is-retry-allowed": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", @@ -23443,12 +23249,6 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/mdn-data": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", - "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", - "dev": true - }, "node_modules/mdurl": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", @@ -25437,100 +25237,6 @@ "url": "https://opencollective.com/postcss/" } }, - "node_modules/postcss-calc": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.0.0.tgz", - "integrity": "sha512-5NglwDrcbiy8XXfPM11F3HeC6hoT9W7GUH/Zi5U/p7u3Irv4rHhdDcIZwG0llHXV4ftsBjpfWMXAnXNl4lnt8g==", - "dev": true, - "dependencies": { - "postcss-selector-parser": "^6.0.2", - "postcss-value-parser": "^4.0.2" - }, - "peerDependencies": { - "postcss": "^8.2.2" - } - }, - "node_modules/postcss-colormin": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.1.tgz", - "integrity": "sha512-VVwMrEYLcHYePUYV99Ymuoi7WhKrMGy/V9/kTS0DkCoJYmmjdOMneyhzYUxcNgteKDVbrewOkSM7Wje/MFwxzA==", - "dev": true, - "dependencies": { - "browserslist": "^4.16.6", - "caniuse-api": "^3.0.0", - "colord": "^2.9.1", - "postcss-value-parser": "^4.1.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-convert-values": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.0.2.tgz", - "integrity": "sha512-KQ04E2yadmfa1LqXm7UIDwW1ftxU/QWZmz6NKnHnUvJ3LEYbbcX6i329f/ig+WnEByHegulocXrECaZGLpL8Zg==", - "dev": true, - "dependencies": { - "postcss-value-parser": "^4.1.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-discard-comments": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz", - "integrity": "sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg==", - "dev": true, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-discard-duplicates": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz", - "integrity": "sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA==", - "dev": true, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-discard-empty": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz", - "integrity": "sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw==", - "dev": true, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-discard-overridden": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz", - "integrity": "sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q==", - "dev": true, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, "node_modules/postcss-flexbugs-fixes": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz", @@ -25687,106 +25393,6 @@ "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=", "dev": true }, - "node_modules/postcss-merge-longhand": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.4.tgz", - "integrity": "sha512-2lZrOVD+d81aoYkZDpWu6+3dTAAGkCKbV5DoRhnIR7KOULVrI/R7bcMjhrH9KTRy6iiHKqmtG+n/MMj1WmqHFw==", - "dev": true, - "dependencies": { - "postcss-value-parser": "^4.1.0", - "stylehacks": "^5.0.1" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-merge-rules": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.3.tgz", - "integrity": "sha512-cEKTMEbWazVa5NXd8deLdCnXl+6cYG7m2am+1HzqH0EnTdy8fRysatkaXb2dEnR+fdaDxTvuZ5zoBdv6efF6hg==", - "dev": true, - "dependencies": { - "browserslist": "^4.16.6", - "caniuse-api": "^3.0.0", - "cssnano-utils": "^2.0.1", - "postcss-selector-parser": "^6.0.5" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-minify-font-values": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz", - "integrity": "sha512-7JS4qIsnqaxk+FXY1E8dHBDmraYFWmuL6cgt0T1SWGRO5bzJf8sUoelwa4P88LEWJZweHevAiDKxHlofuvtIoA==", - "dev": true, - "dependencies": { - "postcss-value-parser": "^4.1.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-minify-gradients": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.3.tgz", - "integrity": "sha512-Z91Ol22nB6XJW+5oe31+YxRsYooxOdFKcbOqY/V8Fxse1Y3vqlNRpi1cxCqoACZTQEhl+xvt4hsbWiV5R+XI9Q==", - "dev": true, - "dependencies": { - "colord": "^2.9.1", - "cssnano-utils": "^2.0.1", - "postcss-value-parser": "^4.1.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-minify-params": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.2.tgz", - "integrity": "sha512-qJAPuBzxO1yhLad7h2Dzk/F7n1vPyfHfCCh5grjGfjhi1ttCnq4ZXGIW77GSrEbh9Hus9Lc/e/+tB4vh3/GpDg==", - "dev": true, - "dependencies": { - "alphanum-sort": "^1.0.2", - "browserslist": "^4.16.6", - "cssnano-utils": "^2.0.1", - "postcss-value-parser": "^4.1.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-minify-selectors": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz", - "integrity": "sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og==", - "dev": true, - "dependencies": { - "alphanum-sort": "^1.0.2", - "postcss-selector-parser": "^6.0.5" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, "node_modules/postcss-modules-extract-imports": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz", @@ -25960,204 +25566,6 @@ "postcss": "^8.2.14" } }, - "node_modules/postcss-normalize-charset": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz", - "integrity": "sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg==", - "dev": true, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-normalize-display-values": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz", - "integrity": "sha512-uupdvWk88kLDXi5HEyI9IaAJTE3/Djbcrqq8YgjvAVuzgVuqIk3SuJWUisT2gaJbZm1H9g5k2w1xXilM3x8DjQ==", - "dev": true, - "dependencies": { - "cssnano-utils": "^2.0.1", - "postcss-value-parser": "^4.1.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-normalize-positions": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz", - "integrity": "sha512-rvzWAJai5xej9yWqlCb1OWLd9JjW2Ex2BCPzUJrbaXmtKtgfL8dBMOOMTX6TnvQMtjk3ei1Lswcs78qKO1Skrg==", - "dev": true, - "dependencies": { - "postcss-value-parser": "^4.1.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-normalize-repeat-style": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz", - "integrity": "sha512-syZ2itq0HTQjj4QtXZOeefomckiV5TaUO6ReIEabCh3wgDs4Mr01pkif0MeVwKyU/LHEkPJnpwFKRxqWA/7O3w==", - "dev": true, - "dependencies": { - "cssnano-utils": "^2.0.1", - "postcss-value-parser": "^4.1.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-normalize-string": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz", - "integrity": "sha512-Ic8GaQ3jPMVl1OEn2U//2pm93AXUcF3wz+OriskdZ1AOuYV25OdgS7w9Xu2LO5cGyhHCgn8dMXh9bO7vi3i9pA==", - "dev": true, - "dependencies": { - "postcss-value-parser": "^4.1.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-normalize-timing-functions": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz", - "integrity": "sha512-cPcBdVN5OsWCNEo5hiXfLUnXfTGtSFiBU9SK8k7ii8UD7OLuznzgNRYkLZow11BkQiiqMcgPyh4ZqXEEUrtQ1Q==", - "dev": true, - "dependencies": { - "cssnano-utils": "^2.0.1", - "postcss-value-parser": "^4.1.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-normalize-unicode": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz", - "integrity": "sha512-kAtYD6V3pK0beqrU90gpCQB7g6AOfP/2KIPCVBKJM2EheVsBQmx/Iof+9zR9NFKLAx4Pr9mDhogB27pmn354nA==", - "dev": true, - "dependencies": { - "browserslist": "^4.16.0", - "postcss-value-parser": "^4.1.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-normalize-url": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.3.tgz", - "integrity": "sha512-qWiUMbvkRx3kc1Dp5opzUwc7MBWZcSDK2yofCmdvFBCpx+zFPkxBC1FASQ59Pt+flYfj/nTZSkmF56+XG5elSg==", - "dev": true, - "dependencies": { - "is-absolute-url": "^3.0.3", - "normalize-url": "^6.0.1", - "postcss-value-parser": "^4.1.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-normalize-url/node_modules/normalize-url": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", - "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/postcss-normalize-whitespace": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz", - "integrity": "sha512-iPklmI5SBnRvwceb/XH568yyzK0qRVuAG+a1HFUsFRf11lEJTiQQa03a4RSCQvLKdcpX7XsI1Gen9LuLoqwiqA==", - "dev": true, - "dependencies": { - "postcss-value-parser": "^4.1.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-ordered-values": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz", - "integrity": "sha512-8AFYDSOYWebJYLyJi3fyjl6CqMEG/UVworjiyK1r573I56kb3e879sCJLGvR3merj+fAdPpVplXKQZv+ey6CgQ==", - "dev": true, - "dependencies": { - "cssnano-utils": "^2.0.1", - "postcss-value-parser": "^4.1.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-reduce-initial": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.0.2.tgz", - "integrity": "sha512-v/kbAAQ+S1V5v9TJvbGkV98V2ERPdU6XvMcKMjqAlYiJ2NtsHGlKYLPjWWcXlaTKNxooId7BGxeraK8qXvzKtw==", - "dev": true, - "dependencies": { - "browserslist": "^4.16.6", - "caniuse-api": "^3.0.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-reduce-transforms": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz", - "integrity": "sha512-a//FjoPeFkRuAguPscTVmRQUODP+f3ke2HqFNgGPwdYnpeC29RZdCBvGRGTsKpMURb/I3p6jdKoBQ2zI+9Q7kA==", - "dev": true, - "dependencies": { - "cssnano-utils": "^2.0.1", - "postcss-value-parser": "^4.1.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, "node_modules/postcss-resolve-nested-selector": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz", @@ -26209,38 +25617,6 @@ "node": ">=4" } }, - "node_modules/postcss-svgo": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.0.3.tgz", - "integrity": "sha512-41XZUA1wNDAZrQ3XgWREL/M2zSw8LJPvb5ZWivljBsUQAGoEKMYm6okHsTjJxKYI4M75RQEH4KYlEM52VwdXVA==", - "dev": true, - "dependencies": { - "postcss-value-parser": "^4.1.0", - "svgo": "^2.7.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-unique-selectors": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.2.tgz", - "integrity": "sha512-w3zBVlrtZm7loQWRPVC0yjUwwpty7OM6DnEHkxcSQXO1bMS3RJ+JUS5LFMSDZHJcvGsRwhZinCWVqn8Kej4EDA==", - "dev": true, - "dependencies": { - "alphanum-sort": "^1.0.2", - "postcss-selector-parser": "^6.0.5" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, "node_modules/postcss-value-parser": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", @@ -31233,22 +30609,6 @@ "inline-style-parser": "0.1.1" } }, - "node_modules/stylehacks": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.0.1.tgz", - "integrity": "sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA==", - "dev": true, - "dependencies": { - "browserslist": "^4.16.0", - "postcss-selector-parser": "^6.0.4" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, "node_modules/stylelint": { "version": "14.1.0", "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.1.0.tgz", @@ -31592,33 +30952,6 @@ "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=", "dev": true }, - "node_modules/svgo": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz", - "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==", - "dev": true, - "dependencies": { - "@trysound/sax": "0.2.0", - "commander": "^7.2.0", - "css-select": "^4.1.3", - "css-tree": "^1.1.3", - "csso": "^4.2.0", - "picocolors": "^1.0.0", - "stable": "^0.1.8" - }, - "bin": { - "svgo": "bin/svgo" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/svgo/node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true - }, "node_modules/symbol-tree": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", @@ -32383,12 +31716,6 @@ "node": ">=0.6.0" } }, - "node_modules/timsort": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", - "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", - "dev": true - }, "node_modules/tiny-emitter": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", @@ -40072,12 +39399,6 @@ "defer-to-connect": "^1.0.1" } }, - "@trysound/sax": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", - "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==", - "dev": true - }, "@tsconfig/node10": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", @@ -41184,12 +40505,6 @@ "dev": true, "requires": {} }, - "alphanum-sort": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", - "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", - "dev": true - }, "ansi-align": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", @@ -43151,18 +42466,6 @@ } } }, - "caniuse-api": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", - "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", - "dev": true, - "requires": { - "browserslist": "^4.0.0", - "caniuse-lite": "^1.0.0", - "lodash.memoize": "^4.1.2", - "lodash.uniq": "^4.5.0" - } - }, "caniuse-lite": { "version": "1.0.30001291", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001291.tgz", @@ -43997,12 +43300,6 @@ "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", "dev": true }, - "colord": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.1.tgz", - "integrity": "sha512-4LBMSt09vR0uLnPVkOUBnmxgoaeN4ewRbx801wY/bXcltXfpR/G46OdWn96XpYmCWuYvO46aBZP4NgX8HpNAcw==", - "dev": true - }, "colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", @@ -44024,12 +43321,6 @@ "integrity": "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==", "dev": true }, - "commander": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", - "dev": true - }, "common-tags": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz", @@ -45560,15 +44851,6 @@ "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", "dev": true }, - "css-declaration-sorter": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz", - "integrity": "sha512-SvjQjNRZgh4ULK1LDJ2AduPKUKxIqmtU7ZAyi47BTV+M90Qvxr9AB6lKlLbDUfXqI9IQeYA8LbAsCZPpJEV3aA==", - "dev": true, - "requires": { - "timsort": "^0.3.0" - } - }, "css-loader": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz", @@ -45666,24 +44948,6 @@ } } }, - "css-tree": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", - "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==", - "dev": true, - "requires": { - "mdn-data": "2.0.14", - "source-map": "^0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, "css-what": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz", @@ -45696,83 +44960,6 @@ "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", "dev": true }, - "cssnano": { - "version": "5.0.12", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.12.tgz", - "integrity": "sha512-U38V4x2iJ3ijPdeWqUrEr4eKBB5PbEKsNP5T8xcik2Au3LeMtiMHX0i2Hu9k51FcKofNZumbrcdC6+a521IUHg==", - "dev": true, - "requires": { - "cssnano-preset-default": "^5.1.8", - "is-resolvable": "^1.1.0", - "lilconfig": "^2.0.3", - "yaml": "^1.10.2" - } - }, - "cssnano-preset-default": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.8.tgz", - "integrity": "sha512-zWMlP0+AMPBVE852SqTrP0DnhTcTA2C1wAF92TKZ3Va+aUVqLIhkqKlnJIXXdqXD7RN+S1ujuWmNpvrJBiM/vg==", - "dev": true, - "requires": { - "css-declaration-sorter": "^6.0.3", - "cssnano-utils": "^2.0.1", - "postcss-calc": "^8.0.0", - "postcss-colormin": "^5.2.1", - "postcss-convert-values": "^5.0.2", - "postcss-discard-comments": "^5.0.1", - "postcss-discard-duplicates": "^5.0.1", - "postcss-discard-empty": "^5.0.1", - "postcss-discard-overridden": "^5.0.1", - "postcss-merge-longhand": "^5.0.4", - "postcss-merge-rules": "^5.0.3", - "postcss-minify-font-values": "^5.0.1", - "postcss-minify-gradients": "^5.0.3", - "postcss-minify-params": "^5.0.2", - "postcss-minify-selectors": "^5.1.0", - "postcss-normalize-charset": "^5.0.1", - "postcss-normalize-display-values": "^5.0.1", - "postcss-normalize-positions": "^5.0.1", - "postcss-normalize-repeat-style": "^5.0.1", - "postcss-normalize-string": "^5.0.1", - "postcss-normalize-timing-functions": "^5.0.1", - "postcss-normalize-unicode": "^5.0.1", - "postcss-normalize-url": "^5.0.3", - "postcss-normalize-whitespace": "^5.0.1", - "postcss-ordered-values": "^5.0.2", - "postcss-reduce-initial": "^5.0.2", - "postcss-reduce-transforms": "^5.0.1", - "postcss-svgo": "^5.0.3", - "postcss-unique-selectors": "^5.0.2" - } - }, - "cssnano-preset-lite": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/cssnano-preset-lite/-/cssnano-preset-lite-2.0.1.tgz", - "integrity": "sha512-PDLB+Zm/Sj3bOmkd471bfN2JAlXBOJAQ+r1GrWjlODdaQyMLJCqPRTvGbqSLbbfMKNsOCG/8SKryZnsSlA9zCA==", - "dev": true, - "requires": { - "cssnano-utils": "^2.0.1", - "postcss-discard-comments": "^5.0.1", - "postcss-discard-empty": "^5.0.1", - "postcss-normalize-whitespace": "^5.0.1" - } - }, - "cssnano-utils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-2.0.1.tgz", - "integrity": "sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ==", - "dev": true, - "requires": {} - }, - "csso": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz", - "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==", - "dev": true, - "requires": { - "css-tree": "^1.1.2" - } - }, "cssom": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", @@ -50932,12 +50119,6 @@ "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=", "dev": true }, - "is-resolvable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", - "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", - "dev": true - }, "is-retry-allowed": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", @@ -53659,12 +52840,6 @@ "integrity": "sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==", "dev": true }, - "mdn-data": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", - "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", - "dev": true - }, "mdurl": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", @@ -55280,65 +54455,6 @@ } } }, - "postcss-calc": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.0.0.tgz", - "integrity": "sha512-5NglwDrcbiy8XXfPM11F3HeC6hoT9W7GUH/Zi5U/p7u3Irv4rHhdDcIZwG0llHXV4ftsBjpfWMXAnXNl4lnt8g==", - "dev": true, - "requires": { - "postcss-selector-parser": "^6.0.2", - "postcss-value-parser": "^4.0.2" - } - }, - "postcss-colormin": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.1.tgz", - "integrity": "sha512-VVwMrEYLcHYePUYV99Ymuoi7WhKrMGy/V9/kTS0DkCoJYmmjdOMneyhzYUxcNgteKDVbrewOkSM7Wje/MFwxzA==", - "dev": true, - "requires": { - "browserslist": "^4.16.6", - "caniuse-api": "^3.0.0", - "colord": "^2.9.1", - "postcss-value-parser": "^4.1.0" - } - }, - "postcss-convert-values": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.0.2.tgz", - "integrity": "sha512-KQ04E2yadmfa1LqXm7UIDwW1ftxU/QWZmz6NKnHnUvJ3LEYbbcX6i329f/ig+WnEByHegulocXrECaZGLpL8Zg==", - "dev": true, - "requires": { - "postcss-value-parser": "^4.1.0" - } - }, - "postcss-discard-comments": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz", - "integrity": "sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg==", - "dev": true, - "requires": {} - }, - "postcss-discard-duplicates": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz", - "integrity": "sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA==", - "dev": true, - "requires": {} - }, - "postcss-discard-empty": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz", - "integrity": "sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw==", - "dev": true, - "requires": {} - }, - "postcss-discard-overridden": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz", - "integrity": "sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q==", - "dev": true, - "requires": {} - }, "postcss-flexbugs-fixes": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz", @@ -55443,70 +54559,6 @@ "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=", "dev": true }, - "postcss-merge-longhand": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.4.tgz", - "integrity": "sha512-2lZrOVD+d81aoYkZDpWu6+3dTAAGkCKbV5DoRhnIR7KOULVrI/R7bcMjhrH9KTRy6iiHKqmtG+n/MMj1WmqHFw==", - "dev": true, - "requires": { - "postcss-value-parser": "^4.1.0", - "stylehacks": "^5.0.1" - } - }, - "postcss-merge-rules": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.3.tgz", - "integrity": "sha512-cEKTMEbWazVa5NXd8deLdCnXl+6cYG7m2am+1HzqH0EnTdy8fRysatkaXb2dEnR+fdaDxTvuZ5zoBdv6efF6hg==", - "dev": true, - "requires": { - "browserslist": "^4.16.6", - "caniuse-api": "^3.0.0", - "cssnano-utils": "^2.0.1", - "postcss-selector-parser": "^6.0.5" - } - }, - "postcss-minify-font-values": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz", - "integrity": "sha512-7JS4qIsnqaxk+FXY1E8dHBDmraYFWmuL6cgt0T1SWGRO5bzJf8sUoelwa4P88LEWJZweHevAiDKxHlofuvtIoA==", - "dev": true, - "requires": { - "postcss-value-parser": "^4.1.0" - } - }, - "postcss-minify-gradients": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.3.tgz", - "integrity": "sha512-Z91Ol22nB6XJW+5oe31+YxRsYooxOdFKcbOqY/V8Fxse1Y3vqlNRpi1cxCqoACZTQEhl+xvt4hsbWiV5R+XI9Q==", - "dev": true, - "requires": { - "colord": "^2.9.1", - "cssnano-utils": "^2.0.1", - "postcss-value-parser": "^4.1.0" - } - }, - "postcss-minify-params": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.2.tgz", - "integrity": "sha512-qJAPuBzxO1yhLad7h2Dzk/F7n1vPyfHfCCh5grjGfjhi1ttCnq4ZXGIW77GSrEbh9Hus9Lc/e/+tB4vh3/GpDg==", - "dev": true, - "requires": { - "alphanum-sort": "^1.0.2", - "browserslist": "^4.16.6", - "cssnano-utils": "^2.0.1", - "postcss-value-parser": "^4.1.0" - } - }, - "postcss-minify-selectors": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz", - "integrity": "sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og==", - "dev": true, - "requires": { - "alphanum-sort": "^1.0.2", - "postcss-selector-parser": "^6.0.5" - } - }, "postcss-modules-extract-imports": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz", @@ -55629,129 +54681,6 @@ "postcss-selector-parser": "^6.0.6" } }, - "postcss-normalize-charset": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz", - "integrity": "sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg==", - "dev": true, - "requires": {} - }, - "postcss-normalize-display-values": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz", - "integrity": "sha512-uupdvWk88kLDXi5HEyI9IaAJTE3/Djbcrqq8YgjvAVuzgVuqIk3SuJWUisT2gaJbZm1H9g5k2w1xXilM3x8DjQ==", - "dev": true, - "requires": { - "cssnano-utils": "^2.0.1", - "postcss-value-parser": "^4.1.0" - } - }, - "postcss-normalize-positions": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz", - "integrity": "sha512-rvzWAJai5xej9yWqlCb1OWLd9JjW2Ex2BCPzUJrbaXmtKtgfL8dBMOOMTX6TnvQMtjk3ei1Lswcs78qKO1Skrg==", - "dev": true, - "requires": { - "postcss-value-parser": "^4.1.0" - } - }, - "postcss-normalize-repeat-style": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz", - "integrity": "sha512-syZ2itq0HTQjj4QtXZOeefomckiV5TaUO6ReIEabCh3wgDs4Mr01pkif0MeVwKyU/LHEkPJnpwFKRxqWA/7O3w==", - "dev": true, - "requires": { - "cssnano-utils": "^2.0.1", - "postcss-value-parser": "^4.1.0" - } - }, - "postcss-normalize-string": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz", - "integrity": "sha512-Ic8GaQ3jPMVl1OEn2U//2pm93AXUcF3wz+OriskdZ1AOuYV25OdgS7w9Xu2LO5cGyhHCgn8dMXh9bO7vi3i9pA==", - "dev": true, - "requires": { - "postcss-value-parser": "^4.1.0" - } - }, - "postcss-normalize-timing-functions": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz", - "integrity": "sha512-cPcBdVN5OsWCNEo5hiXfLUnXfTGtSFiBU9SK8k7ii8UD7OLuznzgNRYkLZow11BkQiiqMcgPyh4ZqXEEUrtQ1Q==", - "dev": true, - "requires": { - "cssnano-utils": "^2.0.1", - "postcss-value-parser": "^4.1.0" - } - }, - "postcss-normalize-unicode": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz", - "integrity": "sha512-kAtYD6V3pK0beqrU90gpCQB7g6AOfP/2KIPCVBKJM2EheVsBQmx/Iof+9zR9NFKLAx4Pr9mDhogB27pmn354nA==", - "dev": true, - "requires": { - "browserslist": "^4.16.0", - "postcss-value-parser": "^4.1.0" - } - }, - "postcss-normalize-url": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.3.tgz", - "integrity": "sha512-qWiUMbvkRx3kc1Dp5opzUwc7MBWZcSDK2yofCmdvFBCpx+zFPkxBC1FASQ59Pt+flYfj/nTZSkmF56+XG5elSg==", - "dev": true, - "requires": { - "is-absolute-url": "^3.0.3", - "normalize-url": "^6.0.1", - "postcss-value-parser": "^4.1.0" - }, - "dependencies": { - "normalize-url": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", - "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", - "dev": true - } - } - }, - "postcss-normalize-whitespace": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz", - "integrity": "sha512-iPklmI5SBnRvwceb/XH568yyzK0qRVuAG+a1HFUsFRf11lEJTiQQa03a4RSCQvLKdcpX7XsI1Gen9LuLoqwiqA==", - "dev": true, - "requires": { - "postcss-value-parser": "^4.1.0" - } - }, - "postcss-ordered-values": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz", - "integrity": "sha512-8AFYDSOYWebJYLyJi3fyjl6CqMEG/UVworjiyK1r573I56kb3e879sCJLGvR3merj+fAdPpVplXKQZv+ey6CgQ==", - "dev": true, - "requires": { - "cssnano-utils": "^2.0.1", - "postcss-value-parser": "^4.1.0" - } - }, - "postcss-reduce-initial": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.0.2.tgz", - "integrity": "sha512-v/kbAAQ+S1V5v9TJvbGkV98V2ERPdU6XvMcKMjqAlYiJ2NtsHGlKYLPjWWcXlaTKNxooId7BGxeraK8qXvzKtw==", - "dev": true, - "requires": { - "browserslist": "^4.16.6", - "caniuse-api": "^3.0.0" - } - }, - "postcss-reduce-transforms": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz", - "integrity": "sha512-a//FjoPeFkRuAguPscTVmRQUODP+f3ke2HqFNgGPwdYnpeC29RZdCBvGRGTsKpMURb/I3p6jdKoBQ2zI+9Q7kA==", - "dev": true, - "requires": { - "cssnano-utils": "^2.0.1", - "postcss-value-parser": "^4.1.0" - } - }, "postcss-resolve-nested-selector": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz", @@ -55782,26 +54711,6 @@ "util-deprecate": "^1.0.2" } }, - "postcss-svgo": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.0.3.tgz", - "integrity": "sha512-41XZUA1wNDAZrQ3XgWREL/M2zSw8LJPvb5ZWivljBsUQAGoEKMYm6okHsTjJxKYI4M75RQEH4KYlEM52VwdXVA==", - "dev": true, - "requires": { - "postcss-value-parser": "^4.1.0", - "svgo": "^2.7.0" - } - }, - "postcss-unique-selectors": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.2.tgz", - "integrity": "sha512-w3zBVlrtZm7loQWRPVC0yjUwwpty7OM6DnEHkxcSQXO1bMS3RJ+JUS5LFMSDZHJcvGsRwhZinCWVqn8Kej4EDA==", - "dev": true, - "requires": { - "alphanum-sort": "^1.0.2", - "postcss-selector-parser": "^6.0.5" - } - }, "postcss-value-parser": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", @@ -59680,16 +58589,6 @@ "inline-style-parser": "0.1.1" } }, - "stylehacks": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.0.1.tgz", - "integrity": "sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA==", - "dev": true, - "requires": { - "browserslist": "^4.16.0", - "postcss-selector-parser": "^6.0.4" - } - }, "stylelint": { "version": "14.1.0", "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.1.0.tgz", @@ -59953,29 +58852,6 @@ "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=", "dev": true }, - "svgo": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz", - "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==", - "dev": true, - "requires": { - "@trysound/sax": "0.2.0", - "commander": "^7.2.0", - "css-select": "^4.1.3", - "css-tree": "^1.1.3", - "csso": "^4.2.0", - "picocolors": "^1.0.0", - "stable": "^0.1.8" - }, - "dependencies": { - "picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true - } - } - }, "symbol-tree": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", @@ -60558,12 +59434,6 @@ "setimmediate": "^1.0.4" } }, - "timsort": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", - "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", - "dev": true - }, "tiny-emitter": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", diff --git a/package.json b/package.json index d5f112bc373..3d5315c2051 100644 --- a/package.json +++ b/package.json @@ -108,8 +108,6 @@ "concurrently": "6.4.0", "conventional-changelog-cli": "2.1.1", "cpy-cli": "^3.1.1", - "cssnano": "5.0.12", - "cssnano-preset-lite": "2.0.1", "dedent": "0.7.0", "eslint": "8.4.1", "eslint-config-prettier": "8.3.0", diff --git a/src/components/calcite-modal/calcite-modal.e2e.ts b/src/components/calcite-modal/calcite-modal.e2e.ts index b4cbd707f02..4724dbd5803 100644 --- a/src/components/calcite-modal/calcite-modal.e2e.ts +++ b/src/components/calcite-modal/calcite-modal.e2e.ts @@ -346,7 +346,7 @@ describe("calcite-modal accessibility checks", () => { const scrim = document.querySelector("calcite-modal").shadowRoot.querySelector(".scrim"); return window.getComputedStyle(scrim).getPropertyValue("--calcite-scrim-background"); }); - expect(scrimStyles).toEqual("rgba(0,0,0,0.75)"); + expect(scrimStyles).toEqual("rgba(0, 0, 0, 0.75)"); }); it("correctly reflects the scale of the modal on the close button icon", async () => { diff --git a/stencil.config.ts b/stencil.config.ts index 7d45a3c284f..7b667b2a8a9 100644 --- a/stencil.config.ts +++ b/stencil.config.ts @@ -5,7 +5,6 @@ import babel from "@rollup/plugin-babel"; import autoprefixer from "autoprefixer"; import tailwindcss from "tailwindcss"; import tailwindConfig from "./tailwind.config"; -import cssnano from "cssnano"; import { generatePreactTypes } from "./support/preact"; export const create: () => Config = () => ({ @@ -101,7 +100,7 @@ export const create: () => Config = () => ({ injectGlobalPaths: ["src/assets/styles/includes.scss"] }), postcss({ - plugins: [tailwindcss(tailwindConfig), autoprefixer(), cssnano({ preset: "lite" })] + plugins: [tailwindcss(tailwindConfig), autoprefixer()] }) ], rollupPlugins: { From dc4bdc81513f8fc0faa9eed0412d3e7d74ed77fd Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Mon, 20 Dec 2021 11:16:05 -0800 Subject: [PATCH 22/24] cleanup fraction values. --- src/components/calcite-notice/calcite-notice.scss | 2 +- .../calcite-shell-center-row/calcite-shell-center-row.scss | 2 +- src/components/calcite-tip/calcite-tip.scss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/calcite-notice/calcite-notice.scss b/src/components/calcite-notice/calcite-notice.scss index d1c7eb48eb8..e1705382364 100644 --- a/src/components/calcite-notice/calcite-notice.scss +++ b/src/components/calcite-notice/calcite-notice.scss @@ -58,7 +58,7 @@ } :host([width="half"]) { - --calcite-notice-width: theme("width.1/2"); + --calcite-notice-width: theme("width[1/2]"); } :host([width="full"]) { diff --git a/src/components/calcite-shell-center-row/calcite-shell-center-row.scss b/src/components/calcite-shell-center-row/calcite-shell-center-row.scss index 6c6ba687168..e70725bc911 100644 --- a/src/components/calcite-shell-center-row/calcite-shell-center-row.scss +++ b/src/components/calcite-shell-center-row/calcite-shell-center-row.scss @@ -36,7 +36,7 @@ } :host([height-scale="s"]) { - height: theme("width.1/3"); + height: theme("width[1/3]"); } :host([height-scale="m"]) { diff --git a/src/components/calcite-tip/calcite-tip.scss b/src/components/calcite-tip/calcite-tip.scss index b2bb062c337..80cce321ce9 100644 --- a/src/components/calcite-tip/calcite-tip.scss +++ b/src/components/calcite-tip/calcite-tip.scss @@ -68,7 +68,7 @@ } .image-frame { - width: theme("width.1/4"); + width: theme("width[1/4]"); img { @apply max-w-full; } From b0ab9486a3a5e04badff26a93b99f0089a8bdc39 Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Mon, 20 Dec 2021 16:07:06 -0800 Subject: [PATCH 23/24] cleanup typing config --- tailwind.config.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tailwind.config.ts b/tailwind.config.ts index 167b9f39f68..7d3be73d9b8 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -3,7 +3,7 @@ import plugin from "tailwindcss/plugin"; export default { theme: { - borderColor: ({ theme }): any => ({ + borderColor: ({ theme }): object => ({ color: { 1: "var(--calcite-ui-border-1)", 2: "var(--calcite-ui-border-2)", @@ -117,10 +117,10 @@ export default { l: "1024px", xl: "1440px" }, - textColor: ({ theme }): any => ({ + textColor: ({ theme }): object => ({ ...theme("colors.text") }), - backgroundColor: ({ theme }): any => ({ + backgroundColor: ({ theme }): object => ({ ...theme("colors.background"), transparent: theme("colors.transparent"), brand: theme("colors.brand"), @@ -155,7 +155,7 @@ export default { "outline-active": "0 0 0 1px var(--calcite-ui-brand)", none: "none" }, - fill: ({ theme }): any => ({ + fill: ({ theme }): object => ({ ...theme("colors.text") }), keyframes: { From f955a9368ed0a1f908aba904f748cb834af0eb83 Mon Sep 17 00:00:00 2001 From: Matt Driscoll Date: Tue, 21 Dec 2021 09:53:49 -0800 Subject: [PATCH 24/24] cleanup config --- src/assets/styles/_header.scss | 5 ++--- .../calcite-split-button.scss | 4 ++-- tailwind.config.ts | 17 ++--------------- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/src/assets/styles/_header.scss b/src/assets/styles/_header.scss index 42a6943989b..a31cd6a6b7c 100644 --- a/src/assets/styles/_header.scss +++ b/src/assets/styles/_header.scss @@ -4,9 +4,8 @@ flex items-center content-between - text-color-2; - - fill: theme("textColor.2"); + text-color-2 + fill-color-2; } .heading { diff --git a/src/components/calcite-split-button/calcite-split-button.scss b/src/components/calcite-split-button/calcite-split-button.scss index 64d1ae85857..f68e9b7d4cd 100644 --- a/src/components/calcite-split-button/calcite-split-button.scss +++ b/src/components/calcite-split-button/calcite-split-button.scss @@ -18,7 +18,7 @@ } &:host([color="neutral"]) { --calcite-split-button-background: theme("colors.background.foreground.3"); - --calcite-split-button-divider: theme("colors.text.1"); + --calcite-split-button-divider: theme("colors.color.1"); } &:host([color="inverse"]) { --calcite-split-button-background: var(--calcite-ui-inverse); @@ -34,7 +34,7 @@ --calcite-split-button-divider: theme("colors.danger"); } &:host([color="neutral"]) { - --calcite-split-button-divider: theme("colors.text.1"); + --calcite-split-button-divider: theme("colors.color.1"); } &:host([color="inverse"]) { --calcite-split-button-divider: theme("colors.background.foreground.1"); diff --git a/tailwind.config.ts b/tailwind.config.ts index 7d3be73d9b8..4b0e33ed46a 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -40,19 +40,12 @@ export default { 3: "var(--calcite-ui-foreground-3)" } }, - text: { + color: { 1: "var(--calcite-ui-text-1)", 2: "var(--calcite-ui-text-2)", 3: "var(--calcite-ui-text-3)", inverse: "var(--calcite-ui-text-inverse)", - link: "var(--calcite-ui-text-link)", - color: { - 1: "var(--calcite-ui-text-1)", - 2: "var(--calcite-ui-text-2)", - 3: "var(--calcite-ui-text-3)", - inverse: "var(--calcite-ui-text-inverse)", - link: "var(--calcite-ui-text-link)" - } + link: "var(--calcite-ui-text-link)" }, transparent: "transparent" }, @@ -117,9 +110,6 @@ export default { l: "1024px", xl: "1440px" }, - textColor: ({ theme }): object => ({ - ...theme("colors.text") - }), backgroundColor: ({ theme }): object => ({ ...theme("colors.background"), transparent: theme("colors.transparent"), @@ -155,9 +145,6 @@ export default { "outline-active": "0 0 0 1px var(--calcite-ui-brand)", none: "none" }, - fill: ({ theme }): object => ({ - ...theme("colors.text") - }), keyframes: { in: { "0%": {