From 46a26363a3295b3cb562baf2c7d0186f12aed021 Mon Sep 17 00:00:00 2001 From: Caleb Pollman Date: Sat, 19 Nov 2022 17:37:39 -0800 Subject: [PATCH 1/5] chore(ui): add csstype devDep to ui package (#3024) --- packages/ui/package.json | 1 + yarn.lock | 815 ++++++++++++++++++++++++--------------- 2 files changed, 497 insertions(+), 319 deletions(-) diff --git a/packages/ui/package.json b/packages/ui/package.json index 8a034887fbc..0742304e5a2 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -61,6 +61,7 @@ "@types/webpack-env": "^1.16.2", "@typescript-eslint/parser": "^5.20.0", "autoprefixer": "^10.3.1", + "csstype": "^3.1.1", "fs-extra": "^10.0.0", "glob": "^7.1.7", "globcat": "^1.3.4", diff --git a/yarn.lock b/yarn.lock index 62ffb0abb2b..6264351c830 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2919,7 +2919,7 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.13.16", "@babel/parser@^7.14.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.7", "@babel/parser@^7.14.8", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.18.8", "@babel/parser@^7.20.1", "@babel/parser@^7.20.2", "@babel/parser@^7.7.0": +"@babel/parser@^7.1.0", "@babel/parser@^7.13.16", "@babel/parser@^7.14.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.7", "@babel/parser@^7.14.8", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.18.8", "@babel/parser@^7.20.1", "@babel/parser@^7.20.2", "@babel/parser@^7.6.0", "@babel/parser@^7.7.0", "@babel/parser@^7.9.6": version "7.20.3" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.3.tgz#5358cf62e380cf69efcb87a7bb922ff88bfac6e2" integrity sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg== @@ -3857,7 +3857,7 @@ "@babel/helper-validator-identifier" "^7.14.9" to-fast-properties "^2.0.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.6", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.8.6": +"@babel/types@^7.0.0", "@babel/types@^7.12.6", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.6.1", "@babel/types@^7.7.0", "@babel/types@^7.8.6", "@babel/types@^7.9.6": version "7.20.2" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.2.tgz#67ac09266606190f496322dbaff360fdaa5e7842" integrity sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog== @@ -4269,6 +4269,25 @@ "@docsearch/css" "3.3.0" algoliasearch "^4.0.0" +"@emmetio/abbreviation@^2.2.3": + version "2.2.3" + resolved "https://registry.yarnpkg.com/@emmetio/abbreviation/-/abbreviation-2.2.3.tgz#2b3c0383c1a4652f677d5b56fb3f1616fe16ef10" + integrity sha512-87pltuCPt99aL+y9xS6GPZ+Wmmyhll2WXH73gG/xpGcQ84DRnptBsI2r0BeIQ0EB/SQTOe2ANPqFqj3Rj5FOGA== + dependencies: + "@emmetio/scanner" "^1.0.0" + +"@emmetio/css-abbreviation@^2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@emmetio/css-abbreviation/-/css-abbreviation-2.1.4.tgz#90362e8a1122ce3b76f6c3157907d30182f53f54" + integrity sha512-qk9L60Y+uRtM5CPbB0y+QNl/1XKE09mSO+AhhSauIfr2YOx/ta3NJw2d8RtCFxgzHeRqFRr8jgyzThbu+MZ4Uw== + dependencies: + "@emmetio/scanner" "^1.0.0" + +"@emmetio/scanner@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@emmetio/scanner/-/scanner-1.0.0.tgz#065b2af6233fe7474d44823e3deb89724af42b5f" + integrity sha512-8HqW8EVqjnCmWXVpqAOZf+EGESdkR27odcMMMGefgKXtar00SoYNSryGv//TELI4T3QFsECo78p+0lmalk/CFA== + "@emotion/cache@^10.0.27", "@emotion/cache@^10.0.9": version "10.0.29" resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.29.tgz#87e7e64f412c060102d589fe7c6dc042e6f9d1e0" @@ -7397,7 +7416,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@17.0.47", "@types/react@>=16", "@types/react@>=16.9.0", "@types/react@^17", "@types/react@^17.0.2": +"@types/react@*", "@types/react@17.0.47", "@types/react@>=16", "@types/react@>=16.9.0", "@types/react@^16", "@types/react@^17", "@types/react@^17.0.2": version "17.0.47" resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.47.tgz#4ee71aaf4c5a9e290e03aa4d0d313c5d666b3b78" integrity sha512-mk0BL8zBinf2ozNr3qPnlu1oyVTYq+4V7WA76RgxUAtf0Em/Wbid38KN6n4abEkvO4xMTBWmnP1FtQzgkEiJoA== @@ -7406,15 +7425,6 @@ "@types/scheduler" "*" csstype "^3.0.2" -"@types/react@^16": - version "16.14.34" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.34.tgz#d129324ffda312044e1c47aab18696e4ed493282" - integrity sha512-b99nWeGGReLh6aKBppghVqp93dFJtgtDOzc8NXM6hewD8PQ2zZG5kBLgbx+VJr7Q7WBMjHxaIl3dwpwwPIUgyA== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - "@types/reactcss@*": version "1.2.6" resolved "https://registry.yarnpkg.com/@types/reactcss/-/reactcss-1.2.6.tgz#133c1e7e896f2726370d1d5a26bf06a30a038bcc" @@ -7930,6 +7940,33 @@ dependencies: "@volar/source-map" "0.40.13" +"@volar/code-gen@^0.27.24": + version "0.27.24" + resolved "https://registry.yarnpkg.com/@volar/code-gen/-/code-gen-0.27.24.tgz#ccdbe858951c1ee4e0c3979232d52412dc46756a" + integrity sha512-s4j/QqOZUW03PeD6LmVYI00Q1C3CfJEOePDOQwDvCTUov4lFk0iSBtFyYhjlLyQ1pdtV1+TDTErkj2aMQtc4PA== + dependencies: + "@volar/shared" "^0.27.24" + "@volar/source-map" "^0.27.24" + +"@volar/html2pug@^0.27.13": + version "0.27.13" + resolved "https://registry.yarnpkg.com/@volar/html2pug/-/html2pug-0.27.13.tgz#48dfa73ecf1ef1955a02a046d0c88845950fac85" + integrity sha512-3NYgNA5F3PDsKbbpOrVdGy2S7ZYmZIbFmbp1A/27DDzjj/uIC9Pj7HXVvbYOzi8HcOxUPt0BMrh4TVzBUaCFww== + dependencies: + domelementtype "^2.2.0" + domhandler "^4.2.0" + htmlparser2 "^6.1.0" + pug "^3.0.2" + +"@volar/shared@^0.27.24": + version "0.27.24" + resolved "https://registry.yarnpkg.com/@volar/shared/-/shared-0.27.24.tgz#a33457ec8ac0b0d367ed54c9e21913a5f8c2d6c2" + integrity sha512-Mi8a4GQaiorfb+o4EqOXDZm9E/uBJXgScFgF+NhtcMBOUKHNMKQyLI7YRGumtyJTTdaX7nSDJjGGTkv23tcOtQ== + dependencies: + upath "^2.0.1" + vscode-jsonrpc "^8.0.0-next.2" + vscode-uri "^3.0.2" + "@volar/source-map@0.40.13": version "0.40.13" resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-0.40.13.tgz#9acbc47614bbd8fa710d233d10fff1b18cb78a80" @@ -7937,6 +7974,21 @@ dependencies: "@vue/reactivity" "3.2.38" +"@volar/source-map@^0.27.24": + version "0.27.24" + resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-0.27.24.tgz#60f2e070c169be82cbf7ffa296a30c2823c5205f" + integrity sha512-2I5a7cXqekZ66D6lHep7ttJgvVVtPEBUIe1hnpcGbnXWNA2ya6f6jKNNyTmrXQyfkh32IEuaUd4kocR+3AKMag== + dependencies: + "@volar/shared" "^0.27.24" + +"@volar/transforms@^0.27.24": + version "0.27.24" + resolved "https://registry.yarnpkg.com/@volar/transforms/-/transforms-0.27.24.tgz#68ebc53dca2e36884e247c0866ec3d24ed815784" + integrity sha512-sOHi1ZSapFlxn7yPl4MO5TXd9aWC0BVq2CgXAJ2EESb+ddh2uJbGQgLLNocX+MDh419cUuuFT2QAJpuWHhJcng== + dependencies: + "@volar/shared" "^0.27.24" + vscode-languageserver "^8.0.0-next.2" + "@volar/typescript-faster@0.40.13": version "0.40.13" resolved "https://registry.yarnpkg.com/@volar/typescript-faster/-/typescript-faster-0.40.13.tgz#5d9600333cc250ad53e8604ff6a2a32e4acfbc86" @@ -7966,6 +8018,18 @@ "@volar/typescript-faster" "0.40.13" "@volar/vue-language-core" "0.40.13" +"@vscode/emmet-helper@^2.7.0": + version "2.8.4" + resolved "https://registry.yarnpkg.com/@vscode/emmet-helper/-/emmet-helper-2.8.4.tgz#ab937e3ce79b0873c604d1ad50a9eeb7abae2937" + integrity sha512-lUki5QLS47bz/U8IlG9VQ+1lfxMtxMZENmU5nu4Z71eOD5j9FK0SmYGL5NiVJg9WBWeAU0VxRADMY2Qpq7BfVg== + dependencies: + emmet "^2.3.0" + jsonc-parser "^2.3.0" + vscode-languageserver-textdocument "^1.0.1" + vscode-languageserver-types "^3.15.1" + vscode-nls "^5.0.0" + vscode-uri "^2.1.2" + "@vue/babel-helper-vue-transform-on@^1.0.2": version "1.0.2" resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.0.2.tgz#9b9c691cd06fc855221a2475c3cc831d774bc7dc" @@ -7996,6 +8060,16 @@ estree-walker "^2.0.2" source-map "^0.6.1" +"@vue/compiler-core@3.2.45": + version "3.2.45" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.45.tgz#d9311207d96f6ebd5f4660be129fb99f01ddb41b" + integrity sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A== + dependencies: + "@babel/parser" "^7.16.4" + "@vue/shared" "3.2.45" + estree-walker "^2.0.2" + source-map "^0.6.1" + "@vue/compiler-dom@3.2.44", "@vue/compiler-dom@^3.2.38": version "3.2.44" resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.44.tgz#0fac337a8a6b3cae586aa8cac62e418aa4c79a83" @@ -8004,6 +8078,14 @@ "@vue/compiler-core" "3.2.44" "@vue/shared" "3.2.44" +"@vue/compiler-dom@^3.2.19": + version "3.2.45" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz#c43cc15e50da62ecc16a42f2622d25dc5fd97dce" + integrity sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw== + dependencies: + "@vue/compiler-core" "3.2.45" + "@vue/shared" "3.2.45" + "@vue/compiler-sfc@3.2.44", "@vue/compiler-sfc@^3.0.5", "@vue/compiler-sfc@^3.2.38": version "3.2.44" resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.44.tgz#3cc87afdd39d1d9294b45bdd3402ef405d2b0938" @@ -8075,6 +8157,13 @@ dependencies: "@vue/shared" "3.2.44" +"@vue/reactivity@^3.2.19": + version "3.2.45" + resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.45.tgz#412a45b574de601be5a4a5d9a8cbd4dee4662ff0" + integrity sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A== + dependencies: + "@vue/shared" "3.2.45" + "@vue/runtime-core@3.2.44": version "3.2.44" resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.44.tgz#14abcb1c005873a2d506eaa0bd41726997a82ea1" @@ -8110,6 +8199,11 @@ resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.44.tgz#d180eae83de86a48a3a0b6aaded546683443ca57" integrity sha512-mGZ44bnn0zpZ36nXtxbrBPno43yr96wjQE1dBEKS1Sieugt27HS4OGZVBRIgsdGzosB7vqZAvu0ttu1FDVdolA== +"@vue/shared@3.2.45", "@vue/shared@^3.2.19": + version "3.2.45" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.45.tgz#a3fffa7489eafff38d984e23d0236e230c818bc2" + integrity sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg== + "@vue/test-utils@^2.0.0": version "2.2.1" resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.2.1.tgz#c16061e081e0f1d3d5a126b79ae93d2abb6d2c17" @@ -8774,31 +8868,16 @@ ansi-html-community@0.0.8: resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA== - -ansi-regex@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1" - integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw== - -ansi-regex@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed" - integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g== +ansi-html@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.8.tgz#e969db193b12bcdfa6727b29ffd8882dc13cc501" + integrity sha512-QROYz1I1Kj+8bTYgx0IlMBpRSCIU+7GjbE0oH+KF7QKc+qSF8YAlIutN59Db17tXN70Ono9upT9Ht0iG93W7ug== -ansi-regex@^5.0.0, ansi-regex@^5.0.1: +ansi-regex@5.0.1, ansi-regex@^2.0.0, ansi-regex@^3.0.0, ansi-regex@^4.1.0, ansi-regex@^5.0.0, ansi-regex@^5.0.1, ansi-regex@^6.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== -ansi-regex@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" - integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== - ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -9095,7 +9174,7 @@ arrify@^1.0.0, arrify@^1.0.1: resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA== -asap@~2.0.6: +asap@~2.0.3, asap@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA== @@ -9117,6 +9196,11 @@ asn1@~0.2.3: dependencies: safer-buffer "~2.1.0" +assert-never@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe" + integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw== + assert-plus@1.0.0, assert-plus@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" @@ -9182,19 +9266,7 @@ async-each@^1.0.1: resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== -async-limiter@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" - integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== - -async@^2.4.0, async@^2.6.4: - version "2.6.4" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" - integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== - dependencies: - lodash "^4.17.14" - -async@^3.2.0, async@^3.2.3: +async@^2.4.0, async@^2.6.4, async@^3.2.0, async@^3.2.2, async@^3.2.3: version "3.2.4" resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== @@ -9204,11 +9276,6 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== -at-least-node@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" - integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== - atob@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" @@ -9833,6 +9900,13 @@ babel-preset-jest@^28.1.3: babel-plugin-transform-undefined-to-void "^6.9.4" lodash "^4.17.11" +babel-walk@3.0.0-canary-5: + version "3.0.0-canary-5" + resolved "https://registry.yarnpkg.com/babel-walk/-/babel-walk-3.0.0-canary-5.tgz#f66ecd7298357aee44955f235a6ef54219104b11" + integrity sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw== + dependencies: + "@babel/types" "^7.9.6" + bail@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" @@ -10575,7 +10649,7 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001202, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001228, caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001426: +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001228, caniuse-lite@^1.0.30001314, caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001426: version "1.0.30001431" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz#e7c59bd1bc518fae03a4656be442ce6c4887a795" integrity sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ== @@ -10751,6 +10825,13 @@ character-entities@^2.0.0: resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-2.0.2.tgz#2d09c2e72cd9523076ccb21157dff66ad43fcc22" integrity sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ== +character-parser@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0" + integrity sha512-+UqJQjFEFaTAs3bNsF2j2kEN1baG/zghZbdqoYEDxGZtJo9LBzl1A+m0D4n3qKx8N2FNv8/Xp6yV9mQmBuptaw== + dependencies: + is-regex "^1.0.3" + character-reference-invalid@^1.0.0: version "1.1.4" resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" @@ -11016,15 +11097,6 @@ cli-width@^3.0.0: resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== -clipboard@^2.0.0: - version "2.0.11" - resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.11.tgz#62180360b97dd668b6b3a84ec226975762a70be5" - integrity sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw== - dependencies: - good-listener "^1.2.2" - select "^1.1.2" - tiny-emitter "^2.0.0" - clipboardy@2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-2.3.0.tgz#3c2903650c68e46a91b388985bc2774287dba290" @@ -11438,6 +11510,14 @@ constant-case@^3.0.4: tslib "^2.0.3" upper-case "^2.0.2" +constantinople@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-4.0.1.tgz#0def113fa0e4dc8de83331a5cf79c8b325213151" + integrity sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw== + dependencies: + "@babel/parser" "^7.6.0" + "@babel/types" "^7.6.1" + constants-browserify@1.0.0, constants-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" @@ -11956,19 +12036,19 @@ cssnano-preset-default@^5.2.13: postcss-svgo "^5.1.0" postcss-unique-selectors "^5.1.1" -cssnano-preset-simple@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/cssnano-preset-simple/-/cssnano-preset-simple-3.0.2.tgz#5d9d0caf4de7a76319b8716a789bb989a028054c" - integrity sha512-7c6EOw3oZshKOZc20Jh+cs2dIKxp0viV043jdal/t1iGVQkoyAQio3rrFWhPgAlkXMu+PRXsslqLhosFTmLhmQ== +cssnano-preset-simple@4.0.0, cssnano-preset-simple@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/cssnano-preset-simple/-/cssnano-preset-simple-4.0.0.tgz#f1aeed23d6d3cb99f946243189934ecfd3c887ee" + integrity sha512-hSqVEM4JOnp5dwAm8LNjkN8wlqZ0zbvbtUbh3bQqfZFIqCNZXoU2xpM/YC01k4TcJJHJemThkbNDaurZTgj5pw== dependencies: - caniuse-lite "^1.0.30001202" + caniuse-lite "^1.0.30001314" -cssnano-simple@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/cssnano-simple/-/cssnano-simple-3.0.0.tgz#a4b8ccdef4c7084af97e19bc5b93b4ecf211e90f" - integrity sha512-oU3ueli5Dtwgh0DyeohcIEE00QVfbPR3HzyXdAl89SfnQG3y0/qcpfLVW+jPIh3/rgMZGwuW96rejZGaYE9eUg== +cssnano-simple@3.0.0, cssnano-simple@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/cssnano-simple/-/cssnano-simple-3.0.2.tgz#97c301cad6d8f121ac3361aa01cab68bbf8f9504" + integrity sha512-16jgh/dmhAhA529g2+s6vlxbIDvG9r/sT8y50y63ZBIXVxPqG1KpL3pjNOu9a9HWGJOGeG6j7TqexpHOvRGMkw== dependencies: - cssnano-preset-simple "^3.0.0" + cssnano-preset-simple "^4.0.0" cssnano-utils@^3.1.0: version "3.1.0" @@ -12013,7 +12093,7 @@ csstype@^2.5.7, csstype@^2.6.8: resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.21.tgz#2efb85b7cc55c80017c66a5ad7cbd931fda3a90e" integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w== -csstype@^3.0.2: +csstype@^3.0.2, csstype@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9" integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw== @@ -12385,11 +12465,6 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== -delegate@^3.1.2: - version "3.2.0" - resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166" - integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw== - delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" @@ -12581,6 +12656,11 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" +doctypes@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9" + integrity sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ== + dom-accessibility-api@^0.5.6, dom-accessibility-api@^0.5.9: version "0.5.14" resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.14.tgz#56082f71b1dc7aac69d83c4285eef39c15d93f56" @@ -12819,12 +12899,7 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -ejs@^2.7.4: - version "2.7.4" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" - integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== - -ejs@^3.1.5: +ejs@^2.7.4, ejs@^3.1.5, ejs@^3.1.7: version "3.1.8" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b" integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ== @@ -12866,6 +12941,14 @@ emittery@^0.8.1: resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860" integrity sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg== +emmet@^2.3.0: + version "2.3.6" + resolved "https://registry.yarnpkg.com/emmet/-/emmet-2.3.6.tgz#1d93c1ac03164da9ddf74864c1f341ed6ff6c336" + integrity sha512-pLS4PBPDdxuUAmw7Me7+TcHbykTsBKN/S9XJbUOMFQrNv9MoshzyMFK/R57JBm94/6HSL4vHnDeEmxlC82NQ4A== + dependencies: + "@emmetio/abbreviation" "^2.2.3" + "@emmetio/css-abbreviation" "^2.1.4" + emoji-regex@^7.0.1: version "7.0.3" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" @@ -12881,11 +12964,6 @@ emoji-regex@^9.2.2: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== -emojis-list@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" - integrity sha512-knHEZMgs8BB+MInokmNTg/OyPlAddghe1YBgNwJBc5zsJi/uyIcXoSDsL/W9ymOsBoBGdPIHXYJ9+qKFwRwDng== - emojis-list@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" @@ -13971,12 +14049,7 @@ events@^3.0.0, events@^3.1.0, events@^3.2.0: resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== -eventsource@^1.0.7: - version "1.1.2" - resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.2.tgz#bc75ae1c60209e7cb1541231980460343eaea7c2" - integrity sha512-xAH3zWhgO2/3KIniEKYPr8plNSzlGINOUqYj0m0u7AB81iRw8b/3E73W6AuU+6klLbaSFmZnaETQ2lXPfAydrA== - -eventsource@^2.0.2: +eventsource@^1.0.7, eventsource@^2.0.2, eventsource@~2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-2.0.2.tgz#76dfcc02930fb2ff339520b6d290da573a9e8508" integrity sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA== @@ -14698,16 +14771,7 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== -fs-extra@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950" - integrity sha512-VerQV6vEKuhDWD2HGOybV6v5I73syoc/cXAbKlgTC7M/oFVEtklWlp9QH2Ijw3IaWDOQcMkldSPa7zXy79Z/UQ== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^2.1.0" - klaw "^1.0.0" - -fs-extra@^10.0.0, fs-extra@^10.1.0: +fs-extra@^1.0.0, fs-extra@^10.0.0, fs-extra@^10.1.0, fs-extra@^5.0.0, fs-extra@^7.0.1, fs-extra@^8.0.1, fs-extra@^8.1.0, fs-extra@^9.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== @@ -14716,43 +14780,6 @@ fs-extra@^10.0.0, fs-extra@^10.1.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-extra@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd" - integrity sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-extra@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" - integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-extra@^8.0.1, fs-extra@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" - integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-extra@^9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" - integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== - dependencies: - at-least-node "^1.0.0" - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - fs-minipass@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" @@ -15040,29 +15067,7 @@ glob-base@^0.3.0: glob-parent "^2.0.0" is-glob "^2.0.0" -glob-parent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" - integrity sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w== - dependencies: - is-glob "^2.0.0" - -glob-parent@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" - integrity sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA== - dependencies: - is-glob "^3.1.0" - path-dirname "^1.0.0" - -glob-parent@^5.1.2, glob-parent@~5.1.0, glob-parent@~5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" - integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== - dependencies: - is-glob "^4.0.1" - -glob-parent@^6.0.0, glob-parent@^6.0.2: +glob-parent@^2.0.0, glob-parent@^3.1.0, glob-parent@^5.1.2, glob-parent@^6.0.0, glob-parent@^6.0.2, glob-parent@~5.1.0, glob-parent@~5.1.2: version "6.0.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== @@ -15235,13 +15240,6 @@ globcat@^1.3.4: command-line-usage "^6.1.1" glob "^7.1.6" -good-listener@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50" - integrity sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw== - dependencies: - delegate "^3.1.2" - gopd@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" @@ -15249,7 +15247,7 @@ gopd@^1.0.1: dependencies: get-intrinsic "^1.1.3" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.5, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.5, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== @@ -15969,15 +15967,10 @@ immediate@~3.0.5: resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ== -immer@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/immer/-/immer-1.10.0.tgz#bad67605ba9c810275d91e1c2a47d4582e98286d" - integrity sha512-O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg== - -immer@9.0.6: - version "9.0.6" - resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.6.tgz#7a96bf2674d06c8143e327cbf73539388ddf1a73" - integrity sha512-G95ivKpy+EvVAnAab4fVa4YGYn24J1SpEktnJX7JJ45Bd7xqME/SCplFzYFmTbrkwZbQ4xJK1xMTUYBkN6pWsQ== +immer@1.10.0, immer@9.0.6, immer@^9.0.6: + version "9.0.16" + resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.16.tgz#8e7caab80118c2b54b37ad43e05758cdefad0198" + integrity sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ== immutable@^4.0.0: version "4.1.0" @@ -16421,6 +16414,14 @@ is-dom@^1.0.9: is-object "^1.0.1" is-window "^1.0.2" +is-expression@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-4.0.0.tgz#c33155962abf21d0afd2552514d67d2ec16fd2ab" + integrity sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A== + dependencies: + acorn "^7.1.1" + object-assign "^4.1.1" + is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -16438,7 +16439,7 @@ is-extglob@^1.0.0: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" integrity sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww== -is-extglob@^2.1.0, is-extglob@^2.1.1: +is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== @@ -16489,13 +16490,6 @@ is-glob@^2.0.0: dependencies: is-extglob "^1.0.0" -is-glob@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" - integrity sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw== - dependencies: - is-extglob "^2.1.0" - is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" @@ -16663,6 +16657,11 @@ is-potential-custom-element-name@^1.0.1: resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== +is-promise@^2.0.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" + integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== + is-reference@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7" @@ -16677,7 +16676,7 @@ is-reference@^3.0.0: dependencies: "@types/estree" "*" -is-regex@^1.0.4, is-regex@^1.1.4: +is-regex@^1.0.3, is-regex@^1.0.4, is-regex@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== @@ -17919,6 +17918,11 @@ js-sdsl@^4.1.4: resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.5.tgz#1ff1645e6b4d1b028cd3f862db88c9d887f26e2a" integrity sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q== +js-stringify@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db" + integrity sha512-rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g== + "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -18042,7 +18046,7 @@ json-schema-traverse@^1.0.0: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== -json-schema@0.4.0: +json-schema@0.4.0, json-schema@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5" integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA== @@ -18084,25 +18088,16 @@ jsonc-parser@3.0.0: resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22" integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA== +jsonc-parser@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.3.1.tgz#59549150b133f2efacca48fe9ce1ec0659af2342" + integrity sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg== + jsonc-parser@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76" integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w== -jsonfile@^2.1.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8" - integrity sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw== - optionalDependencies: - graceful-fs "^4.1.6" - -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg== - optionalDependencies: - graceful-fs "^4.1.6" - jsonfile@^6.0.1: version "6.1.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" @@ -18137,6 +18132,14 @@ jsprim@^2.0.2: json-schema "0.4.0" verror "1.10.0" +jstransformer@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3" + integrity sha512-C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A== + dependencies: + is-promise "^2.0.0" + promise "^7.0.1" + "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.2: version "3.3.3" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz#76b3e6e6cece5c69d49a5792c3d01bd1a0cdc7ea" @@ -18257,13 +18260,6 @@ kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== -klaw@^1.0.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439" - integrity sha512-TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw== - optionalDependencies: - graceful-fs "^4.1.9" - kleur@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" @@ -18498,34 +18494,7 @@ loader-runner@^4.2.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== -loader-utils@1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" - integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== - dependencies: - big.js "^5.2.2" - emojis-list "^2.0.0" - json5 "^1.0.1" - -loader-utils@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" - integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^2.1.2" - -loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0: - version "1.4.2" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3" - integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^1.0.1" - -loader-utils@^2.0.0: +loader-utils@1.2.3, loader-utils@2.0.0, loader-utils@2.0.3, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0, loader-utils@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.3.tgz#d4b15b8504c63d1fc3f2ade52d41bc8459d6ede1" integrity sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A== @@ -18706,7 +18675,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ== -lodash@4.17.21, lodash@^4, lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0: +lodash@4.17.21, lodash@^4, lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -20162,6 +20131,13 @@ minimatch@3.0.4: dependencies: brace-expansion "^1.1.7" +minimatch@3.0.5: + version "3.0.5" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3" + integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw== + dependencies: + brace-expansion "^1.1.7" + minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" @@ -20690,10 +20666,10 @@ node-fetch@2.6.7, node-fetch@^2.2.0, node-fetch@^2.5.0, node-fetch@^2.6.0, node- dependencies: whatwg-url "^5.0.0" -node-forge@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" - integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== +node-forge@1.3.0, node-forge@^0.10.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.0.tgz#37a874ea723855f37db091e6c186e5b67a01d4b2" + integrity sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA== node-gyp-build@^4.2.2: version "4.5.0" @@ -20955,20 +20931,13 @@ npmlog@^6.0.0: gauge "^4.0.3" set-blocking "^2.0.0" -nth-check@^2.0.1: +nth-check@^2.0.1, nth-check@~1.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d" integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w== dependencies: boolbase "^1.0.0" -nth-check@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" - integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== - dependencies: - boolbase "~1.0.0" - nullthrows@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1" @@ -21605,11 +21574,6 @@ path-case@^3.0.4: dot-case "^3.0.4" tslib "^2.0.3" -path-dirname@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" - integrity sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q== - path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" @@ -22671,25 +22635,11 @@ prism-react-renderer@1.2.1, prism-react-renderer@^1.2.1: resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.2.1.tgz#392460acf63540960e5e3caa699d851264e99b89" integrity sha512-w23ch4f75V1Tnz8DajsYKvY5lF7H1+WvzvLUcF0paFxkTHSp42RS0H5CttdN2Q8RR3DRGZ9v5xD/h3n8C8kGmg== -prismjs@^1.8.4: +prismjs@^1.25.0, prismjs@^1.8.4, prismjs@~1.17.0, prismjs@~1.23.0: version "1.29.0" resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.29.0.tgz#f113555a8fa9b57c35e637bba27509dcf802dd12" integrity sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q== -prismjs@~1.17.0: - version "1.17.1" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.17.1.tgz#e669fcbd4cdd873c35102881c33b14d0d68519be" - integrity sha512-PrEDJAFdUGbOP6xK/UsfkC5ghJsPJviKgnQOoxaDbBjwc8op68Quupwt1DeAFoG8GImPhiKXAvvsH7wDSLsu1Q== - optionalDependencies: - clipboard "^2.0.0" - -prismjs@~1.23.0: - version "1.23.0" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.23.0.tgz#d3b3967f7d72440690497652a9d40ff046067f33" - integrity sha512-c29LVsqOaLbBHuIbsTxaKENh1N2EQBOHaWv7gkHN4dgRbxSREqDnDbtFJYdpPauS4YCplMSNCABQ6Eeor69bAA== - optionalDependencies: - clipboard "^2.0.0" - process-nextick-args@^2.0.1, process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -22744,6 +22694,13 @@ promise.prototype.finally@^3.1.0: define-properties "^1.1.4" es-abstract "^1.20.4" +promise@^7.0.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" + integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== + dependencies: + asap "~2.0.3" + promise@^8.0.3, promise@^8.2.0: version "8.3.0" resolved "https://registry.yarnpkg.com/promise/-/promise-8.3.0.tgz#8cb333d1edeb61ef23869fbb8a4ea0279ab60e0a" @@ -22851,6 +22808,109 @@ public-encrypt@^4.0.0: randombytes "^2.0.1" safe-buffer "^5.1.2" +pug-attrs@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-3.0.0.tgz#b10451e0348165e31fad1cc23ebddd9dc7347c41" + integrity sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA== + dependencies: + constantinople "^4.0.1" + js-stringify "^1.0.2" + pug-runtime "^3.0.0" + +pug-code-gen@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-3.0.2.tgz#ad190f4943133bf186b60b80de483100e132e2ce" + integrity sha512-nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg== + dependencies: + constantinople "^4.0.1" + doctypes "^1.1.0" + js-stringify "^1.0.2" + pug-attrs "^3.0.0" + pug-error "^2.0.0" + pug-runtime "^3.0.0" + void-elements "^3.1.0" + with "^7.0.0" + +pug-error@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-2.0.0.tgz#5c62173cb09c34de2a2ce04f17b8adfec74d8ca5" + integrity sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ== + +pug-filters@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-4.0.0.tgz#d3e49af5ba8472e9b7a66d980e707ce9d2cc9b5e" + integrity sha512-yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A== + dependencies: + constantinople "^4.0.1" + jstransformer "1.0.0" + pug-error "^2.0.0" + pug-walk "^2.0.0" + resolve "^1.15.1" + +pug-lexer@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-5.0.1.tgz#ae44628c5bef9b190b665683b288ca9024b8b0d5" + integrity sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w== + dependencies: + character-parser "^2.2.0" + is-expression "^4.0.0" + pug-error "^2.0.0" + +pug-linker@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-4.0.0.tgz#12cbc0594fc5a3e06b9fc59e6f93c146962a7708" + integrity sha512-gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw== + dependencies: + pug-error "^2.0.0" + pug-walk "^2.0.0" + +pug-load@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-3.0.0.tgz#9fd9cda52202b08adb11d25681fb9f34bd41b662" + integrity sha512-OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ== + dependencies: + object-assign "^4.1.1" + pug-walk "^2.0.0" + +pug-parser@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-6.0.0.tgz#a8fdc035863a95b2c1dc5ebf4ecf80b4e76a1260" + integrity sha512-ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw== + dependencies: + pug-error "^2.0.0" + token-stream "1.0.0" + +pug-runtime@^3.0.0, pug-runtime@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-3.0.1.tgz#f636976204723f35a8c5f6fad6acda2a191b83d7" + integrity sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg== + +pug-strip-comments@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz#f94b07fd6b495523330f490a7f554b4ff876303e" + integrity sha512-zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ== + dependencies: + pug-error "^2.0.0" + +pug-walk@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-2.0.0.tgz#417aabc29232bb4499b5b5069a2b2d2a24d5f5fe" + integrity sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ== + +pug@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/pug/-/pug-3.0.2.tgz#f35c7107343454e43bc27ae0ff76c731b78ea535" + integrity sha512-bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw== + dependencies: + pug-code-gen "^3.0.2" + pug-filters "^4.0.0" + pug-lexer "^5.0.1" + pug-linker "^4.0.0" + pug-load "^3.0.0" + pug-parser "^6.0.0" + pug-runtime "^3.0.1" + pug-strip-comments "^2.0.0" + pump@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" @@ -24157,6 +24217,11 @@ repeat-string@^1.0.0, repeat-string@^1.6.1: resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== +request-light@^0.5.4: + version "0.5.8" + resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.5.8.tgz#8bf73a07242b9e7b601fac2fa5dc22a094abcc27" + integrity sha512-3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg== + request-progress@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe" @@ -24292,7 +24357,7 @@ resolve@1.20.0: is-core-module "^2.2.0" path-parse "^1.0.6" -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.21.0, resolve@^1.22.0, resolve@^1.3.2: +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.21.0, resolve@^1.22.0, resolve@^1.3.2: version "1.22.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== @@ -24665,11 +24730,6 @@ select-hose@^2.0.0: resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg== -select@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d" - integrity sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA== - selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1: version "3.6.0" resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz#2ba87a1662c020b8988c981ae62cb2a01298eafc" @@ -24919,12 +24979,7 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shell-quote@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2" - integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg== - -shell-quote@^1.6.1, shell-quote@^1.7.3: +shell-quote@1.7.2, shell-quote@1.7.3, shell-quote@^1.6.1, shell-quote@^1.7.3: version "1.7.3" resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw== @@ -26344,11 +26399,6 @@ timers-browserify@2.0.12, timers-browserify@^2.0.4: dependencies: setimmediate "^1.0.4" -tiny-emitter@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423" - integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q== - tinycolor2@1.4.2, tinycolor2@^1.4.1: version "1.4.2" resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.2.tgz#3f6a4d1071ad07676d7fa472e1fac40a719d8803" @@ -26457,6 +26507,11 @@ toidentifier@1.0.1: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== +token-stream@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-1.0.0.tgz#cc200eab2613f4166d27ff9afc7ca56d49df6eb4" + integrity sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg== + toml@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee" @@ -26519,16 +26574,16 @@ trim-lines@^3.0.0: resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-3.0.1.tgz#d802e332a07df861c48802c04321017b1bd87338" integrity sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg== -trim-newlines@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20" - integrity sha512-MTBWv3jhVjTU7XR3IQHllbiJs8sc75a80OEhB6or/q7pLTWgQ0bMGQXXYQSrSuXe6WiKWDZ5txXY5P59a/coVA== - -trim-newlines@^3.0.0: +trim-newlines@3.0.1, trim-newlines@^2.0.0, trim-newlines@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== +trim@^0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.3.tgz#05243a47a3a4113e6b49367880a9cca59697a20b" + integrity sha512-h82ywcYhHK7veeelXrCScdH7HkWfbIT1D/CgYO+nmDarz3SGNssVBMws6jU16Ga60AJCRAvPV6w6RLuNerQqjg== + trough@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" @@ -27132,11 +27187,6 @@ universal-cookie@^4.0.4: "@types/cookie" "^0.3.3" cookie "^0.4.0" -universalify@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== - universalify@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" @@ -27223,6 +27273,11 @@ upath@^1.1.1: resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== +upath@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b" + integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w== + update-browserslist-db@^1.0.9: version "1.0.10" resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" @@ -27586,6 +27641,135 @@ void-elements@^2.0.0: resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung== +void-elements@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09" + integrity sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w== + +vscode-css-languageservice@^5.1.4: + version "5.4.2" + resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-5.4.2.tgz#69ea74c000bd653dfc8e458a1720d28b9ffa5cfb" + integrity sha512-DT7+7vfdT2HDNjDoXWtYJ0lVDdeDEdbMNdK4PKqUl2MS8g7PWt7J5G9B6k9lYox8nOfhCEjLnoNC3UKHHCR1lg== + dependencies: + vscode-languageserver-textdocument "^1.0.4" + vscode-languageserver-types "^3.16.0" + vscode-nls "^5.0.0" + vscode-uri "^3.0.3" + +vscode-html-languageservice@^4.0.7: + version "4.2.5" + resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-4.2.5.tgz#c0cc8ff3d824d16388bbac187e1828749eccf006" + integrity sha512-dbr10KHabB9EaK8lI0XZW7SqOsTfrNyT3Nuj0GoPi4LjGKUmMiLtsqzfedIzRTzqY+w0FiLdh0/kQrnQ0tLxrw== + dependencies: + vscode-languageserver-textdocument "^1.0.4" + vscode-languageserver-types "^3.16.0" + vscode-nls "^5.0.0" + vscode-uri "^3.0.3" + +vscode-json-languageservice@^4.1.7: + version "4.2.1" + resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-4.2.1.tgz#94b6f471ece193bf4a1ef37f6ab5cce86d50a8b4" + integrity sha512-xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA== + dependencies: + jsonc-parser "^3.0.0" + vscode-languageserver-textdocument "^1.0.3" + vscode-languageserver-types "^3.16.0" + vscode-nls "^5.0.0" + vscode-uri "^3.0.3" + +vscode-jsonrpc@8.0.2, vscode-jsonrpc@^8.0.0-next.2: + version "8.0.2" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2.tgz#f239ed2cd6004021b6550af9fd9d3e47eee3cac9" + integrity sha512-RY7HwI/ydoC1Wwg4gJ3y6LpU9FJRZAUnTYMXthqhFXXu77ErDd/xkREpGuk4MyYkk4a+XDWAMqe0S3KkelYQEQ== + +vscode-languageserver-protocol@3.17.2: + version "3.17.2" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2.tgz#beaa46aea06ed061576586c5e11368a9afc1d378" + integrity sha512-8kYisQ3z/SQ2kyjlNeQxbkkTNmVFoQCqkmGrzLH6A9ecPlgTbp3wDTnUNqaUxYr4vlAcloxx8zwy7G5WdguYNg== + dependencies: + vscode-jsonrpc "8.0.2" + vscode-languageserver-types "3.17.2" + +vscode-languageserver-textdocument@^1.0.1, vscode-languageserver-textdocument@^1.0.3, vscode-languageserver-textdocument@^1.0.4: + version "1.0.7" + resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.7.tgz#16df468d5c2606103c90554ae05f9f3d335b771b" + integrity sha512-bFJH7UQxlXT8kKeyiyu41r22jCZXG8kuuVVA33OEJn1diWOZK5n8zBSPZFHVBOu8kXZ6h0LIRhf5UnCo61J4Hg== + +vscode-languageserver-types@3.17.2, vscode-languageserver-types@^3.15.1, vscode-languageserver-types@^3.16.0: + version "3.17.2" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz#b2c2e7de405ad3d73a883e91989b850170ffc4f2" + integrity sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA== + +vscode-languageserver@^8.0.0-next.2: + version "8.0.2" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.0.2.tgz#cfe2f0996d9dfd40d3854e786b2821604dfec06d" + integrity sha512-bpEt2ggPxKzsAOZlXmCJ50bV7VrxwCS5BI4+egUmure/oI/t4OlFzi/YNtVvY24A2UDOZAgwFGgnZPwqSJubkA== + dependencies: + vscode-languageserver-protocol "3.17.2" + +vscode-nls@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f" + integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng== + +vscode-pug-languageservice@^0.27.24: + version "0.27.24" + resolved "https://registry.yarnpkg.com/vscode-pug-languageservice/-/vscode-pug-languageservice-0.27.24.tgz#fa805c4d3e33dee3681e660a0767136738e68370" + integrity sha512-GSvsFB+rPhAD7cBlEKCVNNsFGIaOnp/0zyLw3WpYbXY24vJZafXu1kHvtYaaQXJRnIhqp5EI5p+EqpdI3hTBnw== + dependencies: + "@volar/code-gen" "^0.27.24" + "@volar/shared" "^0.27.24" + "@volar/source-map" "^0.27.24" + "@volar/transforms" "^0.27.24" + pug-lexer "^5.0.1" + pug-parser "^6.0.0" + vscode-languageserver "^8.0.0-next.2" + +vscode-typescript-languageservice@^0.27.25: + version "0.27.25" + resolved "https://registry.yarnpkg.com/vscode-typescript-languageservice/-/vscode-typescript-languageservice-0.27.25.tgz#acd211723b600108c25515388b75d55ce15bb056" + integrity sha512-nxpJI9MnF2rn5rKL/032Qrsq3T9DgM3slK5fwZp3suNdo90JG2zFTs3Ola8n62k7+KWu4A775obxyb4wLIW6Gw== + dependencies: + "@volar/shared" "^0.27.24" + semver "^7.3.5" + upath "^2.0.1" + vscode-languageserver "^8.0.0-next.2" + vscode-languageserver-textdocument "^1.0.1" + +vscode-uri@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.2.tgz#c8d40de93eb57af31f3c715dd650e2ca2c096f1c" + integrity sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A== + +vscode-uri@^3.0.2, vscode-uri@^3.0.3: + version "3.0.6" + resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.6.tgz#5e6e2e1a4170543af30151b561a41f71db1d6f91" + integrity sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ== + +vscode-vue-languageservice@0.27.26: + version "0.27.26" + resolved "https://registry.yarnpkg.com/vscode-vue-languageservice/-/vscode-vue-languageservice-0.27.26.tgz#d20d2b526aa73d003d1329a451328374b9502e2c" + integrity sha512-Xui/YWho4f8OhaUVXYRFe27c4ZHXkZNlblQhh3/vU+TdhDxtcJ/4KK4IWVdotg8Oy0008XI1Ede8QS4zTylDsw== + dependencies: + "@volar/code-gen" "^0.27.24" + "@volar/html2pug" "^0.27.13" + "@volar/shared" "^0.27.24" + "@volar/source-map" "^0.27.24" + "@volar/transforms" "^0.27.24" + "@vscode/emmet-helper" "^2.7.0" + "@vue/compiler-dom" "^3.2.19" + "@vue/reactivity" "^3.2.19" + "@vue/shared" "^3.2.19" + request-light "^0.5.4" + upath "^2.0.1" + vscode-css-languageservice "^5.1.4" + vscode-html-languageservice "^4.0.7" + vscode-json-languageservice "^4.1.7" + vscode-languageserver "^8.0.0-next.2" + vscode-languageserver-textdocument "^1.0.1" + vscode-pug-languageservice "^0.27.24" + vscode-typescript-languageservice "^0.27.25" + vt-pbf@^3.1.1, vt-pbf@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/vt-pbf/-/vt-pbf-3.1.3.tgz#68fd150756465e2edae1cc5c048e063916dcfaac" @@ -28159,6 +28343,16 @@ window-size@^0.1.4: resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" integrity sha512-2thx4pB0cV3h+Bw7QmMXcEbdmOzv9t0HFplJH/Lz6yu60hXYy5RT8rUu+wlIreVxWsGN20mo+MHeCSfUpQBwPw== +with@^7.0.0: + version "7.0.2" + resolved "https://registry.yarnpkg.com/with/-/with-7.0.2.tgz#ccee3ad542d25538a7a7a80aad212b9828495bac" + integrity sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w== + dependencies: + "@babel/parser" "^7.9.6" + "@babel/types" "^7.9.6" + assert-never "^1.2.1" + babel-walk "3.0.0-canary-5" + word-wrap@^1.2.3, word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" @@ -28253,28 +28447,11 @@ write-file-atomic@^4.0.1: imurmurhash "^0.1.4" signal-exit "^3.0.7" -ws@*, ws@^7, ws@^7.1.2, ws@^7.4.6, ws@^7.5.1, ws@^7.5.5: +ws@*, ws@8.5.0, ws@^6.1.4, ws@^6.2.1, ws@^7, ws@^7.1.2, ws@^7.4.6, ws@^7.5.1, ws@^7.5.5, ws@~8.2.3: version "7.5.9" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== -ws@8.5.0: - version "8.5.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" - integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== - -ws@^6.1.4, ws@^6.2.1: - version "6.2.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e" - integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw== - dependencies: - async-limiter "~1.0.0" - -ws@~8.2.3: - version "8.2.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" - integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== - xcode@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/xcode/-/xcode-3.0.1.tgz#3efb62aac641ab2c702458f9a0302696146aa53c" From 4f8188f3e237e7831b1297286129050757e15d9f Mon Sep 17 00:00:00 2001 From: Ioana Brooks <68251134+ioanabrooks@users.noreply.github.com> Date: Sat, 19 Nov 2022 21:20:57 -0800 Subject: [PATCH 2/5] chore(ui-react-native): Update RNA theme support (#3025) --- packages/react-native/src/primitives/Tabs/Tabs.tsx | 2 +- packages/react-native/src/primitives/Tabs/types.ts | 6 ++++-- .../react-native/src/theme/__tests__/createTheme.spec.ts | 5 +++-- packages/react-native/src/theme/types.ts | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/react-native/src/primitives/Tabs/Tabs.tsx b/packages/react-native/src/primitives/Tabs/Tabs.tsx index 8caf833ed48..762d6a8e34d 100644 --- a/packages/react-native/src/primitives/Tabs/Tabs.tsx +++ b/packages/react-native/src/primitives/Tabs/Tabs.tsx @@ -7,10 +7,10 @@ import { TabProps, TabsProps } from './types'; export default function Tabs({ children, + indicatorPosition = 'bottom', onChange, selectedIndex = 0, style, - indicatorPosition, ...rest }: TabsProps): JSX.Element { const theme = useTheme(); diff --git a/packages/react-native/src/primitives/Tabs/types.ts b/packages/react-native/src/primitives/Tabs/types.ts index a1f764af2a8..a0e4f29afea 100644 --- a/packages/react-native/src/primitives/Tabs/types.ts +++ b/packages/react-native/src/primitives/Tabs/types.ts @@ -2,6 +2,8 @@ import { TextStyle, ViewProps, ViewStyle } from 'react-native'; import { ButtonProps } from '../Button'; +type IndicatorPosition = 'top' | 'bottom'; + export interface TabsProps extends ViewProps { /** * @description @@ -28,7 +30,7 @@ export interface TabsProps extends ViewProps { * @description * Sets the border and indicator of the tabs to be the top or bottom. */ - indicatorPosition?: 'top' | 'bottom'; + indicatorPosition?: IndicatorPosition; } export interface TabProps extends ButtonProps { @@ -37,7 +39,7 @@ export interface TabProps extends ButtonProps { * Indicates if a Tab is currently selected */ selected?: boolean; - indicatorPosition?: 'top' | 'bottom'; + indicatorPosition?: IndicatorPosition; } export interface TabsStyles { diff --git a/packages/react-native/src/theme/__tests__/createTheme.spec.ts b/packages/react-native/src/theme/__tests__/createTheme.spec.ts index d0d9dcc4c58..358661ed8f4 100644 --- a/packages/react-native/src/theme/__tests__/createTheme.spec.ts +++ b/packages/react-native/src/theme/__tests__/createTheme.spec.ts @@ -1,5 +1,6 @@ import { defaultTheme } from '@aws-amplify/ui'; import { createTheme } from '../createTheme'; +import { StrictTokens } from '../types'; describe('createTheme', () => { describe('without a base theme', () => { @@ -66,7 +67,7 @@ describe('createTheme', () => { it('should resolve references in a functional component theme', () => { const { components } = createTheme({ components: { - button(tokens) { + button(tokens: StrictTokens) { return { container: { backgroundColor: tokens.colors.background.primary, @@ -108,7 +109,7 @@ describe('createTheme', () => { const { components } = createTheme( { components: { - button(tokens) { + button(tokens: StrictTokens) { return { container: { // default value is a reference to colors.white diff --git a/packages/react-native/src/theme/types.ts b/packages/react-native/src/theme/types.ts index ebb54261c30..0b9e7896463 100644 --- a/packages/react-native/src/theme/types.ts +++ b/packages/react-native/src/theme/types.ts @@ -55,13 +55,13 @@ export type StrictTokens = ReactNativeTokens<'required'>; export type Tokens = ReactNativeTokens<'optional'>; /** - * A Theme just needs a name, all other properties are optional. + * A custom Theme with all properties optional. */ export interface Theme { /** * Custom component styles */ - components?: Components<'input'>; + components?: Omit, 'divider' | 'tabs'>; /** * Component and component agnostic tokens. */ From d41b6e5b895f29f028b139e9a94be26abf0eeeda Mon Sep 17 00:00:00 2001 From: Caleb Pollman Date: Sat, 19 Nov 2022 21:21:32 -0800 Subject: [PATCH 3/5] chore(rna): update TextField style (#3022) --- .../ConfirmResetPassword.spec.tsx.snap | 94 ++++-- .../__snapshots__/ConfirmSignIn.spec.tsx.snap | 26 +- .../__snapshots__/ResetPassword.spec.tsx.snap | 26 +- .../__snapshots__/SetupTOTP.spec.tsx.snap | 52 +-- .../__snapshots__/SignIn.spec.tsx.snap | 90 ++++-- .../__snapshots__/SignUp.spec.tsx.snap | 300 +++++++++++------- .../__snapshots__/VerifyUser.spec.tsx.snap | 12 +- .../FederatedProviderButton.spec.tsx.snap | 3 +- .../FederatedProviderButtons.spec.tsx.snap | 6 +- .../__snapshots__/Checkbox.spec.tsx.snap | 21 +- .../__snapshots__/Divider.spec.tsx.snap | 6 +- .../__snapshots__/Label.spec.tsx.snap | 12 +- .../src/primitives/Label/styles.ts | 4 +- .../__snapshots__/PasswordField.spec.tsx.snap | 81 +++-- .../src/primitives/PasswordField/styles.ts | 13 +- .../PhoneNumberField.spec.tsx.snap | 35 +- .../__snapshots__/Radio.spec.tsx.snap | 21 +- .../__snapshots__/RadioGroup.spec.tsx.snap | 72 +++-- .../src/primitives/TextField/TextField.tsx | 2 + .../__snapshots__/TextField.spec.tsx.snap | 81 +++-- .../src/primitives/TextField/styles.ts | 8 +- 21 files changed, 618 insertions(+), 347 deletions(-) diff --git a/packages/react-native/src/Authenticator/Defaults/ConfirmResetPassword/__tests__/__snapshots__/ConfirmResetPassword.spec.tsx.snap b/packages/react-native/src/Authenticator/Defaults/ConfirmResetPassword/__tests__/__snapshots__/ConfirmResetPassword.spec.tsx.snap index 2b2d599dcb4..4f0792bb402 100644 --- a/packages/react-native/src/Authenticator/Defaults/ConfirmResetPassword/__tests__/__snapshots__/ConfirmResetPassword.spec.tsx.snap +++ b/packages/react-native/src/Authenticator/Defaults/ConfirmResetPassword/__tests__/__snapshots__/ConfirmResetPassword.spec.tsx.snap @@ -43,8 +43,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -52,9 +53,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -72,8 +72,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -85,9 +85,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Code" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -122,8 +125,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -131,9 +135,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -151,8 +154,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -164,10 +167,13 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="New Password" + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -219,7 +225,9 @@ Array [ "width": 16, }, Array [ - Object {}, + Object { + "tintColor": "hsl(210, 10%, 40%)", + }, undefined, ], ] @@ -253,8 +261,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -262,9 +271,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -282,8 +290,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -295,10 +303,13 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Confirm Password" + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -350,7 +361,9 @@ Array [ "width": 16, }, Array [ - Object {}, + Object { + "tintColor": "hsl(210, 10%, 40%)", + }, undefined, ], ] @@ -560,8 +573,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -569,9 +583,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -589,8 +602,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -602,9 +615,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Code" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -639,8 +655,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -648,9 +665,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -668,8 +684,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -681,10 +697,13 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="New Password" + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -736,7 +755,9 @@ Array [ "width": 16, }, Array [ - Object {}, + Object { + "tintColor": "hsl(210, 10%, 40%)", + }, undefined, ], ] @@ -770,8 +791,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -779,9 +801,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -799,8 +820,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -812,10 +833,13 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Confirm Password" + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -867,7 +891,9 @@ Array [ "width": 16, }, Array [ - Object {}, + Object { + "tintColor": "hsl(210, 10%, 40%)", + }, undefined, ], ] diff --git a/packages/react-native/src/Authenticator/Defaults/ConfirmSignIn/__tests__/__snapshots__/ConfirmSignIn.spec.tsx.snap b/packages/react-native/src/Authenticator/Defaults/ConfirmSignIn/__tests__/__snapshots__/ConfirmSignIn.spec.tsx.snap index f104c5f0259..cc50a3fc54c 100644 --- a/packages/react-native/src/Authenticator/Defaults/ConfirmSignIn/__tests__/__snapshots__/ConfirmSignIn.spec.tsx.snap +++ b/packages/react-native/src/Authenticator/Defaults/ConfirmSignIn/__tests__/__snapshots__/ConfirmSignIn.spec.tsx.snap @@ -43,8 +43,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -52,9 +53,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -72,8 +72,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -85,9 +85,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Code" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -295,8 +298,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -304,9 +308,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -324,8 +327,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -337,9 +340,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Code" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, diff --git a/packages/react-native/src/Authenticator/Defaults/ResetPassword/__tests__/__snapshots__/ResetPassword.spec.tsx.snap b/packages/react-native/src/Authenticator/Defaults/ResetPassword/__tests__/__snapshots__/ResetPassword.spec.tsx.snap index c1677c75e5e..187fdbe8265 100644 --- a/packages/react-native/src/Authenticator/Defaults/ResetPassword/__tests__/__snapshots__/ResetPassword.spec.tsx.snap +++ b/packages/react-native/src/Authenticator/Defaults/ResetPassword/__tests__/__snapshots__/ResetPassword.spec.tsx.snap @@ -43,8 +43,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -52,9 +53,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -72,8 +72,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -85,9 +85,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Username" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -295,8 +298,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -304,9 +308,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -324,8 +327,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -337,9 +340,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Username" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, diff --git a/packages/react-native/src/Authenticator/Defaults/SetupTOTP/__tests__/__snapshots__/SetupTOTP.spec.tsx.snap b/packages/react-native/src/Authenticator/Defaults/SetupTOTP/__tests__/__snapshots__/SetupTOTP.spec.tsx.snap index 3b3d46f5f44..ce840e68d45 100644 --- a/packages/react-native/src/Authenticator/Defaults/SetupTOTP/__tests__/__snapshots__/SetupTOTP.spec.tsx.snap +++ b/packages/react-native/src/Authenticator/Defaults/SetupTOTP/__tests__/__snapshots__/SetupTOTP.spec.tsx.snap @@ -43,8 +43,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -52,9 +53,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -72,8 +72,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -85,9 +85,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Code" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -295,8 +298,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -304,9 +308,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -324,8 +327,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -337,9 +340,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Code" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -496,8 +502,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -505,9 +512,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -525,8 +531,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -538,9 +544,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Code" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -763,8 +772,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -772,9 +782,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -792,8 +801,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -805,9 +814,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Code" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, diff --git a/packages/react-native/src/Authenticator/Defaults/SignIn/__tests__/__snapshots__/SignIn.spec.tsx.snap b/packages/react-native/src/Authenticator/Defaults/SignIn/__tests__/__snapshots__/SignIn.spec.tsx.snap index a4b57ecfe49..c7a43c043cf 100644 --- a/packages/react-native/src/Authenticator/Defaults/SignIn/__tests__/__snapshots__/SignIn.spec.tsx.snap +++ b/packages/react-native/src/Authenticator/Defaults/SignIn/__tests__/__snapshots__/SignIn.spec.tsx.snap @@ -31,8 +31,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -40,9 +41,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -60,8 +60,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -73,9 +73,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Username" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -110,8 +113,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -119,9 +123,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -139,8 +142,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -152,10 +155,13 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Password" + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -207,7 +213,9 @@ Array [ "width": 16, }, Array [ - Object {}, + Object { + "tintColor": "hsl(210, 10%, 40%)", + }, undefined, ], ] @@ -412,8 +420,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -421,9 +430,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -441,8 +449,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -454,9 +462,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Username" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -491,8 +502,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -500,9 +512,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -520,8 +531,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -533,10 +544,13 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Password" + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -588,7 +602,9 @@ Array [ "width": 16, }, Array [ - Object {}, + Object { + "tintColor": "hsl(210, 10%, 40%)", + }, undefined, ], ] @@ -733,8 +749,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -742,9 +759,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -762,8 +778,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -775,9 +791,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Username" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -812,8 +831,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -821,9 +841,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -841,8 +860,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -854,10 +873,13 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Password" + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -909,7 +931,9 @@ Array [ "width": 16, }, Array [ - Object {}, + Object { + "tintColor": "hsl(210, 10%, 40%)", + }, undefined, ], ] diff --git a/packages/react-native/src/Authenticator/Defaults/SignUp/__tests__/__snapshots__/SignUp.spec.tsx.snap b/packages/react-native/src/Authenticator/Defaults/SignUp/__tests__/__snapshots__/SignUp.spec.tsx.snap index c0e3711eb76..4f898c73a49 100644 --- a/packages/react-native/src/Authenticator/Defaults/SignUp/__tests__/__snapshots__/SignUp.spec.tsx.snap +++ b/packages/react-native/src/Authenticator/Defaults/SignUp/__tests__/__snapshots__/SignUp.spec.tsx.snap @@ -196,8 +196,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -205,9 +206,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -225,8 +225,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -238,9 +238,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Username" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -275,8 +278,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -284,9 +288,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -304,8 +307,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -317,10 +320,13 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Password" + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -372,7 +378,9 @@ Array [ "width": 16, }, Array [ - Object {}, + Object { + "tintColor": "hsl(210, 10%, 40%)", + }, undefined, ], ] @@ -406,8 +414,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -415,9 +424,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -435,8 +443,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -448,10 +456,13 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Confirm Password" + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -503,7 +514,9 @@ Array [ "width": 16, }, Array [ - Object {}, + Object { + "tintColor": "hsl(210, 10%, 40%)", + }, undefined, ], ] @@ -597,8 +610,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -606,9 +620,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -626,8 +639,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -640,9 +653,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Phone" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -734,8 +750,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -743,9 +760,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -763,8 +779,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -776,9 +792,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Username" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -813,8 +832,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -822,9 +842,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -842,8 +861,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -855,10 +874,13 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Password" + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -910,7 +932,9 @@ Array [ "width": 16, }, Array [ - Object {}, + Object { + "tintColor": "hsl(210, 10%, 40%)", + }, undefined, ], ] @@ -944,8 +968,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -953,9 +978,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -973,8 +997,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -986,10 +1010,13 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Confirm Password" + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -1041,7 +1068,9 @@ Array [ "width": 16, }, Array [ - Object {}, + Object { + "tintColor": "hsl(210, 10%, 40%)", + }, undefined, ], ] @@ -1135,8 +1164,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -1144,9 +1174,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -1164,8 +1193,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -1178,9 +1207,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Phone" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -1443,8 +1475,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -1452,9 +1485,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -1473,8 +1505,8 @@ Array [ "flexDirection": "row", "lineHeight": 24, "opacity": 0.6, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -1486,9 +1518,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Username" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -1523,8 +1558,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -1532,9 +1568,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -1553,8 +1588,8 @@ Array [ "flexDirection": "row", "lineHeight": 24, "opacity": 0.6, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -1566,10 +1601,13 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Password" + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -1623,7 +1661,9 @@ Array [ "width": 16, }, Array [ - Object {}, + Object { + "tintColor": "hsl(210, 10%, 40%)", + }, undefined, ], ] @@ -1657,8 +1697,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -1666,9 +1707,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -1687,8 +1727,8 @@ Array [ "flexDirection": "row", "lineHeight": 24, "opacity": 0.6, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -1700,10 +1740,13 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Confirm Password" + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -1757,7 +1800,9 @@ Array [ "width": 16, }, Array [ - Object {}, + Object { + "tintColor": "hsl(210, 10%, 40%)", + }, undefined, ], ] @@ -1851,8 +1896,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -1860,9 +1906,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -1881,8 +1926,8 @@ Array [ "flexDirection": "row", "lineHeight": 24, "opacity": 0.6, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -1895,9 +1940,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Phone" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -2160,8 +2208,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -2169,9 +2218,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -2189,8 +2237,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -2202,9 +2250,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Username" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -2239,8 +2290,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -2248,9 +2300,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -2268,8 +2319,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -2281,10 +2332,13 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Password" + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -2336,7 +2390,9 @@ Array [ "width": 16, }, Array [ - Object {}, + Object { + "tintColor": "hsl(210, 10%, 40%)", + }, undefined, ], ] @@ -2370,8 +2426,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -2379,9 +2436,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -2399,8 +2455,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -2412,10 +2468,13 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Confirm Password" + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -2467,7 +2526,9 @@ Array [ "width": 16, }, Array [ - Object {}, + Object { + "tintColor": "hsl(210, 10%, 40%)", + }, undefined, ], ] @@ -2561,8 +2622,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -2570,9 +2632,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -2590,8 +2651,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -2604,9 +2665,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Phone" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -2920,8 +2984,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -2929,9 +2994,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -2949,8 +3013,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -2962,9 +3026,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Username" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -2999,8 +3066,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -3008,9 +3076,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -3028,8 +3095,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -3041,10 +3108,13 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Password" + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -3096,7 +3166,9 @@ Array [ "width": 16, }, Array [ - Object {}, + Object { + "tintColor": "hsl(210, 10%, 40%)", + }, undefined, ], ] @@ -3130,8 +3202,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -3139,9 +3212,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -3159,8 +3231,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -3172,10 +3244,13 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Confirm Password" + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -3227,7 +3302,9 @@ Array [ "width": 16, }, Array [ - Object {}, + Object { + "tintColor": "hsl(210, 10%, 40%)", + }, undefined, ], ] @@ -3321,8 +3398,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -3330,9 +3408,8 @@ Array [ Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -3350,8 +3427,8 @@ Array [ "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -3364,9 +3441,12 @@ Array [ onBlur={[Function]} onChangeText={[Function]} placeholder="Phone" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, diff --git a/packages/react-native/src/Authenticator/Defaults/VerifyUser/__tests__/__snapshots__/VerifyUser.spec.tsx.snap b/packages/react-native/src/Authenticator/Defaults/VerifyUser/__tests__/__snapshots__/VerifyUser.spec.tsx.snap index 43396213912..7b9ee5a3d23 100644 --- a/packages/react-native/src/Authenticator/Defaults/VerifyUser/__tests__/__snapshots__/VerifyUser.spec.tsx.snap +++ b/packages/react-native/src/Authenticator/Defaults/VerifyUser/__tests__/__snapshots__/VerifyUser.spec.tsx.snap @@ -81,8 +81,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -143,8 +144,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -343,8 +345,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -405,8 +408,9 @@ Array [ style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", diff --git a/packages/react-native/src/Authenticator/common/FederatedProviderButton/__tests__/__snapshots__/FederatedProviderButton.spec.tsx.snap b/packages/react-native/src/Authenticator/common/FederatedProviderButton/__tests__/__snapshots__/FederatedProviderButton.spec.tsx.snap index 38f1cf0e518..06372487f8f 100644 --- a/packages/react-native/src/Authenticator/common/FederatedProviderButton/__tests__/__snapshots__/FederatedProviderButton.spec.tsx.snap +++ b/packages/react-native/src/Authenticator/common/FederatedProviderButton/__tests__/__snapshots__/FederatedProviderButton.spec.tsx.snap @@ -72,8 +72,9 @@ exports[`FederatedProviderButton renders default button as expected 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", diff --git a/packages/react-native/src/Authenticator/common/FederatedProviderButtons/__tests__/__snapshots__/FederatedProviderButtons.spec.tsx.snap b/packages/react-native/src/Authenticator/common/FederatedProviderButtons/__tests__/__snapshots__/FederatedProviderButtons.spec.tsx.snap index 577d1c970be..0540378e4f6 100644 --- a/packages/react-native/src/Authenticator/common/FederatedProviderButtons/__tests__/__snapshots__/FederatedProviderButtons.spec.tsx.snap +++ b/packages/react-native/src/Authenticator/common/FederatedProviderButtons/__tests__/__snapshots__/FederatedProviderButtons.spec.tsx.snap @@ -81,8 +81,9 @@ exports[`FederatedProviderButtons renders as expected 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -128,8 +129,9 @@ exports[`FederatedProviderButtons renders as expected 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", diff --git a/packages/react-native/src/primitives/Checkbox/__tests__/__snapshots__/Checkbox.spec.tsx.snap b/packages/react-native/src/primitives/Checkbox/__tests__/__snapshots__/Checkbox.spec.tsx.snap index 2b06584f1ae..7e9accba1ed 100644 --- a/packages/react-native/src/primitives/Checkbox/__tests__/__snapshots__/Checkbox.spec.tsx.snap +++ b/packages/react-native/src/primitives/Checkbox/__tests__/__snapshots__/Checkbox.spec.tsx.snap @@ -51,8 +51,9 @@ exports[`Checkbox applies label position prop 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -119,8 +120,9 @@ exports[`Checkbox applies theme and style props 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -191,8 +193,9 @@ exports[`Checkbox renders as expected when disabled 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -257,8 +260,9 @@ exports[`Checkbox renders as expected when passing a number to the size prop 1`] style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -323,8 +327,9 @@ exports[`Checkbox renders as expected when selected is false 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -389,8 +394,9 @@ exports[`Checkbox renders as expected when selected is true 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -455,8 +461,9 @@ exports[`Checkbox renders as expected with custom accessibilityRole 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", diff --git a/packages/react-native/src/primitives/Divider/__tests__/__snapshots__/Divider.spec.tsx.snap b/packages/react-native/src/primitives/Divider/__tests__/__snapshots__/Divider.spec.tsx.snap index 8ba4f1e0b05..1ed8fa6b999 100644 --- a/packages/react-native/src/primitives/Divider/__tests__/__snapshots__/Divider.spec.tsx.snap +++ b/packages/react-native/src/primitives/Divider/__tests__/__snapshots__/Divider.spec.tsx.snap @@ -32,8 +32,9 @@ exports[`Divider applies theme and style props 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -100,8 +101,9 @@ exports[`Divider renders as expected with label 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", diff --git a/packages/react-native/src/primitives/Label/__tests__/__snapshots__/Label.spec.tsx.snap b/packages/react-native/src/primitives/Label/__tests__/__snapshots__/Label.spec.tsx.snap index 8cbcb00696d..104ab48b2b1 100644 --- a/packages/react-native/src/primitives/Label/__tests__/__snapshots__/Label.spec.tsx.snap +++ b/packages/react-native/src/primitives/Label/__tests__/__snapshots__/Label.spec.tsx.snap @@ -6,8 +6,9 @@ exports[`Label applies accessibility role 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -27,8 +28,9 @@ exports[`Label renders a default Label 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -48,8 +50,9 @@ exports[`Label should apply theme and style props 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -71,8 +74,9 @@ exports[`Label should apply variant styles 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(130, 27%, 29%)", diff --git a/packages/react-native/src/primitives/Label/styles.ts b/packages/react-native/src/primitives/Label/styles.ts index 2dee4d0a149..1ce029cffb5 100644 --- a/packages/react-native/src/primitives/Label/styles.ts +++ b/packages/react-native/src/primitives/Label/styles.ts @@ -1,6 +1,7 @@ import { StyleSheet } from 'react-native'; import { StrictTheme } from '../../theme'; +import { getLineHeight } from '../../utils'; import { LabelStyles } from './types'; export const getThemedStyles = (theme: StrictTheme): LabelStyles => { @@ -11,8 +12,9 @@ export const getThemedStyles = (theme: StrictTheme): LabelStyles => { return StyleSheet.create({ text: { - fontSize: fontSizes.medium, + fontSize: fontSizes.small, fontWeight: fontWeights.normal, + lineHeight: getLineHeight(fontSizes.small), ...components?.label?.text, }, primary: { diff --git a/packages/react-native/src/primitives/PasswordField/__tests__/__snapshots__/PasswordField.spec.tsx.snap b/packages/react-native/src/primitives/PasswordField/__tests__/__snapshots__/PasswordField.spec.tsx.snap index bd0220c5ce3..ba7d813291a 100644 --- a/packages/react-native/src/primitives/PasswordField/__tests__/__snapshots__/PasswordField.spec.tsx.snap +++ b/packages/react-native/src/primitives/PasswordField/__tests__/__snapshots__/PasswordField.spec.tsx.snap @@ -29,8 +29,9 @@ exports[`PasswordField applies theme and style props 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -38,9 +39,8 @@ exports[`PasswordField applies theme and style props 1`] = ` Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -58,8 +58,8 @@ exports[`PasswordField applies theme and style props 1`] = ` "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -68,10 +68,13 @@ exports[`PasswordField applies theme and style props 1`] = ` accessible={true} autoCapitalize="none" editable={true} + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -119,7 +122,9 @@ exports[`PasswordField applies theme and style props 1`] = ` "width": 16, }, Array [ - Object {}, + Object { + "tintColor": "hsl(210, 10%, 40%)", + }, Object { "backgroundColor": "blue", }, @@ -158,8 +163,9 @@ exports[`PasswordField renders as expected 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -167,9 +173,8 @@ exports[`PasswordField renders as expected 1`] = ` Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -187,8 +192,8 @@ exports[`PasswordField renders as expected 1`] = ` "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -197,10 +202,13 @@ exports[`PasswordField renders as expected 1`] = ` accessible={true} autoCapitalize="none" editable={true} + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -248,7 +256,9 @@ exports[`PasswordField renders as expected 1`] = ` "width": 16, }, Array [ - Object {}, + Object { + "tintColor": "hsl(210, 10%, 40%)", + }, undefined, ], ] @@ -285,8 +295,9 @@ exports[`PasswordField renders as expected when disabled 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -294,9 +305,8 @@ exports[`PasswordField renders as expected when disabled 1`] = ` Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -315,8 +325,8 @@ exports[`PasswordField renders as expected when disabled 1`] = ` "flexDirection": "row", "lineHeight": 24, "opacity": 0.6, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -325,10 +335,13 @@ exports[`PasswordField renders as expected when disabled 1`] = ` accessible={true} autoCapitalize="none" editable={false} + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -383,7 +396,9 @@ exports[`PasswordField renders as expected when disabled 1`] = ` "width": 16, }, Array [ - Object {}, + Object { + "tintColor": "hsl(210, 10%, 40%)", + }, undefined, ], ] @@ -420,8 +435,9 @@ exports[`PasswordField should be able to hide show password icon 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -429,9 +445,8 @@ exports[`PasswordField should be able to hide show password icon 1`] = ` Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -449,8 +464,8 @@ exports[`PasswordField should be able to hide show password icon 1`] = ` "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -459,10 +474,13 @@ exports[`PasswordField should be able to hide show password icon 1`] = ` accessible={true} autoCapitalize="none" editable={true} + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -501,8 +519,9 @@ exports[`PasswordField should be able to obscure text programmatically 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -510,9 +529,8 @@ exports[`PasswordField should be able to obscure text programmatically 1`] = ` Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -530,8 +548,8 @@ exports[`PasswordField should be able to obscure text programmatically 1`] = ` "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -540,10 +558,13 @@ exports[`PasswordField should be able to obscure text programmatically 1`] = ` accessible={true} autoCapitalize="none" editable={true} + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={false} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -591,7 +612,9 @@ exports[`PasswordField should be able to obscure text programmatically 1`] = ` "width": 16, }, Array [ - Object {}, + Object { + "tintColor": "hsl(210, 10%, 40%)", + }, undefined, ], ] diff --git a/packages/react-native/src/primitives/PasswordField/styles.ts b/packages/react-native/src/primitives/PasswordField/styles.ts index c8aea90eaa1..04600a6a974 100644 --- a/packages/react-native/src/primitives/PasswordField/styles.ts +++ b/packages/react-native/src/primitives/PasswordField/styles.ts @@ -3,13 +3,18 @@ import { StyleSheet } from 'react-native'; import { StrictTheme } from '../../theme'; import { PasswordFieldStyles } from './types'; -export const getThemedStyles = (theme: StrictTheme): PasswordFieldStyles => { - const { components } = theme; - +export const getThemedStyles = ({ + components, + tokens: { colors }, +}: StrictTheme): PasswordFieldStyles => { return StyleSheet.create({ container: { ...components?.passwordField?.container, }, - icon: { ...components?.passwordField?.icon }, + icon: { + // match to `TextField` placeholder color + tintColor: colors.font.tertiary, + ...components?.passwordField?.icon, + }, }); }; diff --git a/packages/react-native/src/primitives/PhoneNumberField/__tests__/__snapshots__/PhoneNumberField.spec.tsx.snap b/packages/react-native/src/primitives/PhoneNumberField/__tests__/__snapshots__/PhoneNumberField.spec.tsx.snap index dc148a59546..e60dbfe0d05 100644 --- a/packages/react-native/src/primitives/PhoneNumberField/__tests__/__snapshots__/PhoneNumberField.spec.tsx.snap +++ b/packages/react-native/src/primitives/PhoneNumberField/__tests__/__snapshots__/PhoneNumberField.spec.tsx.snap @@ -1313,8 +1313,8 @@ exports[`PhoneNumberField applies theming 1`] = ` "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -1324,9 +1324,12 @@ exports[`PhoneNumberField applies theming 1`] = ` autoCapitalize="none" editable={true} keyboardType="phone-pad" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -1381,8 +1384,8 @@ exports[`PhoneNumberField does not render picker when dial codes are undefined 1 "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -1392,9 +1395,12 @@ exports[`PhoneNumberField does not render picker when dial codes are undefined 1 autoCapitalize="none" editable={true} keyboardType="phone-pad" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -2721,8 +2727,8 @@ exports[`PhoneNumberField renders as expected 1`] = ` "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -2732,9 +2738,12 @@ exports[`PhoneNumberField renders as expected 1`] = ` autoCapitalize="none" editable={true} keyboardType="phone-pad" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -4061,8 +4070,8 @@ exports[`PhoneNumberField renders as expected when default dial code is undefine "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -4072,9 +4081,12 @@ exports[`PhoneNumberField renders as expected when default dial code is undefine autoCapitalize="none" editable={true} keyboardType="phone-pad" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -5402,8 +5414,8 @@ exports[`PhoneNumberField renders as expected when disabled 1`] = ` "flexDirection": "row", "lineHeight": 24, "opacity": 0.6, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -5413,9 +5425,12 @@ exports[`PhoneNumberField renders as expected when disabled 1`] = ` autoCapitalize="none" editable={false} keyboardType="phone-pad" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, diff --git a/packages/react-native/src/primitives/Radio/__tests__/__snapshots__/Radio.spec.tsx.snap b/packages/react-native/src/primitives/Radio/__tests__/__snapshots__/Radio.spec.tsx.snap index 60ebc2acc18..b20aa491477 100644 --- a/packages/react-native/src/primitives/Radio/__tests__/__snapshots__/Radio.spec.tsx.snap +++ b/packages/react-native/src/primitives/Radio/__tests__/__snapshots__/Radio.spec.tsx.snap @@ -121,8 +121,9 @@ exports[`Radio renders as expected when disabled 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -202,8 +203,9 @@ exports[`Radio renders as expected when passing a number to the size prop 1`] = style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -266,8 +268,9 @@ exports[`Radio renders as expected when selected is false 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -347,8 +350,9 @@ exports[`Radio renders as expected when selected is true 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -428,8 +432,9 @@ exports[`Radio renders as expected when size is large 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -509,8 +514,9 @@ exports[`Radio renders as expected when size is medium 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -590,8 +596,9 @@ exports[`Radio renders as expected when size is small 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", diff --git a/packages/react-native/src/primitives/RadioGroup/__tests__/__snapshots__/RadioGroup.spec.tsx.snap b/packages/react-native/src/primitives/RadioGroup/__tests__/__snapshots__/RadioGroup.spec.tsx.snap index 5ec5c73467b..aec5bc3cd86 100644 --- a/packages/react-native/src/primitives/RadioGroup/__tests__/__snapshots__/RadioGroup.spec.tsx.snap +++ b/packages/react-native/src/primitives/RadioGroup/__tests__/__snapshots__/RadioGroup.spec.tsx.snap @@ -85,8 +85,9 @@ exports[`RadioGroup renders as expected when direction is horizontal 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -146,8 +147,9 @@ exports[`RadioGroup renders as expected when direction is horizontal 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -207,8 +209,9 @@ exports[`RadioGroup renders as expected when direction is horizontal 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -269,8 +272,9 @@ exports[`RadioGroup renders as expected when direction is horizontal 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -371,8 +375,9 @@ exports[`RadioGroup renders as expected when direction is vertical 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -432,8 +437,9 @@ exports[`RadioGroup renders as expected when direction is vertical 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -493,8 +499,9 @@ exports[`RadioGroup renders as expected when direction is vertical 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -555,8 +562,9 @@ exports[`RadioGroup renders as expected when direction is vertical 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -657,8 +665,9 @@ exports[`RadioGroup renders as expected when size is large 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -718,8 +727,9 @@ exports[`RadioGroup renders as expected when size is large 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -779,8 +789,9 @@ exports[`RadioGroup renders as expected when size is large 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -841,8 +852,9 @@ exports[`RadioGroup renders as expected when size is large 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -943,8 +955,9 @@ exports[`RadioGroup renders as expected when size is medium 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -1004,8 +1017,9 @@ exports[`RadioGroup renders as expected when size is medium 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -1065,8 +1079,9 @@ exports[`RadioGroup renders as expected when size is medium 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -1127,8 +1142,9 @@ exports[`RadioGroup renders as expected when size is medium 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -1229,8 +1245,9 @@ exports[`RadioGroup renders as expected when size is small 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -1290,8 +1307,9 @@ exports[`RadioGroup renders as expected when size is small 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -1351,8 +1369,9 @@ exports[`RadioGroup renders as expected when size is small 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -1413,8 +1432,9 @@ exports[`RadioGroup renders as expected when size is small 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -1515,8 +1535,9 @@ exports[`RadioGroup renders default RadioGroup as expected 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -1576,8 +1597,9 @@ exports[`RadioGroup renders default RadioGroup as expected 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -1637,8 +1659,9 @@ exports[`RadioGroup renders default RadioGroup as expected 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -1699,8 +1722,9 @@ exports[`RadioGroup renders default RadioGroup as expected 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", diff --git a/packages/react-native/src/primitives/TextField/TextField.tsx b/packages/react-native/src/primitives/TextField/TextField.tsx index 61da0d3fc9f..99c95889600 100644 --- a/packages/react-native/src/primitives/TextField/TextField.tsx +++ b/packages/react-native/src/primitives/TextField/TextField.tsx @@ -53,6 +53,8 @@ export default function TextField({ accessible={accessible} autoCapitalize={autoCapitalize} editable={!disabled} + placeholderTextColor={theme.tokens.colors.font.tertiary} + selectionColor={theme.tokens.colors.font.primary} style={[themedStyle.input, fieldStyle]} /> {endAccessory ?? null} diff --git a/packages/react-native/src/primitives/TextField/__tests__/__snapshots__/TextField.spec.tsx.snap b/packages/react-native/src/primitives/TextField/__tests__/__snapshots__/TextField.spec.tsx.snap index 43e6be055ae..ed9f4c4621e 100644 --- a/packages/react-native/src/primitives/TextField/__tests__/__snapshots__/TextField.spec.tsx.snap +++ b/packages/react-native/src/primitives/TextField/__tests__/__snapshots__/TextField.spec.tsx.snap @@ -23,8 +23,9 @@ exports[`TextField doesn't render the errorMessage if error prop is false 1`] = style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -32,9 +33,8 @@ exports[`TextField doesn't render the errorMessage if error prop is false 1`] = Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -52,8 +52,8 @@ exports[`TextField doesn't render the errorMessage if error prop is false 1`] = "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -63,9 +63,12 @@ exports[`TextField doesn't render the errorMessage if error prop is false 1`] = autoCapitalize="none" editable={true} placeholder="Placeholder" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -101,8 +104,9 @@ exports[`TextField doesn't render the errorMessage if errorMessage prop is undef style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -110,9 +114,8 @@ exports[`TextField doesn't render the errorMessage if errorMessage prop is undef Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -130,8 +133,8 @@ exports[`TextField doesn't render the errorMessage if errorMessage prop is undef "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -141,9 +144,12 @@ exports[`TextField doesn't render the errorMessage if errorMessage prop is undef autoCapitalize="none" editable={true} placeholder="Placeholder" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -179,8 +185,9 @@ exports[`TextField renders as expected 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -188,9 +195,8 @@ exports[`TextField renders as expected 1`] = ` Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -208,8 +214,8 @@ exports[`TextField renders as expected 1`] = ` "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -219,9 +225,12 @@ exports[`TextField renders as expected 1`] = ` autoCapitalize="none" editable={true} placeholder="Placeholder" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -257,8 +266,9 @@ exports[`TextField renders as expected as password field 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -266,9 +276,8 @@ exports[`TextField renders as expected as password field 1`] = ` Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -286,8 +295,8 @@ exports[`TextField renders as expected as password field 1`] = ` "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -297,10 +306,13 @@ exports[`TextField renders as expected as password field 1`] = ` autoCapitalize="none" editable={true} placeholder="Placeholder" + placeholderTextColor="hsl(210, 10%, 40%)" secureTextEntry={true} + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -336,8 +348,9 @@ exports[`TextField renders as expected when disabled 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -345,9 +358,8 @@ exports[`TextField renders as expected when disabled 1`] = ` Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -366,8 +378,8 @@ exports[`TextField renders as expected when disabled 1`] = ` "flexDirection": "row", "lineHeight": 24, "opacity": 0.6, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -377,9 +389,12 @@ exports[`TextField renders as expected when disabled 1`] = ` autoCapitalize="none" editable={false} placeholder="Placeholder" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -415,8 +430,9 @@ exports[`TextField renders as expected with error message 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", @@ -424,9 +440,8 @@ exports[`TextField renders as expected with error message 1`] = ` Array [ Object { "color": "hsl(210, 25%, 25%)", - "fontSize": 16, "lineHeight": 21, - "paddingVertical": 12, + "paddingVertical": 8, }, undefined, ], @@ -444,8 +459,8 @@ exports[`TextField renders as expected with error message 1`] = ` "borderWidth": 1, "flexDirection": "row", "lineHeight": 24, - "padding": 16, - "width": "100%", + "paddingHorizontal": 8, + "paddingVertical": 12, } } testID="amplify__text-field__input-container" @@ -455,9 +470,12 @@ exports[`TextField renders as expected with error message 1`] = ` autoCapitalize="none" editable={true} placeholder="Placeholder" + placeholderTextColor="hsl(210, 10%, 40%)" + selectionColor="hsl(210, 50%, 10%)" style={ Array [ Object { + "color": "hsl(210, 50%, 10%)", "flexGrow": 1, "fontSize": 16, }, @@ -472,8 +490,9 @@ exports[`TextField renders as expected with error message 1`] = ` style={ Array [ Object { - "fontSize": 16, + "fontSize": 14, "fontWeight": "400", + "lineHeight": 21, }, Object { "color": "hsl(210, 50%, 10%)", diff --git a/packages/react-native/src/primitives/TextField/styles.ts b/packages/react-native/src/primitives/TextField/styles.ts index 0fd65aa5d0b..979d5ab1b0d 100644 --- a/packages/react-native/src/primitives/TextField/styles.ts +++ b/packages/react-native/src/primitives/TextField/styles.ts @@ -26,11 +26,12 @@ export const getThemedStyles = (theme: StrictTheme): TextFieldStyles => { borderWidth: borderWidths.small, flexDirection: 'row', lineHeight: getLineHeight(fontSizes.medium), - padding: space.medium, - width: '100%', + paddingHorizontal: space.xs, + paddingVertical: space.small, ...components?.textField?.inputContainer, }, input: { + color: colors.font.primary, flexGrow: 1, fontSize: fontSizes.medium, // this is needed because of extra padding inside the input - in Android only @@ -38,9 +39,8 @@ export const getThemedStyles = (theme: StrictTheme): TextFieldStyles => { ...components?.textField?.input, }, label: { - fontSize: fontSizes.medium, color: colors.font.secondary, - paddingVertical: space.small, + paddingVertical: space.xs, lineHeight: getLineHeight(fontSizes.small), ...components?.textField?.label, }, From 5d6bc57686002b20814018204352eee653bf1300 Mon Sep 17 00:00:00 2001 From: Caleb Pollman Date: Sat, 19 Nov 2022 21:22:06 -0800 Subject: [PATCH 4/5] chore(ui-react-core): remove react dom peerDep from ui-react-core (#3026) --- packages/react-core/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/react-core/package.json b/packages/react-core/package.json index 5beb1e62de1..ec4ff9c0990 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -35,8 +35,7 @@ }, "peerDependencies": { "aws-amplify": ">= 5.0.1", - "react": ">= 16.14.0", - "react-dom": ">= 16.14.0" + "react": ">= 16.14.0" }, "devDependencies": { "@rollup/plugin-commonjs": "^22.0.1", From 33b26516881c1c191058d48b86b5fd85d9b13b50 Mon Sep 17 00:00:00 2001 From: Caleb Pollman Date: Sat, 19 Nov 2022 21:22:35 -0800 Subject: [PATCH 5/5] rna(chore): update DefaultContent, migrate SignUp (#3023) --- .../Authenticator/Defaults/SignIn/SignIn.tsx | 4 +- .../__snapshots__/SignIn.spec.tsx.snap | 122 ++- .../Authenticator/Defaults/SignUp/SignUp.tsx | 67 +- .../__snapshots__/SignUp.spec.tsx.snap | 991 ++++++------------ .../Authenticator/Defaults/SignUp/style.ts | 22 - .../Defaults/VerifyUser/VerifyUser.tsx | 7 +- .../__snapshots__/VerifyUser.spec.tsx.snap | 196 ++-- .../common/DefaultContent/DefaultContent.tsx | 35 +- .../common/DefaultContent/styles.ts | 35 +- .../common/DefaultContent/types.ts | 6 +- 10 files changed, 569 insertions(+), 916 deletions(-) delete mode 100644 packages/react-native/src/Authenticator/Defaults/SignUp/style.ts diff --git a/packages/react-native/src/Authenticator/Defaults/SignIn/SignIn.tsx b/packages/react-native/src/Authenticator/Defaults/SignIn/SignIn.tsx index 2eeb33e5423..daf0b8d395b 100644 --- a/packages/react-native/src/Authenticator/Defaults/SignIn/SignIn.tsx +++ b/packages/react-native/src/Authenticator/Defaults/SignIn/SignIn.tsx @@ -45,8 +45,8 @@ const SignIn: DefaultSignInComponent = ({ }; return { primary: { children: signInText, onPress: handleFormSubmit }, - secondary: hideSignUp - ? forgotPassword + links: hideSignUp + ? [forgotPassword] : [forgotPassword, { children: signUpText, onPress: toSignUp }], }; }, [ diff --git a/packages/react-native/src/Authenticator/Defaults/SignIn/__tests__/__snapshots__/SignIn.spec.tsx.snap b/packages/react-native/src/Authenticator/Defaults/SignIn/__tests__/__snapshots__/SignIn.spec.tsx.snap index c7a43c043cf..2dc03f4efba 100644 --- a/packages/react-native/src/Authenticator/Defaults/SignIn/__tests__/__snapshots__/SignIn.spec.tsx.snap +++ b/packages/react-native/src/Authenticator/Defaults/SignIn/__tests__/__snapshots__/SignIn.spec.tsx.snap @@ -5,7 +5,7 @@ Array [ @@ -22,7 +22,9 @@ Array [ Object { "alignItems": "flex-start", }, - Object {}, + Object { + "paddingHorizontal": 12, + }, ] } > @@ -103,7 +105,9 @@ Array [ }, Array [ Object {}, - Object {}, + Object { + "paddingHorizontal": 12, + }, ], ] } @@ -255,7 +259,7 @@ Array [ null, null, Object { - "marginVertical": 16, + "margin": 16, }, ] } @@ -394,7 +398,7 @@ Array [ @@ -411,7 +415,9 @@ Array [ Object { "alignItems": "flex-start", }, - Object {}, + Object { + "paddingHorizontal": 12, + }, ] } > @@ -492,7 +498,9 @@ Array [ }, Array [ Object {}, - Object {}, + Object { + "paddingHorizontal": 12, + }, ], ] } @@ -644,7 +652,7 @@ Array [ null, null, Object { - "marginVertical": 16, + "margin": 16, }, ] } @@ -666,54 +674,64 @@ Array [ , - - Forgot Password? - + + Forgot Password? + + , ] `; @@ -723,7 +741,7 @@ Array [ @@ -740,7 +758,9 @@ Array [ Object { "alignItems": "flex-start", }, - Object {}, + Object { + "paddingHorizontal": 12, + }, ] } > @@ -821,7 +841,9 @@ Array [ }, Array [ Object {}, - Object {}, + Object { + "paddingHorizontal": 12, + }, ], ] } @@ -1026,7 +1048,7 @@ Array [ null, null, Object { - "marginVertical": 16, + "margin": 16, }, ] } diff --git a/packages/react-native/src/Authenticator/Defaults/SignUp/SignUp.tsx b/packages/react-native/src/Authenticator/Defaults/SignUp/SignUp.tsx index 010b50ebba6..425f3197c1d 100644 --- a/packages/react-native/src/Authenticator/Defaults/SignUp/SignUp.tsx +++ b/packages/react-native/src/Authenticator/Defaults/SignUp/SignUp.tsx @@ -1,9 +1,8 @@ -import React from 'react'; +import React, { useMemo } from 'react'; import { authenticatorTextUtil } from '@aws-amplify/ui'; -import { Button, ErrorMessage, Tab, Tabs } from '../../../primitives'; - import { + DefaultContent, DefaultFooter, DefaultTextFormFields, DefaultHeader, @@ -12,30 +11,20 @@ import { useFieldValues } from '../../hooks'; import { DefaultSignUpComponent } from '../types'; -import { styles } from './style'; - const COMPONENT_NAME = 'SignUp'; -const { - getCreateAccountText, - getCreatingAccountText, - getSignInTabText, - getSignUpTabText, -} = authenticatorTextUtil; +const { getCreateAccountText, getCreatingAccountText, getSignInTabText } = + authenticatorTextUtil; const SignUp: DefaultSignUpComponent = ({ - error, fields, - Footer, - FormFields, - Header, handleBlur, handleChange, handleSubmit, hideSignIn, isPending, toSignIn, - validationErrors, + ...rest }) => { const { fields: fieldsWithHandlers, handleFormSubmit } = useFieldValues({ componentName: COMPONENT_NAME, @@ -45,26 +34,34 @@ const SignUp: DefaultSignUpComponent = ({ handleSubmit, }); + const primaryButtonText = isPending + ? getCreatingAccountText() + : getCreateAccountText(); + const secondaryButtonText = getSignInTabText(); + + const buttons = useMemo( + () => ({ + primary: { children: primaryButtonText, onPress: handleFormSubmit }, + links: hideSignIn + ? undefined + : [{ children: secondaryButtonText, onPress: toSignIn }], + }), + [ + handleFormSubmit, + hideSignIn, + primaryButtonText, + secondaryButtonText, + toSignIn, + ] + ); + return ( - <> - {hideSignIn ? null : ( - - {getSignInTabText()} - {getSignUpTabText()} - - )} -
- - {error ? {error} : null} - -