From 1ab7ff70e750d2d72319318916097433a0f2f83c Mon Sep 17 00:00:00 2001 From: "REDMOND\\krsiler" Date: Mon, 9 Mar 2020 16:59:39 -0700 Subject: [PATCH 01/24] yarn lock --- yarn.lock | 407 +++++++++++++++++++++++++++++------------------------- 1 file changed, 219 insertions(+), 188 deletions(-) diff --git a/yarn.lock b/yarn.lock index 400e58abf3..651f9640af 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1103,13 +1103,13 @@ pirates "^4.0.0" source-map-support "^0.5.16" -"@babel/runtime-corejs2@7.7.2": - version "7.7.2" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.7.2.tgz#5a8c4e2f8688ce58adc9eb1d8320b6e7341f96ce" - integrity sha512-GfVnHchOBvIMsweQ13l4jd9lT4brkevnavnVOej5g2y7PpTRY+R4pcQlCjWMZoUla5rMLFzaS/Ll2s59cB1TqQ== +"@babel/runtime-corejs3@^7.8.3": + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.8.7.tgz#8209d9dff2f33aa2616cb319c83fe159ffb07b8c" + integrity sha512-sc7A+H4I8kTd7S61dgB9RomXu/C+F4IrRr4Ytze4dnfx7AXEpCrejSNpjx7vq6y/Bak9S6Kbk65a/WgMLtg43Q== dependencies: - core-js "^2.6.5" - regenerator-runtime "^0.13.2" + core-js-pure "^3.0.0" + regenerator-runtime "^0.13.4" "@babel/runtime@7.7.2": version "7.7.2" @@ -1118,7 +1118,7 @@ dependencies: regenerator-runtime "^0.13.2" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.4": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": version "7.8.7" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.7.tgz#8fefce9802db54881ba59f90bb28719b4996324d" integrity sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg== @@ -1149,6 +1149,15 @@ globals "^11.1.0" lodash "^4.17.13" +"@babel/types@7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193" + integrity sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA== + dependencies: + esutils "^2.0.2" + lodash "^4.17.13" + to-fast-properties "^2.0.0" + "@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.1", "@babel/types@^7.7.2", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7": version "7.8.7" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.7.tgz#1fc9729e1acbb2337d5b6977a63979b4819f5d1d" @@ -2250,14 +2259,14 @@ glob-to-regexp "^0.3.0" "@next/mdx@^9.2.1": - version "9.2.2" - resolved "https://registry.yarnpkg.com/@next/mdx/-/mdx-9.2.2.tgz#ee49199691f6c74dd28e9968f127b33edc1dbfdd" - integrity sha512-TB7YJhYIu8DnpWYIkp4N7yaYTh92MGQ3tfeMOB/wLgB5y+W3ozgg5rA2y1RUTK4MQfUk4Ll7cm+4xhVpvrXMlA== + version "9.3.0" + resolved "https://registry.yarnpkg.com/@next/mdx/-/mdx-9.3.0.tgz#fc04bd605bd42db8be1164bda38d0a66fff14389" + integrity sha512-CcdOswxSYTneXV2lA1JBZZLmipJyW9DM8Yvu2bi3qaudEDDOvhLtZzGOkQMcNg5gydFO6tIJ3s+IP4JtTbFiZw== -"@next/polyfill-nomodule@9.2.2": - version "9.2.2" - resolved "https://registry.yarnpkg.com/@next/polyfill-nomodule/-/polyfill-nomodule-9.2.2.tgz#2687d5b64ba053b247700f057f083dfd392ee52e" - integrity sha512-J51QpynN0AxQ0saWkxgpr0JxWqSJFCBOOeQpbyn5hlgxjrcXR9dQ59tN677vbq2wJ8idLn898vZFaRmQsLq13A== +"@next/polyfill-nomodule@9.3.0": + version "9.3.0" + resolved "https://registry.yarnpkg.com/@next/polyfill-nomodule/-/polyfill-nomodule-9.3.0.tgz#5d564a6af7f80f95dba30281dd3420a4a170e219" + integrity sha512-CPYTirQylgrtXNHfQriy5V/ur4xURkF5PNRiBg5Tac1fQtCFc6mCJzK4+K0eKcn8mPKdo+20stnr9dvOtrajXw== "@nodelib/fs.stat@^1.1.2": version "1.1.3" @@ -2669,9 +2678,9 @@ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== "@types/node@*", "@types/node@>= 8": - version "13.7.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.7.tgz#1628e6461ba8cc9b53196dfeaeec7b07fa6eea99" - integrity sha512-Uo4chgKbnPNlxQwoFmYIwctkQVkMMmsAoGGU4JKwLuvBefF0pCq4FybNSnfkfRCpC7ZW7kttcC/TrRtAJsvGtg== + version "13.9.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.0.tgz#5b6ee7a77faacddd7de719017d0bc12f52f81589" + integrity sha512-0ARSQootUG1RljH2HncpsY2TJBfGQIKOOi7kxzUY6z54ePu/ZD+wJA8zI2Q6v8rol2qpG/rvqsReco8zNMPvhQ== "@types/node@10.17.13": version "10.17.13" @@ -2819,39 +2828,39 @@ "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^2.1.0": - version "2.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.22.0.tgz#218ce6d4aa0244c6a40baba39ca1e021b26bb017" - integrity sha512-BvxRLaTDVQ3N+Qq8BivLiE9akQLAOUfxNHIEhedOcg8B2+jY8Rc4/D+iVprvuMX1AdezFYautuGDwr9QxqSxBQ== + version "2.23.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.23.0.tgz#aa7133bfb7b685379d9eafe4ae9e08b9037e129d" + integrity sha512-8iA4FvRsz8qTjR0L/nK9RcRUN3QtIHQiOm69FzV7WS3SE+7P7DyGGwh3k4UNR2JBbk+Ej2Io+jLAaqKibNhmtw== dependencies: - "@typescript-eslint/experimental-utils" "2.22.0" + "@typescript-eslint/experimental-utils" "2.23.0" eslint-utils "^1.4.3" functional-red-black-tree "^1.0.1" regexpp "^3.0.0" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@2.22.0": - version "2.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.22.0.tgz#4d00c91fbaaa68e56e7869be284999a265707f85" - integrity sha512-sJt1GYBe6yC0dWOQzXlp+tiuGglNhJC9eXZeC8GBVH98Zv9jtatccuhz0OF5kC/DwChqsNfghHx7OlIDQjNYAQ== +"@typescript-eslint/experimental-utils@2.23.0": + version "2.23.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.23.0.tgz#5d2261c8038ec1698ca4435a8da479c661dc9242" + integrity sha512-OswxY59RcXH3NNPmq+4Kis2CYZPurRU6mG5xPcn24CjFyfdVli5mySwZz/g/xDbJXgDsYqNGq7enV0IziWGXVQ== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.22.0" + "@typescript-eslint/typescript-estree" "2.23.0" eslint-scope "^5.0.0" "@typescript-eslint/parser@^2.1.0": - version "2.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.22.0.tgz#8eeb6cb6de873f655e64153397d4790898e149d0" - integrity sha512-FaZKC1X+nvD7qMPqKFUYHz3H0TAioSVFGvG29f796Nc5tBluoqfHgLbSFKsh7mKjRoeTm8J9WX2Wo9EyZWjG7w== + version "2.23.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.23.0.tgz#f3d4e2928ff647fe77fc2fcef1a3534fee6a3212" + integrity sha512-k61pn/Nepk43qa1oLMiyqApC6x5eP5ddPz6VUYXCAuXxbmRLqkPYzkFRKl42ltxzB2luvejlVncrEpflgQoSUg== dependencies: "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "2.22.0" - "@typescript-eslint/typescript-estree" "2.22.0" + "@typescript-eslint/experimental-utils" "2.23.0" + "@typescript-eslint/typescript-estree" "2.23.0" eslint-visitor-keys "^1.1.0" -"@typescript-eslint/typescript-estree@2.22.0": - version "2.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.22.0.tgz#a16ed45876abf743e1f5857e2f4a1c3199fd219e" - integrity sha512-2HFZW2FQc4MhIBB8WhDm9lVFaBDy6h9jGrJ4V2Uzxe/ON29HCHBTj3GkgcsgMWfsl2U5as+pTOr30Nibaw7qRQ== +"@typescript-eslint/typescript-estree@2.23.0": + version "2.23.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.23.0.tgz#d355960fab96bd550855488dcc34b9a4acac8d36" + integrity sha512-pmf7IlmvXdlEXvE/JWNNJpEvwBV59wtJqA8MLAxMKLXNKVRC3HZBXR/SlZLPWTCcwOSg9IM7GeRSV3SIerGVqw== dependencies: debug "^4.1.1" eslint-visitor-keys "^1.1.0" @@ -3104,14 +3113,14 @@ acorn-walk@^6.0.1, acorn-walk@^6.1.1: integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA== acorn@^5.5.3: - version "5.7.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" - integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== + version "5.7.4" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e" + integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg== acorn@^6.0.1, acorn@^6.0.7, acorn@^6.2.1: - version "6.4.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784" - integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw== + version "6.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474" + integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== acorn@^7.1.0: version "7.1.1" @@ -3208,14 +3217,14 @@ amdefine@>=0.0.4: resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= -amphtml-validator@1.0.23: - version "1.0.23" - resolved "https://registry.yarnpkg.com/amphtml-validator/-/amphtml-validator-1.0.23.tgz#dba0c3854289563c0adaac292cd4d6096ee4d7c8" - integrity sha1-26DDhUKJVjwK2qwpLNTWCW7k18g= +amphtml-validator@1.0.30: + version "1.0.30" + resolved "https://registry.yarnpkg.com/amphtml-validator/-/amphtml-validator-1.0.30.tgz#b722ea5e965d0cc028cbdc360fc76b97e669715e" + integrity sha512-CaEm2ivIi4M4QTiFnCE9t4MRgawCf88iAV/+VsS0zEw6T4VBU6zoXcgn4L+dt6/WZ/NYxKpc38duSoRLqZJhNQ== dependencies: - colors "1.1.2" - commander "2.9.0" - promise "7.1.1" + colors "1.2.5" + commander "2.15.1" + promise "8.0.1" ansi-colors@^1.0.1: version "1.1.0" @@ -4737,9 +4746,9 @@ bcrypt-pbkdf@^1.0.0: tweetnacl "^0.14.3" beachball@^1.11.7: - version "1.20.1" - resolved "https://registry.yarnpkg.com/beachball/-/beachball-1.20.1.tgz#547314e4ddb6d1d1ed520e8fe5112b3f428ed382" - integrity sha512-gi9XvRThmMH80EsEwFznJqrCkCS0RWqf/T54WPPIkhZe654U7JDluHyU1gLs8+9ITAJs7JPh4l5UlOYt+tD65w== + version "1.20.2" + resolved "https://registry.yarnpkg.com/beachball/-/beachball-1.20.2.tgz#ad52dedae5d3582627de611c371e8a9252129fc6" + integrity sha512-YZ3SADQqxlerKcM7SvFeZ+1QYi08vSNlfQZ7lPfYtn2yKZv+vaBt6fRrn8VVhW590rRUCFinjBRzFr//XqdQGg== dependencies: cosmiconfig "^6.0.0" fs-extra "^8.0.1" @@ -4919,10 +4928,10 @@ brorand@^1.0.1: resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= -browser-process-hrtime@^0.1.2: - version "0.1.3" - resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4" - integrity sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw== +browser-process-hrtime@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" + integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== browser-resolve@^1.11.3: version "1.11.3" @@ -5314,14 +5323,14 @@ caniuse-api@^1.5.2: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30001032" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001032.tgz#e22cb42d00005d2f98be82217c86d0acd6031132" - integrity sha512-thSkUHbrj3Qt4J6kt7j1IUTUFJaMPWAGhPRe9vIO5QIUSyHHPaJRabhfKRWvDs8MveleUERUhwYqK6paWqcyAw== + version "1.0.30001033" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001033.tgz#383288df833c85d83c2bfc3469245ec1fa1f881e" + integrity sha512-2ZReq+OHqHhsIQSiv8OVNhQ6Ht9eYJpwblZydHV8nI44Od6J5YUl3J9Wxvjry/v969jCHH5fR9+C6FwJ41XbOQ== caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001017, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001030: - version "1.0.30001032" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001032.tgz#b8d224914e2cd7f507085583d4e38144c652bce4" - integrity sha512-8joOm7BwcpEN4BfVHtfh0hBXSAPVYk+eUIcNntGtMkUWy/6AKRCDZINCLe3kB1vHhT2vBxBF85Hh9VlPXi/qjA== + version "1.0.30001033" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001033.tgz#60c328fb56860de60f9a2cb419c31fb80587cba0" + integrity sha512-8Ibzxee6ibc5q88cM1usPsMpJOG5CTq0s/dKOmlekPbDGKt+UrnOOTPSjQz3kVo6yL7N4SB5xd+FGLHQmbzh6A== capture-exit@^1.2.0: version "1.2.0" @@ -5750,20 +5759,20 @@ colors@1.0.3: resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs= -colors@1.1.2, colors@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" - integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM= +colors@1.2.5, colors@~1.2.1: + version "1.2.5" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.5.tgz#89c7ad9a374bc030df8013241f68136ed8835afc" + integrity sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg== colors@^1.1.2: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== -colors@~1.2.1: - version "1.2.5" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.5.tgz#89c7ad9a374bc030df8013241f68136ed8835afc" - integrity sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg== +colors@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" + integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM= columnify@^1.5.4: version "1.5.4" @@ -5814,18 +5823,16 @@ command-line-usage@^5.0.5: table-layout "^0.4.3" typical "^2.6.1" +commander@2.15.1: + version "2.15.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" + integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag== + commander@2.17.x: version "2.17.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg== -commander@2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" - integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q= - dependencies: - graceful-readlink ">= 1.0.0" - commander@^2.11.0, commander@^2.18.0, commander@^2.19.0, commander@^2.20.0, commander@^2.7.1, commander@^2.9.0, commander@~2.20.3: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" @@ -6114,12 +6121,17 @@ core-js-compat@^3.1.1, core-js-compat@^3.6.2: browserslist "^4.8.3" semver "7.0.0" +core-js-pure@^3.0.0: + version "3.6.4" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.4.tgz#4bf1ba866e25814f149d4e9aaa08c36173506e3a" + integrity sha512-epIhRLkXdgv32xIUFaaAry2wdxZYBi6bgM7cB136dzzXXa+dFyRLTZeLUJxnd8ShrmyVXBub63n2NHo2JAt8Cw== + core-js@^1.0.0: version "1.2.7" resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY= -core-js@^2.2.2, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0, core-js@^2.6.5: +core-js@^2.2.2, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0: version "2.6.11" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== @@ -6526,9 +6538,9 @@ dateformat@^3.0.0: integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== dayjs@^1.8.15: - version "1.8.21" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.21.tgz#98299185b72b9b679f31c7ed987b63923c961552" - integrity sha512-1kbWK0hziklUHkGgiKr7xm59KwAg/K3Tp7H/8X+f58DnNCwY3pKYjOCJpIlVs125FRBukGVZdKZojC073D0IeQ== + version "1.8.22" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.22.tgz#5e835d776b373e216678be8d12c336da71a25a9c" + integrity sha512-N8IXfxBD62Y9cKTuuuSoOlCXRnnzaTj1vu91r855iq6FbY5cZqOZnW/95nUn6kJiR+W9PHHrLykEoQOe6fUKxQ== debounce@^1.2.0: version "1.2.0" @@ -6556,7 +6568,7 @@ debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: dependencies: ms "^2.1.1" -debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5: +debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -6630,7 +6642,7 @@ deep-equal@^1.0.1: object-keys "^1.1.1" regexp.prototype.flags "^1.2.0" -deep-extend@~0.6.0: +deep-extend@^0.6.0, deep-extend@~0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== @@ -6780,6 +6792,11 @@ detect-indent@^5.0.0: resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50= +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + detect-newline@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" @@ -7032,9 +7049,9 @@ ejs@^2.6.1: integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.322, electron-to-chromium@^1.3.363: - version "1.3.368" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.368.tgz#d7597e04339f7ca70762031ec473d38eb2df6acb" - integrity sha512-fqzDipW3p+uDkHUHFPrdW3wINRKcJsbnJwBD7hgaQEQwcuLSvNLw6SeUp5gKDpTbmTl7zri7IZfhsdTUTnygJg== + version "1.3.372" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.372.tgz#fb61b6dfe06f3278a384d084ebef75d463ec7580" + integrity sha512-77a4jYC52OdisHM+Tne7dgWEvQT1FoNu/jYl279pP88ZtG4ZRIPyhQwAKxj6C2rzsyC1OwsOds9JlZtNncSz6g== elliptic@^6.0.0: version "6.5.2" @@ -7386,9 +7403,9 @@ eslint-plugin-promise@^4.2.1: integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw== eslint-plugin-react@^7.14.3: - version "7.18.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.18.3.tgz#8be671b7f6be095098e79d27ac32f9580f599bc8" - integrity sha512-Bt56LNHAQCoou88s8ViKRjMB2+36XRejCQ1VoLj716KI1MoE99HpTVvIThJ0rvFmG4E4Gsq+UgToEjn+j044Bg== + version "7.19.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz#6d08f9673628aa69c5559d33489e855d83551666" + integrity sha512-SPT8j72CGuAP+JFbT0sJHOB80TX/pu44gQ4vXH/cq+hQTiY2PuZ6IHkqXJV6x1b28GDdo1lbInjKUrrdUf0LOQ== dependencies: array-includes "^3.1.1" doctrine "^2.1.0" @@ -7398,8 +7415,10 @@ eslint-plugin-react@^7.14.3: object.fromentries "^2.0.2" object.values "^1.1.1" prop-types "^15.7.2" - resolve "^1.14.2" + resolve "^1.15.1" + semver "^6.3.0" string.prototype.matchall "^4.0.2" + xregexp "^4.3.0" eslint-plugin-standard@^4.0.1: version "4.0.1" @@ -8155,9 +8174,9 @@ find-cache-dir@^2.0.0, find-cache-dir@^2.1.0: pkg-dir "^3.0.0" find-cache-dir@^3.0.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.0.tgz#4d74ed1fe9ef1731467ca24378e8f8f5c8b6ed11" - integrity sha512-PtXtQb7IrD8O+h6Cq1dbpJH5NzD8+9keN1zZ0YlpDzl1PwXEJEBj6u1Xa92t1Hwluoozd9TNKul5Hi2iqpsWwg== + version "3.3.1" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" + integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ== dependencies: commondir "^1.0.1" make-dir "^3.0.2" @@ -8255,9 +8274,9 @@ flatten@^1.0.2: integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg== flow-parser@^0.*: - version "0.119.1" - resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.119.1.tgz#c120c402e164c7e9379a8d84b2c838adaaa0e610" - integrity sha512-yFd4z6ZBXq//TJo/gtSzGKhz6wEVeI2m+6JB25JzXuRAOhM5Ze4xFkc3FSIStbYjrAx4H1IUiUTI/yy30oKp8A== + version "0.120.1" + resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.120.1.tgz#26781130575fee4a45ecae0240b9d037e2746b72" + integrity sha512-t5y9QoOegJuY+LCIjh0p6SGF7ItsxG5ycQApTSqWloutUZQ2gC0f6wMu91dab0/SSj2vH41bu5pDTLuvtP49ng== flush-write-stream@^1.0.0: version "1.1.1" @@ -8740,9 +8759,9 @@ globals@^11.1.0: integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globals@^12.1.0: - version "12.3.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz#1e564ee5c4dded2ab098b0f88f24702a3c56be13" - integrity sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw== + version "12.4.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" + integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== dependencies: type-fest "^0.8.1" @@ -8790,11 +8809,6 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3 resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== -"graceful-readlink@>= 1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" - integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= - growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" @@ -9272,7 +9286,7 @@ hyphenate-style-name@^1.0.2, hyphenate-style-name@^1.0.3: resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz#097bb7fa0b8f1a9cf0bd5c734cf95899981a9b48" integrity sha512-EcuixamT82oplpoJ2XU4pDtKGWQ7b00CD9f1ug9IaQ3p1bkHMiKCZ9ut9QDI6qsa6cpUuB+A/I+zLtdNK4n2DQ== -iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@~0.4.13: +iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -9433,7 +9447,7 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@^1.3.2, ini@^1.3.4: +ini@^1.3.2, ini@^1.3.4, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -12476,6 +12490,13 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" +native-url@0.2.6: + version "0.2.6" + resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.2.6.tgz#ca1258f5ace169c716ff44eccbddb674e10399ae" + integrity sha512-k4bDC87WtgrdD362gZz6zoiXQrl40kYlBmpfmSjwRO1VU0V5ccwJTlxuE72F6m3V0vc1xOf6n3UCP9QyerRqmA== + dependencies: + querystring "^0.2.0" + natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -12492,6 +12513,15 @@ nearley@^2.7.10: randexp "0.4.6" semver "^5.4.1" +needle@^2.2.1: + version "2.3.3" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.3.tgz#a041ad1d04a871b0ebb666f40baaf1fb47867117" + integrity sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw== + dependencies: + debug "^3.2.6" + iconv-lite "^0.4.4" + sax "^1.2.4" + negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -12508,9 +12538,9 @@ next-tick@~1.0.0: integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= next@^9.2.1: - version "9.2.2" - resolved "https://registry.yarnpkg.com/next/-/next-9.2.2.tgz#c41a793011747cc51dc7c9b3b5d2a932caca5c57" - integrity sha512-7ribVzmj5wvOvp7kTynujukftHqgpGcxOPfUA8lYEWyTJHjsl/JVHE+eay4Qe74VEuCfDRQE8679fe0SKtsNXw== + version "9.3.0" + resolved "https://registry.yarnpkg.com/next/-/next-9.3.0.tgz#7be6ebbddd154214c523fb9e7b88c8e88d553378" + integrity sha512-dGuL9xufFqebF0CtbUrOaLXurEjLoqv8Si9U5Yi2ovzsfq2RPjQs8UmgOFYYRjGM4jhJOFCUK0bxLwvSb4uzBg== dependencies: "@ampproject/toolbox-optimizer" "2.0.0" "@babel/core" "7.7.2" @@ -12527,9 +12557,9 @@ next@^9.2.1: "@babel/preset-react" "7.7.0" "@babel/preset-typescript" "7.7.2" "@babel/runtime" "7.7.2" - "@babel/runtime-corejs2" "7.7.2" - "@next/polyfill-nomodule" "9.2.2" - amphtml-validator "1.0.23" + "@babel/types" "7.7.4" + "@next/polyfill-nomodule" "9.3.0" + amphtml-validator "1.0.30" async-retry "1.2.3" async-sema "3.0.0" autodll-webpack-plugin "0.4.2" @@ -12570,12 +12600,12 @@ next@^9.2.1: lru-cache "5.1.1" mini-css-extract-plugin "0.8.0" mkdirp "0.5.1" + native-url "0.2.6" node-fetch "2.6.0" - object-assign "4.1.1" ora "3.4.0" path-to-regexp "6.1.0" pnp-webpack-plugin "1.5.0" - postcss-flexbugs-fixes "4.1.0" + postcss-flexbugs-fixes "4.2.0" postcss-loader "3.0.0" postcss-preset-env "6.7.0" prop-types "15.7.2" @@ -12596,14 +12626,12 @@ next@^9.2.1: thread-loader "2.1.3" unfetch "4.1.0" url "0.11.0" - url-polyfill "1.1.7" use-subscription "1.1.1" - watchpack "2.0.0-beta.5" - webpack "4.41.2" + watchpack "2.0.0-beta.13" + webpack "4.42.0" webpack-dev-middleware "3.7.0" webpack-hot-middleware "2.25.0" webpack-sources "1.4.3" - whatwg-fetch "3.0.0" ngrok@^3.0.1: version "3.2.7" @@ -12769,10 +12797,26 @@ node-notifier@^5.1.2, node-notifier@^5.2.1, node-notifier@^5.4.2: shellwords "^0.1.1" which "^1.3.0" +node-pre-gyp@*: + version "0.14.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" + integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4.4.2" + node-releases@^1.1.44, node-releases@^1.1.50: - version "1.1.50" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.50.tgz#803c40d2c45db172d0410e4efec83aa8c6ad0592" - integrity sha512-lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ== + version "1.1.51" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.51.tgz#70d0e054221343d2966006bfbd4d98622cc00bd0" + integrity sha512-1eQEs6HFYY1kMXQPOLzCf7HdjReErmvn85tZESMczdCNVWP3Y7URYLBAyYynuI7yef1zj4HN5q+oB2x67QU0lw== dependencies: semver "^6.3.0" @@ -12820,9 +12864,9 @@ noop-fn@^1.0.0: abbrev "1" nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= + version "4.0.3" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" + integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== dependencies: abbrev "1" osenv "^0.1.4" @@ -12929,7 +12973,7 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1: semver "^5.6.0" validate-npm-package-name "^3.0.0" -npm-packlist@^1.4.4: +npm-packlist@^1.1.6, npm-packlist@^1.4.4: version "1.4.8" resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== @@ -12966,7 +13010,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.1.2: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2, npmlog@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -13022,7 +13066,7 @@ ob1@0.55.0: resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.55.0.tgz#e393b4ae786ef442b3ef2a298ab70d6ec353dbdd" integrity sha512-pfyiMVsUItl8WiRKMT15eCi662pCRAuYTq2+V3UpE+PpFErJI/TvRh/M/l/9TaLlbFr7krJ7gdl+FXJNcybmvw== -object-assign@4.1.1, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -13995,12 +14039,12 @@ postcss-filter-plugins@^2.0.0: dependencies: postcss "^5.0.4" -postcss-flexbugs-fixes@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.1.0.tgz#e094a9df1783e2200b7b19f875dcad3b3aff8b20" - integrity sha512-jr1LHxQvStNNAHlgco6PzY308zvLklh7SJVYuWUwyUQncofaAlD2l+P/gxKHOdqWKe7xJSkVLFF/2Tp+JqMSZA== +postcss-flexbugs-fixes@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.0.tgz#662b3dcb6354638b9213a55eed8913bcdc8d004a" + integrity sha512-QRE0n3hpkxxS/OGvzOa+PDuy4mh/Jg4o9ui22/ko5iGYOG3M5dfJabjnAZjTdh2G9F85c7Hv8hWcEDEKW/xceQ== dependencies: - postcss "^7.0.0" + postcss "^7.0.26" postcss-focus-visible@^4.0.0: version "4.0.0" @@ -14618,10 +14662,10 @@ promise-retry@^1.1.1: err-code "^1.0.0" retry "^0.10.0" -promise@7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/promise/-/promise-7.1.1.tgz#489654c692616b8aa55b0724fa809bb7db49c5bf" - integrity sha1-SJZUxpJha4qlWwck+oCbt9tJxb8= +promise@8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/promise/-/promise-8.0.1.tgz#e45d68b00a17647b6da711bf85ed6ed47208f450" + integrity sha1-5F1osAoXZHttpxG/he1u1HII9FA= dependencies: asap "~2.0.3" @@ -14891,6 +14935,16 @@ raw-loader@^0.5.1: resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa" integrity sha1-DD0L6u2KAclm2Xh793goElKpeao= +rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + react-app-polyfill@~1.0.1: version "1.0.6" resolved "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-1.0.6.tgz#890f8d7f2842ce6073f030b117de9130a5f385f0" @@ -15688,7 +15742,7 @@ resolve@1.8.1: dependencies: path-parse "^1.0.5" -resolve@1.x, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.7.1, resolve@^1.8.1: +resolve@1.x, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.7.1, resolve@^1.8.1: version "1.15.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w== @@ -15739,7 +15793,7 @@ rework@1.0.1: convert-source-map "^0.3.3" css "^2.0.0" -rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3: +rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -15999,7 +16053,7 @@ selfsigned@^1.9.1: dependencies: node-forge "0.9.0" -"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: +"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -16738,6 +16792,11 @@ strip-json-comments@^3.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + strong-log-transformer@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10" @@ -16919,7 +16978,7 @@ tar@^2.0.0: fstream "^1.0.12" inherits "2" -tar@^4.4.10, tar@^4.4.12, tar@^4.4.8: +tar@^4.4.10, tar@^4.4.12, tar@^4.4.2, tar@^4.4.8: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== @@ -16975,7 +17034,7 @@ temp@^0.8.1: dependencies: rimraf "~2.6.2" -terser-webpack-plugin@^1.4.1, terser-webpack-plugin@^1.4.3: +terser-webpack-plugin@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" integrity sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA== @@ -17786,11 +17845,6 @@ url-parse@^1.4.3, url-parse@^1.4.4: querystringify "^2.1.1" requires-port "^1.0.0" -url-polyfill@1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/url-polyfill/-/url-polyfill-1.1.7.tgz#402ee84360eb549bbeb585f4c7971e79a31de9e3" - integrity sha512-ZrAxYWCREjmMtL8gSbSiKKLZZticgihCvVBtrFbUVpyoETt8GQJeG2okMWA8XryDAaHMjJfhnc+rnhXRbI4DXA== - url@0.11.0, url@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" @@ -17957,11 +18011,11 @@ vm-browserify@^1.0.1: integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== w3c-hr-time@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045" - integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU= + version "1.0.2" + resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" + integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== dependencies: - browser-process-hrtime "^0.1.2" + browser-process-hrtime "^1.0.0" walker@^1.0.7, walker@~1.0.5: version "1.0.7" @@ -17978,14 +18032,13 @@ watch@~0.18.0: exec-sh "^0.2.0" minimist "^1.2.0" -watchpack@2.0.0-beta.5: - version "2.0.0-beta.5" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.0.0-beta.5.tgz#c005db39570d81d9d34334870abc0f548901b880" - integrity sha512-HGqh9e9QZFhow8JYX+1+E+kIYK0uTTsk6rCOkI0ff0f9kMO0wX783yW8saQC9WDx7qHpVGPXsRnld9nY7iwzQA== +watchpack@2.0.0-beta.13: + version "2.0.0-beta.13" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.0.0-beta.13.tgz#9d9b0c094b8402139333e04eb6194643c8384f55" + integrity sha512-ZEFq2mx/k5qgQwgi6NOm+2ImICb8ngAkA/rZ6oyXZ7SgPn3pncf+nfhYTCrs3lmHwOxnPtGLTOuFLfpSMh1VMA== dependencies: glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" - neo-async "^2.5.0" watchpack@^1.6.0: version "1.6.0" @@ -18154,36 +18207,7 @@ webpack-sources@1.4.3, webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-s source-list-map "^2.0.0" source-map "~0.6.1" -webpack@4.41.2: - version "4.41.2" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.2.tgz#c34ec76daa3a8468c9b61a50336d8e3303dce74e" - integrity sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-module-context" "1.8.5" - "@webassemblyjs/wasm-edit" "1.8.5" - "@webassemblyjs/wasm-parser" "1.8.5" - acorn "^6.2.1" - ajv "^6.10.2" - ajv-keywords "^3.4.1" - chrome-trace-event "^1.0.2" - enhanced-resolve "^4.1.0" - eslint-scope "^4.0.3" - json-parse-better-errors "^1.0.2" - loader-runner "^2.4.0" - loader-utils "^1.2.3" - memory-fs "^0.4.1" - micromatch "^3.1.10" - mkdirp "^0.5.1" - neo-async "^2.6.1" - node-libs-browser "^2.2.1" - schema-utils "^1.0.0" - tapable "^1.1.3" - terser-webpack-plugin "^1.4.1" - watchpack "^1.6.0" - webpack-sources "^1.4.1" - -webpack@^4.29.5: +webpack@4.42.0, webpack@^4.29.5: version "4.42.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.0.tgz#b901635dd6179391d90740a63c93f76f39883eb8" integrity sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w== @@ -18510,6 +18534,13 @@ xregexp@4.0.0: resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020" integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg== +xregexp@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz#7e92e73d9174a99a59743f67a4ce879a04b5ae50" + integrity sha512-7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g== + dependencies: + "@babel/runtime-corejs3" "^7.8.3" + xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" @@ -18536,11 +18567,11 @@ yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== yaml@^1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz#f26aabf738590ab61efaca502358e48dc9f348b2" - integrity sha512-qXROVp90sb83XtAoqE8bP9RwAkTTZbugRUTm5YeFCBfNRPEp2YzTeqWiz7m5OORHzEvrA/qcGS8hp/E+MMROYw== + version "1.8.0" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.8.0.tgz#169fbcfa2081302dc9441d02b0b6fe667e4f74c9" + integrity sha512-6qI/tTx7OVtA4qNqD0OyutbM6Z9EKu4rxWm/2Y3FDEBQ4/2X2XAnyuRXMzAE2+1BPyqzksJZtrIwblOHg0IEzA== dependencies: - "@babel/runtime" "^7.6.3" + "@babel/runtime" "^7.8.7" yargs-parser@10.x, yargs-parser@^10.0.0, yargs-parser@^10.1.0: version "10.1.0" From 928dd99a86be6f7e68471def7d53a8a989a332ee Mon Sep 17 00:00:00 2001 From: "REDMOND\\krsiler" Date: Tue, 24 Mar 2020 12:59:54 -0700 Subject: [PATCH 02/24] update yarn lock --- yarn.lock | 63 ++++++++----------------------------------------------- 1 file changed, 9 insertions(+), 54 deletions(-) diff --git a/yarn.lock b/yarn.lock index 651f9640af..0c00cc5062 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6568,7 +6568,7 @@ debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: dependencies: ms "^2.1.1" -debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: +debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -6642,7 +6642,7 @@ deep-equal@^1.0.1: object-keys "^1.1.1" regexp.prototype.flags "^1.2.0" -deep-extend@^0.6.0, deep-extend@~0.6.0: +deep-extend@~0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== @@ -6792,11 +6792,6 @@ detect-indent@^5.0.0: resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50= -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - detect-newline@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" @@ -9286,7 +9281,7 @@ hyphenate-style-name@^1.0.2, hyphenate-style-name@^1.0.3: resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz#097bb7fa0b8f1a9cf0bd5c734cf95899981a9b48" integrity sha512-EcuixamT82oplpoJ2XU4pDtKGWQ7b00CD9f1ug9IaQ3p1bkHMiKCZ9ut9QDI6qsa6cpUuB+A/I+zLtdNK4n2DQ== -iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: +iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -9447,7 +9442,7 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@^1.3.2, ini@^1.3.4, ini@~1.3.0: +ini@^1.3.2, ini@^1.3.4: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -12513,15 +12508,6 @@ nearley@^2.7.10: randexp "0.4.6" semver "^5.4.1" -needle@^2.2.1: - version "2.3.3" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.3.tgz#a041ad1d04a871b0ebb666f40baaf1fb47867117" - integrity sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -12797,22 +12783,6 @@ node-notifier@^5.1.2, node-notifier@^5.2.1, node-notifier@^5.4.2: shellwords "^0.1.1" which "^1.3.0" -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - node-releases@^1.1.44, node-releases@^1.1.50: version "1.1.51" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.51.tgz#70d0e054221343d2966006bfbd4d98622cc00bd0" @@ -12973,7 +12943,7 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1: semver "^5.6.0" validate-npm-package-name "^3.0.0" -npm-packlist@^1.1.6, npm-packlist@^1.4.4: +npm-packlist@^1.4.4: version "1.4.8" resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== @@ -13010,7 +12980,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2, npmlog@^4.1.2: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -14935,16 +14905,6 @@ raw-loader@^0.5.1: resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa" integrity sha1-DD0L6u2KAclm2Xh793goElKpeao= -rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - react-app-polyfill@~1.0.1: version "1.0.6" resolved "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-1.0.6.tgz#890f8d7f2842ce6073f030b117de9130a5f385f0" @@ -15793,7 +15753,7 @@ rework@1.0.1: convert-source-map "^0.3.3" css "^2.0.0" -rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: +rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -16053,7 +16013,7 @@ selfsigned@^1.9.1: dependencies: node-forge "0.9.0" -"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: +"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -16792,11 +16752,6 @@ strip-json-comments@^3.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - strong-log-transformer@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10" @@ -16978,7 +16933,7 @@ tar@^2.0.0: fstream "^1.0.12" inherits "2" -tar@^4.4.10, tar@^4.4.12, tar@^4.4.2, tar@^4.4.8: +tar@^4.4.10, tar@^4.4.12, tar@^4.4.8: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== From 804446961b0175da6ad73705ac8f2db33ed766a6 Mon Sep 17 00:00:00 2001 From: "REDMOND\\krsiler" Date: Tue, 24 Mar 2020 16:07:17 -0700 Subject: [PATCH 03/24] Add fluent typeramp variants to fluent native text --- .../src/RNTester/TestComponents/ThemeTest.tsx | 8 +-- packages/components/Link/src/Link.settings.ts | 4 +- packages/components/text/src/Text.settings.ts | 4 +- packages/components/text/src/Text.types.ts | 5 +- .../text/src/__tests__/Text.test.win32.tsx | 21 ++++--- .../__snapshots__/Text.test.win32.tsx.snap | 4 +- .../src/Link/Link.settings.ts | 4 +- .../src/Text/Text.settings.ts | 4 +- .../framework/theming-ramp/src/Theme.test.ts | 22 +++++-- .../theming-ramp/src/Typography.test.ts | 33 ++++++++--- .../theming-ramp/src/Typography.types.ts | 58 +++++++++++++++---- .../src/BaselinePlatformDefaults.ts | 40 ++++++++----- packages/utils/tokens/src/text-tokens.ts | 43 ++++++++++---- 13 files changed, 176 insertions(+), 74 deletions(-) diff --git a/experiments/tester/src/RNTester/TestComponents/ThemeTest.tsx b/experiments/tester/src/RNTester/TestComponents/ThemeTest.tsx index 9ae6891c4f..6acb20b0ba 100644 --- a/experiments/tester/src/RNTester/TestComponents/ThemeTest.tsx +++ b/experiments/tester/src/RNTester/TestComponents/ThemeTest.tsx @@ -60,14 +60,14 @@ const getThemedStyles = themedStyleSheet((theme: ITheme) => { }, extraLargeStandardEmphasis: { color: hostSettings ? hostSettings.palette.TextEmphasis : theme.colors.bodyText, - fontSize: theme.typography.sizes.xxLarge, - fontWeight: theme.typography.weights.medium, + fontSize: theme.typography.sizes.hero, + fontWeight: theme.typography.weights.regular, fontFamily: theme.typography.families.primary } as ReactNative.TextStyle, largeStandard: { color: theme.colors.bodyText, - fontSize: theme.typography.sizes.large, - fontWeight: theme.typography.weights.medium, + fontSize: theme.typography.sizes.body, + fontWeight: theme.typography.weights.regular, fontFamily: theme.typography.families.primary, marginBottom: 5 } as ReactNative.TextStyle, diff --git a/packages/components/Link/src/Link.settings.ts b/packages/components/Link/src/Link.settings.ts index 774a403ccb..3bb5de685f 100644 --- a/packages/components/Link/src/Link.settings.ts +++ b/packages/components/Link/src/Link.settings.ts @@ -7,8 +7,8 @@ export const settings: IComposeSettings = [ { tokens: { fontFamily: 'primary', - fontSize: 'medium', - fontWeight: 'medium', + fontSize: 'secondary', + fontWeight: 'regular', color: 'link' }, root: { diff --git a/packages/components/text/src/Text.settings.ts b/packages/components/text/src/Text.settings.ts index 93e7fb8d16..48863a1c4d 100644 --- a/packages/components/text/src/Text.settings.ts +++ b/packages/components/text/src/Text.settings.ts @@ -5,9 +5,7 @@ import { IComposeSettings } from '@uifabricshared/foundation-compose'; export const settings: IComposeSettings = [ { tokens: { - fontFamily: 'primary', - fontSize: 'medium', - fontWeight: 'medium', + fontVariant: 'secondaryStandard', color: 'bodyText' }, root: { diff --git a/packages/components/text/src/Text.types.ts b/packages/components/text/src/Text.types.ts index 5f52f81102..e63ceb86c9 100644 --- a/packages/components/text/src/Text.types.ts +++ b/packages/components/text/src/Text.types.ts @@ -1,4 +1,4 @@ -import { ITextTokens, IForegroundColorTokens } from '@fluentui-react-native/tokens'; +import { ITextTokens, ITextVariantTokens, IForegroundColorTokens, IColorTokens } from '@fluentui-react-native/tokens'; import { ITextProps as INativeTextProps } from '@fluentui-react-native/adapters'; export const textName = 'RNFText'; @@ -7,13 +7,14 @@ export const textName = 'RNFText'; * Properties for fabric native text field, these extend the default props for text */ export type ITextProps = TBase & - ITextTokens & + ITextVariantTokens & IForegroundColorTokens & { disabled?: boolean; }; export type ITextType = { props: ITextProps; + tokens: ITextTokens & IColorTokens; slotProps: { root: TBase; }; diff --git a/packages/components/text/src/__tests__/Text.test.win32.tsx b/packages/components/text/src/__tests__/Text.test.win32.tsx index 7484f1bc8d..233ae1107a 100644 --- a/packages/components/text/src/__tests__/Text.test.win32.tsx +++ b/packages/components/text/src/__tests__/Text.test.win32.tsx @@ -8,17 +8,24 @@ it('Text default', () => { }); it('Text all props', () => { - const tree = renderer.create(All props).toJSON(); - expect(tree).toMatchSnapshot(); -}); - -it('Text all tokens', () => { const tree = renderer .create( - - All tokens + + All props ) .toJSON(); expect(tree).toMatchSnapshot(); }); + +it('Text all tokens', () => { + const BoldText = Text.customize({ + tokens: { + fontFamily: 'Wingdings', + fontWeight: '900', + fontSize: 15 + } + }); + const tree = renderer.create(All tokens).toJSON(); + expect(tree).toMatchSnapshot(); +}); diff --git a/packages/components/text/src/__tests__/__snapshots__/Text.test.win32.tsx.snap b/packages/components/text/src/__tests__/__snapshots__/Text.test.win32.tsx.snap index 1f3588d5c8..aec60dbfee 100644 --- a/packages/components/text/src/__tests__/__snapshots__/Text.test.win32.tsx.snap +++ b/packages/components/text/src/__tests__/__snapshots__/Text.test.win32.tsx.snap @@ -5,9 +5,7 @@ exports[`Text all props 1`] = ` style={ Object { "color": "pink", - "fontFamily": "Segoe UI", - "fontSize": 12, - "fontWeight": "500", + "fontVariant": "bodyStandard", "margin": 0, } } diff --git a/packages/experiments/experimental-web-controls/src/Link/Link.settings.ts b/packages/experiments/experimental-web-controls/src/Link/Link.settings.ts index 53b5a1332f..334a6d1d95 100644 --- a/packages/experiments/experimental-web-controls/src/Link/Link.settings.ts +++ b/packages/experiments/experimental-web-controls/src/Link/Link.settings.ts @@ -5,8 +5,8 @@ export const settings: IComposeSettings = [ { tokens: { fontFamily: 'primary', - fontSize: 'medium', - fontWeight: 'medium', + fontSize: 'secondary', + fontWeight: 'regular', color: 'link' }, root: { diff --git a/packages/experiments/experimental-web-controls/src/Text/Text.settings.ts b/packages/experiments/experimental-web-controls/src/Text/Text.settings.ts index 1839f1033b..52553a73d7 100644 --- a/packages/experiments/experimental-web-controls/src/Text/Text.settings.ts +++ b/packages/experiments/experimental-web-controls/src/Text/Text.settings.ts @@ -5,8 +5,8 @@ export const settings: IComposeSettings = [ { tokens: { fontFamily: 'primary', - fontSize: 'medium', - fontWeight: 'medium', + fontSize: 'secondary', + fontWeight: 'regular', color: 'bodyText' }, root: { diff --git a/packages/framework/theming-ramp/src/Theme.test.ts b/packages/framework/theming-ramp/src/Theme.test.ts index 41aeba0402..264ef4b3ab 100644 --- a/packages/framework/theming-ramp/src/Theme.test.ts +++ b/packages/framework/theming-ramp/src/Theme.test.ts @@ -12,10 +12,17 @@ const theme: ITheme = { primary: 'Arial' }, sizes: { - medium: 14 + secondary: 14 }, weights: { - medium: '500' + regular: '400' + }, + variants: { + secondaryStandard: { + face: 'Arial', + size: 14, + weight: '400' + } } } as ITypography, spacing: { s2: '4px', s1: '8px', m: '16px', l1: '20px', l2: '32px' }, @@ -71,10 +78,17 @@ describe('Theme tests', () => { primary: 'Arial' }, sizes: { - medium: 14 + secondary: 14 }, weights: { - medium: '500' + regular: '400' + }, + variants: { + secondaryStandard: { + face: 'Arial', + size: 14, + weight: '400' + } } } as ITypography, spacing: { s2: '4px', s1: '8px', m: '16px', l1: '20px', l2: '32px' }, diff --git a/packages/framework/theming-ramp/src/Typography.test.ts b/packages/framework/theming-ramp/src/Typography.test.ts index d6499d21a3..d0f1056f05 100644 --- a/packages/framework/theming-ramp/src/Typography.test.ts +++ b/packages/framework/theming-ramp/src/Typography.test.ts @@ -1,4 +1,4 @@ -import { IFontFamilies, IFontSizes, IFontWeights, ITypography } from './Typography.types'; +import { IFontFamilies, IFontSizes, IFontWeights, IFontVariants, ITypography } from './Typography.types'; import { resolveFontFamily, resolveFontSize, resolveFontWeight } from './Typography'; const families = { @@ -7,19 +7,38 @@ const families = { } as IFontFamilies; const sizes = { - xSmall: 8, - xLarge: 16 + caption: 8, + subheader: 16 } as IFontSizes; const weights = { - medium: '500', + regular: '500', semiBold: '700' } as IFontWeights; +const variants = { + captionStandard: { + face: 'Verdana', + size: 8, + weight: '500' + }, + subheaderStandard: { + face: 'Verdana', + size: 16, + weight: '500' + }, + subheaderSemibold: { + face: 'Verdana', + size: 16, + weight: '700' + } +} as IFontVariants; + const typography: ITypography = { families, sizes, - weights + weights, + variants }; describe('Typography tests', () => { @@ -31,8 +50,8 @@ describe('Typography tests', () => { expect(resolveFontFamily(typography, 'Arial')).toBe('Arial'); }); - test('resolveFontSize "xSmall" returns 8', () => { - expect(resolveFontSize(typography, 'xSmall')).toBe(8); + test('resolveFontSize "caption" returns 8', () => { + expect(resolveFontSize(typography, 'caption')).toBe(8); }); test('resolveFontSize 15 returns 15', () => { diff --git a/packages/framework/theming-ramp/src/Typography.types.ts b/packages/framework/theming-ramp/src/Typography.types.ts index 8024674377..0a1d41cafa 100644 --- a/packages/framework/theming-ramp/src/Typography.types.ts +++ b/packages/framework/theming-ramp/src/Typography.types.ts @@ -50,15 +50,13 @@ export type FontSizeValuePoints = number; * These names should be used when defining a theme. */ export interface IFontSizes { - xxxSmall: FontSizeValuePoints; - xxSmall: FontSizeValuePoints; - xSmall: FontSizeValuePoints; - small: FontSizeValuePoints; - medium: FontSizeValuePoints; - large: FontSizeValuePoints; - xLarge: FontSizeValuePoints; - xxLarge: FontSizeValuePoints; - xxxLarge: FontSizeValuePoints; + caption: FontSizeValuePoints; + secondary: FontSizeValuePoints; + body: FontSizeValuePoints; + subheader: FontSizeValuePoints; + header: FontSizeValuePoints; + hero: FontSizeValuePoints; + heroLarge: FontSizeValuePoints; } /** @@ -85,8 +83,7 @@ export type FontWeightValue = '100' | '200' | '300' | '400' | '500' | '600' | '7 */ export interface IFontWeights { light: FontWeightValue; - semiLight: FontWeightValue; - medium: FontWeightValue; + regular: FontWeightValue; semiBold: FontWeightValue; bold: FontWeightValue; } @@ -96,18 +93,55 @@ export interface IFontWeights { */ export type FontWeight = keyof IFontWeights | FontWeightValue; +/** + * A font variant value. + */ +export type FontVariantValue = { + face: FontFamily; + size: FontSize; + weight: FontWeight; +}; + +/** + * A collection of named font variants. + */ +export interface IFontVariants { + captionStandard: FontVariantValue; + secondaryStandard: FontVariantValue; + secondarySemibold: FontVariantValue; + bodyStandard: FontVariantValue; + bodySemibold: FontVariantValue; + subheaderStandard: FontVariantValue; + subheaderSemibold: FontVariantValue; + headerStandard: FontVariantValue; + headerSemibold: FontVariantValue; + heroStandard: FontVariantValue; + heroSemibold: FontVariantValue; + heroLargeStandard: FontVariantValue; + heroLargeSemibold: FontVariantValue; +} + +/** + * A font variant, used when defining a visual element in a theme. + */ +export type FontVariant = keyof IFontVariants | FontVariantValue; + /** * A collection of typographic (font) information. * * When setting a font in a theme, choose a family, size and weight from * this collection. */ -export interface ITypography { + +export interface ITextStyle { families: IFontFamilies; sizes: IFontSizes; weights: IFontWeights; + variants: IFontVariants; } +export type ITypography = ITextStyle; + /** * A partially specified typography. */ diff --git a/packages/framework/theming-react-native/src/BaselinePlatformDefaults.ts b/packages/framework/theming-react-native/src/BaselinePlatformDefaults.ts index 436bf7e196..61d70ddeb5 100644 --- a/packages/framework/theming-react-native/src/BaselinePlatformDefaults.ts +++ b/packages/framework/theming-react-native/src/BaselinePlatformDefaults.ts @@ -4,22 +4,19 @@ import { getStockWebPalette, ITypography, ISpacing } from '@uifabricshared/themi function _defaultTypography(): ITypography { return { sizes: { - xxxSmall: 8, - xxSmall: 9, - xSmall: 10, - small: 11, - medium: 12, - large: 14, - xLarge: 18, - xxLarge: 24, - xxxLarge: 32 + caption: 8, + secondary: 9, + body: 11, + subheader: 12, + header: 15, + hero: 22, + heroLarge: 30 }, weights: { - light: '200', - semiLight: '300', - medium: '500', - semiBold: '700', - bold: '900' + light: '300', + regular: '400', + semiBold: '600', + bold: '700' }, families: { primary: 'Segoe UI', @@ -28,6 +25,21 @@ function _defaultTypography(): ITypography { monospace: 'System', sansSerif: 'System', serif: 'System' + }, + variants: { + captionStandard: { face: 'primary', size: 'caption', weight: 'regular' }, + secondaryStandard: { face: 'primary', size: 'secondary', weight: 'regular' }, + secondarySemibold: { face: 'primary', size: 'secondary', weight: 'semiBold' }, + bodyStandard: { face: 'primary', size: 'body', weight: 'regular' }, + bodySemibold: { face: 'primary', size: 'body', weight: 'semiBold' }, + subheaderStandard: { face: 'primary', size: 'subheader', weight: 'regular' }, + subheaderSemibold: { face: 'primary', size: 'subheader', weight: 'semiBold' }, + headerStandard: { face: 'primary', size: 'header', weight: 'regular' }, + headerSemibold: { face: 'primary', size: 'header', weight: 'semiBold' }, + heroStandard: { face: 'primary', size: 'hero', weight: 'regular' }, + heroSemibold: { face: 'primary', size: 'hero', weight: 'semiBold' }, + heroLargeStandard: { face: 'primary', size: 'heroLarge', weight: 'regular' }, + heroLargeSemibold: { face: 'primary', size: 'heroLarge', weight: 'semiBold' } } }; } diff --git a/packages/utils/tokens/src/text-tokens.ts b/packages/utils/tokens/src/text-tokens.ts index 8deb7e0024..c951cbc1d3 100644 --- a/packages/utils/tokens/src/text-tokens.ts +++ b/packages/utils/tokens/src/text-tokens.ts @@ -1,15 +1,34 @@ -import { TextStyle } from 'react-native'; -import { IOperationSet } from '@uifabricshared/foundation-tokens'; -import { ITheme } from '@uifabricshared/theming-ramp'; +import { TextStyle, TextProps } from 'react-native'; +import { ITheme, ITypography } from '@uifabricshared/theming-ramp'; +import { styleFunction } from '@uifabricshared/foundation-tokens'; -export interface ITextTokens { - fontFamily?: TextStyle['fontFamily'] | string; - fontSize?: TextStyle['fontSize'] | string; - fontWeight?: TextStyle['fontWeight'] | string; +export interface ITextVariantTokens { + fontVariant?: keyof ITypography['variants'] | string; } -export const textTokens: IOperationSet = [ - { source: 'fontFamily', lookup: (t: ITheme) => t.typography.families }, - { source: 'fontSize', lookup: (t: ITheme) => t.typography.sizes }, - { source: 'fontWeight', lookup: (t: ITheme) => t.typography.weights } -]; +export interface ITextStyleTokens { + fontFamily?: keyof ITypography['families'] | TextStyle['fontFamily'] | string; + fontSize?: keyof ITypography['sizes'] | TextStyle['fontSize'] | string; + fontWeight?: keyof ITypography['weights'] | TextStyle['fontWeight'] | string; +} + +export type ITextTokens = ITextStyleTokens & ITextVariantTokens; + +export function _buildTextStyles({ fontFamily, fontSize, fontWeight, fontVariant }: ITextTokens, { typography }: ITheme): TextProps { + const { families, sizes, weights, variants } = typography; + if (fontFamily || fontSize || fontWeight || fontVariant) { + return { + style: { + fontFamily: families[fontFamily] || fontFamily || families[variants[fontVariant].face] || variants[fontVariant].face, + fontSize: sizes[fontSize] || fontSize || sizes[variants[fontVariant].size] || variants[fontVariant].size, + fontWeight: weights[fontWeight] || fontWeight || weights[variants[fontVariant].weight] || variants[fontVariant].weight + } + }; + } + + return {}; +} + +const _keyProps: (keyof ITextTokens)[] = ['fontFamily', 'fontSize', 'fontWeight', 'fontVariant']; + +export const textTokens = styleFunction(_buildTextStyles, _keyProps); From a3a68af03882da9a3d1c5dadec118387991e00a3 Mon Sep 17 00:00:00 2001 From: "REDMOND\\krsiler" Date: Tue, 24 Mar 2020 16:07:45 -0700 Subject: [PATCH 04/24] Add tests for text --- .../TestComponents/Text/CustomizeUsage.tsx | 87 +++++++++++++++++++ .../TestComponents/Text/StandardUsage.tsx | 24 +++++ .../RNTester/TestComponents/Text/TextTest.tsx | 21 +++++ .../RNTester/TestComponents/Text/styles.ts | 16 ++++ .../src/RNTester/TestComponents/index.ts | 5 ++ 5 files changed, 153 insertions(+) create mode 100644 experiments/tester/src/RNTester/TestComponents/Text/CustomizeUsage.tsx create mode 100644 experiments/tester/src/RNTester/TestComponents/Text/StandardUsage.tsx create mode 100644 experiments/tester/src/RNTester/TestComponents/Text/TextTest.tsx create mode 100644 experiments/tester/src/RNTester/TestComponents/Text/styles.ts diff --git a/experiments/tester/src/RNTester/TestComponents/Text/CustomizeUsage.tsx b/experiments/tester/src/RNTester/TestComponents/Text/CustomizeUsage.tsx new file mode 100644 index 0000000000..fcaee2cf62 --- /dev/null +++ b/experiments/tester/src/RNTester/TestComponents/Text/CustomizeUsage.tsx @@ -0,0 +1,87 @@ +import * as React from 'react'; +import { View } from 'react-native'; +import { Stack } from '@fluentui-react-native/stack'; +import { Text } from '@fluentui-react-native/text'; +import { stackStyle } from '../../TesterStyles'; +import { styles } from './styles'; +import { useTheme } from '@uifabricshared/theming-react-native'; + +export const CustomizeUsage: React.FunctionComponent<{}> = () => { + const theme = useTheme(); + + const RedCaptionBold = Text.customize({ tokens: { fontVariant: 'captionStandard', fontWeight: 'bold', color: '#ff0000' } }); + const OrangeSecondaryBold = Text.customize({ tokens: { fontVariant: 'secondaryStandard', fontWeight: 'bold', color: '#ff9900' } }); + const YellowBodyBold = Text.customize({ tokens: { fontVariant: 'bodyStandard', fontWeight: 'bold', color: '#f3ce00' } }); + const GreenSubheaderBold = Text.customize({ tokens: { fontVariant: 'subheaderStandard', fontWeight: 'bold', color: '#02c440' } }); + const BlueHeaderBold = Text.customize({ tokens: { fontVariant: 'headerStandard', fontWeight: 'bold', color: '#0229c4' } }); + const IndigoHeroBold = Text.customize({ tokens: { fontVariant: 'heroStandard', fontWeight: 'bold', color: '#4b0082' } }); + const PurpleHeroLargeBold = Text.customize({ tokens: { fontVariant: 'heroLargeStandard', fontWeight: 'bold', color: '#8402c4' } }); + + const ArialBlack = Text.customize({ tokens: { fontVariant: 'heroLargeStandard', fontFamily: 'Arial Black' } }); + const BrushScriptMT = Text.customize({ tokens: { fontVariant: 'heroStandard', fontFamily: 'Brush Script MT' } }); + const CourierNew = Text.customize({ tokens: { fontVariant: 'headerStandard', fontFamily: 'Courier New' } }); + const Georgia = Text.customize({ tokens: { fontVariant: 'subheaderStandard', fontFamily: 'Georgia' } }); + const SegoeScript = Text.customize({ tokens: { fontVariant: 'bodyStandard', fontFamily: 'Segoe Script' } }); + const TimesNewRoman = Text.customize({ tokens: { fontVariant: 'secondaryStandard', fontFamily: 'Times New Roman' } }); + const Wingdings = Text.customize({ tokens: { fontVariant: 'captionStandard', fontFamily: 'Wingdings' } }); + + const LightText = Text.customize({ + tokens: { + fontFamily: theme.typography.families.primary, + fontWeight: theme.typography.weights.light, + fontSize: theme.typography.sizes.hero + } + }); + const RegularText = Text.customize({ + tokens: { + fontFamily: theme.typography.families.primary, + fontWeight: theme.typography.weights.regular, + fontSize: theme.typography.sizes.hero + } + }); + const SemiBoldText = Text.customize({ + tokens: { + fontFamily: theme.typography.families.primary, + fontWeight: theme.typography.weights.semiBold, + fontSize: theme.typography.sizes.hero + } + }); + const BoldText = Text.customize({ + tokens: { + fontFamily: theme.typography.families.primary, + fontWeight: theme.typography.weights.bold, + fontSize: theme.typography.sizes.hero + } + }); + + return ( + + + RedCaptionBold + OrangeSecondaryBold + YellowBodyBold + GreenSubheaderBold + BlueHeaderBold + IndigoHeroBold + PurpleHeroLargeBold + + + + Arial Black + Brush Script MT + Courier New + Georgia + Segoe Script + TimesNewRoman + Wingdings + + + + Light + Regular + Semibold + Bold + + + ); +}; diff --git a/experiments/tester/src/RNTester/TestComponents/Text/StandardUsage.tsx b/experiments/tester/src/RNTester/TestComponents/Text/StandardUsage.tsx new file mode 100644 index 0000000000..06544404f5 --- /dev/null +++ b/experiments/tester/src/RNTester/TestComponents/Text/StandardUsage.tsx @@ -0,0 +1,24 @@ +import * as React from 'react'; +import { View } from 'react-native'; +import { Text } from '@fluentui-react-native/text'; +import { styles } from './styles'; + +export const StandardUsage: React.FunctionComponent<{}> = () => { + return ( + + CaptionStandard + SecondaryStandard + SecondarySemibold + BodyStandard + BodySemibold + SubheaderStandard + SubheaderSemibold + HeaderStandard + HeaderSemibold + HeroStandard + HeroSemibold + HeroLargeStandard + HeroLargeSemibold + + ); +}; diff --git a/experiments/tester/src/RNTester/TestComponents/Text/TextTest.tsx b/experiments/tester/src/RNTester/TestComponents/Text/TextTest.tsx new file mode 100644 index 0000000000..41b59ea63d --- /dev/null +++ b/experiments/tester/src/RNTester/TestComponents/Text/TextTest.tsx @@ -0,0 +1,21 @@ +import * as React from 'react'; +import { View } from 'react-native'; +import { Separator } from '@fluentui-react-native/separator'; +import { StandardUsage } from './StandardUsage'; +import { CustomizeUsage } from './CustomizeUsage'; +import { styles } from './styles'; +import { TextWin32 } from '@office-iss/react-native-win32'; + +export const TextTest: React.FunctionComponent<{}> = () => { + return ( + + Standard Usage + + + + Customize Usage + + + + ); +}; diff --git a/experiments/tester/src/RNTester/TestComponents/Text/styles.ts b/experiments/tester/src/RNTester/TestComponents/Text/styles.ts new file mode 100644 index 0000000000..50edf9a3bc --- /dev/null +++ b/experiments/tester/src/RNTester/TestComponents/Text/styles.ts @@ -0,0 +1,16 @@ +import { StyleSheet } from 'react-native'; + +export const styles = StyleSheet.create({ + root: { + marginTop: 16, + marginRight: 32, + flexDirection: 'column', + alignItems: 'flex-start' + }, + section: { + fontSize: 15, + fontWeight: 'bold', + color: '#0B6A0B', + marginTop: 12 + } +}); diff --git a/experiments/tester/src/RNTester/TestComponents/index.ts b/experiments/tester/src/RNTester/TestComponents/index.ts index 4ac100e688..beb483c032 100644 --- a/experiments/tester/src/RNTester/TestComponents/index.ts +++ b/experiments/tester/src/RNTester/TestComponents/index.ts @@ -3,6 +3,7 @@ import { ButtonFocusTest } from './ButtonFocusTest'; import { PressableTest } from './PressableTest'; import { LinkTest } from './LinkTest.win32'; import { SeparatorTest } from './SeparatorTest'; +import { TextTest } from './Text/TextTest'; import { ThemeTest } from './ThemeTest'; import { FocusTrapTest } from './FocusTrapZoneTest'; import { PersonaCoinTest } from './PersonaCoin/PersonaCoinTest'; @@ -35,6 +36,10 @@ export const allTestComponents: TestDescription[] = [ name: 'Separator Test', component: SeparatorTest }, + { + name: 'Text Test', + component: TextTest + }, { name: 'Theme Test', component: ThemeTest From 60332f8630b24d64159deeece6855cd752fff2b9 Mon Sep 17 00:00:00 2001 From: "REDMOND\\krsiler" Date: Tue, 24 Mar 2020 16:12:02 -0700 Subject: [PATCH 05/24] Merge upstream/master into master --- .../src/RNTester/TestComponents/ThemeTest.tsx | 414 +++++++++--------- packages/components/Link/src/Link.settings.ts | 90 ++-- packages/components/text/src/Text.settings.ts | 56 +-- packages/components/text/src/Text.types.ts | 40 +- .../text/src/__tests__/Text.test.win32.tsx | 48 +- .../__snapshots__/Text.test.win32.tsx.snap | 98 ++--- .../src/Link/Link.settings.ts | 86 ++-- .../src/Text/Text.settings.ts | 54 +-- .../framework/theming-ramp/src/Theme.test.ts | 192 ++++---- .../theming-ramp/src/Typography.test.ts | 98 ++--- .../theming-ramp/src/Typography.types.ts | 228 +++++----- .../src/BaselinePlatformDefaults.ts | 94 ++-- 12 files changed, 749 insertions(+), 749 deletions(-) diff --git a/experiments/tester/src/RNTester/TestComponents/ThemeTest.tsx b/experiments/tester/src/RNTester/TestComponents/ThemeTest.tsx index 9ae6891c4f..9e96409b04 100644 --- a/experiments/tester/src/RNTester/TestComponents/ThemeTest.tsx +++ b/experiments/tester/src/RNTester/TestComponents/ThemeTest.tsx @@ -1,207 +1,207 @@ -import * as React from 'react'; -import * as ReactNative from 'react-native'; -import { getHostSettingsWin32, ThemeProvider, useTheme, IThemeDefinition, ThemingModuleHelper } from '@uifabricshared/theming-react-native'; -import { themedStyleSheet } from '@uifabricshared/themed-stylesheet'; -import { commonTestStyles } from '../styles'; -import { Button, PrimaryButton, Separator, StealthButton, Text, RadioGroup, RadioButton } from '@fluentui/react-native'; -import { ITheme, IPartialTheme } from '@uifabricshared/theming-ramp'; -import { customRegistry } from '../CustomThemes'; - -let brand = 'Office'; - -const brandColors = { - Word: ['#E3ECFA', '#A5B9D1', '#7DA3C6', '#4A78B0', '#3C65A4', '#2B579A', '#124078', '#002050'], - Excel: ['#E9F5EE', '#9FCDB3', '#6EB38A', '#4E9668', '#3F8159', '#217346', '#0E5C2F', '#004B1C'], - Powerpoint: ['#FCF0ED', '#FDC9B5', '#ED9583', '#E86E58', '#C75033', '#B7472A', '#A92B1A', '#740912'], - Outlook: ['#CCE3F5', '#B3D6F2', '#69AFE5', '#2488D8', '#0078D7', '#106EBE', '#1664A7', '#135995'] -}; - -// This IProcessTheme takes the parent theme and shims in the brand colors selected in the RadioGroup -const fakeBrandTheme: IThemeDefinition = (theme: ITheme): IPartialTheme => { - if (brand === 'Office') { - return {}; - } - - const brandValues = theme.colors.brand.values; - const brandedTheme = { colors: {}, host: { palette: {} } }; - Object.keys(theme.colors).forEach((value: string) => { - if (typeof theme.colors[value] === 'string') { - const index = brandValues.indexOf(theme.colors[value].toString()); - if (index !== -1) brandedTheme.colors[value] = brandColors[brand][index]; - } - }); - - const hostThemeSettings = getHostSettingsWin32(theme); - if (hostThemeSettings === undefined) return brandedTheme; - - Object.keys(hostThemeSettings.palette).forEach((value: string) => { - const index = brandValues.indexOf(hostThemeSettings.palette[value].toString()); - if (index !== -1) brandedTheme.host.palette[value] = brandColors[brand][index]; - }); - return brandedTheme; -}; - -// this applies the shim to the default theme -customRegistry.setTheme(fakeBrandTheme, 'Default'); -// this registers platform white colors -customRegistry.setTheme(ThemingModuleHelper.getPlatformThemeDefinition('WhiteColors'), 'RealWhiteColors'); -// this applies the shim to the white colors theme -customRegistry.setTheme(fakeBrandTheme, 'WhiteColors', 'RealWhiteColors'); - -const getThemedStyles = themedStyleSheet((theme: ITheme) => { - const hostSettings = getHostSettingsWin32(theme); - return { - swatch: { - width: 80, - height: 20, - marginRight: 5, - borderWidth: 2, - borderColor: theme.colors.bodyText - }, - extraLargeStandardEmphasis: { - color: hostSettings ? hostSettings.palette.TextEmphasis : theme.colors.bodyText, - fontSize: theme.typography.sizes.xxLarge, - fontWeight: theme.typography.weights.medium, - fontFamily: theme.typography.families.primary - } as ReactNative.TextStyle, - largeStandard: { - color: theme.colors.bodyText, - fontSize: theme.typography.sizes.large, - fontWeight: theme.typography.weights.medium, - fontFamily: theme.typography.families.primary, - marginBottom: 5 - } as ReactNative.TextStyle, - stackStyle: { - borderWidth: 2, - borderColor: theme.colors.focusBorder, - padding: 12, - margin: 8, - backgroundColor: theme.colors.background - } - }; -}); - -const styles = ReactNative.StyleSheet.create({ - swatchItem: { - flexDirection: 'row', - alignItems: 'center', - marginVertical: 5 - }, - pickerContainer: { - flexDirection: 'row', - justifyContent: 'space-evenly' - } -}); - -const Panel: React.FunctionComponent = () => { - const [disabled, setDisabled] = React.useState(false); - const onClick = React.useCallback(() => setDisabled(!disabled), [disabled, setDisabled]); - const themedStyles = getThemedStyles(useTheme()); - return ( - - - - - ); -}; - -export default Counter; +import React, { useState } from 'react'; + +export const Counter = function() { + // Declare a new state variable, which we'll call "count" + const [count, setCount] = useState(0); + + return ( +
+

You clicked {count} times

+ +
+ ); +}; + +export default Counter; diff --git a/docs/pages/index.mdx b/docs/pages/index.mdx index 33c070f1a9..7757b8c2b2 100644 --- a/docs/pages/index.mdx +++ b/docs/pages/index.mdx @@ -1,50 +1,50 @@ -import Counter from './counter.jsx'; - -# JDX in MDX - -You can import React components in an `.mdx` file. Like this: - -> ```jsx -> import Counter from './counter.jsx'; -> ; -> ``` - - - -# FluentUI Docs - -## Components - -- [Button](/Components/Button) -- [Link](/Components/Link) -- [Separator](/Components/Separator) -- [Text](/Components/Text) - -## Utilities - -- [FocusTrapZone](/Utilities/FocusTrapZone) -- [Pressable](/Utilities/Pressable) -- [Stack](/Utilities/Stack) - -## Contributing Docs - -- Follow and maintain the template below -- Run the local dev server with: - > ``` - > cd fluentui-react-native - > yarn - > cd Docs - > yarn dev - > ``` - -## Template - -> ``` -> # Component Name -> -> ## Purpose -> -> ## Do's and Don'ts -> -> ## Sample Code -> ``` +import Counter from './counter.jsx'; + +# JDX in MDX + +You can import React components in an `.mdx` file. Like this: + +> ```jsx +> import Counter from './counter.jsx'; +> ; +> ``` + + + +# FluentUI Docs + +## Components + +- [Button](/Components/Button) +- [Link](/Components/Link) +- [Separator](/Components/Separator) +- [Text](/Components/Text) + +## Utilities + +- [FocusTrapZone](/Utilities/FocusTrapZone) +- [Pressable](/Utilities/Pressable) +- [Stack](/Utilities/Stack) + +## Contributing Docs + +- Follow and maintain the template below +- Run the local dev server with: + > ``` + > cd fluentui-react-native + > yarn + > cd Docs + > yarn dev + > ``` + +## Template + +> ``` +> # Component Name +> +> ## Purpose +> +> ## Do's and Don'ts +> +> ## Sample Code +> ``` diff --git a/package.json b/package.json index 6d4db20fdb..6ff992b40a 100644 --- a/package.json +++ b/package.json @@ -1,62 +1,62 @@ -{ - "name": "uifabric-react-native", - "version": "0.1.1", - "private": true, - "description": "", - "keywords": [], - "license": "MIT", - "author": "Jason Morse ", - "main": "index.js", - "repository": { - "type": "git", - "url": "https://github.com/Microsoft/ui-fabric-react-native.git" - }, - "scripts": { - "preinstall": "node ./scripts/use-yarn-please.js", - "postinstall": "node ./scripts/postinstall.js", - "clean-all": "node ./scripts/clean-all.js", - "start": "cd apps && cd demo && npm start", - "docs": "cd docs && npm start", - "build": "lerna run build --stream -- --production --lint --color", - "bundle": "lerna run bundle --stream -- --production --lint --color", - "clean": "lerna run clean --stream", - "change": "beachball change", - "check-for-changed-files": "cd scripts && yarn fluentui-scripts check-for-modified-files", - "checkchange": "beachball check --changehint \"Run 'yarn change' to generate a change file\"", - "prettier": "cd scripts && yarn prettier", - "publish:beachball": "beachball publish --bump-deps -m\"📦 applying package updates ***NO_CI***\"", - "bump-versions": "beachball bump", - "lint": "lerna run lint", - "verify-api": "lerna run verify-api", - "update-api": "lerna run update-api" - }, - "devDependencies": { - "@office-iss/react-native-win32": "0.27.3", - "@office-iss/rex-win32": "0.0.35", - "@types/react": "16.8.23", - "@types/react-dom": "16.8.5", - "@types/react-native": "^0.60.0", - "beachball": "^1.11.7", - "lerna": "^3.16.4", - "react": "16.8.6", - "react-dom": "16.8.6", - "react-native": "0.60.6", - "react-native-windows": "0.60.0-vnext.149" - }, - "workspaces": { - "packages": [ - "apps/*", - "docs", - "packages/**", - "scripts" - ], - "nohoist": [ - "**/expo" - ] - }, - "beachball": { - "disallowedChangeTypes": [ - "major" - ] - } -} +{ + "name": "uifabric-react-native", + "version": "0.1.1", + "private": true, + "description": "", + "keywords": [], + "license": "MIT", + "author": "Jason Morse ", + "main": "index.js", + "repository": { + "type": "git", + "url": "https://github.com/Microsoft/ui-fabric-react-native.git" + }, + "scripts": { + "preinstall": "node ./scripts/use-yarn-please.js", + "postinstall": "node ./scripts/postinstall.js", + "clean-all": "node ./scripts/clean-all.js", + "start": "cd apps && cd demo && npm start", + "docs": "cd docs && npm start", + "build": "lerna run build --stream -- --production --lint --color", + "bundle": "lerna run bundle --stream -- --production --lint --color", + "clean": "lerna run clean --stream", + "change": "beachball change", + "check-for-changed-files": "cd scripts && yarn fluentui-scripts check-for-modified-files", + "checkchange": "beachball check --changehint \"Run 'yarn change' to generate a change file\"", + "prettier": "cd scripts && yarn prettier", + "publish:beachball": "beachball publish --bump-deps -m\"📦 applying package updates ***NO_CI***\"", + "bump-versions": "beachball bump", + "lint": "lerna run lint", + "verify-api": "lerna run verify-api", + "update-api": "lerna run update-api" + }, + "devDependencies": { + "@office-iss/react-native-win32": "0.27.3", + "@office-iss/rex-win32": "0.0.35", + "@types/react": "16.8.23", + "@types/react-dom": "16.8.5", + "@types/react-native": "^0.60.0", + "beachball": "^1.11.7", + "lerna": "^3.16.4", + "react": "16.8.6", + "react-dom": "16.8.6", + "react-native": "0.60.6", + "react-native-windows": "0.60.0-vnext.149" + }, + "workspaces": { + "packages": [ + "apps/*", + "docs", + "packages/**", + "scripts" + ], + "nohoist": [ + "**/expo" + ] + }, + "beachball": { + "disallowedChangeTypes": [ + "major" + ] + } +} diff --git a/packages/components/Button/CHANGELOG.json b/packages/components/Button/CHANGELOG.json index 16cde33f94..1ab6db3f4b 100644 --- a/packages/components/Button/CHANGELOG.json +++ b/packages/components/Button/CHANGELOG.json @@ -1,90 +1,90 @@ -{ - "name": "@fluentui-react-native/button", - "entries": [ - { - "date": "Fri, 03 Apr 2020 20:40:51 GMT", - "tag": "@fluentui-react-native/button_v0.3.1", - "version": "0.3.1", - "comments": { - "patch": [ - { - "comment": "switch the bin name from just-script to fluent-scripts to disambiguate names", - "author": "jasonmo@microsoft.com", - "commit": "232a97794dc044cec9671e5cca4cf204d881f614", - "package": "@fluentui-react-native/button" - } - ] - } - }, - { - "date": "Tue, 31 Mar 2020 18:01:09 GMT", - "tag": "@fluentui-react-native/button_v0.3.0", - "version": "0.3.0", - "comments": { - "minor": [ - { - "comment": "Checkbox Final V1 Changes", - "author": "safreibe@microsoft.com", - "commit": "0a82a531a8dd9cd29d1799badaa49733ef7c8ccf" - } - ] - } - }, - { - "date": "Mon, 30 Mar 2020 16:27:00 GMT", - "tag": "@fluentui-react-native/button_v0.2.7", - "version": "0.2.7", - "comments": { - "patch": [ - { - "comment": "Update main attribute to specify TypeScript index file.", - "author": "kinhln@microsoft.com", - "commit": "ab291fb90d584c81310aa6559d05a360e86f97de" - } - ] - } - }, - { - "date": "Fri, 27 Mar 2020 04:10:56 GMT", - "tag": "@fluentui-react-native/button_v0.2.6", - "version": "0.2.6", - "comments": { - "none": [ - { - "comment": "shared package configs", - "author": "ppatboyd@outlook.com", - "commit": "1471793de9a859b9908ef50069aeb673d06e5b42" - } - ] - } - }, - { - "date": "Wed, 18 Mar 2020 00:37:12 GMT", - "tag": "@fluentui-react-native/button_v0.2.3", - "version": "0.2.3", - "comments": { - "none": [ - { - "comment": "no change", - "author": "email not defined", - "commit": "eb75093eefe61d9235cb01a8adcafd105e57351c" - } - ] - } - }, - { - "date": "Mon, 16 Mar 2020 23:03:24 GMT", - "tag": "@fluentui-react-native/button_v0.2.0", - "version": "0.2.0", - "comments": { - "minor": [ - { - "comment": "turn on publishing", - "author": "jasonmo@microsoft.com", - "commit": "86f6fc7932479f6afcb8f77c539dd4e0d4e436d7" - } - ] - } - } - ] +{ + "name": "@fluentui-react-native/button", + "entries": [ + { + "date": "Fri, 03 Apr 2020 20:40:51 GMT", + "tag": "@fluentui-react-native/button_v0.3.1", + "version": "0.3.1", + "comments": { + "patch": [ + { + "comment": "switch the bin name from just-script to fluent-scripts to disambiguate names", + "author": "jasonmo@microsoft.com", + "commit": "232a97794dc044cec9671e5cca4cf204d881f614", + "package": "@fluentui-react-native/button" + } + ] + } + }, + { + "date": "Tue, 31 Mar 2020 18:01:09 GMT", + "tag": "@fluentui-react-native/button_v0.3.0", + "version": "0.3.0", + "comments": { + "minor": [ + { + "comment": "Checkbox Final V1 Changes", + "author": "safreibe@microsoft.com", + "commit": "0a82a531a8dd9cd29d1799badaa49733ef7c8ccf" + } + ] + } + }, + { + "date": "Mon, 30 Mar 2020 16:27:00 GMT", + "tag": "@fluentui-react-native/button_v0.2.7", + "version": "0.2.7", + "comments": { + "patch": [ + { + "comment": "Update main attribute to specify TypeScript index file.", + "author": "kinhln@microsoft.com", + "commit": "ab291fb90d584c81310aa6559d05a360e86f97de" + } + ] + } + }, + { + "date": "Fri, 27 Mar 2020 04:10:56 GMT", + "tag": "@fluentui-react-native/button_v0.2.6", + "version": "0.2.6", + "comments": { + "none": [ + { + "comment": "shared package configs", + "author": "ppatboyd@outlook.com", + "commit": "1471793de9a859b9908ef50069aeb673d06e5b42" + } + ] + } + }, + { + "date": "Wed, 18 Mar 2020 00:37:12 GMT", + "tag": "@fluentui-react-native/button_v0.2.3", + "version": "0.2.3", + "comments": { + "none": [ + { + "comment": "no change", + "author": "email not defined", + "commit": "eb75093eefe61d9235cb01a8adcafd105e57351c" + } + ] + } + }, + { + "date": "Mon, 16 Mar 2020 23:03:24 GMT", + "tag": "@fluentui-react-native/button_v0.2.0", + "version": "0.2.0", + "comments": { + "minor": [ + { + "comment": "turn on publishing", + "author": "jasonmo@microsoft.com", + "commit": "86f6fc7932479f6afcb8f77c539dd4e0d4e436d7" + } + ] + } + } + ] } \ No newline at end of file diff --git a/packages/components/Button/CHANGELOG.md b/packages/components/Button/CHANGELOG.md index 5c979cd3ac..945ae74809 100644 --- a/packages/components/Button/CHANGELOG.md +++ b/packages/components/Button/CHANGELOG.md @@ -1,28 +1,28 @@ -# Change Log - @fluentui-react-native/button - -This log was last generated on Fri, 03 Apr 2020 20:40:51 GMT and should not be manually modified. - -## 0.3.1 -Fri, 03 Apr 2020 20:40:51 GMT - -### Patches - -- switch the bin name from just-script to fluent-scripts to disambiguate names (jasonmo@microsoft.com) -## 0.3.0 -Tue, 31 Mar 2020 18:01:09 GMT - -### Minor changes - -- Checkbox Final V1 Changes (safreibe@microsoft.com) -## 0.2.7 -Mon, 30 Mar 2020 16:27:00 GMT - -### Patches - -- Update main attribute to specify TypeScript index file. (kinhln@microsoft.com) -## 0.2.0 -Mon, 16 Mar 2020 23:03:24 GMT - -### Minor changes - +# Change Log - @fluentui-react-native/button + +This log was last generated on Fri, 03 Apr 2020 20:40:51 GMT and should not be manually modified. + +## 0.3.1 +Fri, 03 Apr 2020 20:40:51 GMT + +### Patches + +- switch the bin name from just-script to fluent-scripts to disambiguate names (jasonmo@microsoft.com) +## 0.3.0 +Tue, 31 Mar 2020 18:01:09 GMT + +### Minor changes + +- Checkbox Final V1 Changes (safreibe@microsoft.com) +## 0.2.7 +Mon, 30 Mar 2020 16:27:00 GMT + +### Patches + +- Update main attribute to specify TypeScript index file. (kinhln@microsoft.com) +## 0.2.0 +Mon, 16 Mar 2020 23:03:24 GMT + +### Minor changes + - turn on publishing (jasonmo@microsoft.com) \ No newline at end of file diff --git a/packages/components/Button/package.json b/packages/components/Button/package.json index 3e375d7ab7..430da398dc 100644 --- a/packages/components/Button/package.json +++ b/packages/components/Button/package.json @@ -1,36 +1,36 @@ -{ - "name": "@fluentui-react-native/button", - "version": "0.3.1", - "description": "A cross-platform opinionated Fluent Text component", - "main": "src/index.ts", - "module": "src/index.ts", - "typings": "lib/index.d.ts", - "scripts": { - "build": "fluentui-scripts build", - "just": "fluentui-scripts", - "clean": "fluentui-scripts clean", - "update-snapshots": "fluentui-scripts jest -u", - "verify-api": "fluentui-scripts verify-api-extractor", - "update-api": "fluentui-scripts update-api-extractor" - }, - "dependencies": { - "@uifabricshared/foundation-compose": "^1.5.14", - "@fluentui-react-native/adapters": "^0.1.4", - "@fluentui-react-native/interactive-hooks": "^0.2.4", - "@fluentui-react-native/pressable": "^0.2.9", - "@fluentui-react-native/text": "^0.2.8", - "@fluentui-react-native/tokens": "^0.1.5" - }, - "devDependencies": { - "@office-iss/react-native-win32": "0.27.3", - "@types/react-native": "^0.60.0", - "@uifabricshared/build-native": "^0.1.1", - "@uifabricshared/eslint-config-rules": "^0.1.1", - "react-native": "^0.60.0" - }, - "peerDependencies": { - "react-native": "^0.59.0" - }, - "author": "", - "license": "MIT" -} +{ + "name": "@fluentui-react-native/button", + "version": "0.3.1", + "description": "A cross-platform opinionated Fluent Text component", + "main": "src/index.ts", + "module": "src/index.ts", + "typings": "lib/index.d.ts", + "scripts": { + "build": "fluentui-scripts build", + "just": "fluentui-scripts", + "clean": "fluentui-scripts clean", + "update-snapshots": "fluentui-scripts jest -u", + "verify-api": "fluentui-scripts verify-api-extractor", + "update-api": "fluentui-scripts update-api-extractor" + }, + "dependencies": { + "@uifabricshared/foundation-compose": "^1.5.14", + "@fluentui-react-native/adapters": "^0.1.4", + "@fluentui-react-native/interactive-hooks": "^0.2.4", + "@fluentui-react-native/pressable": "^0.2.9", + "@fluentui-react-native/text": "^0.2.8", + "@fluentui-react-native/tokens": "^0.1.5" + }, + "devDependencies": { + "@office-iss/react-native-win32": "0.27.3", + "@types/react-native": "^0.60.0", + "@uifabricshared/build-native": "^0.1.1", + "@uifabricshared/eslint-config-rules": "^0.1.1", + "react-native": "^0.60.0" + }, + "peerDependencies": { + "react-native": "^0.59.0" + }, + "author": "", + "license": "MIT" +} diff --git a/packages/components/Button/src/Button.test.win32.tsx b/packages/components/Button/src/Button.test.win32.tsx index 19dc10d239..8d8305e1c3 100644 --- a/packages/components/Button/src/Button.test.win32.tsx +++ b/packages/components/Button/src/Button.test.win32.tsx @@ -1,8 +1,8 @@ -import * as React from 'react'; -import { Button } from './Button'; -import * as renderer from 'react-test-renderer'; - -it('Button default', () => { - const tree = renderer.create(