From e4d093f943f1b19948b566e5e6318118382a13d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 17:41:51 +0000 Subject: [PATCH 1/3] Bump @18f/identity-design-system from 9.2.0 to 9.3.0 Bumps [@18f/identity-design-system](https://github.com/18F/identity-design-system) from 9.2.0 to 9.3.0. - [Release notes](https://github.com/18F/identity-design-system/releases) - [Changelog](https://github.com/18F/identity-design-system/blob/main/CHANGELOG.md) - [Commits](https://github.com/18F/identity-design-system/compare/v9.2.0...v9.3.0) --- updated-dependencies: - dependency-name: "@18f/identity-design-system" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../packages/clipboard-button/package.json | 2 +- package.json | 2 +- yarn.lock | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/javascript/packages/clipboard-button/package.json b/app/javascript/packages/clipboard-button/package.json index 86ae7f2f7b1..bd1df2ce1e0 100644 --- a/app/javascript/packages/clipboard-button/package.json +++ b/app/javascript/packages/clipboard-button/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "private": true, "dependencies": { - "@18f/identity-design-system": "^9.2.0" + "@18f/identity-design-system": "^9.3.0" }, "sideEffects": [ "./clipboard-button-element.ts" diff --git a/package.json b/package.json index 279d76117b7..c0c0c50e466 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "build:css": "build-sass app/assets/stylesheets/*.css.scss app/components/*.scss --load-path=app/assets/stylesheets --out-dir=app/assets/builds" }, "dependencies": { - "@18f/identity-design-system": "^9.2.0", + "@18f/identity-design-system": "^9.3.0", "@babel/core": "^7.20.7", "@babel/preset-env": "^7.15.6", "@babel/preset-react": "^7.14.5", diff --git a/yarn.lock b/yarn.lock index 24ae052d682..1bacc1cdecc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,13 +2,13 @@ # yarn lockfile v1 -"@18f/identity-design-system@^9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@18f/identity-design-system/-/identity-design-system-9.2.0.tgz#36f1e4c4c68cae52c0cd4d5256ac33e6ef872763" - integrity sha512-gzzcRtxRPKdxcbdgYKBS+IEmBielCwbxB9KkUTwNyXTqDMJoWmscSODPEpmegIEB8Tg/LXwxJQfr+LyEePYewQ== +"@18f/identity-design-system@^9.3.0": + version "9.3.0" + resolved "https://registry.yarnpkg.com/@18f/identity-design-system/-/identity-design-system-9.3.0.tgz#990089ea93c5ac773cf87ac61d175d739ec89ae7" + integrity sha512-vOhBNu20rtSUUIx0bpyLjUTcOzyzLpq9/Oyot+vWPYxyatTg2m+7dpQK8xSNVDtnNtpVEwOhf1GnOGF+v7n+nA== dependencies: "@types/uswds__uswds" "^3.8.0" - "@uswds/uswds" "^3.8.0" + "@uswds/uswds" "^3.8.1" "@aashutoshrathi/word-wrap@^1.2.3": version "1.2.6" @@ -1895,10 +1895,10 @@ "@typescript-eslint/types" "6.7.5" eslint-visitor-keys "^3.4.1" -"@uswds/uswds@^3.8.0": - version "3.8.0" - resolved "https://registry.yarnpkg.com/@uswds/uswds/-/uswds-3.8.0.tgz#dba0b0b38182053779276f9ae6809474bd31d548" - integrity sha512-rMwCXe/u4HGkfskvS1Iuabapi/EXku3ChaIFW7y/dUhc7R1TXQhbbfp8YXEjmXPF0yqJnv9T08WPgS0fQqWZ8w== +"@uswds/uswds@^3.8.1": + version "3.8.1" + resolved "https://registry.yarnpkg.com/@uswds/uswds/-/uswds-3.8.1.tgz#3d834559498ae1bb7d3a618f3f85a5f4e9818497" + integrity sha512-bKG/B9mJF1v0yoqth48wQDzST5Xyu3OxxpePIPDyhKWS84oDrCehnu3Z88JhSjdIAJMl8dtjtH8YvdO9kZUpAg== dependencies: classlist-polyfill "1.2.0" object-assign "4.1.1" From dc266984fb3de17ede19118e1551c47b4b5ca10e Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Tue, 2 Jul 2024 13:57:04 -0400 Subject: [PATCH 2/3] Remove "other" alert handling --- .../packages/components/alert.spec.tsx | 17 ++++++++--------- app/javascript/packages/components/alert.tsx | 8 ++++---- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/app/javascript/packages/components/alert.spec.tsx b/app/javascript/packages/components/alert.spec.tsx index 917247d6f05..47a645048ef 100644 --- a/app/javascript/packages/components/alert.spec.tsx +++ b/app/javascript/packages/components/alert.spec.tsx @@ -5,15 +5,14 @@ import type { AlertType } from './alert'; describe('Alert', () => { describe('role', () => { - ( - [ - ['success', 'status'], - ['warning', 'status'], - ['error', 'alert'], - ['info', 'status'], - ['other', 'status'], - ] as [AlertType, 'alert' | 'status'][] - ).forEach(([type, role]) => { + const variants: [AlertType, 'alert' | 'status'][] = [ + ['success', 'status'], + ['warning', 'status'], + ['error', 'alert'], + ['info', 'status'], + ]; + + variants.forEach(([type, role]) => { context(`with ${type} type`, () => { it(`should apply ${role} role`, () => { const { getByRole } = render(); diff --git a/app/javascript/packages/components/alert.tsx b/app/javascript/packages/components/alert.tsx index 033b5bafdbe..ca2f3e65620 100644 --- a/app/javascript/packages/components/alert.tsx +++ b/app/javascript/packages/components/alert.tsx @@ -1,11 +1,11 @@ import { forwardRef, createElement } from 'react'; import type { ReactNode, ForwardedRef } from 'react'; -export type AlertType = 'success' | 'warning' | 'error' | 'info' | 'other'; +export type AlertType = 'success' | 'warning' | 'error' | 'info'; interface AlertProps { /** - * Alert type. Defaults to "other". + * Alert type. */ type?: AlertType; @@ -32,10 +32,10 @@ interface AlertProps { } function Alert( - { type = 'other', className, isFocusable, children, textTag = 'p' }: AlertProps, + { type, className, isFocusable, children, textTag = 'p' }: AlertProps, ref: ForwardedRef, ) { - const classes = [`usa-alert usa-alert--${type}`, className].filter(Boolean).join(' '); + const classes = ['usa-alert', type && `usa-alert--${type}`, className].filter(Boolean).join(' '); const role = type === 'error' ? 'alert' : 'status'; const inner = createElement(textTag, { className: 'usa-alert__text' }, children); From 879a2025803aaf062cd7faa2959d76e91e34cc5b Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Tue, 2 Jul 2024 13:57:27 -0400 Subject: [PATCH 3/3] Remove temporary patch Now patched upstream --- app/components/badge_component.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/components/badge_component.scss b/app/components/badge_component.scss index 2dbbf933fc0..4958757cead 100644 --- a/app/components/badge_component.scss +++ b/app/components/badge_component.scss @@ -1,7 +1,2 @@ @use 'uswds-core' as *; @forward 'usa-verification-badge'; - -// Upstream: https://github.com/18F/identity-design-system/pull/445 -.lg-verification-badge .usa-icon { - margin-right: units(1); -}