From 7721e5879cbb3443f8d37c974a9a33ac44454a9c Mon Sep 17 00:00:00 2001 From: Andrew Nelson Date: Tue, 25 Jul 2023 17:00:29 -0700 Subject: [PATCH 1/5] docs: updated path (#2521) --- docs/styles_and_assets.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/styles_and_assets.md b/docs/styles_and_assets.md index b94746cc2d..538775ff8c 100644 --- a/docs/styles_and_assets.md +++ b/docs/styles_and_assets.md @@ -19,7 +19,7 @@ If you want to use USWDS SCSS (mixins, functions, variables, etc.), you will nee @use 'uswds-core' with ( $theme-image-path: '@uswds/uswds/img', $theme-font-path: '@uswds/uswds/fonts', - $theme-hero-image: '@uswds/uswds/img/hero.png' + $theme-hero-image: '@uswds/uswds/img/hero.jpg' ); ``` @@ -66,7 +66,7 @@ You can also customize any of the variables used in USWDS SCSS in the `your-proj $theme-grid-container-max-width: 'desktop-lg', - $theme-hero-image: '@uswds/uswds/img/hero.png', + $theme-hero-image: '@uswds/uswds/img/hero.jpg', ); ``` From e1c60cbff90c484b1942675a459aaab2e581b0e1 Mon Sep 17 00:00:00 2001 From: Andrew Nelson Date: Tue, 25 Jul 2023 17:08:11 -0700 Subject: [PATCH 2/5] docs: Updated storybook templates (#2522) --- src/components/forms/Form/Form.stories.tsx | 191 ++++++++++++--------- 1 file changed, 108 insertions(+), 83 deletions(-) diff --git a/src/components/forms/Form/Form.stories.tsx b/src/components/forms/Form/Form.stories.tsx index 0876337460..c2d1458fe7 100644 --- a/src/components/forms/Form/Form.stories.tsx +++ b/src/components/forms/Form/Form.stories.tsx @@ -79,104 +79,126 @@ export const textInputForm = (): React.ReactElement => ( export const nameForm = (): React.ReactElement => (
- - - + + For example, Jose, Darren, or Mai - + - + + + For example, Martinez Gonzalez, Gu, or Smith +
+
+ + + For example, Prof. Madeline Martinez Hernandez + + +
+
+ + + For example, Dr. Gu, Mrs. Schmidt, Alix Martinez + + +
) export const addressForm = (): React.ReactElement => (
- +

+ Required fields are marked with an asterisk ( + + * + + ). +

+ - + -
-
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + ( inputSize="medium" pattern="[\d]{5}(-[\d]{4})?" /> + + +
) From c6bffa088fca533821ce1484554db24a37f66221 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jul 2023 06:03:46 +0000 Subject: [PATCH 3/5] build(deps-dev): Bump eslint-plugin-react from 7.32.2 to 7.33.1 (#2534) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index bc327eea0f..a6d651136b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7563,9 +7563,9 @@ eslint-plugin-react-hooks@^4.6.0: integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g== eslint-plugin-react@^7.31.10: - version "7.32.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz#e71f21c7c265ebce01bcbc9d0955170c55571f10" - integrity sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg== + version "7.33.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.33.1.tgz#bc27cccf860ae45413a4a4150bf0977345c1ceab" + integrity sha512-L093k0WAMvr6VhNwReB8VgOq5s2LesZmrpPdKz/kZElQDzqS7G7+DnKoqT+w4JwuiGeAhAvHO0fvy0Eyk4ejDA== dependencies: array-includes "^3.1.6" array.prototype.flatmap "^1.3.1" @@ -7580,7 +7580,7 @@ eslint-plugin-react@^7.31.10: object.values "^1.1.6" prop-types "^15.8.1" resolve "^2.0.0-next.4" - semver "^6.3.0" + semver "^6.3.1" string.prototype.matchall "^4.0.8" eslint-plugin-security@^1.4.0: From 2a3969682dbe72593ec444ac9a352f37c3340cd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jul 2023 06:12:20 +0000 Subject: [PATCH 4/5] build(deps-dev): Bump @storybook/theming from 7.0.27 to 7.1.1 (#2535) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- yarn.lock | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index a6d651136b..9dea08684c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2770,6 +2770,13 @@ dependencies: "@storybook/global" "^5.0.0" +"@storybook/client-logger@7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-7.1.1.tgz#62b7760ab05977f831f1831d5842ab4a4501c585" + integrity sha512-R0bdVjzJ5CwLNAG3XMyMZ0e9XDteBkFkTTIZJ9m+WMh/+oa2PInCpXDxoYb180UI6abrqh1jEaAsrHMC1pTKnA== + dependencies: + "@storybook/global" "^5.0.0" + "@storybook/components@6.5.16": version "6.5.16" resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.5.16.tgz#f8dc51213bc08fe32154be964e1e8b0e2f670ed6" @@ -3394,7 +3401,7 @@ "@storybook/global" "^5.0.0" memoizerific "^1.11.3" -"@storybook/theming@7.0.27", "@storybook/theming@^7.0.8": +"@storybook/theming@7.0.27": version "7.0.27" resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-7.0.27.tgz#62d6f4af8e8e2089c0b84e4d47a1a4ec3ba06fb3" integrity sha512-l2Lc8xX8QXQO8c9gpzdUUJ+0YqLoh8w74I7lzxiife0TzEQrhWD9aRJAVimm8Vzfq5x3CNeJNFHc5PcG8ypQig== @@ -3404,6 +3411,16 @@ "@storybook/global" "^5.0.0" memoizerific "^1.11.3" +"@storybook/theming@^7.0.8": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-7.1.1.tgz#5dc1bf43c7522aa6f4d24a01d361f0c2825f109c" + integrity sha512-8ri/BvfgUzBln9EYB8N/xgRaxZIFFTG0IEEekuV2H5uv4q9JW9p3E5zqghmM1OC/vspJJa8e4Eajb1YiTO0W6w== + dependencies: + "@emotion/use-insertion-effect-with-fallbacks" "^1.0.0" + "@storybook/client-logger" "7.1.1" + "@storybook/global" "^5.0.0" + memoizerific "^1.11.3" + "@storybook/types@7.0.26": version "7.0.26" resolved "https://registry.yarnpkg.com/@storybook/types/-/types-7.0.26.tgz#83be03bcd5ab4cfdac154a25731058466d055ff3" From ac2e19c7a40d299eb6e381b6adfc827215a1ccb6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jul 2023 06:19:49 +0000 Subject: [PATCH 5/5] build(deps-dev): Bump @testing-library/jest-dom from 5.16.5 to 5.17.0 (#2512) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 9dea08684c..4b4fae7063 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3618,9 +3618,9 @@ pretty-format "^27.0.2" "@testing-library/jest-dom@^5.16.5": - version "5.16.5" - resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz#3912846af19a29b2dbf32a6ae9c31ef52580074e" - integrity sha512-N5ixQ2qKpi5OLYfwQmUb/5mSV9LneAcaUfp32pn4yCnpb8r/Yz0pXFPck21dIicKmi+ta5WRAknkZCfA8refMA== + version "5.17.0" + resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.17.0.tgz#5e97c8f9a15ccf4656da00fecab505728de81e0c" + integrity sha512-ynmNeT7asXyH3aSVv4vvX4Rb+0qjOhdNHnO/3vuZNqPmhDpV/+rCSGwQ7bLcmU2cJ4dvoheIO85LQj0IbJHEtg== dependencies: "@adobe/css-tools" "^4.0.1" "@babel/runtime" "^7.9.2"