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

Attempt to fix minimist CVE (#1470)

Browse source 
* Attempt to fix minimist CVE

- udpate npm to 8.5.5
- update node to 14.17.5
- update all minor versions to latest
- minimist to 1.2.6 (could still be CVE)
- set docker frontend to use cdn by default
- update all dependencies
- update survey button launch svg color
- update to zoom / territory buttons
- search icon changed
- update Feature type from maplibre-gl
- use default search icon

* Rollback maplibre to 1.15.2

* Revert maplibre to 1.14.0

* Rollback some changes

- rollback uswds
- search icon is back
- update snapshots
- rollback docker to be cdn by default
This commit is contained in:
Vim 2022-03-23 13:51:54 -04:00 • committed by GitHub
parent a986674ed9
commit 712e5bb4ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 33149 additions and 10340 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client/gatsby-node.js
View file

@ -1,5 +1,6 @@
path = require('path');
// https://github.com/maplibre/maplibre-gl-js/issues/83#issuecomment-877012839
exports.onCreateWebpackConfig = ({stage, loaders, actions}) => {
actions.setWebpackConfig({
devtool: 'eval-source-map',

43352
client/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

88
client/package.json
View file

@ -30,68 +30,70 @@
"prepare": "cd .. && husky install client/.husky"
},
"devDependencies": {
"@formatjs/cli": "^4.2.15",
"@testing-library/cypress": "^7.0.6",
"@testing-library/jest-dom": "^5.12.0",
"@formatjs/cli": "^4.8.2",
"@testing-library/cypress": "^8.0.2",
"@testing-library/jest-dom": "^5.16.2",
"@testing-library/react": "^11.2.7",
"@types/d3-ease": "^3.0.0",
"@types/jest": "^26.0.23",
"@types/maplibre-gl": "^1.13.1",
"@types/node": "^15.3.1",
"@types/react": "^17.0.1",
"@types/react-dom": "^17.0.1",
"@types/react-helmet": "^6.1.1",
"@types/jest": "^26.0.24",
"@types/maplibre-gl": "^1.14.0",
"@types/node": "^15.14.9",
"@types/react": "^17.0.41",
"@types/react-dom": "^17.0.14",
"@types/react-helmet": "^6.1.5",
"@types/react-test-renderer": "^17.0.1",
"@typescript-eslint/eslint-plugin": "^4.25.0",
"@typescript-eslint/parser": "^4.25.0",
"axe-core": "^4.2.1",
"babel-jest": "^27.0.1",
"babel-preset-gatsby": "^1.6.0",
"cypress": "^8.5.0",
"cypress-axe": "^0.12.2",
"cypress-cucumber-preprocessor": "^4.2.0",
"eslint": "^7.27.0",
"@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "^4.33.0",
"axe-core": "^4.4.1",
"babel-jest": "^27.5.1",
"babel-preset-gatsby": "^1.14.0",
"cypress": "^9.5.2",
"cypress-axe": "^0.14.0",
"cypress-cucumber-preprocessor": "^4.3.1",
"eslint": "^7.32.0",
"eslint-config-google": "^0.14.0",
"eslint-plugin-cypress": "^2.11.3",
"eslint-plugin-formatjs": "^2.17.1",
"eslint-plugin-react": "^7.23.2",
"gatsby": "^3.4.1",
"gatsby-cli": "^3.5.0",
"eslint-plugin-cypress": "^2.12.1",
"eslint-plugin-formatjs": "^2.21.0",
"eslint-plugin-react": "^7.29.4",
"gatsby": "^3.14.6",
"gatsby-cli": "^3.14.2",
"gatsby-plugin-intl": "^0.3.3",
"gatsby-plugin-prettier-eslint": "^1.0.6",
"gatsby-plugin-react-helmet": "^4.6.0",
"gatsby-plugin-sass": "^4.5.0",
"gh-pages": "^3.2.0",
"gatsby-plugin-react-helmet": "^4.14.0",
"gatsby-plugin-sass": "^4.14.0",
"gh-pages": "^3.2.3",
"husky": "^7.0.4",
"identity-obj-proxy": "^3.0.0",
"jest": "^27.0.1",
"jest": "^27.5.1",
"license-checker": "^25.0.1",
"prettier": "^2.3.0",
"prettier": "^2.6.0",
"react-test-renderer": "^17.0.2",
"sass": "^1.33.0",
"sass": "^1.49.9",
"sass-loader": "^11.1.1",
"start-server-and-test": "^1.12.3",
"ts-jest": "^27.0.0"
"start-server-and-test": "^1.14.0",
"ts-jest": "^27.1.3"
},
"dependencies": {
"@sentry/gatsby": "^6.13.2",
"@trussworks/react-uswds": "^2.0.0",
"-": "^0.0.1",
"@sentry/gatsby": "^6.19.1",
"@trussworks/react-uswds": "^2.8.0",
"@turf/bbox": "^6.5.0",
"D": "^1.0.0",
"d3-ease": "^3.0.1",
"gatsby-plugin-env-variables": "^2.1.0",
"gatsby-plugin-robots-txt": "^1.6.10",
"gatsby-plugin-env-variables": "^2.2.0",
"gatsby-plugin-robots-txt": "^1.7.0",
"gatsby-plugin-sitemap": "^4.10.0",
"mapbox-gl": "^1.13.0",
"maplibre-gl": ">=1.14.0",
"query-string": "^7.0.0",
"mapbox-gl": "^1.13.2",
"maplibre-gl": "^1.14.0",
"query-string": "^7.1.1",
"react": "^17.0.2",
"react-device-detect": "^1.17.0",
"react-dom": "^17.0.1",
"react-dom": "^17.0.2",
"react-helmet": "^6.1.0",
"react-intl": "^5.20.4",
"react-map-gl": "^6.1.16",
"react-use": "^17.3.1",
"uswds": "^2.10.3"
"react-intl": "^5.24.7",
"react-map-gl": "^6.1.19",
"react-use": "^17.3.2",
"uswds": "^2.11.2"
},
"cypress-cucumber-preprocessor": {
"nonGlobalStepDefinitions": false

40
client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
View file

@ -79,7 +79,7 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
class="usa-accordion"
data-testid="accordion"
>
<h2
<h4
class="usa-accordion__heading"
>
<button
@ -98,7 +98,7 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
/>
</div>
</button>
</h2>
</h4>
<div
class="usa-accordion__content usa-prose"
data-testid="accordionItem_work-dev"
@ -281,7 +281,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
class="usa-accordion"
data-testid="accordion"
>
<h2
<h4
class="usa-accordion__heading"
>
<button
@ -300,7 +300,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
/>
</div>
</button>
</h2>
</h4>
<div
class="usa-accordion__content usa-prose"
data-testid="accordionItem_climate-change"
@ -414,7 +414,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
</div>
</li>
</div>
<h2
<h4
class="usa-accordion__heading"
>
<button
@ -433,7 +433,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
/>
</div>
</button>
</h2>
</h4>
<div
class="usa-accordion__content usa-prose"
data-testid="accordionItem_clean-energy"
@ -527,7 +527,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
</div>
</li>
</div>
<h2
<h4
class="usa-accordion__heading"
>
<button
@ -546,7 +546,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
/>
</div>
</button>
</h2>
</h4>
<div
class="usa-accordion__content usa-prose"
data-testid="accordionItem_clean-transport"
@ -640,7 +640,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
</div>
</li>
</div>
<h2
<h4
class="usa-accordion__heading"
>
<button
@ -659,7 +659,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
/>
</div>
</button>
</h2>
</h4>
<div
class="usa-accordion__content usa-prose"
data-testid="accordionItem_sustain-house"
@ -757,7 +757,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
</div>
</li>
</div>
<h2
<h4
class="usa-accordion__heading"
>
<button
@ -776,7 +776,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
/>
</div>
</button>
</h2>
</h4>
<div
class="usa-accordion__content usa-prose"
data-testid="accordionItem_leg-pollute"
@ -888,7 +888,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
</div>
</li>
</div>
<h2
<h4
class="usa-accordion__heading"
>
<button
@ -907,7 +907,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
/>
</div>
</button>
</h2>
</h4>
<div
class="usa-accordion__content usa-prose"
data-testid="accordionItem_clean-water"
@ -983,7 +983,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
</div>
</li>
</div>
<h2
<h4
class="usa-accordion__heading"
>
<button
@ -1002,7 +1002,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
/>
</div>
</button>
</h2>
</h4>
<div
class="usa-accordion__content usa-prose"
data-testid="accordionItem_health-burdens"
@ -1137,7 +1137,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
</div>
</li>
</div>
<h2
<h4
class="usa-accordion__heading"
>
<button
@ -1156,7 +1156,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
/>
</div>
</button>
</h2>
</h4>
<div
class="usa-accordion__content usa-prose"
data-testid="accordionItem_work-dev"
@ -1379,7 +1379,7 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
class="usa-accordion"
data-testid="accordion"
>
<h2
<h4
class="usa-accordion__heading"
>
<button
@ -1398,7 +1398,7 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
/>
</div>
</button>
</h2>
</h4>
<div
class="usa-accordion__content usa-prose"
data-testid="accordionItem_work-dev"

2
client/src/components/J40Map.module.scss
View file

@ -8,7 +8,7 @@
.navigationControl {
left: .75em;
top: units(15);
width: 2.5em;
// width: 2.5em;
}
.fullscreenControl {

3
client/src/components/SurveyButton/SurveyButton.module.scss
View file

@ -26,6 +26,9 @@
.launchIcon {
height: .8rem;
// @include u-margin-bottom('neg-05');
// Change color of USWDS icon
filter: invert(13%) sepia(76%) saturate(5142%) hue-rotate(192deg) brightness(80%) contrast(106%);
}
}
}

3
client/src/components/SurveyButton/SurveyButton.tsx
View file

@ -7,7 +7,7 @@ import * as CONTACT_COPY from '../../data/copy/contact';
import J40MainGridContainer from '../J40MainGridContainer';
// @ts-ignore
import launchIcon from '/node_modules/uswds/dist/img/usa-icons-bg/launch--blue-70v.svg';
import launchIcon from '/node_modules/uswds/dist/img/usa-icons/launch.svg';
export const onClickHandler = () => {
Object.assign(document.createElement('a'), {target: '_blank', href: 'https://www.surveymonkey.com/r/cejst-survey'}).click();
@ -15,6 +15,7 @@ export const onClickHandler = () => {
const SurveyButton = () => {
const intl = useIntl();
return (
<J40MainGridContainer className={styles.surveyButtonContainer}>
<Button