Skip to content

Commit

Permalink
Merge branch 'main' into snyk-upgrade-af7e08195c7f91c2630440a9c59945b3
Browse files Browse the repository at this point in the history
  • Loading branch information
amvertex authored Aug 23, 2023
2 parents 847c13e + c79d52b commit dd231d7
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with: { node-version: 14.x }
with: { node-version: 18.x }
- name: Build
run: |
yarn install --frozen-lockfile
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"@emotion/server": "^11.11.0",
"@emotion/styled": "^11.10.8",
"@mui/icons-material": "^5.14.3",
"@mui/material": "^5.13.7",
"@mui/material": "^5.14.3",
"@vertexvis/api-client-node": "^0.21.0",
"@vertexvis/viewer-react": "^0.17.5",
"next": "^12.3.4",
Expand Down
87 changes: 40 additions & 47 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -207,13 +207,6 @@
dependencies:
regenerator-runtime "^0.13.11"

"@babel/runtime@^7.22.5":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec"
integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==
dependencies:
regenerator-runtime "^0.13.11"

"@babel/runtime@^7.22.6":
version "7.22.6"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.6.tgz#57d64b9ae3cff1d67eb067ae117dac087f5bd438"
Expand Down Expand Up @@ -455,24 +448,24 @@
"@jridgewell/resolve-uri" "^3.0.3"
"@jridgewell/sourcemap-codec" "^1.4.10"

"@mui/[email protected].8":
version "5.0.0-beta.8"
resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.8.tgz#a0a9531ae9147be92d17e4f0e3b9accc57916841"
integrity sha512-b4vVjMZx5KzzEMf4arXKoeV5ZegAMOoPwoy1vfUBwhvXc2QtaaAyBp50U7OA2L06Leubc1A+lEp3eqwZoFn87g==
"@mui/[email protected].11":
version "5.0.0-beta.11"
resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.11.tgz#0124d336f1931c6cd5f0008d015df5bd8fafd3a8"
integrity sha512-FdKZGPd8qmC3ZNke7CNhzcEgToc02M6WYZc9hcBsNQ17bgAd3s9F//1bDDYgMVBYxDM71V0sv/hBHlOY4I1ZVA==
dependencies:
"@babel/runtime" "^7.22.6"
"@emotion/is-prop-valid" "^1.2.1"
"@mui/types" "^7.2.4"
"@mui/utils" "^5.14.1"
"@mui/utils" "^5.14.5"
"@popperjs/core" "^2.11.8"
clsx "^1.2.1"
clsx "^2.0.0"
prop-types "^15.8.1"
react-is "^18.2.0"

"@mui/core-downloads-tracker@^5.14.2":
version "5.14.2"
resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-5.14.2.tgz#d8fcacdb1d37e621fce33ea808180fa5a590f908"
integrity sha512-x+c/MgDL1t/IIy5lDbMlrDouFG5DYZbl3DP4dbbuhlpPFBnE9glYwmJEee/orVHQpOPwLxCAIWQs+2DKSaBVWQ==
"@mui/core-downloads-tracker@^5.14.5":
version "5.14.5"
resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-5.14.5.tgz#c5854b89d57520c77253a79b20b784d5c2903fb6"
integrity sha512-+wpGH1USwPcKMFPMvXqYPC6fEvhxM3FzxC8lyDiNK/imLyyJ6y2DPb1Oue7OGIKJWBmYBqrWWtfovrxd1aJHTA==

"@mui/icons-material@^5.14.3":
version "5.14.3"
Expand All @@ -481,31 +474,31 @@
dependencies:
"@babel/runtime" "^7.22.6"

"@mui/material@^5.13.7":
version "5.14.2"
resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.14.2.tgz#13b113489a61021145d62e0383912ca487a46375"
integrity sha512-TgNR4/YRL11RifsnMWNhITNCkGJYVz20SCvVJBBoU5Y/KhUNSSJxjDpEB8VrnY+sUsV0NigLCkHZJglfsiS3Pw==
"@mui/material@^5.14.3":
version "5.14.5"
resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.14.5.tgz#4610b381fd159cd208c28e1d1f29c303ea24a518"
integrity sha512-4qa4GMfuZH0Ai3mttk5ccXP8a3sf7aPlAJwyMrUSz6h9hPri6BPou94zeu3rENhhmKLby9S/W1y+pmficy8JKA==
dependencies:
"@babel/runtime" "^7.22.6"
"@mui/base" "5.0.0-beta.8"
"@mui/core-downloads-tracker" "^5.14.2"
"@mui/system" "^5.14.1"
"@mui/base" "5.0.0-beta.11"
"@mui/core-downloads-tracker" "^5.14.5"
"@mui/system" "^5.14.5"
"@mui/types" "^7.2.4"
"@mui/utils" "^5.14.1"
"@mui/utils" "^5.14.5"
"@types/react-transition-group" "^4.4.6"
clsx "^1.2.1"
clsx "^2.0.0"
csstype "^3.1.2"
prop-types "^15.8.1"
react-is "^18.2.0"
react-transition-group "^4.4.5"

"@mui/private-theming@^5.13.7":
version "5.13.7"
resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.13.7.tgz#2f8ef5da066f3c6c6423bd4260d003a28d10b099"
integrity sha512-qbSr+udcij5F9dKhGX7fEdx2drXchq7htLNr2Qg2Ma+WJ6q0ERlEqGSBiPiVDJkptcjeVL4DGmcf1wl5+vD4EA==
"@mui/private-theming@^5.14.5":
version "5.14.5"
resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.14.5.tgz#834e1569c31e2644665f98d902def79014053017"
integrity sha512-cC4C5RrpXpDaaZyH9QwmPhRLgz+f2SYbOty3cPkk4qPSOSfif2ZEcDD9HTENKDDd9deB+xkPKzzZhi8cxIx8Ig==
dependencies:
"@babel/runtime" "^7.22.5"
"@mui/utils" "^5.13.7"
"@babel/runtime" "^7.22.6"
"@mui/utils" "^5.14.5"
prop-types "^15.8.1"

"@mui/styled-engine@^5.13.2":
Expand All @@ -518,17 +511,17 @@
csstype "^3.1.2"
prop-types "^15.8.1"

"@mui/system@^5.14.1":
version "5.14.1"
resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.14.1.tgz#ec8ae69f63963b5916dad4bca2f8a86a001a2392"
integrity sha512-u+xlsU34Jdkgx1CxmBnIC4Y08uPdVX5iEd3S/1dggDFtOGp+Lj8xmKRJAQ8PJOOJLOh8pDwaZx4AwXikL4l1QA==
"@mui/system@^5.14.5":
version "5.14.5"
resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.14.5.tgz#614394c4183d90df82c540e0e736ba72c1f95f8e"
integrity sha512-mextXZHDeGcR7E1kx43TRARrVXy+gI4wzpUgNv7MqZs1dvTVXQGVeAT6ydj9d6FUqHBPMNLGV/21vJOrpqsL+w==
dependencies:
"@babel/runtime" "^7.22.6"
"@mui/private-theming" "^5.13.7"
"@mui/private-theming" "^5.14.5"
"@mui/styled-engine" "^5.13.2"
"@mui/types" "^7.2.4"
"@mui/utils" "^5.14.1"
clsx "^1.2.1"
"@mui/utils" "^5.14.5"
clsx "^2.0.0"
csstype "^3.1.2"
prop-types "^15.8.1"

Expand All @@ -537,10 +530,10 @@
resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.2.4.tgz#b6fade19323b754c5c6de679a38f068fd50b9328"
integrity sha512-LBcwa8rN84bKF+f5sDyku42w1NTxaPgPyYKODsh01U1fVstTClbUoSA96oyRBnSNyEiAVjKm6Gwx9vjR+xyqHA==

"@mui/utils@^5.13.7", "@mui/utils@^5.14.1":
version "5.14.1"
resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.14.1.tgz#29696371016552a6eb3af975bc7af429ec88b29a"
integrity sha512-39KHKK2JeqRmuUcLDLwM+c2XfVC136C5/yUyQXmO2PVbOb2Bol4KxtkssEqCbTwg87PSCG3f1Tb0keRsK7cVGw==
"@mui/utils@^5.14.5":
version "5.14.5"
resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.14.5.tgz#98fb6060610b793a8478e70ffe5e4ed5bd922dba"
integrity sha512-6Hzw63VR9C5xYv+CbjndoRLU6Gntal8rJ5W+GUzkyHrGWIyYPWZPa6AevnyGioySNETATe1H9oXS8f/7qgIHJA==
dependencies:
"@babel/runtime" "^7.22.6"
"@types/prop-types" "^15.7.5"
Expand Down Expand Up @@ -1234,10 +1227,10 @@ classnames@*, classnames@^2.3.1:
resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==

clsx@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"
integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==
clsx@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.0.0.tgz#12658f3fd98fafe62075595a5c30e43d18f3d00b"
integrity sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==

color-convert@^1.9.0:
version "1.9.3"
Expand Down

0 comments on commit dd231d7

Please sign in to comment.