publicdata/j40-cejst-2
1
0
Fork 0
mirror of https://github.com/DOI-DO/j40-cejst-2.git synced 2025-02-23 10:04:18 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Upgrade lb dependencies

Browse source 
- upgrade uswds to 2.13.3
- upgrade trussworks to 3.1.0
- fix breaking changes on Accordion, Search, SummaryBox, Collections,
This commit is contained in:
Vim USDS 2022-07-19 09:29:30 -07:00
parent 8d2f3d26b1
commit 49df74a28e
8 changed files with 111 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/README.md
View file

@ -222,5 +222,5 @@ The following attemps to explain why certain packages versions have been chosen
| gatsby | 3.14.6 | 4.14.2 | No | when attempting to update - breaks all unit tests. Compatibility warning come up with all plugins but this doesn't seems to effect functionality. This is the latest version we can release without investigating unit tests. | | gatsby | 3.14.6 | 4.14.2 | No | when attempting to update - breaks all unit tests. Compatibility warning come up with all plugins but this doesn't seems to effect functionality. This is the latest version we can release without investigating unit tests. |
| gatsby-cli | 3.14.2 | 4.15.2 | No | when attempting to update - breaks all unit tests. Compatibility warning come up with all plugins but this doesn't seems to effect functionality. This is the latest version we can release without investigating unit tests.| | gatsby-cli | 3.14.2 | 4.15.2 | No | when attempting to update - breaks all unit tests. Compatibility warning come up with all plugins but this doesn't seems to effect functionality. This is the latest version we can release without investigating unit tests.|
| sass | 1.32.12 | 1.52.3 | No | This version is needed to surpress the dart warnings on / as division for each component. See [here](https://github.com/twbs/bootstrap/issues/34051#issuecomment-845884423) for more information | | sass | 1.32.12 | 1.52.3 | No | This version is needed to surpress the dart warnings on / as division for each component. See [here](https://github.com/twbs/bootstrap/issues/34051#issuecomment-845884423) for more information |
| uswds | 2.11.2 | 3.0.2 | No | Needs to stay at 2.11 for peer dependency on trussworks| | uswds | 2.13.3 | 3.0.2 | No | Needs to stay at 2.13.3 for peer dependency on trussworks|
| trussworks | 2.9.0 | 3.0.2 | No | Needs to stay at 2.9 as 3.0 is breaking change | | trussworks | 3.1.0 | 3.1.0 | No | latest! |

138
client/package-lock.json generated
View file

@ -11,7 +11,7 @@
"dependencies": { "dependencies": {
"-": "^0.0.1", "-": "^0.0.1",
"@sentry/gatsby": "^7.7.0", "@sentry/gatsby": "^7.7.0",
"@trussworks/react-uswds": "^2.9.0", "@trussworks/react-uswds": "^3.1.0",
"@turf/bbox": "^6.5.0", "@turf/bbox": "^6.5.0",
"d3-ease": "^3.0.1", "d3-ease": "^3.0.1",
"gatsby-plugin-env-variables": "^2.2.0", "gatsby-plugin-env-variables": "^2.2.0",
@ -27,7 +27,7 @@
"react-intl": "^5.24.7", "react-intl": "^5.24.7",
"react-map-gl": "^6.1.19", "react-map-gl": "^6.1.19",
"react-use": "^17.3.2", "react-use": "^17.3.2",
"uswds": "^2.11.2" "uswds": "^2.13.3"
}, },
"devDependencies": { "devDependencies": {
"@formatjs/cli": "^4.8.2", "@formatjs/cli": "^4.8.2",
@ -3579,16 +3579,16 @@
} }
}, },
"node_modules/@trussworks/react-uswds": { "node_modules/@trussworks/react-uswds": {
"version": "2.9.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/@trussworks/react-uswds/-/react-uswds-2.9.0.tgz", "resolved": "https://registry.npmjs.org/@trussworks/react-uswds/-/react-uswds-3.1.0.tgz",
"integrity": "sha512-qv5twPgzLJulWsZew3No3W45FTp3WrYGwG/3B+w/mPFuAMHmAX7VAiigmg+k2kHFvrpjyAiKZHREpHyhkZIbig==", "integrity": "sha512-4krdLn8LGgr3EwOsizUF6cBLnwDS6x0WgJjjGk59kNBpgH4qiv8YGzic3HYaVr8xWBq36VpEEfGeQZnjYGMegw==",
"engines": { "engines": {
"node": "10.x - 16.x" "node": "10.x - 18.x"
}, },
"peerDependencies": { "peerDependencies": {
"react": "^16.x || ^17.x", "react": "^16.x || ^17.x",
"react-dom": "^16.x || ^17.x", "react-dom": "^16.x || ^17.x",
"uswds": "2.11.2" "uswds": "2.13.3"
} }
}, },
"node_modules/@trysound/sax": { "node_modules/@trysound/sax": {
@ -6622,9 +6622,9 @@
} }
}, },
"node_modules/classlist-polyfill": { "node_modules/classlist-polyfill": {
"version": "1.2.0", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/classlist-polyfill/-/classlist-polyfill-1.2.0.tgz", "resolved": "https://registry.npmjs.org/classlist-polyfill/-/classlist-polyfill-1.0.3.tgz",
"integrity": "sha1-k1vC39lFiodrJ5YXUUY4vKqWSi4=" "integrity": "sha512-bDLDUsSg5LYFWsc2hphtG6ulyaCFSupdEBU3wxNECKWHnyPVvY8EB9Wbt9DzWkstWclFZhDaZK/VnEK/DmqE/Q=="
}, },
"node_modules/clean-stack": { "node_modules/clean-stack": {
"version": "2.2.0", "version": "2.2.0",
@ -8877,11 +8877,6 @@
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.89.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.89.tgz",
"integrity": "sha512-z1Axg0Fu54fse8wN4fd+GAINdU5mJmLtcl6bqIcYyzNVGONcfHAeeJi88KYMQVKalhXlYuVPzKkFIU5VD0raUw==" "integrity": "sha512-z1Axg0Fu54fse8wN4fd+GAINdU5mJmLtcl6bqIcYyzNVGONcfHAeeJi88KYMQVKalhXlYuVPzKkFIU5VD0raUw=="
}, },
"node_modules/elem-dataset": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/elem-dataset/-/elem-dataset-2.0.0.tgz",
"integrity": "sha512-e7gieGopWw5dMdEgythH3lUS7nMizutPDTtkzfQW/q2gCvFnACyNnK3ytCncAXKxdBXQWcXeKaYTTODiMnp8mw=="
},
"node_modules/element-closest": { "node_modules/element-closest": {
"version": "2.0.2", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/element-closest/-/element-closest-2.0.2.tgz", "resolved": "https://registry.npmjs.org/element-closest/-/element-closest-2.0.2.tgz",
@ -25238,57 +25233,20 @@
} }
}, },
"node_modules/uswds": { "node_modules/uswds": {
"version": "2.11.2", "version": "2.13.3",
"resolved": "https://registry.npmjs.org/uswds/-/uswds-2.11.2.tgz", "resolved": "https://registry.npmjs.org/uswds/-/uswds-2.13.3.tgz",
"integrity": "sha512-JISTXCjPIlrufbObIifjrMDn5jF9bbLu7UYhGWmEs9iqB6Z2KDCXHVoBUyzMmIrIjW/UWWYHZzPqOOHO6/IMCQ==", "integrity": "sha512-qCblljeaRvS3+PrSxoHqQwmMnp746+Y1YZA34BkTzJknvo2bhhdzGE21yJaInumzIqV3glLD13TFdRwrwikMMQ==",
"dependencies": { "dependencies": {
"classlist-polyfill": "^1.0.3", "classlist-polyfill": "1.0.3",
"del": "^6.0.0", "domready": "1.0.8",
"domready": "^1.0.8", "object-assign": "4.1.1",
"elem-dataset": "^2.0.0", "receptor": "1.0.0",
"object-assign": "^4.1.1", "resolve-id-refs": "0.1.0"
"receptor": "^1.0.0",
"resolve-id-refs": "^0.1.0"
}, },
"engines": { "engines": {
"node": ">= 4" "node": ">= 4"
} }
}, },
"node_modules/uswds/node_modules/del": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz",
"integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==",
"dependencies": {
"globby": "^11.0.1",
"graceful-fs": "^4.2.4",
"is-glob": "^4.0.1",
"is-path-cwd": "^2.2.0",
"is-path-inside": "^3.0.2",
"p-map": "^4.0.0",
"rimraf": "^3.0.2",
"slash": "^3.0.0"
},
"engines": {
"node": ">=10"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/uswds/node_modules/p-map": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
"integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
"dependencies": {
"aggregate-error": "^3.0.0"
},
"engines": {
"node": ">=10"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/util": { "node_modules/util": {
"version": "0.10.4", "version": "0.10.4",
"resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz", "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
@ -29128,9 +29086,9 @@
"dev": true "dev": true
}, },
"@trussworks/react-uswds": { "@trussworks/react-uswds": {
"version": "2.9.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/@trussworks/react-uswds/-/react-uswds-2.9.0.tgz", "resolved": "https://registry.npmjs.org/@trussworks/react-uswds/-/react-uswds-3.1.0.tgz",
"integrity": "sha512-qv5twPgzLJulWsZew3No3W45FTp3WrYGwG/3B+w/mPFuAMHmAX7VAiigmg+k2kHFvrpjyAiKZHREpHyhkZIbig==", "integrity": "sha512-4krdLn8LGgr3EwOsizUF6cBLnwDS6x0WgJjjGk59kNBpgH4qiv8YGzic3HYaVr8xWBq36VpEEfGeQZnjYGMegw==",
"requires": {} "requires": {}
}, },
"@trysound/sax": { "@trysound/sax": {
@ -31616,9 +31574,9 @@
} }
}, },
"classlist-polyfill": { "classlist-polyfill": {
"version": "1.2.0", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/classlist-polyfill/-/classlist-polyfill-1.2.0.tgz", "resolved": "https://registry.npmjs.org/classlist-polyfill/-/classlist-polyfill-1.0.3.tgz",
"integrity": "sha1-k1vC39lFiodrJ5YXUUY4vKqWSi4=" "integrity": "sha512-bDLDUsSg5LYFWsc2hphtG6ulyaCFSupdEBU3wxNECKWHnyPVvY8EB9Wbt9DzWkstWclFZhDaZK/VnEK/DmqE/Q=="
}, },
"clean-stack": { "clean-stack": {
"version": "2.2.0", "version": "2.2.0",
@ -33405,11 +33363,6 @@
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.89.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.89.tgz",
"integrity": "sha512-z1Axg0Fu54fse8wN4fd+GAINdU5mJmLtcl6bqIcYyzNVGONcfHAeeJi88KYMQVKalhXlYuVPzKkFIU5VD0raUw==" "integrity": "sha512-z1Axg0Fu54fse8wN4fd+GAINdU5mJmLtcl6bqIcYyzNVGONcfHAeeJi88KYMQVKalhXlYuVPzKkFIU5VD0raUw=="
}, },
"elem-dataset": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/elem-dataset/-/elem-dataset-2.0.0.tgz",
"integrity": "sha512-e7gieGopWw5dMdEgythH3lUS7nMizutPDTtkzfQW/q2gCvFnACyNnK3ytCncAXKxdBXQWcXeKaYTTODiMnp8mw=="
},
"element-closest": { "element-closest": {
"version": "2.0.2", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/element-closest/-/element-closest-2.0.2.tgz", "resolved": "https://registry.npmjs.org/element-closest/-/element-closest-2.0.2.tgz",
@ -45704,42 +45657,15 @@
"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
}, },
"uswds": { "uswds": {
"version": "2.11.2", "version": "2.13.3",
"resolved": "https://registry.npmjs.org/uswds/-/uswds-2.11.2.tgz", "resolved": "https://registry.npmjs.org/uswds/-/uswds-2.13.3.tgz",
"integrity": "sha512-JISTXCjPIlrufbObIifjrMDn5jF9bbLu7UYhGWmEs9iqB6Z2KDCXHVoBUyzMmIrIjW/UWWYHZzPqOOHO6/IMCQ==", "integrity": "sha512-qCblljeaRvS3+PrSxoHqQwmMnp746+Y1YZA34BkTzJknvo2bhhdzGE21yJaInumzIqV3glLD13TFdRwrwikMMQ==",
"requires": { "requires": {
"classlist-polyfill": "^1.0.3", "classlist-polyfill": "1.0.3",
"del": "^6.0.0", "domready": "1.0.8",
"domready": "^1.0.8", "object-assign": "4.1.1",
"elem-dataset": "^2.0.0", "receptor": "1.0.0",
"object-assign": "^4.1.1", "resolve-id-refs": "0.1.0"
"receptor": "^1.0.0",
"resolve-id-refs": "^0.1.0"
},
"dependencies": {
"del": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz",
"integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==",
"requires": {
"globby": "^11.0.1",
"graceful-fs": "^4.2.4",
"is-glob": "^4.0.1",
"is-path-cwd": "^2.2.0",
"is-path-inside": "^3.0.2",
"p-map": "^4.0.0",
"rimraf": "^3.0.2",
"slash": "^3.0.0"
}
},
"p-map": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
"integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
"requires": {
"aggregate-error": "^3.0.0"
}
}
} }
}, },
"util": { "util": {

4
client/package.json
View file

@ -77,7 +77,7 @@
"dependencies": { "dependencies": {
"-": "^0.0.1", "-": "^0.0.1",
"@sentry/gatsby": "^7.7.0", "@sentry/gatsby": "^7.7.0",
"@trussworks/react-uswds": "^2.9.0", "@trussworks/react-uswds": "^3.1.0",
"@turf/bbox": "^6.5.0", "@turf/bbox": "^6.5.0",
"d3-ease": "^3.0.1", "d3-ease": "^3.0.1",
"gatsby-plugin-env-variables": "^2.2.0", "gatsby-plugin-env-variables": "^2.2.0",
@ -93,7 +93,7 @@
"react-intl": "^5.24.7", "react-intl": "^5.24.7",
"react-map-gl": "^6.1.19", "react-map-gl": "^6.1.19",
"react-use": "^17.3.2", "react-use": "^17.3.2",
"uswds": "^2.11.2" "uswds": "^2.13.3"
}, },
"cypress-cucumber-preprocessor": { "cypress-cucumber-preprocessor": {
"nonGlobalStepDefinitions": false "nonGlobalStepDefinitions": false

9
client/src/components/AreaDetail/AreaDetail.tsx
View file

@ -500,6 +500,15 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
// component to render the actual Indicator // component to render the actual Indicator
const categoryItems = categories.map((category) => ({ const categoryItems = categories.map((category) => ({
id: category.id, id: category.id,
/*
As of trussworks 3.0.0, there were some breaking changes. This new prop of headingLevel
is required, however, the title prop is already defining the category styling, so this
is placed here to satisfy the requirement of the AccordionItems API, however it's not
being used.
*/
headingLevel: 'h4',
title: <Category name={category.titleText} isDisadvantaged={category.isDisadvagtaged} />, title: <Category name={category.titleText} isDisadvantaged={category.isDisadvagtaged} />,
content: ( content: (
<> <>

10
client/src/components/MapSearch/__snapshots__/MapSearch.test.tsx.snap
View file

@ -31,11 +31,11 @@ exports[`rendering of the MapSearch checks if component renders 1`] = `
data-testid="button" data-testid="button"
type="submit" type="submit"
> >
<span <img
class="usa-sr-only" alt="Search"
> class="usa-search__submit-icon"
Search src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCIgd2lkdGg9IjI0Ij48cGF0aCBkPSJNMCAwaDI0djI0SDB6IiBmaWxsPSJub25lIi8+PHBhdGggZmlsbD0iI2ZmZmZmZiIgZD0iTTE1LjUgMTRoLS43OWwtLjI4LS4yN0MxNS40MSAxMi41OSAxNiAxMS4xMSAxNiA5LjUgMTYgNS45MSAxMy4wOSAzIDkuNSAzUzMgNS45MSAzIDkuNSA1LjkxIDE2IDkuNSAxNmMxLjYxIDAgMy4wOS0uNTkgNC4yMy0xLjU3bC4yNy4yOHYuNzlsNSA0Ljk5TDIwLjQ5IDE5bC00Ljk5LTV6bS02IDBDNy4wMSAxNCA1IDExLjk5IDUgOS41UzcuMDEgNSA5LjUgNSAxNCA3LjAxIDE0IDkuNSAxMS45OSAxNCA5LjUgMTR6Ii8+PC9zdmc+"
</span> />
</button> </button>
</form> </form>
</div> </div>

2
client/src/components/PublicEvent/PublicEvent.tsx
View file

@ -43,7 +43,7 @@ const PublicEvent = ({event}:IPublicEvent) => {
}> }>
{/* Heading */} {/* Heading */}
<CollectionHeading> <CollectionHeading headingLevel='h3'>
{isEventExpired ? eventName : <LinkTypeWrapper {isEventExpired ? eventName : <LinkTypeWrapper
linkText={eventName} linkText={eventName}
internal={false} internal={false}

12
client/src/components/PublicVideoBox/PublicVideoBox.tsx
View file

@ -1,5 +1,5 @@
import React from 'react'; import React from 'react';
import {Button, SummaryBox} from '@trussworks/react-uswds'; import {Button, SummaryBox, SummaryBoxContent, SummaryBoxHeading} from '@trussworks/react-uswds';
import {useIntl} from 'gatsby-plugin-intl'; import {useIntl} from 'gatsby-plugin-intl';
import * as PUBLIC_COPY from '../../data/copy/publicEngage'; import * as PUBLIC_COPY from '../../data/copy/publicEngage';
@ -15,8 +15,13 @@ const PublicVideoBox = () => {
return ( return (
<SummaryBox <SummaryBox
className={styles.publicVideoContainer} className={styles.publicVideoContainer}>
heading={intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.TITLE)}>
<SummaryBoxHeading headingLevel='h3'>
{intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.TITLE)}
</SummaryBoxHeading>
<SummaryBoxContent>
{intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.BODY)} {intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.BODY)}
<a <a
className={styles.publicVideoLink} className={styles.publicVideoLink}
@ -61,6 +66,7 @@ const PublicVideoBox = () => {
</div> </div>
</Button> </Button>
</a> </a>
</SummaryBoxContent>
</SummaryBox> </SummaryBox>
); );
}; };

12
client/src/components/RequestForInfo/RequestForInfo.tsx
View file

@ -1,5 +1,5 @@
import React from 'react'; import React from 'react';
import {SummaryBox} from '@trussworks/react-uswds'; import {SummaryBox, SummaryBoxContent, SummaryBoxHeading} from '@trussworks/react-uswds';
import {useIntl} from 'gatsby-plugin-intl'; import {useIntl} from 'gatsby-plugin-intl';
import * as CONTACT_COPY from '../../data/copy/contact'; import * as CONTACT_COPY from '../../data/copy/contact';
@ -9,8 +9,16 @@ const RequestForInfo = () => {
const intl = useIntl(); const intl = useIntl();
return ( return (
<SummaryBox className={styles.rfiBox} heading={intl.formatMessage(CONTACT_COPY.RFI_BOX.TITLE)}> <SummaryBox className={styles.rfiBox}>
<SummaryBoxHeading headingLevel='h3'>
{intl.formatMessage(CONTACT_COPY.RFI_BOX.TITLE)}
</SummaryBoxHeading>
<SummaryBoxContent>
<p>{CONTACT_COPY.RFI_BOX_BODY}</p> <p>{CONTACT_COPY.RFI_BOX_BODY}</p>
</SummaryBoxContent>
</SummaryBox> </SummaryBox>
); );
}; };