Merge branch 'main' into feature/257-roettger-SpacerComponent

department-of-veterans-affairs · May 15, 2024 · 37d4d39 · 37d4d39
2 parents a6cb639 + 9a8aa68
commit 37d4d39
Show file tree

Hide file tree

Showing 9 changed files with 21,912 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Changelog
 
+## [linting-v0.15.0](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/linting-v0.15.0) (2024-05-14)
+
+[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/assets-v0.5.0...linting-v0.15.0)
+
+**Merged pull requests:**
+
+- \[Patch\] Remove ClickToCallPhoneNumber and AttachmentLink from rules [\#316](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/316) ([narin](https://github.com/narin))
+
+## [assets-v0.5.0](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/assets-v0.5.0) (2024-05-14)
+
+[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.15.3...assets-v0.5.0)
+
+**Merged pull requests:**
+
+- \[Feature\] Add Space Force and Dark VA text logo to assets package [\#320](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/320) ([narin](https://github.com/narin))
+
+## [components-v0.15.3](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.15.3) (2024-05-14)
+
+[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.15.2...components-v0.15.3)
+
+**Merged pull requests:**
+
+- \[Bug\] Fix TS complaint in Icon [\#318](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/318) ([TimRoe](https://github.com/TimRoe))
+
 ## [components-v0.15.2](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.15.2) (2024-05-14)
 
 [Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.15.1...components-v0.15.2)

diff --git a/packages/assets/VALogo/LogoDarkText.svg b/packages/assets/VALogo/LogoDarkText.svg
diff --git a/packages/assets/package.json b/packages/assets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@department-of-veterans-affairs/mobile-assets",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "VA Design System Mobile Assets",
   "repository": {
     "type": "git",

diff --git a/packages/assets/serviceEmblems/SpaceForceDark.svg b/packages/assets/serviceEmblems/SpaceForceDark.svg
diff --git a/packages/assets/serviceEmblems/SpaceForceLight.svg b/packages/assets/serviceEmblems/SpaceForceLight.svg
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@department-of-veterans-affairs/mobile-component-library",
-  "version": "0.15.2",
+  "version": "0.15.3",
   "description": "VA Design System Mobile Component Library",
   "main": "src/index.tsx",
   "scripts": {

diff --git a/packages/components/src/components/Icon/Icon.tsx b/packages/components/src/components/Icon/Icon.tsx
@@ -211,7 +211,8 @@ export const Icon: FC<IconProps> = ({
   const fontScale = useWindowDimensions().fontScale
   const fs = (val: number) => fontScale * val
 
-  const _Icon: FC<SvgProps> = name ? IconMap[name] : svg
+  // ! to override TS incorrectly thinking svg can be undefined after update
+  const _Icon: FC<SvgProps> = name ? IconMap[name] : svg!
 
   if (typeof fill === 'object') {
     fill = isDarkMode ? fill.dark : fill.light

diff --git a/packages/linting/index.js b/packages/linting/index.js
@@ -13,16 +13,6 @@ module.exports = {
         module: 'components',
         use: 'Link from @department-of-veterans-affairs/mobile-component-library',
       },
-      {
-        name: 'ClickToCallPhoneNumber',
-        module: 'components',
-        use: 'Link from @department-of-veterans-affairs/mobile-component-library',
-      },
-      {
-        name: 'AttachmentLink',
-        module: 'components',
-        use: 'Link from @department-of-veterans-affairs/mobile-component-library',
-      },
       {
         name: 'AlertBox',
         module: 'components',

diff --git a/packages/linting/package.json b/packages/linting/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@department-of-veterans-affairs/eslint-config-mobile",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "description": "VA Design System Mobile ESLint Configuration",
   "repository": {
     "type": "git",