From bce3291c15402f5a118e2792311f539a6259e140 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Thu, 31 Mar 2022 10:00:19 -0400 Subject: [PATCH 1/4] Update identity-style-guide to 6.4.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index e4b1ad4581d..cd977dd0307 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "fast-glob": "^3.2.7", "focus-trap": "^6.7.1", "foundation-emails": "^2.3.1", - "identity-style-guide": "^6.3.3", + "identity-style-guide": "^6.4.0", "intl-tel-input": "^17.0.8", "react": "^17.0.2", "react-dom": "^17.0.2", diff --git a/yarn.lock b/yarn.lock index 4de07c4aa7e..d2de5ae78f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3669,10 +3669,10 @@ iconv-lite@0.6.3, iconv-lite@^0.6.3: dependencies: safer-buffer ">= 2.1.2 < 3.0.0" -identity-style-guide@^6.3.3: - version "6.3.3" - resolved "https://registry.yarnpkg.com/identity-style-guide/-/identity-style-guide-6.3.3.tgz#3832b5dfea3c31610ea19762f7c9fc9cb2104614" - integrity sha512-B4k2ZpMz7S6VXjhzEZdPJp2LQf/OXDxPe4avdYqSQXu6y+Bn+qTH46eCaqAmuvjt45B52QnAZ7YbgNAwXlEHNg== +identity-style-guide@^6.4.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/identity-style-guide/-/identity-style-guide-6.4.0.tgz#10f56ce450c4b4bd8c76c8a87d2f54ee27c5dfd2" + integrity sha512-0H8oEm4rpvkYV3/sPtNLFrnhPiFY6EiePjM2HTBGkTL0PcgMH3kvcMzZhZ4aWFBW09YP2+f6mku7LXVpOkGOpA== dependencies: domready "^1.0.8" uswds "^2.13.1" From 4c45f525bc4fb248f38d480ecbdccd8c83ab488b Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Thu, 31 Mar 2022 10:01:48 -0400 Subject: [PATCH 2/4] Remove unnecessary patch for sprite SVG Fixed upstream in USWDS 2.13.2 ([see changelog](https://github.com/uswds/uswds/releases/tag/v2.13.2)) --- app/assets/images/sprite.svg | 1 - app/components/icon_component.rb | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 app/assets/images/sprite.svg diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg deleted file mode 100644 index e9c20bfeb7f..00000000000 --- a/app/assets/images/sprite.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/components/icon_component.rb b/app/components/icon_component.rb index fe1f0c36d8d..d41d84b571b 100644 --- a/app/components/icon_component.rb +++ b/app/components/icon_component.rb @@ -258,9 +258,7 @@ def initialize(icon:, **tag_options) end def icon_path - # Revert back to using design system image once upstream CSP fix has been patched. - # See: https://github.com/uswds/uswds/pull/4487 - [image_path('sprite.svg', host: asset_host), '#', icon].join + asset_path([design_system_asset_path('img/sprite.svg'), '#', icon].join) end private From 4c56c7fddad2ce115c81173dbd8ac6506a33a5fb Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Thu, 31 Mar 2022 10:11:54 -0400 Subject: [PATCH 3/4] Add changelog changelog: Internal, Dependencies, Update Login.gov Design System to v6.4.0 From dc3e30f953576c912f7bd53e8704d358e0c22e58 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Thu, 31 Mar 2022 10:25:50 -0400 Subject: [PATCH 4/4] Restore asset host pinning --- app/components/icon_component.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/icon_component.rb b/app/components/icon_component.rb index d41d84b571b..3e51371be3a 100644 --- a/app/components/icon_component.rb +++ b/app/components/icon_component.rb @@ -258,7 +258,7 @@ def initialize(icon:, **tag_options) end def icon_path - asset_path([design_system_asset_path('img/sprite.svg'), '#', icon].join) + asset_path([design_system_asset_path('img/sprite.svg'), '#', icon].join, host: asset_host) end private