From f0474726ac3cdb6048685e623307641d4d8973d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dafydd=20Ll=C5=B7r=20Pearson?= Date: Fri, 3 May 2024 20:50:26 +0100 Subject: [PATCH 01/13] feat: Setup query and placeholder components for "Team members" page (#3109) --- editor.planx.uk/src/components/Header.tsx | 14 +++- .../components/Team/TeamMembers.tsx | 19 +++++ editor.planx.uk/src/routes/team.tsx | 2 + editor.planx.uk/src/routes/teamMembers.tsx | 77 +++++++++++++++++++ 4 files changed, 109 insertions(+), 3 deletions(-) create mode 100644 editor.planx.uk/src/pages/FlowEditor/components/Team/TeamMembers.tsx create mode 100644 editor.planx.uk/src/routes/teamMembers.tsx diff --git a/editor.planx.uk/src/components/Header.tsx b/editor.planx.uk/src/components/Header.tsx index 7a7ff62081..9e142825cd 100644 --- a/editor.planx.uk/src/components/Header.tsx +++ b/editor.planx.uk/src/components/Header.tsx @@ -539,9 +539,17 @@ const EditorToolbar: React.FC<{ {/* Only show team settings link if inside a team route */} {isTeamSettingsVisible && ( - navigate(`${rootTeamPath()}/settings`)}> - Team Settings - + <> + navigate(`${rootTeamPath()}/settings`)} + > + Team Settings + + {/* Hidden until feature complete */} + {/* navigate(`${rootTeamPath()}/members`)}> + Team Members + */} + )} {/* Only show flow settings link if inside a flow route */} diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Team/TeamMembers.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Team/TeamMembers.tsx new file mode 100644 index 0000000000..b3f09a6ccb --- /dev/null +++ b/editor.planx.uk/src/pages/FlowEditor/components/Team/TeamMembers.tsx @@ -0,0 +1,19 @@ +import Box from "@mui/material/Box"; +import { Role, User } from "@opensystemslab/planx-core/types"; +import React from "react"; + +export type TeamMember = Omit & { + role: Role; +}; + +interface Props { + teamMembersByRole: Record; +} + +export const TeamMembers: React.FC = ({ teamMembersByRole }) => { + return ( + + {JSON.stringify(teamMembersByRole, null, 4)} + + ); +}; diff --git a/editor.planx.uk/src/routes/team.tsx b/editor.planx.uk/src/routes/team.tsx index 3d7aebfdcf..60e68060f2 100644 --- a/editor.planx.uk/src/routes/team.tsx +++ b/editor.planx.uk/src/routes/team.tsx @@ -71,6 +71,8 @@ const routes = compose( return import("./flow"); }), + + "/members": lazy(() => import("./teamMembers")), }), ); diff --git a/editor.planx.uk/src/routes/teamMembers.tsx b/editor.planx.uk/src/routes/teamMembers.tsx new file mode 100644 index 0000000000..5562c84ee5 --- /dev/null +++ b/editor.planx.uk/src/routes/teamMembers.tsx @@ -0,0 +1,77 @@ +import { Role, User } from "@opensystemslab/planx-core/types"; +import gql from "graphql-tag"; +import { groupBy } from "lodash"; +import { compose, mount, route, withData } from "navi"; +import { + TeamMember, + TeamMembers, +} from "pages/FlowEditor/components/Team/TeamMembers"; +import { useStore } from "pages/FlowEditor/lib/store"; +import React from "react"; + +import { client } from "../lib/graphql"; +import { makeTitle } from "./utils"; + +interface GetUsersForTeam { + users: User[]; +} + +const teamMembersRoutes = compose( + withData((req) => ({ + mountpath: req.mountpath, + })), + + mount({ + "/": route(async () => { + const teamSlug = useStore.getState().teamSlug; + + const { + data: { users }, + } = await client.query({ + query: gql` + query GetUsersForTeam($teamSlug: String!) { + users( + where: { + _or: [ + { is_platform_admin: { _eq: true } } + { teams: { team: { slug: { _eq: $teamSlug } } } } + ] + } + order_by: { first_name: asc } + ) { + id + firstName: first_name + lastName: last_name + isPlatformAdmin: is_platform_admin + email + teams(where: { team: { slug: { _eq: $teamSlug } } }) { + role + } + } + } + `, + variables: { teamSlug }, + }); + + const teamMembers: TeamMember[] = users.map((user) => ({ + firstName: user.firstName, + lastName: user.lastName, + email: user.email, + id: user.id, + role: user.isPlatformAdmin ? "platformAdmin" : user.teams[0].role, + })); + + const teamMembersByRole = groupBy(teamMembers, "role") as Record< + Role, + TeamMember[] + >; + + return { + title: makeTitle("Team Members"), + view: , + }; + }), + }), +); + +export default teamMembersRoutes; From 910f9accf334989ca82a6a238fbd8e804b00972f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dafydd=20Ll=C5=B7r=20Pearson?= Date: Tue, 7 May 2024 12:06:53 +0100 Subject: [PATCH 02/13] fix: `EditorIcon` warning (#3111) --- editor.planx.uk/src/ui/icons/Editor.tsx | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/editor.planx.uk/src/ui/icons/Editor.tsx b/editor.planx.uk/src/ui/icons/Editor.tsx index 8239a23efd..b318f36a71 100644 --- a/editor.planx.uk/src/ui/icons/Editor.tsx +++ b/editor.planx.uk/src/ui/icons/Editor.tsx @@ -1,15 +1,17 @@ -import SvgIcon from "@mui/material/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; import * as React from "react"; -export default function EditorIcon() { +export default function EditorIcon(props: SvgIconProps) { return ( - - - - + + ); } From 81f40b1251efc958bdb150f16067ecb27cbdce8b Mon Sep 17 00:00:00 2001 From: Jessica McInchak Date: Tue, 7 May 2024 13:32:06 +0100 Subject: [PATCH 03/13] chore: bump planx-core to ODP Schema v0.6.0 types (#3112) --- api.planx.uk/package.json | 2 +- api.planx.uk/pnpm-lock.yaml | 22 ++++++--- e2e/tests/api-driven/package.json | 2 +- e2e/tests/api-driven/pnpm-lock.yaml | 14 +++--- e2e/tests/ui-driven/package.json | 2 +- e2e/tests/ui-driven/pnpm-lock.yaml | 72 +++++++++++++---------------- editor.planx.uk/package.json | 2 +- editor.planx.uk/pnpm-lock.yaml | 68 ++++++++++++--------------- 8 files changed, 88 insertions(+), 96 deletions(-) diff --git a/api.planx.uk/package.json b/api.planx.uk/package.json index a94bc6e1ff..43f9cafa1b 100644 --- a/api.planx.uk/package.json +++ b/api.planx.uk/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@airbrake/node": "^2.1.8", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#722e1c7", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#177eefe", "@types/isomorphic-fetch": "^0.0.36", "adm-zip": "^0.5.10", "aws-sdk": "^2.1467.0", diff --git a/api.planx.uk/pnpm-lock.yaml b/api.planx.uk/pnpm-lock.yaml index 99e08d3ac0..952e99248b 100644 --- a/api.planx.uk/pnpm-lock.yaml +++ b/api.planx.uk/pnpm-lock.yaml @@ -12,8 +12,8 @@ dependencies: specifier: ^2.1.8 version: 2.1.8 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#722e1c7 - version: github.com/theopensystemslab/planx-core/722e1c7 + specifier: git+https://github.com/theopensystemslab/planx-core#177eefe + version: github.com/theopensystemslab/planx-core/177eefe '@types/isomorphic-fetch': specifier: ^0.0.36 version: 0.0.36 @@ -5717,6 +5717,7 @@ packages: chalk: 3.0.0 diff-match-patch: 1.0.5 dev: false + bundledDependencies: [] /jsonwebtoken@9.0.2: resolution: {integrity: sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==} @@ -7931,6 +7932,11 @@ packages: engines: {node: '>=16'} dev: false + /type-fest@4.18.2: + resolution: {integrity: sha512-+suCYpfJLAe4OXS6+PPXjW3urOS4IoP9waSiLuXfLgqZODKw/aWwASvzqE886wA0kQgGy0mIWyhd87VpqIy6Xg==} + engines: {node: '>=16'} + dev: false + /type-is@1.6.18: resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==} engines: {node: '>= 0.6'} @@ -8355,8 +8361,12 @@ packages: resolution: {integrity: sha512-fkwiq0VIQTksNNA131rDOsVJcns0pfVUjHzLrNBiF/O/Xxb5lQyEXkhZWcJ7npWsYlvs+h0jFWXXy4X46Em1JA==} dev: false - github.com/theopensystemslab/planx-core/722e1c7: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/722e1c7} + /zod@3.23.6: + resolution: {integrity: sha512-RTHJlZhsRbuA8Hmp/iNL7jnfc4nZishjsanDAfEY1QpDQZCahUp3xDzl+zfweE9BklxMUcgBgS1b7Lvie/ZVwA==} + dev: false + + github.com/theopensystemslab/planx-core/177eefe: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/177eefe} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true @@ -8381,9 +8391,9 @@ packages: prettier: 3.2.5 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - type-fest: 4.18.1 + type-fest: 4.18.2 uuid: 9.0.1 - zod: 3.23.5 + zod: 3.23.6 transitivePeerDependencies: - '@types/react' - encoding diff --git a/e2e/tests/api-driven/package.json b/e2e/tests/api-driven/package.json index 689e76ad91..1686084238 100644 --- a/e2e/tests/api-driven/package.json +++ b/e2e/tests/api-driven/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@cucumber/cucumber": "^9.3.0", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#722e1c7", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#177eefe", "axios": "^1.6.8", "dotenv": "^16.3.1", "dotenv-expand": "^10.0.0", diff --git a/e2e/tests/api-driven/pnpm-lock.yaml b/e2e/tests/api-driven/pnpm-lock.yaml index bee2964d31..2a5bddb132 100644 --- a/e2e/tests/api-driven/pnpm-lock.yaml +++ b/e2e/tests/api-driven/pnpm-lock.yaml @@ -9,8 +9,8 @@ dependencies: specifier: ^9.3.0 version: 9.3.0 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#722e1c7 - version: github.com/theopensystemslab/planx-core/722e1c7 + specifier: git+https://github.com/theopensystemslab/planx-core#177eefe + version: github.com/theopensystemslab/planx-core/177eefe axios: specifier: ^1.6.8 version: 1.6.8 @@ -2731,8 +2731,8 @@ packages: engines: {node: '>=10'} dev: false - /type-fest@4.18.1: - resolution: {integrity: sha512-qXhgeNsX15bM63h5aapNFcQid9jRF/l3ojDoDFmekDQEUufZ9U4ErVt6SjDxnHp48Ltrw616R8yNc3giJ3KvVQ==} + /type-fest@4.18.2: + resolution: {integrity: sha512-+suCYpfJLAe4OXS6+PPXjW3urOS4IoP9waSiLuXfLgqZODKw/aWwASvzqE886wA0kQgGy0mIWyhd87VpqIy6Xg==} engines: {node: '>=16'} dev: false @@ -2935,8 +2935,8 @@ packages: resolution: {integrity: sha512-RTHJlZhsRbuA8Hmp/iNL7jnfc4nZishjsanDAfEY1QpDQZCahUp3xDzl+zfweE9BklxMUcgBgS1b7Lvie/ZVwA==} dev: false - github.com/theopensystemslab/planx-core/722e1c7: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/722e1c7} + github.com/theopensystemslab/planx-core/177eefe: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/177eefe} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true @@ -2961,7 +2961,7 @@ packages: prettier: 3.2.5 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - type-fest: 4.18.1 + type-fest: 4.18.2 uuid: 9.0.1 zod: 3.23.6 transitivePeerDependencies: diff --git a/e2e/tests/ui-driven/package.json b/e2e/tests/ui-driven/package.json index 2c90e3a4c4..2c9e0827ca 100644 --- a/e2e/tests/ui-driven/package.json +++ b/e2e/tests/ui-driven/package.json @@ -8,7 +8,7 @@ "postinstall": "./install-dependencies.sh" }, "dependencies": { - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#722e1c7", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#177eefe", "axios": "^1.6.8", "dotenv": "^16.3.1", "eslint": "^8.56.0", diff --git a/e2e/tests/ui-driven/pnpm-lock.yaml b/e2e/tests/ui-driven/pnpm-lock.yaml index 2bfd6cbdac..71f5f03025 100644 --- a/e2e/tests/ui-driven/pnpm-lock.yaml +++ b/e2e/tests/ui-driven/pnpm-lock.yaml @@ -6,8 +6,8 @@ settings: dependencies: '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#722e1c7 - version: github.com/theopensystemslab/planx-core/722e1c7 + specifier: git+https://github.com/theopensystemslab/planx-core#177eefe + version: github.com/theopensystemslab/planx-core/177eefe axios: specifier: ^1.6.8 version: 1.6.8 @@ -287,7 +287,7 @@ packages: '@floating-ui/utils': 0.2.1 dev: false - /@floating-ui/react-dom@2.0.8(react-dom@18.2.0)(react@18.3.1): + /@floating-ui/react-dom@2.0.8(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-HOdqOt3R3OGeTKidaLvJKcgg75S6tibQ3Tif4eyd91QnIJWr0NLvoXFpJA/j8HqkFSL68GDca9AuyWEHlhyClw==} peerDependencies: react: '>=16.8.0' @@ -295,7 +295,7 @@ packages: dependencies: '@floating-ui/dom': 1.6.3 react: 18.3.1 - react-dom: 18.2.0(react@18.3.1) + react-dom: 18.3.1(react@18.3.1) dev: false /@floating-ui/utils@0.2.1: @@ -343,7 +343,7 @@ packages: resolution: {integrity: sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==} dev: false - /@mui/base@5.0.0-beta.37(react-dom@18.2.0)(react@18.3.1): + /@mui/base@5.0.0-beta.37(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-/o3anbb+DeCng8jNsd3704XtmmLDZju1Fo8R2o7ugrVtPQ/QpcqddwKNzKPZwa0J5T8YNW3ZVuHyQgbTnQLisQ==} engines: {node: '>=12.0.0'} peerDependencies: @@ -355,21 +355,21 @@ packages: optional: true dependencies: '@babel/runtime': 7.24.0 - '@floating-ui/react-dom': 2.0.8(react-dom@18.2.0)(react@18.3.1) + '@floating-ui/react-dom': 2.0.8(react-dom@18.3.1)(react@18.3.1) '@mui/types': 7.2.13 '@mui/utils': 5.15.11(react@18.3.1) '@popperjs/core': 2.11.8 clsx: 2.1.0 prop-types: 15.8.1 react: 18.3.1 - react-dom: 18.2.0(react@18.3.1) + react-dom: 18.3.1(react@18.3.1) dev: false /@mui/core-downloads-tracker@5.15.11: resolution: {integrity: sha512-JVrJ9Jo4gyU707ujnRzmE8ABBWpXd6FwL9GYULmwZRtfPg89ggXs/S3MStQkpJ1JRWfdLL6S5syXmgQGq5EDAw==} dev: false - /@mui/material@5.15.11(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react-dom@18.2.0)(react@18.3.1): + /@mui/material@5.15.11(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-FA3eEuEZaDaxgN3CgfXezMWbCZ4VCeU/sv0F0/PK5n42qIgsPVD6q+j71qS7/62sp6wRFMHtDMpXRlN+tT/7NA==} engines: {node: '>=12.0.0'} peerDependencies: @@ -389,7 +389,7 @@ packages: '@babel/runtime': 7.24.0 '@emotion/react': 11.11.4(react@18.3.1) '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(react@18.3.1) - '@mui/base': 5.0.0-beta.37(react-dom@18.2.0)(react@18.3.1) + '@mui/base': 5.0.0-beta.37(react-dom@18.3.1)(react@18.3.1) '@mui/core-downloads-tracker': 5.15.11 '@mui/system': 5.15.11(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react@18.3.1) '@mui/types': 7.2.13 @@ -399,9 +399,9 @@ packages: csstype: 3.1.3 prop-types: 15.8.1 react: 18.3.1 - react-dom: 18.2.0(react@18.3.1) + react-dom: 18.3.1(react@18.3.1) react-is: 18.2.0 - react-transition-group: 4.4.5(react-dom@18.2.0)(react@18.3.1) + react-transition-group: 4.4.5(react-dom@18.3.1)(react@18.3.1) dev: false /@mui/private-theming@5.15.11(react@18.3.1): @@ -560,13 +560,6 @@ packages: resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==} dev: false - /@types/prettier@3.0.0: - resolution: {integrity: sha512-mFMBfMOz8QxhYVbuINtswBp9VL2b4Y0QqYHwqLz3YbgtfAcat2Dl6Y1o4e22S/OVE6Ebl9m7wWiMT2lSbAs1wA==} - deprecated: This is a stub types definition. prettier provides its own type definitions, so you do not need this installed. - dependencies: - prettier: 3.2.5 - dev: false - /@types/prop-types@15.7.11: resolution: {integrity: sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==} dev: false @@ -1698,15 +1691,14 @@ packages: resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==} dev: false - /json-schema-to-typescript@14.0.0: - resolution: {integrity: sha512-y/Pj93Ggu69LyRPxqpe16t8LA/5ZyJVoqmUf+o+2cBG33dH/GsDn5oDZD3EiOTkHXjVuZg4qWnWzTtS2LcoeiA==} + /json-schema-to-typescript@14.0.4: + resolution: {integrity: sha512-covPOp3hrbD+oEcMvDxP5Rh6xNZj7lOTZkXAeQoDyu1PuEl1A6oRZ3Sy05HN11vXXmdJ6gLh5P3Qz0mgMPTzzw==} engines: {node: '>=16.0.0'} hasBin: true dependencies: '@apidevtools/json-schema-ref-parser': 11.6.0 '@types/json-schema': 7.0.15 '@types/lodash': 4.17.0 - '@types/prettier': 3.0.0 cli-color: 2.0.4 glob: 10.3.12 is-glob: 4.0.3 @@ -2208,14 +2200,14 @@ packages: strip-json-comments: 2.0.1 dev: false - /react-dom@18.2.0(react@18.3.1): - resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==} + /react-dom@18.3.1(react@18.3.1): + resolution: {integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==} peerDependencies: - react: ^18.2.0 + react: ^18.3.1 dependencies: loose-envify: 1.4.0 react: 18.3.1 - scheduler: 0.23.0 + scheduler: 0.23.2 dev: false /react-is@16.13.1: @@ -2226,7 +2218,7 @@ packages: resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} dev: false - /react-transition-group@4.4.5(react-dom@18.2.0)(react@18.3.1): + /react-transition-group@4.4.5(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==} peerDependencies: react: '>=16.6.0' @@ -2237,7 +2229,7 @@ packages: loose-envify: 1.4.0 prop-types: 15.8.1 react: 18.3.1 - react-dom: 18.2.0(react@18.3.1) + react-dom: 18.3.1(react@18.3.1) dev: false /react@18.3.1: @@ -2336,8 +2328,8 @@ packages: resolution: {integrity: sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==} dev: false - /scheduler@0.23.0: - resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==} + /scheduler@0.23.2: + resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==} dependencies: loose-envify: 1.4.0 dev: false @@ -2546,8 +2538,8 @@ packages: engines: {node: '>=12.20'} dev: false - /type-fest@4.18.0: - resolution: {integrity: sha512-+dbmiyliDY/2TTcjCS7NpI9yV2iEFlUDk5TKnsbkN7ZoRu5s7bT+zvYtNFhFXC2oLwURGT2frACAZvbbyNBI+w==} + /type-fest@4.18.2: + resolution: {integrity: sha512-+suCYpfJLAe4OXS6+PPXjW3urOS4IoP9waSiLuXfLgqZODKw/aWwASvzqE886wA0kQgGy0mIWyhd87VpqIy6Xg==} engines: {node: '>=16'} dev: false @@ -2701,12 +2693,12 @@ packages: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} - /zod@3.23.5: - resolution: {integrity: sha512-fkwiq0VIQTksNNA131rDOsVJcns0pfVUjHzLrNBiF/O/Xxb5lQyEXkhZWcJ7npWsYlvs+h0jFWXXy4X46Em1JA==} + /zod@3.23.6: + resolution: {integrity: sha512-RTHJlZhsRbuA8Hmp/iNL7jnfc4nZishjsanDAfEY1QpDQZCahUp3xDzl+zfweE9BklxMUcgBgS1b7Lvie/ZVwA==} dev: false - github.com/theopensystemslab/planx-core/722e1c7: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/722e1c7} + github.com/theopensystemslab/planx-core/177eefe: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/177eefe} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true @@ -2714,7 +2706,7 @@ packages: dependencies: '@emotion/react': 11.11.4(react@18.3.1) '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(react@18.3.1) - '@mui/material': 5.15.11(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react-dom@18.2.0)(react@18.3.1) + '@mui/material': 5.15.11(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react-dom@18.3.1)(react@18.3.1) '@types/geojson': 7946.0.14 ajv: 8.12.0 ajv-formats: 2.1.1(ajv@8.12.0) @@ -2725,15 +2717,15 @@ packages: fast-xml-parser: 4.3.6 graphql: 16.8.1 graphql-request: 6.1.0(graphql@16.8.1) - json-schema-to-typescript: 14.0.0 + json-schema-to-typescript: 14.0.4 lodash: 4.17.21 marked: 12.0.2 prettier: 3.2.5 react: 18.3.1 - react-dom: 18.2.0(react@18.3.1) - type-fest: 4.18.0 + react-dom: 18.3.1(react@18.3.1) + type-fest: 4.18.2 uuid: 9.0.1 - zod: 3.23.5 + zod: 3.23.6 transitivePeerDependencies: - '@types/react' - encoding diff --git a/editor.planx.uk/package.json b/editor.planx.uk/package.json index e87ab3859a..cf350d7fcd 100644 --- a/editor.planx.uk/package.json +++ b/editor.planx.uk/package.json @@ -12,7 +12,7 @@ "@mui/material": "^5.15.2", "@mui/utils": "^5.15.2", "@opensystemslab/map": "^0.8.1", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#722e1c7", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#177eefe", "@tiptap/core": "^2.0.3", "@tiptap/extension-bold": "^2.0.3", "@tiptap/extension-bubble-menu": "^2.1.13", diff --git a/editor.planx.uk/pnpm-lock.yaml b/editor.planx.uk/pnpm-lock.yaml index 43d80a5258..1df0d14b2f 100644 --- a/editor.planx.uk/pnpm-lock.yaml +++ b/editor.planx.uk/pnpm-lock.yaml @@ -38,8 +38,8 @@ dependencies: specifier: ^0.8.1 version: 0.8.1 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#722e1c7 - version: github.com/theopensystemslab/planx-core/722e1c7(@types/react@18.2.45) + specifier: git+https://github.com/theopensystemslab/planx-core#177eefe + version: github.com/theopensystemslab/planx-core/177eefe(@types/react@18.2.45) '@tiptap/core': specifier: ^2.0.3 version: 2.0.3(@tiptap/pm@2.0.3) @@ -4185,7 +4185,7 @@ packages: react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - /@floating-ui/react-dom@2.0.9(react-dom@18.2.0)(react@18.3.1): + /@floating-ui/react-dom@2.0.9(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-q0umO0+LQK4+p6aGyvzASqKbKOJcAHJ7ycE9CuUvfx3s9zTHWmGJTPOIlM/hmSBfUfg/XfY5YhLBLR/LHwShQQ==} peerDependencies: react: '>=16.8.0' @@ -4193,7 +4193,7 @@ packages: dependencies: '@floating-ui/dom': 1.6.4 react: 18.3.1 - react-dom: 18.2.0(react@18.3.1) + react-dom: 18.3.1(react@18.3.1) dev: false /@floating-ui/utils@0.2.2: @@ -4810,7 +4810,7 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: false - /@mui/base@5.0.0-beta.29(@types/react@18.2.45)(react-dom@18.2.0)(react@18.3.1): + /@mui/base@5.0.0-beta.29(@types/react@18.2.45)(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-OXfUssYrB6ch/xpBVHMKAjThPlI9VyGGKdvQLMXef2j39wXfcxPlUVQlwia/lmE3rxWIGvbwkZsDtNYzLMsDUg==} engines: {node: '>=12.0.0'} peerDependencies: @@ -4822,7 +4822,7 @@ packages: optional: true dependencies: '@babel/runtime': 7.24.5 - '@floating-ui/react-dom': 2.0.9(react-dom@18.2.0)(react@18.3.1) + '@floating-ui/react-dom': 2.0.9(react-dom@18.3.1)(react@18.3.1) '@mui/types': 7.2.14(@types/react@18.2.45) '@mui/utils': 5.15.2(@types/react@18.2.45)(react@18.3.1) '@popperjs/core': 2.11.8 @@ -4830,7 +4830,7 @@ packages: clsx: 2.1.1 prop-types: 15.8.1 react: 18.3.1 - react-dom: 18.2.0(react@18.3.1) + react-dom: 18.3.1(react@18.3.1) dev: false /@mui/core-downloads-tracker@5.15.16: @@ -4890,7 +4890,7 @@ packages: react-transition-group: 4.4.5(react-dom@18.2.0)(react@18.2.0) dev: false - /@mui/material@5.15.2(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.3.1): + /@mui/material@5.15.2(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.45)(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-JnoIrpNmEHG5uC1IyEdgsnDiaiuCZnUIh7f9oeAr87AvBmNiEJPbo7XrD7kBTFWwp+b97rQ12QdSs9CLhT2n/A==} engines: {node: '>=12.0.0'} peerDependencies: @@ -4910,7 +4910,7 @@ packages: '@babel/runtime': 7.24.5 '@emotion/react': 11.11.4(@types/react@18.2.45)(react@18.3.1) '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.45)(react@18.3.1) - '@mui/base': 5.0.0-beta.29(@types/react@18.2.45)(react-dom@18.2.0)(react@18.3.1) + '@mui/base': 5.0.0-beta.29(@types/react@18.2.45)(react-dom@18.3.1)(react@18.3.1) '@mui/core-downloads-tracker': 5.15.16 '@mui/system': 5.15.15(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.45)(react@18.3.1) '@mui/types': 7.2.14(@types/react@18.2.45) @@ -4921,9 +4921,9 @@ packages: csstype: 3.1.3 prop-types: 15.8.1 react: 18.3.1 - react-dom: 18.2.0(react@18.3.1) + react-dom: 18.3.1(react@18.3.1) react-is: 18.3.1 - react-transition-group: 4.4.5(react-dom@18.2.0)(react@18.3.1) + react-transition-group: 4.4.5(react-dom@18.3.1)(react@18.3.1) dev: false /@mui/private-theming@5.15.14(@types/react@18.2.45)(react@18.2.0): @@ -6216,7 +6216,7 @@ packages: '@storybook/preview-api': 7.6.7 '@storybook/theming': 7.6.7(react-dom@18.2.0)(react@18.2.0) '@storybook/types': 7.6.7 - '@types/lodash': 4.14.202 + '@types/lodash': 4.17.0 color-convert: 2.0.1 dequal: 2.0.3 lodash: 4.17.21 @@ -7150,20 +7150,6 @@ packages: pretty-format: 27.5.1 dev: true - /@testing-library/dom@8.20.1: - resolution: {integrity: sha512-/DiOQ5xBxgdYRC8LNk7U+RWat0S3qRLeIw3ZIkMQ9kkVlRmwD/Eg8k8CqIpD6GW7u20JIUOfMKbxtiLutpjQ4g==} - engines: {node: '>=12'} - dependencies: - '@babel/code-frame': 7.24.2 - '@babel/runtime': 7.24.5 - '@types/aria-query': 5.0.4 - aria-query: 5.1.3 - chalk: 4.1.2 - dom-accessibility-api: 0.5.16 - lz-string: 1.5.0 - pretty-format: 27.5.1 - dev: true - /@testing-library/dom@9.3.4: resolution: {integrity: sha512-FlS4ZWlp97iiNWig0Muq8p+3rVDjRiYE+YKGbAqXOu9nwJFFOdL00kFpz42M+4huzYi86vAK1sOOfyOG45muIQ==} engines: {node: '>=14'} @@ -7201,7 +7187,7 @@ packages: react-dom: ^18.0.0 dependencies: '@babel/runtime': 7.24.5 - '@testing-library/dom': 8.20.1 + '@testing-library/dom': 9.3.4 '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -7769,7 +7755,6 @@ packages: /@types/lodash@4.17.0: resolution: {integrity: sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==} - dev: false /@types/mdast@3.0.15: resolution: {integrity: sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==} @@ -17701,10 +17686,10 @@ packages: react: 18.2.0 scheduler: 0.23.2 - /react-dom@18.2.0(react@18.3.1): - resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==} + /react-dom@18.3.1(react@18.3.1): + resolution: {integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==} peerDependencies: - react: ^18.2.0 + react: ^18.3.1 dependencies: loose-envify: 1.4.0 react: 18.3.1 @@ -18076,7 +18061,7 @@ packages: react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - /react-transition-group@4.4.5(react-dom@18.2.0)(react@18.3.1): + /react-transition-group@4.4.5(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==} peerDependencies: react: '>=16.6.0' @@ -18087,7 +18072,7 @@ packages: loose-envify: 1.4.0 prop-types: 15.8.1 react: 18.3.1 - react-dom: 18.2.0(react@18.3.1) + react-dom: 18.3.1(react@18.3.1) dev: false /react-universal-interface@0.6.2(react@18.2.0)(tslib@2.6.2): @@ -20125,6 +20110,11 @@ packages: engines: {node: '>=16'} dev: false + /type-fest@4.18.2: + resolution: {integrity: sha512-+suCYpfJLAe4OXS6+PPXjW3urOS4IoP9waSiLuXfLgqZODKw/aWwASvzqE886wA0kQgGy0mIWyhd87VpqIy6Xg==} + engines: {node: '>=16'} + dev: false + /type-is@1.6.18: resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==} engines: {node: '>= 0.6'} @@ -21305,9 +21295,9 @@ packages: use-sync-external-store: 1.2.0(react@18.2.0) dev: false - github.com/theopensystemslab/planx-core/722e1c7(@types/react@18.2.45): - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/722e1c7} - id: github.com/theopensystemslab/planx-core/722e1c7 + github.com/theopensystemslab/planx-core/177eefe(@types/react@18.2.45): + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/177eefe} + id: github.com/theopensystemslab/planx-core/177eefe name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true @@ -21315,7 +21305,7 @@ packages: dependencies: '@emotion/react': 11.11.4(@types/react@18.2.45)(react@18.3.1) '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.45)(react@18.3.1) - '@mui/material': 5.15.2(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.3.1) + '@mui/material': 5.15.2(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.45)(react-dom@18.3.1)(react@18.3.1) '@types/geojson': 7946.0.14 ajv: 8.13.0 ajv-formats: 2.1.1(ajv@8.13.0) @@ -21331,8 +21321,8 @@ packages: marked: 12.0.2 prettier: 3.2.5 react: 18.3.1 - react-dom: 18.2.0(react@18.3.1) - type-fest: 4.18.1 + react-dom: 18.3.1(react@18.3.1) + type-fest: 4.18.2 uuid: 9.0.1 zod: 3.23.6 transitivePeerDependencies: From 0f0ed774e33a3eebca03981c786404f57db903a8 Mon Sep 17 00:00:00 2001 From: Jessica McInchak Date: Tue, 7 May 2024 16:26:17 +0100 Subject: [PATCH 04/13] chore: bump planx-core with adjusted schema mappings (#3115) --- api.planx.uk/package.json | 2 +- api.planx.uk/pnpm-lock.yaml | 8 ++++---- e2e/tests/api-driven/package.json | 2 +- e2e/tests/api-driven/pnpm-lock.yaml | 8 ++++---- e2e/tests/ui-driven/package.json | 2 +- e2e/tests/ui-driven/pnpm-lock.yaml | 8 ++++---- editor.planx.uk/package.json | 2 +- editor.planx.uk/pnpm-lock.yaml | 10 +++++----- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/api.planx.uk/package.json b/api.planx.uk/package.json index 43f9cafa1b..53aa638580 100644 --- a/api.planx.uk/package.json +++ b/api.planx.uk/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@airbrake/node": "^2.1.8", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#177eefe", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#04b0f0b", "@types/isomorphic-fetch": "^0.0.36", "adm-zip": "^0.5.10", "aws-sdk": "^2.1467.0", diff --git a/api.planx.uk/pnpm-lock.yaml b/api.planx.uk/pnpm-lock.yaml index 952e99248b..4e75f23169 100644 --- a/api.planx.uk/pnpm-lock.yaml +++ b/api.planx.uk/pnpm-lock.yaml @@ -12,8 +12,8 @@ dependencies: specifier: ^2.1.8 version: 2.1.8 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#177eefe - version: github.com/theopensystemslab/planx-core/177eefe + specifier: git+https://github.com/theopensystemslab/planx-core#04b0f0b + version: github.com/theopensystemslab/planx-core/04b0f0b '@types/isomorphic-fetch': specifier: ^0.0.36 version: 0.0.36 @@ -8365,8 +8365,8 @@ packages: resolution: {integrity: sha512-RTHJlZhsRbuA8Hmp/iNL7jnfc4nZishjsanDAfEY1QpDQZCahUp3xDzl+zfweE9BklxMUcgBgS1b7Lvie/ZVwA==} dev: false - github.com/theopensystemslab/planx-core/177eefe: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/177eefe} + github.com/theopensystemslab/planx-core/04b0f0b: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/04b0f0b} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/e2e/tests/api-driven/package.json b/e2e/tests/api-driven/package.json index 1686084238..c26c967a49 100644 --- a/e2e/tests/api-driven/package.json +++ b/e2e/tests/api-driven/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@cucumber/cucumber": "^9.3.0", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#177eefe", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#04b0f0b", "axios": "^1.6.8", "dotenv": "^16.3.1", "dotenv-expand": "^10.0.0", diff --git a/e2e/tests/api-driven/pnpm-lock.yaml b/e2e/tests/api-driven/pnpm-lock.yaml index 2a5bddb132..a79b710562 100644 --- a/e2e/tests/api-driven/pnpm-lock.yaml +++ b/e2e/tests/api-driven/pnpm-lock.yaml @@ -9,8 +9,8 @@ dependencies: specifier: ^9.3.0 version: 9.3.0 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#177eefe - version: github.com/theopensystemslab/planx-core/177eefe + specifier: git+https://github.com/theopensystemslab/planx-core#04b0f0b + version: github.com/theopensystemslab/planx-core/04b0f0b axios: specifier: ^1.6.8 version: 1.6.8 @@ -2935,8 +2935,8 @@ packages: resolution: {integrity: sha512-RTHJlZhsRbuA8Hmp/iNL7jnfc4nZishjsanDAfEY1QpDQZCahUp3xDzl+zfweE9BklxMUcgBgS1b7Lvie/ZVwA==} dev: false - github.com/theopensystemslab/planx-core/177eefe: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/177eefe} + github.com/theopensystemslab/planx-core/04b0f0b: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/04b0f0b} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/e2e/tests/ui-driven/package.json b/e2e/tests/ui-driven/package.json index 2c9e0827ca..146794eddc 100644 --- a/e2e/tests/ui-driven/package.json +++ b/e2e/tests/ui-driven/package.json @@ -8,7 +8,7 @@ "postinstall": "./install-dependencies.sh" }, "dependencies": { - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#177eefe", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#04b0f0b", "axios": "^1.6.8", "dotenv": "^16.3.1", "eslint": "^8.56.0", diff --git a/e2e/tests/ui-driven/pnpm-lock.yaml b/e2e/tests/ui-driven/pnpm-lock.yaml index 71f5f03025..8f796f119a 100644 --- a/e2e/tests/ui-driven/pnpm-lock.yaml +++ b/e2e/tests/ui-driven/pnpm-lock.yaml @@ -6,8 +6,8 @@ settings: dependencies: '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#177eefe - version: github.com/theopensystemslab/planx-core/177eefe + specifier: git+https://github.com/theopensystemslab/planx-core#04b0f0b + version: github.com/theopensystemslab/planx-core/04b0f0b axios: specifier: ^1.6.8 version: 1.6.8 @@ -2697,8 +2697,8 @@ packages: resolution: {integrity: sha512-RTHJlZhsRbuA8Hmp/iNL7jnfc4nZishjsanDAfEY1QpDQZCahUp3xDzl+zfweE9BklxMUcgBgS1b7Lvie/ZVwA==} dev: false - github.com/theopensystemslab/planx-core/177eefe: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/177eefe} + github.com/theopensystemslab/planx-core/04b0f0b: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/04b0f0b} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/editor.planx.uk/package.json b/editor.planx.uk/package.json index cf350d7fcd..d6ee231c83 100644 --- a/editor.planx.uk/package.json +++ b/editor.planx.uk/package.json @@ -12,7 +12,7 @@ "@mui/material": "^5.15.2", "@mui/utils": "^5.15.2", "@opensystemslab/map": "^0.8.1", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#177eefe", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#04b0f0b", "@tiptap/core": "^2.0.3", "@tiptap/extension-bold": "^2.0.3", "@tiptap/extension-bubble-menu": "^2.1.13", diff --git a/editor.planx.uk/pnpm-lock.yaml b/editor.planx.uk/pnpm-lock.yaml index 1df0d14b2f..9c883c2b6a 100644 --- a/editor.planx.uk/pnpm-lock.yaml +++ b/editor.planx.uk/pnpm-lock.yaml @@ -38,8 +38,8 @@ dependencies: specifier: ^0.8.1 version: 0.8.1 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#177eefe - version: github.com/theopensystemslab/planx-core/177eefe(@types/react@18.2.45) + specifier: git+https://github.com/theopensystemslab/planx-core#04b0f0b + version: github.com/theopensystemslab/planx-core/04b0f0b(@types/react@18.2.45) '@tiptap/core': specifier: ^2.0.3 version: 2.0.3(@tiptap/pm@2.0.3) @@ -21295,9 +21295,9 @@ packages: use-sync-external-store: 1.2.0(react@18.2.0) dev: false - github.com/theopensystemslab/planx-core/177eefe(@types/react@18.2.45): - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/177eefe} - id: github.com/theopensystemslab/planx-core/177eefe + github.com/theopensystemslab/planx-core/04b0f0b(@types/react@18.2.45): + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/04b0f0b} + id: github.com/theopensystemslab/planx-core/04b0f0b name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true From d8ea88cbd40e76646d42c87c9a93625e05d6d11d Mon Sep 17 00:00:00 2001 From: Jessica McInchak Date: Wed, 8 May 2024 12:07:47 +0100 Subject: [PATCH 05/13] chore: bump planx-core (#3118) --- api.planx.uk/package.json | 2 +- api.planx.uk/pnpm-lock.yaml | 8 ++++---- e2e/tests/api-driven/package.json | 2 +- e2e/tests/api-driven/pnpm-lock.yaml | 8 ++++---- e2e/tests/ui-driven/package.json | 2 +- e2e/tests/ui-driven/pnpm-lock.yaml | 8 ++++---- editor.planx.uk/package.json | 2 +- editor.planx.uk/pnpm-lock.yaml | 12 ++++++------ 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/api.planx.uk/package.json b/api.planx.uk/package.json index 53aa638580..0fce3520ca 100644 --- a/api.planx.uk/package.json +++ b/api.planx.uk/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@airbrake/node": "^2.1.8", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#04b0f0b", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#f2f918d", "@types/isomorphic-fetch": "^0.0.36", "adm-zip": "^0.5.10", "aws-sdk": "^2.1467.0", diff --git a/api.planx.uk/pnpm-lock.yaml b/api.planx.uk/pnpm-lock.yaml index 4e75f23169..044036a3fc 100644 --- a/api.planx.uk/pnpm-lock.yaml +++ b/api.planx.uk/pnpm-lock.yaml @@ -12,8 +12,8 @@ dependencies: specifier: ^2.1.8 version: 2.1.8 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#04b0f0b - version: github.com/theopensystemslab/planx-core/04b0f0b + specifier: git+https://github.com/theopensystemslab/planx-core#f2f918d + version: github.com/theopensystemslab/planx-core/f2f918d '@types/isomorphic-fetch': specifier: ^0.0.36 version: 0.0.36 @@ -8365,8 +8365,8 @@ packages: resolution: {integrity: sha512-RTHJlZhsRbuA8Hmp/iNL7jnfc4nZishjsanDAfEY1QpDQZCahUp3xDzl+zfweE9BklxMUcgBgS1b7Lvie/ZVwA==} dev: false - github.com/theopensystemslab/planx-core/04b0f0b: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/04b0f0b} + github.com/theopensystemslab/planx-core/f2f918d: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/f2f918d} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/e2e/tests/api-driven/package.json b/e2e/tests/api-driven/package.json index c26c967a49..387be4bf2c 100644 --- a/e2e/tests/api-driven/package.json +++ b/e2e/tests/api-driven/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@cucumber/cucumber": "^9.3.0", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#04b0f0b", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#f2f918d", "axios": "^1.6.8", "dotenv": "^16.3.1", "dotenv-expand": "^10.0.0", diff --git a/e2e/tests/api-driven/pnpm-lock.yaml b/e2e/tests/api-driven/pnpm-lock.yaml index a79b710562..050dcf29ca 100644 --- a/e2e/tests/api-driven/pnpm-lock.yaml +++ b/e2e/tests/api-driven/pnpm-lock.yaml @@ -9,8 +9,8 @@ dependencies: specifier: ^9.3.0 version: 9.3.0 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#04b0f0b - version: github.com/theopensystemslab/planx-core/04b0f0b + specifier: git+https://github.com/theopensystemslab/planx-core#f2f918d + version: github.com/theopensystemslab/planx-core/f2f918d axios: specifier: ^1.6.8 version: 1.6.8 @@ -2935,8 +2935,8 @@ packages: resolution: {integrity: sha512-RTHJlZhsRbuA8Hmp/iNL7jnfc4nZishjsanDAfEY1QpDQZCahUp3xDzl+zfweE9BklxMUcgBgS1b7Lvie/ZVwA==} dev: false - github.com/theopensystemslab/planx-core/04b0f0b: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/04b0f0b} + github.com/theopensystemslab/planx-core/f2f918d: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/f2f918d} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/e2e/tests/ui-driven/package.json b/e2e/tests/ui-driven/package.json index 146794eddc..d28817521c 100644 --- a/e2e/tests/ui-driven/package.json +++ b/e2e/tests/ui-driven/package.json @@ -8,7 +8,7 @@ "postinstall": "./install-dependencies.sh" }, "dependencies": { - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#04b0f0b", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#f2f918d", "axios": "^1.6.8", "dotenv": "^16.3.1", "eslint": "^8.56.0", diff --git a/e2e/tests/ui-driven/pnpm-lock.yaml b/e2e/tests/ui-driven/pnpm-lock.yaml index 8f796f119a..9b7fd20584 100644 --- a/e2e/tests/ui-driven/pnpm-lock.yaml +++ b/e2e/tests/ui-driven/pnpm-lock.yaml @@ -6,8 +6,8 @@ settings: dependencies: '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#04b0f0b - version: github.com/theopensystemslab/planx-core/04b0f0b + specifier: git+https://github.com/theopensystemslab/planx-core#f2f918d + version: github.com/theopensystemslab/planx-core/f2f918d axios: specifier: ^1.6.8 version: 1.6.8 @@ -2697,8 +2697,8 @@ packages: resolution: {integrity: sha512-RTHJlZhsRbuA8Hmp/iNL7jnfc4nZishjsanDAfEY1QpDQZCahUp3xDzl+zfweE9BklxMUcgBgS1b7Lvie/ZVwA==} dev: false - github.com/theopensystemslab/planx-core/04b0f0b: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/04b0f0b} + github.com/theopensystemslab/planx-core/f2f918d: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/f2f918d} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/editor.planx.uk/package.json b/editor.planx.uk/package.json index d6ee231c83..84e91aab7f 100644 --- a/editor.planx.uk/package.json +++ b/editor.planx.uk/package.json @@ -12,7 +12,7 @@ "@mui/material": "^5.15.2", "@mui/utils": "^5.15.2", "@opensystemslab/map": "^0.8.1", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#04b0f0b", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#f2f918d", "@tiptap/core": "^2.0.3", "@tiptap/extension-bold": "^2.0.3", "@tiptap/extension-bubble-menu": "^2.1.13", diff --git a/editor.planx.uk/pnpm-lock.yaml b/editor.planx.uk/pnpm-lock.yaml index 9c883c2b6a..33bcfdb92f 100644 --- a/editor.planx.uk/pnpm-lock.yaml +++ b/editor.planx.uk/pnpm-lock.yaml @@ -38,8 +38,8 @@ dependencies: specifier: ^0.8.1 version: 0.8.1 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#04b0f0b - version: github.com/theopensystemslab/planx-core/04b0f0b(@types/react@18.2.45) + specifier: git+https://github.com/theopensystemslab/planx-core#f2f918d + version: github.com/theopensystemslab/planx-core/f2f918d(@types/react@18.2.45) '@tiptap/core': specifier: ^2.0.3 version: 2.0.3(@tiptap/pm@2.0.3) @@ -9885,7 +9885,7 @@ packages: dev: false /concat-map@0.0.1: - resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} + resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=} /concat-stream@1.6.2: resolution: {integrity: sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==} @@ -21295,9 +21295,9 @@ packages: use-sync-external-store: 1.2.0(react@18.2.0) dev: false - github.com/theopensystemslab/planx-core/04b0f0b(@types/react@18.2.45): - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/04b0f0b} - id: github.com/theopensystemslab/planx-core/04b0f0b + github.com/theopensystemslab/planx-core/f2f918d(@types/react@18.2.45): + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/f2f918d} + id: github.com/theopensystemslab/planx-core/f2f918d name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true From 0e97a8133562c62b68265d8a1af7a88657079fe9 Mon Sep 17 00:00:00 2001 From: Dan G Date: Wed, 8 May 2024 15:49:37 +0100 Subject: [PATCH 06/13] feat: bump vultr-action to v2 in workflows (#2963) --- .github/workflows/pizza-teardown.yml | 4 ++-- .github/workflows/pull-request.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pizza-teardown.yml b/.github/workflows/pizza-teardown.yml index 6e708cbc34..34113b574a 100644 --- a/.github/workflows/pizza-teardown.yml +++ b/.github/workflows/pizza-teardown.yml @@ -12,12 +12,12 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Remove vultr resources - uses: theopensystemslab/vultr-action@v1.15 + uses: theopensystemslab/vultr-action@v2.0 with: action: destroy api_key: ${{ secrets.VULTR_API_KEY }} domain: ${{ env.DOMAIN }} - pullrequest_id: ${{ env.PULLREQUEST_ID }} + pull_request_id: ${{ env.PULLREQUEST_ID }} - uses: marocchino/sticky-pull-request-comment@v2 with: diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 0037af9292..30a46e86a2 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -302,14 +302,14 @@ jobs: steps: - name: Create Pizza (if it doesn't exist) id: create - uses: theopensystemslab/vultr-action@v1.15 + uses: theopensystemslab/vultr-action@v2.0 with: action: create api_key: ${{ secrets.VULTR_API_KEY }} domain: ${{ env.DOMAIN }} - os_id: 1743 + os_type: ubuntu plan: vc2-1c-1gb - pullrequest_id: ${{ env.PULLREQUEST_ID }} + pull_request_id: ${{ env.PULLREQUEST_ID }} region: lhr tag: pullrequest From 0fd8fbc970469136403798d36c919b337bde556c Mon Sep 17 00:00:00 2001 From: Dan G Date: Wed, 8 May 2024 16:34:47 +0100 Subject: [PATCH 07/13] fix: add required inputs to pizza teardown workflow (#3119) --- .github/workflows/pizza-teardown.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/pizza-teardown.yml b/.github/workflows/pizza-teardown.yml index 34113b574a..24e3de0de2 100644 --- a/.github/workflows/pizza-teardown.yml +++ b/.github/workflows/pizza-teardown.yml @@ -17,7 +17,11 @@ jobs: action: destroy api_key: ${{ secrets.VULTR_API_KEY }} domain: ${{ env.DOMAIN }} + os_type: ubuntu + plan: vc2-1c-1gb pull_request_id: ${{ env.PULLREQUEST_ID }} + region: lhr + tag: pullrequest - uses: marocchino/sticky-pull-request-comment@v2 with: From d09ee2e0c98f7e217c6e9dfb6dbc4f1cfba4a30b Mon Sep 17 00:00:00 2001 From: Jessica McInchak Date: Thu, 9 May 2024 09:31:10 +0100 Subject: [PATCH 08/13] feat: GIS API returns granular A4 variables for St Albans (#3120) --- .../modules/gis/service/digitalLand.ts | 1 + .../local_authorities/metadata/stAlbans.ts | 47 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 api.planx.uk/modules/gis/service/local_authorities/metadata/stAlbans.ts diff --git a/api.planx.uk/modules/gis/service/digitalLand.ts b/api.planx.uk/modules/gis/service/digitalLand.ts index be894310e5..0768711f96 100644 --- a/api.planx.uk/modules/gis/service/digitalLand.ts +++ b/api.planx.uk/modules/gis/service/digitalLand.ts @@ -31,6 +31,7 @@ const localAuthorityMetadata: Record = { medway: require("./local_authorities/metadata/medway"), newcastle: require("./local_authorities/metadata/newcastle"), southwark: require("./local_authorities/metadata/southwark"), + "st-albans": require("./local_authorities/metadata/stAlbans"), tewkesbury: require("./local_authorities/metadata/tewkesbury"), }; diff --git a/api.planx.uk/modules/gis/service/local_authorities/metadata/stAlbans.ts b/api.planx.uk/modules/gis/service/local_authorities/metadata/stAlbans.ts new file mode 100644 index 0000000000..373358fed8 --- /dev/null +++ b/api.planx.uk/modules/gis/service/local_authorities/metadata/stAlbans.ts @@ -0,0 +1,47 @@ +/* +LAD20CD: E07000240 +LAD20NM: St Albans +LAD20NMW: +FID: + +https://www.planning.data.gov.uk/entity/?dataset=article-4-direction-area&geometry_curie=statistical-geography%3AE07000240&entry_date_day=&entry_date_month=&entry_date_year= +https://docs.google.com/spreadsheets/d/17qaNhd7M-F90KZ34kVjyetTxfxECf1QUU8UI-aUiknU/edit#gid=0 +*/ + +import { LocalAuthorityMetadata } from "../../digitalLand"; + +const planningConstraints: LocalAuthorityMetadata["planningConstraints"] = { + article4: { + // Planx granular values link to entity.reference on Planning Data + records: { + "article4.stAlbans.beesonend": "Ar4.8", + "article4.stAlbans.beesonendChildwickbury": "Ar4.8", + "article4.stAlbans.bylandsMeadow": "Ar4.15", + "article4.stAlbans.childwickburyStudBlue": "Ar4.7d", + "article4.stAlbans.childwickburyStudGreen": "Ar4.7c", + "article4.stAlbans.childwickburyStudOrange": "Ar4.7b", + "article4.stAlbans.childwickburyStudRed": "Ar4.7a", + "article4.stAlbans.childwickburyStudYellow": "Ar4.7e", + "article4.stAlbans.childwickGreen": "Ar4.1", + "article4.stAlbans.colneyHeath": "Ar4.9", + "article4.stAlbans.cunningham": "Ar4.20", + "article4.stAlbans.formerRadlettAirfield": "Ar4.5", + "article4.stAlbans.harpenden1": "Ar4.18", + "article4.stAlbans.harpenden2": "Ar4.17", + "article4.stAlbans.kimptonBottom.1": "Ar4.12", + "article4.stAlbans.kimptonBottom.2": "Ar4.13", + "article4.stAlbans.landBetweenRaggedHallAndM10": "Ar4.11", + "article4.stAlbans.lowerLutonNorth": "Ar4.30", + "article4.stAlbans.lowerLutonSouth": "Ar4.19", + "article4.stAlbans.manorRoad": "Ar4.14", + "article4.stAlbans.raggedHall": "Ar4.10", + "article4.stAlbans.sandridgebury": "Ar4.16", + "article4.stAlbans.sopwellAndAlbert": "Ar4.6", + "article4.stAlbans.theHawthornes": "Ar4.2", + "article4.stAlbans.verulamAndFishpool": "Ar4.3", + "article4.stAlbans.whitecroftEstate": "Ar4.4", + }, + }, +}; + +export { planningConstraints }; From 2d8c65b93d99056e0542622444860ded3820e441 Mon Sep 17 00:00:00 2001 From: Jessica McInchak Date: Thu, 9 May 2024 14:05:39 +0100 Subject: [PATCH 09/13] fix(a11y): DrawBoundary link to switch between map and upload should always be enabled (#3131) --- .../DrawBoundary/Public/Public.test.tsx | 83 +++++++++++++++++++ .../components/DrawBoundary/Public/index.tsx | 26 +++--- 2 files changed, 98 insertions(+), 11 deletions(-) diff --git a/editor.planx.uk/src/@planx/components/DrawBoundary/Public/Public.test.tsx b/editor.planx.uk/src/@planx/components/DrawBoundary/Public/Public.test.tsx index 6bb2c55aba..7d39c9f59f 100644 --- a/editor.planx.uk/src/@planx/components/DrawBoundary/Public/Public.test.tsx +++ b/editor.planx.uk/src/@planx/components/DrawBoundary/Public/Public.test.tsx @@ -370,3 +370,86 @@ test("appends to existing '_requestedFiles' value", async () => { expect(recommended).toEqual(["elevations.existing"]); expect(optional).toHaveLength(0); }); + +test("submits data based on the page you continue onwards from", async () => { + // Context - Planning Officers don't want to receive both geojson and an uploaded locationPlan, only one or the other + // But accessibility auditing says a user should always be able to toggle between draw & upload pages with their previous inputs retained + + const handleSubmit = jest.fn(); + + // Setup file mock + const mockFileName = "test.png"; + const mockFileURL = + "https://api.editor.planx.dev/file/private/gws7l5d1/test.png"; + + const file = new File(["test"], mockFileName, { type: "image/png" }); + + const mockedPost = mockedAxios.post.mockResolvedValueOnce({ + data: { + fileType: "image/png", + fileUrl: mockFileURL, + }, + }); + + // Previously submitted data is a good proxy for having previously fetched a title boundary and arriving to Draw with geojson in passport ! + const previouslySubmittedData = { + "property.boundary.site": { + type: "Feature", + properties: {}, + geometry: { + type: "Polygon", + coordinates: [ + [ + [-0.07643975531307334, 51.485847769536015], + [-0.0764006164494183, 51.4855918619739], + [-0.07587615567891393, 51.48561867140494], + [-0.0759899845402056, 51.48584045791162], + [-0.07643975531307334, 51.485847769536015], + ], + ], + }, + }, + }; + + const { user } = setup( + , + ); + + // Toggle to file upload mode + await user.click(screen.getByTestId("upload-file-button")); + + // Upload file + const input = screen.getByTestId("upload-input"); + await user.upload(input, file); + expect(mockedPost).toHaveBeenCalled(); + + // Toggle back to map view after uploading + await user.click(screen.getByTestId("use-map-button")); + + // Click "continue" from map page + await user.click(screen.getByTestId("continue-button")); + expect(handleSubmit).toHaveBeenCalledTimes(1); + + // Confirm that file is NOT saved to passport, but geojson is + const submitted = handleSubmit.mock.calls[0][0]; + expect(submitted.data).not.toHaveProperty(PASSPORT_UPLOAD_KEY); + expect(submitted.data["property.boundary.site"]).toEqual( + previouslySubmittedData["property.boundary.site"], + ); + + // DrawBoundary action captured correctly based on page + expect(submitted.data[PASSPORT_COMPONENT_ACTION_KEY]).toEqual( + DrawBoundaryUserAction.Draw, + ); +}); diff --git a/editor.planx.uk/src/@planx/components/DrawBoundary/Public/index.tsx b/editor.planx.uk/src/@planx/components/DrawBoundary/Public/index.tsx index d28e8b9cc2..69697144be 100644 --- a/editor.planx.uk/src/@planx/components/DrawBoundary/Public/index.tsx +++ b/editor.planx.uk/src/@planx/components/DrawBoundary/Public/index.tsx @@ -43,7 +43,7 @@ export default function Component(props: Props) { passport.data?.["property.boundary.title.area"]; const [boundary, setBoundary] = useState(previousBoundary); const [area, setArea] = useState(previousArea); - + // Buffer applied to the address point to clip this map extent // and applied to the site boundary and written to the passport to later clip the map extent in overview documents const bufferInMeters = area && area > 15000 ? 300 : 120; @@ -100,7 +100,7 @@ export default function Component(props: Props) { const newPassportData: Store.userData["data"] = {}; // Used the map - if (boundary && props.dataFieldBoundary) { + if (page === "draw" && boundary && props.dataFieldBoundary) { newPassportData[props.dataFieldBoundary] = boundary; newPassportData[`${props.dataFieldBoundary}.buffered`] = buffer( boundary, @@ -131,7 +131,7 @@ export default function Component(props: Props) { } // Uploaded a file - if (slots.length) { + if (page === "upload" && slots.length) { newPassportData[PASSPORT_UPLOAD_KEY] = slots; newPassportData[PASSPORT_COMPONENT_ACTION_KEY] = DrawBoundaryUserAction.Upload; @@ -150,7 +150,14 @@ export default function Component(props: Props) { props.handleSubmit?.({ data: { ...newPassportData } }); }} - isValid={props.hideFileUpload ? true : Boolean(boundary || slots[0]?.url)} + isValid={ + props.hideFileUpload + ? true + : Boolean( + (page === "draw" && boundary) || + (page === "upload" && slots[0]?.url), + ) + } > {getBody(bufferInMeters)} @@ -180,11 +187,9 @@ export default function Component(props: Props) {

{!props.hideFileUpload && (

- If you prefer to upload a location plan file instead of using - the map, please reset the map view first to erase the - pre-populated boundary. Then click the "Upload a location plan - instead" link below. A location plan can only be submitted as - a digital boundary or file, not both. + If you prefer to upload a file instead of using the + interactive map, please click "Upload a location plan instead" + below to navigate to the file upload.

)} {/* @ts-ignore */} @@ -229,7 +234,6 @@ export default function Component(props: Props) { setPage("upload")} - disabled={Boolean(boundary)} data-testid="upload-file-button" > @@ -257,7 +261,7 @@ export default function Component(props: Props) { setPage("draw")} - disabled={Boolean(slots[0]?.url)} + data-testid="use-map-button" > Draw the boundary on a map instead From ab444b780ac857780742097b961a7e28e69ad75b Mon Sep 17 00:00:00 2001 From: Dan G Date: Thu, 9 May 2024 16:02:23 +0100 Subject: [PATCH 10/13] feat: build pizzas on alpine (#3117) --- .github/workflows/pizza-teardown.yml | 2 +- .github/workflows/pull-request.yml | 24 ++++++++++++++++++------ scripts/pullrequest/create.sh | 9 --------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/.github/workflows/pizza-teardown.yml b/.github/workflows/pizza-teardown.yml index 24e3de0de2..5eec564860 100644 --- a/.github/workflows/pizza-teardown.yml +++ b/.github/workflows/pizza-teardown.yml @@ -17,7 +17,7 @@ jobs: action: destroy api_key: ${{ secrets.VULTR_API_KEY }} domain: ${{ env.DOMAIN }} - os_type: ubuntu + os_type: alpine plan: vc2-1c-1gb pull_request_id: ${{ env.PULLREQUEST_ID }} region: lhr diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 30a46e86a2..f61e29c664 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -307,7 +307,7 @@ jobs: action: create api_key: ${{ secrets.VULTR_API_KEY }} domain: ${{ env.DOMAIN }} - os_type: ubuntu + os_type: alpine plan: vc2-1c-1gb pull_request_id: ${{ env.PULLREQUEST_ID }} region: lhr @@ -324,13 +324,19 @@ jobs: password: ${{ steps.create.outputs.default_password }} command_timeout: 20m script: | - apt-get update -y - + apk update + apk add docker + addgroup root docker + rc-update add docker default + service docker start + apk add docker-cli-compose + + apk add git git clone "${{ secrets.AUTHENTICATED_REPO_URL }}" cd planx-new git fetch origin "pull/${{ env.PULLREQUEST_ID }}/head" && git checkout FETCH_HEAD - apt-get install awscli -y + apk add aws-cli export AWS_ACCESS_KEY_ID=${{ secrets.PIZZA_AWS_ACCESS_KEY_ID }} export AWS_SECRET_ACCESS_KEY=${{ secrets.PIZZA_AWS_SECRET_ACCESS_KEY }} export AWS_REGION=eu-west-2 @@ -352,15 +358,21 @@ jobs: username: root password: ${{ secrets.SSH_PASSWORD }} command_timeout: 10m + # TODO: some of below script might be superfluous for server update (rather than create) script: | - apt-get update -y + apk update + apk add docker + addgroup root docker + rc-update add docker default + service docker start + apk add docker-cli-compose git clone "${{ secrets.AUTHENTICATED_REPO_URL }}" cd planx-new git add . && git stash git fetch origin "pull/${{ env.PULLREQUEST_ID }}/head" && git checkout FETCH_HEAD - apt-get install awscli -y + apk add aws-cli export AWS_ACCESS_KEY_ID=${{ secrets.PIZZA_AWS_ACCESS_KEY_ID }} export AWS_SECRET_ACCESS_KEY=${{ secrets.PIZZA_AWS_SECRET_ACCESS_KEY }} export AWS_REGION=eu-west-2 diff --git a/scripts/pullrequest/create.sh b/scripts/pullrequest/create.sh index c8fc91cadf..6f0f9394f5 100755 --- a/scripts/pullrequest/create.sh +++ b/scripts/pullrequest/create.sh @@ -10,15 +10,6 @@ echo "root:$SSH_PASSWORD" | chpasswd # https://www.digitalocean.com/community/tutorials/how-to-add-swap-space-on-ubuntu-22-04 swapon --show -# install docker -apt-get install apt-transport-https ca-certificates curl gnupg lsb-release -y -curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --batch --yes --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg -echo \ - "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \ - $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null -apt-get update -y -apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin -y - # set env for this shell set -o allexport source .env.pizza From 6cf2876b8d68da3f7cf1ee21744d89d31d789bc8 Mon Sep 17 00:00:00 2001 From: Ian Jones <51156018+ianjon3s@users.noreply.github.com> Date: Thu, 9 May 2024 17:26:22 +0100 Subject: [PATCH 11/13] fix(a11y): Feedback link as element (#3133) --- .../Feedback/FeedbackPhaseBanner.tsx | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/editor.planx.uk/src/components/Feedback/FeedbackPhaseBanner.tsx b/editor.planx.uk/src/components/Feedback/FeedbackPhaseBanner.tsx index c185539e28..65a25d5b2b 100644 --- a/editor.planx.uk/src/components/Feedback/FeedbackPhaseBanner.tsx +++ b/editor.planx.uk/src/components/Feedback/FeedbackPhaseBanner.tsx @@ -23,6 +23,7 @@ const Inner = styled(Box)(({ theme }) => ({ justifyContent: "space-between", alignItems: "center", flexWrap: "wrap", + gap: theme.spacing(1), padding: theme.spacing(0.75, 0), })); @@ -30,7 +31,14 @@ const PhaseWrap = styled(Box)(({ theme }) => ({ display: "flex", justifyContent: "start", alignItems: "start", + flexDirection: "column", + textWrap: "balance", padding: theme.spacing(0.5, 1, 0.5, 0), + gap: theme.spacing(0.5), + [theme.breakpoints.up("sm")]: { + flexDirection: "row", + gap: theme.spacing(1), + }, })); const BetaFlag = styled(Box)(({ theme }) => ({ @@ -49,6 +57,11 @@ interface Props { } export default function PhaseBanner(props: Props): FCReturn { + const handleFeedbackClick = (event: React.MouseEvent) => { + event.preventDefault(); + props.handleFeedbackClick(); + }; + return ( @@ -61,7 +74,6 @@ export default function PhaseBanner(props: Props): FCReturn { alignItems="flex-start" flexBasis={0} px={1} - mr={1} py={0.5} fontSize={14} textAlign="center" @@ -78,9 +90,9 @@ export default function PhaseBanner(props: Props): FCReturn { > This is a new service. Your{" "} props.handleFeedbackClick()} + onClick={handleFeedbackClick} > feedback {" "} From 6f24b2a7d39ab77a05ef408c204a3f7fee62a418 Mon Sep 17 00:00:00 2001 From: Ian Jones <51156018+ianjon3s@users.noreply.github.com> Date: Thu, 9 May 2024 17:26:51 +0100 Subject: [PATCH 12/13] fix(a11y): Update notice component title to h1 (#3132) --- e2e/tests/ui-driven/src/create-flow/create-flow.spec.ts | 4 ++-- e2e/tests/ui-driven/src/globalHelpers.ts | 2 +- editor.planx.uk/src/@planx/components/Notice/Public.tsx | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/e2e/tests/ui-driven/src/create-flow/create-flow.spec.ts b/e2e/tests/ui-driven/src/create-flow/create-flow.spec.ts index b098fc520e..8c10cffec2 100644 --- a/e2e/tests/ui-driven/src/create-flow/create-flow.spec.ts +++ b/e2e/tests/ui-driven/src/create-flow/create-flow.spec.ts @@ -196,7 +196,7 @@ test.describe("Navigation", () => { await answerQuestion({ page, title: "Is this a test?", answer: "Yes" }); await clickContinue({ page }); await expect( - page.locator("h3", { hasText: "Yes! this is a test" }), + page.locator("h1", { hasText: "Yes! this is a test" }), ).toBeVisible(); await page.getByTestId("backButton").click(); @@ -204,7 +204,7 @@ test.describe("Navigation", () => { await answerQuestion({ page, title: "Is this a test?", answer: "No" }); await clickContinue({ page }); await expect( - page.locator("h3", { hasText: "Sorry, this is a test" }), + page.locator("h1", { hasText: "Sorry, this is a test" }), ).toBeVisible(); }); }); diff --git a/e2e/tests/ui-driven/src/globalHelpers.ts b/e2e/tests/ui-driven/src/globalHelpers.ts index 7ce8798f40..56331da06b 100644 --- a/e2e/tests/ui-driven/src/globalHelpers.ts +++ b/e2e/tests/ui-driven/src/globalHelpers.ts @@ -204,7 +204,7 @@ export async function expectNotice({ page: Page; text: string; }) { - const notice = page.locator("h3", { hasText: text }); + const notice = page.locator("h1", { hasText: text }); await expect(notice).toBeVisible(); } diff --git a/editor.planx.uk/src/@planx/components/Notice/Public.tsx b/editor.planx.uk/src/@planx/components/Notice/Public.tsx index 5a49f982dd..5e57c092e5 100644 --- a/editor.planx.uk/src/@planx/components/Notice/Public.tsx +++ b/editor.planx.uk/src/@planx/components/Notice/Public.tsx @@ -103,12 +103,15 @@ const NoticeComponent: React.FC = (props) => { - {props.title} + + {props.title} + From 420c3c93f66fe9b53809c1e9f210498cd0e3e5e8 Mon Sep 17 00:00:00 2001 From: Jessica McInchak Date: Fri, 10 May 2024 10:44:10 +0100 Subject: [PATCH 13/13] fix(a11y): add aria markup to maps (#3134) --- api.planx.uk/package.json | 2 +- api.planx.uk/pnpm-lock.yaml | 152 +++-- e2e/tests/api-driven/package.json | 2 +- e2e/tests/api-driven/pnpm-lock.yaml | 78 ++- e2e/tests/ui-driven/package.json | 2 +- e2e/tests/ui-driven/pnpm-lock.yaml | 363 ++++++------ editor.planx.uk/package.json | 4 +- editor.planx.uk/pnpm-lock.yaml | 558 +++++++++--------- .../components/DrawBoundary/Public/index.tsx | 1 + .../components/FindProperty/Public/Map.tsx | 1 + .../components/PropertyInformation/Public.tsx | 1 + .../components/shared/Preview/SummaryList.tsx | 1 + 12 files changed, 570 insertions(+), 595 deletions(-) diff --git a/api.planx.uk/package.json b/api.planx.uk/package.json index 0fce3520ca..63eac94acf 100644 --- a/api.planx.uk/package.json +++ b/api.planx.uk/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@airbrake/node": "^2.1.8", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#f2f918d", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d8acbea", "@types/isomorphic-fetch": "^0.0.36", "adm-zip": "^0.5.10", "aws-sdk": "^2.1467.0", diff --git a/api.planx.uk/pnpm-lock.yaml b/api.planx.uk/pnpm-lock.yaml index 044036a3fc..ffc2f2d677 100644 --- a/api.planx.uk/pnpm-lock.yaml +++ b/api.planx.uk/pnpm-lock.yaml @@ -12,8 +12,8 @@ dependencies: specifier: ^2.1.8 version: 2.1.8 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#f2f918d - version: github.com/theopensystemslab/planx-core/f2f918d + specifier: git+https://github.com/theopensystemslab/planx-core#d8acbea + version: github.com/theopensystemslab/planx-core/d8acbea '@types/isomorphic-fetch': specifier: ^0.0.36 version: 0.0.36 @@ -1182,8 +1182,8 @@ packages: '@floating-ui/utils': 0.2.2 dev: false - /@floating-ui/dom@1.6.4: - resolution: {integrity: sha512-0G8R+zOvQsAG1pg2Q99P21jiqxqGBW1iRe/iXHsBRBxnpXKFI8QwbB4x5KmYLggNO5m34IQgOIu9SCRfR/WWiQ==} + /@floating-ui/dom@1.6.5: + resolution: {integrity: sha512-Nsdud2X65Dz+1RHjAIP0t8z5e2ff/IRbei6BqFrl1urT8sDVzM1HMQ+R0XcU5ceRfyO3I6ayeqIfh+6Wb8LGTw==} dependencies: '@floating-ui/core': 1.6.1 '@floating-ui/utils': 0.2.2 @@ -1200,7 +1200,7 @@ packages: react-dom: optional: true dependencies: - '@floating-ui/dom': 1.6.4 + '@floating-ui/dom': 1.6.5 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) dev: false @@ -1576,12 +1576,12 @@ packages: react-dom: 18.3.1(react@18.3.1) dev: false - /@mui/core-downloads-tracker@5.15.16: - resolution: {integrity: sha512-PTIbMJs5C/vYMfyJNW8ArOezh4eyHkg2pTeA7bBxh2kLP1Uzs0Nm+krXWbWGJPwTWjM8EhnDrr4aCF26+2oleg==} + /@mui/core-downloads-tracker@5.15.17: + resolution: {integrity: sha512-DVAejDQkjNnIac7MfP8sLzuo7fyrBPxNdXe+6bYqOqg1z2OPTlfFAejSNzWe7UenRMuFu9/AyFXj/X2vN2w6dA==} dev: false - /@mui/material@5.15.16(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react-dom@18.3.1)(react@18.3.1): - resolution: {integrity: sha512-ery2hFReewko9gpDBqOr2VmXwQG9ifXofPhGzIx09/b9JqCQC/06kZXZDGGrOTpIddK9HlIf4yrS+G70jPAzUQ==} + /@mui/material@5.15.17(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react-dom@18.3.1)(react@18.3.1): + resolution: {integrity: sha512-ru/MLvTkCh0AZXmqwIpqGTOoVBS/sX48zArXq/DvktxXZx4fskiRA2PEc7Rk5ZlFiZhKh4moL4an+l8zZwq49Q==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 @@ -1605,7 +1605,7 @@ packages: '@emotion/react': 11.11.4(react@18.3.1) '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(react@18.3.1) '@mui/base': 5.0.0-beta.40(react-dom@18.3.1)(react@18.3.1) - '@mui/core-downloads-tracker': 5.15.16 + '@mui/core-downloads-tracker': 5.15.17 '@mui/system': 5.15.15(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react@18.3.1) '@mui/types': 7.2.14 '@mui/utils': 5.15.14(react@18.3.1) @@ -1977,8 +1977,8 @@ packages: dependencies: undici-types: 5.26.5 - /@types/node@20.12.8: - resolution: {integrity: sha512-NU0rJLJnshZWdE/097cdCBbyW1h4hEg0xpovcoAQYHl8dnEyp/NAOiE45pvc+Bd1Dt+2r94v2eGFpQJ4R7g+2w==} + /@types/node@20.12.11: + resolution: {integrity: sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==} dependencies: undici-types: 5.26.5 dev: false @@ -1998,11 +1998,11 @@ packages: dependencies: '@types/express': 4.17.21 '@types/passport': 1.0.16 - '@types/passport-oauth2': 1.4.15 + '@types/passport-oauth2': 1.4.16 dev: true - /@types/passport-oauth2@1.4.15: - resolution: {integrity: sha512-9cUTP/HStNSZmhxXGuRrBJfEWzIEJRub2eyJu3CvkA+8HAMc9W3aKdFhVq+Qz1hi42qn+GvSAnz3zwacDSYWpw==} + /@types/passport-oauth2@1.4.16: + resolution: {integrity: sha512-Sdr0rpAdkiidUOtyaapGgvXyMjqYlMTFHRy7gtJtzr0/ysEIa72N3j2FSHIRc14h29g1+dzDl8IW2WT2Mu29vQ==} dependencies: '@types/express': 4.17.21 '@types/oauth': 0.9.4 @@ -2109,8 +2109,8 @@ packages: resolution: {integrity: sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==} dev: true - /@types/superagent@8.1.6: - resolution: {integrity: sha512-yzBOv+6meEHSzV2NThYYOA6RtqvPr3Hbob9ZLp3i07SH27CrYVfm8CrF7ydTmidtelsFiKx2I4gZAiAOamGgvQ==} + /@types/superagent@8.1.7: + resolution: {integrity: sha512-NmIsd0Yj4DDhftfWvvAku482PZum4DBW7U51OvS8gvOkDDY0WT1jsVyDV3hK+vplrsYw8oDwi9QxOM7U68iwww==} dependencies: '@types/cookiejar': 2.1.5 '@types/methods': 1.1.4 @@ -2121,7 +2121,7 @@ packages: resolution: {integrity: sha512-137ypx2lk/wTQbW6An6safu9hXmajAifU/s7szAHLN/FeIm5w7yR0Wkl9fdJMRSHwOn4HLAI0DaB2TOORuhPDg==} dependencies: '@types/methods': 1.1.4 - '@types/superagent': 8.1.6 + '@types/superagent': 8.1.7 dev: true /@types/swagger-jsdoc@6.0.4: @@ -2183,7 +2183,7 @@ packages: graphemer: 1.4.0 ignore: 5.3.1 natural-compare-lite: 1.4.0 - semver: 7.6.0 + semver: 7.6.2 tsutils: 3.21.0(typescript@5.4.3) typescript: 5.4.3 transitivePeerDependencies: @@ -2257,7 +2257,7 @@ packages: debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 - semver: 7.6.0 + semver: 7.6.2 tsutils: 3.21.0(typescript@5.4.3) typescript: 5.4.3 transitivePeerDependencies: @@ -2278,7 +2278,7 @@ packages: '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.4.3) eslint: 8.56.0 eslint-scope: 5.1.1 - semver: 7.6.0 + semver: 7.6.2 transitivePeerDependencies: - supports-color - typescript @@ -2757,10 +2757,10 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001615 - electron-to-chromium: 1.4.754 + caniuse-lite: 1.0.30001617 + electron-to-chromium: 1.4.762 node-releases: 2.0.14 - update-browserslist-db: 1.0.14(browserslist@4.23.0) + update-browserslist-db: 1.0.15(browserslist@4.23.0) dev: true /bs-logger@0.2.6: @@ -2853,8 +2853,8 @@ packages: engines: {node: '>=10'} dev: true - /caniuse-lite@1.0.30001615: - resolution: {integrity: sha512-1IpazM5G3r38meiae0bHRnPhz+CBQ3ZLqbQMtrg+AsTPKAXgW38JNsXkyZ+v8waCsDmPq87lmfun5Q2AGysNEQ==} + /caniuse-lite@1.0.30001617: + resolution: {integrity: sha512-mLyjzNI9I+Pix8zwcrpxEbGlfqOkF9kM3ptzmKNw5tizSyYwMe+nGLTqMK9cO+0E+Bh6TsBxNAaHWEM8xwSsmA==} dev: true /capture-exit@2.0.0: @@ -3073,7 +3073,7 @@ packages: dev: true /concat-map@0.0.1: - resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} + resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=} /concat-stream@1.6.2: resolution: {integrity: sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==} @@ -3125,7 +3125,7 @@ packages: dev: false /cookie-signature@1.0.6: - resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==} + resolution: {integrity: sha1-4wOogrNCzD7oylE6eZmXNNqzriw=} dev: false /cookie@0.4.1: @@ -3479,7 +3479,7 @@ packages: resolution: {integrity: sha512-4SbcbedPXTciySXiSnNNLuJXpvxFe5nqivbiEHXyL8P/w0wx2uW7YXNjnYgjW0e2e6vy+L/tMISU/oAiXCl57Q==} engines: {node: '>=10'} dependencies: - '@types/node': 20.12.8 + '@types/node': 20.12.11 jszip: 3.10.1 nanoid: 5.0.7 xml: 1.0.1 @@ -3554,11 +3554,11 @@ packages: dev: false /ee-first@1.1.1: - resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} + resolution: {integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=} dev: false - /electron-to-chromium@1.4.754: - resolution: {integrity: sha512-7Kr5jUdns5rL/M9wFFmMZAgFDuL2YOnanFH4OI4iFzUqyh3XOL7nAGbSlSMZdzKMIyyTpNSbqZsWG9odwLeKvA==} + /electron-to-chromium@1.4.762: + resolution: {integrity: sha512-rrFvGweLxPwwSwJOjIopy3Vr+J3cIPtZzuc74bmlvmBIgQO3VYJDvVrlj94iKZ3ukXUH64Ex31hSfRTLqvjYJQ==} dev: true /emittery@0.13.1: @@ -4352,7 +4352,7 @@ packages: dev: true /fresh@0.5.2: - resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==} + resolution: {integrity: sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=} engines: {node: '>= 0.6'} dev: false @@ -4433,16 +4433,16 @@ packages: dependencies: is-glob: 4.0.3 - /glob@10.3.12: - resolution: {integrity: sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==} + /glob@10.3.14: + resolution: {integrity: sha512-4fkAqu93xe9Mk7le9v0y3VrPDqLKHarNi2s4Pv7f2yOvfhWfhc7hRPHC/JyqMqb8B/Dt/eGS4n7ykwf3fOsl8g==} engines: {node: '>=16 || 14 >=14.17'} hasBin: true dependencies: foreground-child: 3.1.1 jackspeak: 2.3.6 minimatch: 9.0.4 - minipass: 7.0.4 - path-scurry: 1.10.2 + minipass: 7.1.1 + path-scurry: 1.11.0 /glob@7.1.6: resolution: {integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==} @@ -5065,7 +5065,7 @@ packages: '@babel/parser': 7.24.5 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.2 - semver: 7.6.0 + semver: 7.6.2 transitivePeerDependencies: - supports-color dev: true @@ -5495,7 +5495,7 @@ packages: jest-util: 29.7.0 natural-compare: 1.4.0 pretty-format: 29.7.0 - semver: 7.6.0 + semver: 7.6.2 transitivePeerDependencies: - supports-color dev: true @@ -5674,7 +5674,7 @@ packages: '@types/json-schema': 7.0.15 '@types/lodash': 4.17.0 cli-color: 2.0.4 - glob: 10.3.12 + glob: 10.3.14 is-glob: 4.0.3 js-yaml: 4.1.0 lodash: 4.17.21 @@ -5717,7 +5717,6 @@ packages: chalk: 3.0.0 diff-match-patch: 1.0.5 dev: false - bundledDependencies: [] /jsonwebtoken@9.0.2: resolution: {integrity: sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==} @@ -5732,7 +5731,7 @@ packages: lodash.isstring: 4.0.1 lodash.once: 4.1.1 ms: 2.1.3 - semver: 7.6.0 + semver: 7.6.2 dev: false /jszip@3.10.1: @@ -5944,12 +5943,6 @@ packages: yallist: 3.1.1 dev: true - /lru-cache@6.0.0: - resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} - engines: {node: '>=10'} - dependencies: - yallist: 4.0.0 - /lru-queue@0.1.0: resolution: {integrity: sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==} dependencies: @@ -5960,7 +5953,7 @@ packages: resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==} engines: {node: '>=10'} dependencies: - semver: 7.6.0 + semver: 7.6.2 dev: true /make-error@1.3.6: @@ -5992,7 +5985,7 @@ packages: dev: false /media-typer@0.3.0: - resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==} + resolution: {integrity: sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=} engines: {node: '>= 0.6'} dev: false @@ -6010,7 +6003,7 @@ packages: dev: false /merge-descriptors@1.0.1: - resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==} + resolution: {integrity: sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=} dev: false /merge-stream@2.0.0: @@ -6106,8 +6099,8 @@ packages: /minimist@1.2.8: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} - /minipass@7.0.4: - resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==} + /minipass@7.1.1: + resolution: {integrity: sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==} engines: {node: '>=16 || 14 >=14.17'} /mixin-deep@1.3.2: @@ -6241,7 +6234,7 @@ packages: minimist: 1.2.8 node-notifier: 8.0.2 resolve: 1.22.8 - semver: 7.6.0 + semver: 7.6.2 dev: true /node-domexception@1.0.0: @@ -6279,7 +6272,7 @@ packages: dependencies: growly: 1.3.0 is-wsl: 2.2.0 - semver: 7.6.0 + semver: 7.6.2 shellwords: 0.1.1 uuid: 8.3.2 which: 2.0.2 @@ -6590,15 +6583,15 @@ packages: /path-parse@1.0.7: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} - /path-scurry@1.10.2: - resolution: {integrity: sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==} + /path-scurry@1.11.0: + resolution: {integrity: sha512-LNHTaVkzaYaLGlO+0u3rQTz7QrHTFOuKyba9JMTQutkmtNew8dw8wOD7mTU/5fCPZzCWpfW0XnQKzY61P0aTaw==} engines: {node: '>=16 || 14 >=14.17'} dependencies: lru-cache: 10.2.2 - minipass: 7.0.4 + minipass: 7.1.1 /path-to-regexp@0.1.7: - resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==} + resolution: {integrity: sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=} dev: false /path-type@4.0.0: @@ -7096,7 +7089,7 @@ packages: engines: {node: '>=14'} hasBin: true dependencies: - glob: 10.3.12 + glob: 10.3.14 dev: true /rrweb-cssom@0.6.0: @@ -7189,12 +7182,10 @@ packages: hasBin: true dev: true - /semver@7.6.0: - resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==} + /semver@7.6.2: + resolution: {integrity: sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==} engines: {node: '>=10'} hasBin: true - dependencies: - lru-cache: 6.0.0 /send@0.18.0: resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==} @@ -7641,8 +7632,8 @@ packages: - openapi-types dev: false - /swagger-ui-dist@5.17.2: - resolution: {integrity: sha512-V/NqUw6QoTrjSpctp2oLQvxrl3vW29UsUtZyq7B1CF0v870KOFbYGDQw8rpKaKm0JxTwHpWnW1SN9YuKZdiCyw==} + /swagger-ui-dist@5.17.7: + resolution: {integrity: sha512-hKnq2Dss6Nvqxzj+tToBz0IJvKXgp7FExxX0Zj0rMajXJp8CJ98yLAwbKwKu8rxQf+2iIDUTGir84SCA8AN+fQ==} dev: false /swagger-ui-express@5.0.0(express@4.19.2): @@ -7652,7 +7643,7 @@ packages: express: '>=4.0.0 || >=5.0.0-beta' dependencies: express: 4.19.2 - swagger-ui-dist: 5.17.2 + swagger-ui-dist: 5.17.7 dev: false /symbol-tree@3.2.4: @@ -7810,7 +7801,7 @@ packages: json5: 2.2.3 lodash.memoize: 4.1.2 make-error: 1.3.6 - semver: 7.6.0 + semver: 7.6.2 typescript: 5.4.3 yargs-parser: 21.1.1 dev: true @@ -8005,8 +7996,8 @@ packages: engines: {node: '>=8'} dev: false - /update-browserslist-db@1.0.14(browserslist@4.23.0): - resolution: {integrity: sha512-JixKH8GR2pWYshIPUg/NujK3JO7JiqEEUiNArE86NQyrgUuZeTlZQN3xuS/yiV5Kb48ev9K6RqNkaJjXsdg7Jw==} + /update-browserslist-db@1.0.15(browserslist@4.23.0): + resolution: {integrity: sha512-K9HWH62x3/EalU1U6sjSZiylm9C8tgq2mSvshZpqc7QE69RaA2qjhkW2HlNA0tFpEbtyFz7HTqbSdN4MSwUodA==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' @@ -8091,8 +8082,8 @@ packages: convert-source-map: 2.0.0 dev: true - /validator@13.11.0: - resolution: {integrity: sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==} + /validator@13.12.0: + resolution: {integrity: sha512-c1Q0mCiPlgdTVVVIJIrBuxNicYE+t/7oKeI9MWLj3fh/uq2Pxh/3eeWbVZ4OcGW1TUf53At0njHw5SMdA3tmMg==} engines: {node: '>= 0.10'} dev: false @@ -8282,9 +8273,6 @@ packages: resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==} dev: true - /yallist@4.0.0: - resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - /yaml@1.10.2: resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} engines: {node: '>= 6'} @@ -8352,7 +8340,7 @@ packages: dependencies: lodash.get: 4.4.2 lodash.isequal: 4.5.0 - validator: 13.11.0 + validator: 13.12.0 optionalDependencies: commander: 9.5.0 dev: false @@ -8361,12 +8349,12 @@ packages: resolution: {integrity: sha512-fkwiq0VIQTksNNA131rDOsVJcns0pfVUjHzLrNBiF/O/Xxb5lQyEXkhZWcJ7npWsYlvs+h0jFWXXy4X46Em1JA==} dev: false - /zod@3.23.6: - resolution: {integrity: sha512-RTHJlZhsRbuA8Hmp/iNL7jnfc4nZishjsanDAfEY1QpDQZCahUp3xDzl+zfweE9BklxMUcgBgS1b7Lvie/ZVwA==} + /zod@3.23.8: + resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} dev: false - github.com/theopensystemslab/planx-core/f2f918d: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/f2f918d} + github.com/theopensystemslab/planx-core/d8acbea: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/d8acbea} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true @@ -8374,7 +8362,7 @@ packages: dependencies: '@emotion/react': 11.11.4(react@18.3.1) '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(react@18.3.1) - '@mui/material': 5.15.16(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react-dom@18.3.1)(react@18.3.1) + '@mui/material': 5.15.17(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react-dom@18.3.1)(react@18.3.1) '@types/geojson': 7946.0.14 ajv: 8.13.0 ajv-formats: 2.1.1(ajv@8.13.0) @@ -8393,7 +8381,7 @@ packages: react-dom: 18.3.1(react@18.3.1) type-fest: 4.18.2 uuid: 9.0.1 - zod: 3.23.6 + zod: 3.23.8 transitivePeerDependencies: - '@types/react' - encoding diff --git a/e2e/tests/api-driven/package.json b/e2e/tests/api-driven/package.json index 387be4bf2c..f1c7246f45 100644 --- a/e2e/tests/api-driven/package.json +++ b/e2e/tests/api-driven/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@cucumber/cucumber": "^9.3.0", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#f2f918d", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d8acbea", "axios": "^1.6.8", "dotenv": "^16.3.1", "dotenv-expand": "^10.0.0", diff --git a/e2e/tests/api-driven/pnpm-lock.yaml b/e2e/tests/api-driven/pnpm-lock.yaml index 050dcf29ca..cc27faa949 100644 --- a/e2e/tests/api-driven/pnpm-lock.yaml +++ b/e2e/tests/api-driven/pnpm-lock.yaml @@ -9,8 +9,8 @@ dependencies: specifier: ^9.3.0 version: 9.3.0 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#f2f918d - version: github.com/theopensystemslab/planx-core/f2f918d + specifier: git+https://github.com/theopensystemslab/planx-core#d8acbea + version: github.com/theopensystemslab/planx-core/d8acbea axios: specifier: ^1.6.8 version: 1.6.8 @@ -413,8 +413,8 @@ packages: '@floating-ui/utils': 0.2.2 dev: false - /@floating-ui/dom@1.6.4: - resolution: {integrity: sha512-0G8R+zOvQsAG1pg2Q99P21jiqxqGBW1iRe/iXHsBRBxnpXKFI8QwbB4x5KmYLggNO5m34IQgOIu9SCRfR/WWiQ==} + /@floating-ui/dom@1.6.5: + resolution: {integrity: sha512-Nsdud2X65Dz+1RHjAIP0t8z5e2ff/IRbei6BqFrl1urT8sDVzM1HMQ+R0XcU5ceRfyO3I6ayeqIfh+6Wb8LGTw==} dependencies: '@floating-ui/core': 1.6.1 '@floating-ui/utils': 0.2.2 @@ -426,7 +426,7 @@ packages: react: '>=16.8.0' react-dom: '>=16.8.0' dependencies: - '@floating-ui/dom': 1.6.4 + '@floating-ui/dom': 1.6.5 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) dev: false @@ -517,12 +517,12 @@ packages: react-dom: 18.3.1(react@18.3.1) dev: false - /@mui/core-downloads-tracker@5.15.16: - resolution: {integrity: sha512-PTIbMJs5C/vYMfyJNW8ArOezh4eyHkg2pTeA7bBxh2kLP1Uzs0Nm+krXWbWGJPwTWjM8EhnDrr4aCF26+2oleg==} + /@mui/core-downloads-tracker@5.15.17: + resolution: {integrity: sha512-DVAejDQkjNnIac7MfP8sLzuo7fyrBPxNdXe+6bYqOqg1z2OPTlfFAejSNzWe7UenRMuFu9/AyFXj/X2vN2w6dA==} dev: false - /@mui/material@5.15.16(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react-dom@18.3.1)(react@18.3.1): - resolution: {integrity: sha512-ery2hFReewko9gpDBqOr2VmXwQG9ifXofPhGzIx09/b9JqCQC/06kZXZDGGrOTpIddK9HlIf4yrS+G70jPAzUQ==} + /@mui/material@5.15.17(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react-dom@18.3.1)(react@18.3.1): + resolution: {integrity: sha512-ru/MLvTkCh0AZXmqwIpqGTOoVBS/sX48zArXq/DvktxXZx4fskiRA2PEc7Rk5ZlFiZhKh4moL4an+l8zZwq49Q==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 @@ -542,7 +542,7 @@ packages: '@emotion/react': 11.11.4(react@18.3.1) '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(react@18.3.1) '@mui/base': 5.0.0-beta.40(react-dom@18.3.1)(react@18.3.1) - '@mui/core-downloads-tracker': 5.15.16 + '@mui/core-downloads-tracker': 5.15.17 '@mui/system': 5.15.15(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react@18.3.1) '@mui/types': 7.2.14 '@mui/utils': 5.15.14(react@18.3.1) @@ -713,18 +713,18 @@ packages: /@types/lodash.zipobject@4.1.7: resolution: {integrity: sha512-bsFXX/ac3fFgW3l/yxwRx7NvTXryi4bMaNcsbSK2MJnTPn0nHvs7NdwfHtvOkNKxSQ0dXgnNwI5oEGLoMA1mug==} dependencies: - '@types/lodash': 4.17.0 + '@types/lodash': 4.17.1 dev: true - /@types/lodash@4.17.0: - resolution: {integrity: sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==} + /@types/lodash@4.17.1: + resolution: {integrity: sha512-X+2qazGS3jxLAIz5JDXDzglAF3KpijdhFxlf/V1+hEsOUc+HnWi81L/uv/EvGuV90WY+7mPGFCUDGfQC3Gj95Q==} /@types/node@18.16.1: resolution: {integrity: sha512-DZxSZWXxFfOlx7k7Rv4LAyiMroaxa3Ly/7OOzZO8cBNho0YzAi4qlbrx8W27JGqG57IgR/6J7r+nOJWw6kcvZA==} dev: true - /@types/node@20.12.8: - resolution: {integrity: sha512-NU0rJLJnshZWdE/097cdCBbyW1h4hEg0xpovcoAQYHl8dnEyp/NAOiE45pvc+Bd1Dt+2r94v2eGFpQJ4R7g+2w==} + /@types/node@20.12.11: + resolution: {integrity: sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==} dependencies: undici-types: 5.26.5 dev: false @@ -1055,7 +1055,7 @@ packages: dev: false /concat-map@0.0.1: - resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} + resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=} dev: false /convert-source-map@1.9.0: @@ -1184,7 +1184,7 @@ packages: resolution: {integrity: sha512-4SbcbedPXTciySXiSnNNLuJXpvxFe5nqivbiEHXyL8P/w0wx2uW7YXNjnYgjW0e2e6vy+L/tMISU/oAiXCl57Q==} engines: {node: '>=10'} dependencies: - '@types/node': 20.12.8 + '@types/node': 20.12.11 jszip: 3.10.1 nanoid: 5.0.7 xml: 1.0.1 @@ -1568,16 +1568,16 @@ packages: is-glob: 4.0.3 dev: false - /glob@10.3.12: - resolution: {integrity: sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==} + /glob@10.3.14: + resolution: {integrity: sha512-4fkAqu93xe9Mk7le9v0y3VrPDqLKHarNi2s4Pv7f2yOvfhWfhc7hRPHC/JyqMqb8B/Dt/eGS4n7ykwf3fOsl8g==} engines: {node: '>=16 || 14 >=14.17'} hasBin: true dependencies: foreground-child: 3.1.1 jackspeak: 2.3.6 minimatch: 9.0.4 - minipass: 7.0.4 - path-scurry: 1.10.2 + minipass: 7.1.1 + path-scurry: 1.11.0 dev: false /glob@7.2.3: @@ -1814,9 +1814,9 @@ packages: dependencies: '@apidevtools/json-schema-ref-parser': 11.6.1 '@types/json-schema': 7.0.15 - '@types/lodash': 4.17.0 + '@types/lodash': 4.17.1 cli-color: 2.0.4 - glob: 10.3.12 + glob: 10.3.14 is-glob: 4.0.3 js-yaml: 4.1.0 lodash: 4.17.21 @@ -1856,7 +1856,7 @@ packages: lodash.isstring: 4.0.1 lodash.once: 4.1.1 ms: 2.1.3 - semver: 7.6.0 + semver: 7.6.2 dev: false /jszip@3.10.1: @@ -2052,8 +2052,8 @@ packages: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} dev: false - /minipass@7.0.4: - resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==} + /minipass@7.1.1: + resolution: {integrity: sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==} engines: {node: '>=16 || 14 >=14.17'} dev: false @@ -2264,12 +2264,12 @@ packages: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} dev: false - /path-scurry@1.10.2: - resolution: {integrity: sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==} + /path-scurry@1.11.0: + resolution: {integrity: sha512-LNHTaVkzaYaLGlO+0u3rQTz7QrHTFOuKyba9JMTQutkmtNew8dw8wOD7mTU/5fCPZzCWpfW0XnQKzY61P0aTaw==} engines: {node: '>=16 || 14 >=14.17'} dependencies: lru-cache: 10.2.2 - minipass: 7.0.4 + minipass: 7.1.1 dev: false /path-type@4.0.0: @@ -2499,12 +2499,10 @@ packages: lru-cache: 6.0.0 dev: false - /semver@7.6.0: - resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==} + /semver@7.6.2: + resolution: {integrity: sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==} engines: {node: '>=10'} hasBin: true - dependencies: - lru-cache: 6.0.0 dev: false /setimmediate@1.0.5: @@ -2923,7 +2921,7 @@ packages: engines: {node: '>=10'} dependencies: '@babel/runtime': 7.24.5 - '@types/lodash': 4.17.0 + '@types/lodash': 4.17.1 lodash: 4.17.21 lodash-es: 4.17.21 nanoclone: 0.2.1 @@ -2931,12 +2929,12 @@ packages: toposort: 2.0.2 dev: false - /zod@3.23.6: - resolution: {integrity: sha512-RTHJlZhsRbuA8Hmp/iNL7jnfc4nZishjsanDAfEY1QpDQZCahUp3xDzl+zfweE9BklxMUcgBgS1b7Lvie/ZVwA==} + /zod@3.23.8: + resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} dev: false - github.com/theopensystemslab/planx-core/f2f918d: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/f2f918d} + github.com/theopensystemslab/planx-core/d8acbea: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/d8acbea} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true @@ -2944,7 +2942,7 @@ packages: dependencies: '@emotion/react': 11.11.4(react@18.3.1) '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(react@18.3.1) - '@mui/material': 5.15.16(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react-dom@18.3.1)(react@18.3.1) + '@mui/material': 5.15.17(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react-dom@18.3.1)(react@18.3.1) '@types/geojson': 7946.0.14 ajv: 8.13.0 ajv-formats: 2.1.1(ajv@8.13.0) @@ -2963,7 +2961,7 @@ packages: react-dom: 18.3.1(react@18.3.1) type-fest: 4.18.2 uuid: 9.0.1 - zod: 3.23.6 + zod: 3.23.8 transitivePeerDependencies: - '@types/react' - encoding diff --git a/e2e/tests/ui-driven/package.json b/e2e/tests/ui-driven/package.json index d28817521c..db3e047d2f 100644 --- a/e2e/tests/ui-driven/package.json +++ b/e2e/tests/ui-driven/package.json @@ -8,7 +8,7 @@ "postinstall": "./install-dependencies.sh" }, "dependencies": { - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#f2f918d", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d8acbea", "axios": "^1.6.8", "dotenv": "^16.3.1", "eslint": "^8.56.0", diff --git a/e2e/tests/ui-driven/pnpm-lock.yaml b/e2e/tests/ui-driven/pnpm-lock.yaml index 9b7fd20584..d00b13321e 100644 --- a/e2e/tests/ui-driven/pnpm-lock.yaml +++ b/e2e/tests/ui-driven/pnpm-lock.yaml @@ -6,8 +6,8 @@ settings: dependencies: '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#f2f918d - version: github.com/theopensystemslab/planx-core/f2f918d + specifier: git+https://github.com/theopensystemslab/planx-core#d8acbea + version: github.com/theopensystemslab/planx-core/d8acbea axios: specifier: ^1.6.8 version: 1.6.8 @@ -49,12 +49,8 @@ devDependencies: packages: - /@aashutoshrathi/word-wrap@1.2.6: - resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==} - engines: {node: '>=0.10.0'} - - /@apidevtools/json-schema-ref-parser@11.6.0: - resolution: {integrity: sha512-I+d5/XrazqY86/kGsmjVercjjJ+w6MVXJj7vnHfUgXzaoLJAl0/tPk2WXVpHUeRqHqyJ6AGkXBqx6Dc3wJkrCQ==} + /@apidevtools/json-schema-ref-parser@11.6.1: + resolution: {integrity: sha512-DxjgKBCoyReu4p5HMvpmgSOfRhhBcuf5V5soDDRgOTZMwsA4KSFzol1abFZgiCTE11L2kKGca5Md9GwDdXVBwQ==} engines: {node: '>= 16'} dependencies: '@jsdevtools/ono': 7.1.3 @@ -62,61 +58,62 @@ packages: js-yaml: 4.1.0 dev: false - /@babel/code-frame@7.23.5: - resolution: {integrity: sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==} + /@babel/code-frame@7.24.2: + resolution: {integrity: sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/highlight': 7.23.4 - chalk: 2.4.2 + '@babel/highlight': 7.24.5 + picocolors: 1.0.0 dev: false - /@babel/helper-module-imports@7.22.15: - resolution: {integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==} + /@babel/helper-module-imports@7.24.3: + resolution: {integrity: sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.24.0 + '@babel/types': 7.24.5 dev: false - /@babel/helper-string-parser@7.23.4: - resolution: {integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==} + /@babel/helper-string-parser@7.24.1: + resolution: {integrity: sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==} engines: {node: '>=6.9.0'} dev: false - /@babel/helper-validator-identifier@7.22.20: - resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==} + /@babel/helper-validator-identifier@7.24.5: + resolution: {integrity: sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==} engines: {node: '>=6.9.0'} dev: false - /@babel/highlight@7.23.4: - resolution: {integrity: sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==} + /@babel/highlight@7.24.5: + resolution: {integrity: sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-validator-identifier': 7.22.20 + '@babel/helper-validator-identifier': 7.24.5 chalk: 2.4.2 js-tokens: 4.0.0 + picocolors: 1.0.0 dev: false - /@babel/runtime@7.24.0: - resolution: {integrity: sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==} + /@babel/runtime@7.24.5: + resolution: {integrity: sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==} engines: {node: '>=6.9.0'} dependencies: regenerator-runtime: 0.14.1 dev: false - /@babel/types@7.24.0: - resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==} + /@babel/types@7.24.5: + resolution: {integrity: sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-string-parser': 7.23.4 - '@babel/helper-validator-identifier': 7.22.20 + '@babel/helper-string-parser': 7.24.1 + '@babel/helper-validator-identifier': 7.24.5 to-fast-properties: 2.0.0 dev: false /@emotion/babel-plugin@11.11.0: resolution: {integrity: sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==} dependencies: - '@babel/helper-module-imports': 7.22.15 - '@babel/runtime': 7.24.0 + '@babel/helper-module-imports': 7.24.3 + '@babel/runtime': 7.24.5 '@emotion/hash': 0.9.1 '@emotion/memoize': 0.8.1 '@emotion/serialize': 1.1.4 @@ -161,7 +158,7 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.5 '@emotion/babel-plugin': 11.11.0 '@emotion/cache': 11.11.0 '@emotion/serialize': 1.1.4 @@ -196,7 +193,7 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.5 '@emotion/babel-plugin': 11.11.0 '@emotion/is-prop-valid': 1.2.2 '@emotion/react': 11.11.4(react@18.3.1) @@ -274,32 +271,32 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: false - /@floating-ui/core@1.6.0: - resolution: {integrity: sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==} + /@floating-ui/core@1.6.1: + resolution: {integrity: sha512-42UH54oPZHPdRHdw6BgoBD6cg/eVTmVrFcgeRDM3jbO7uxSoipVcmcIGFcA5jmOHO5apcyvBhkSKES3fQJnu7A==} dependencies: - '@floating-ui/utils': 0.2.1 + '@floating-ui/utils': 0.2.2 dev: false - /@floating-ui/dom@1.6.3: - resolution: {integrity: sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==} + /@floating-ui/dom@1.6.5: + resolution: {integrity: sha512-Nsdud2X65Dz+1RHjAIP0t8z5e2ff/IRbei6BqFrl1urT8sDVzM1HMQ+R0XcU5ceRfyO3I6ayeqIfh+6Wb8LGTw==} dependencies: - '@floating-ui/core': 1.6.0 - '@floating-ui/utils': 0.2.1 + '@floating-ui/core': 1.6.1 + '@floating-ui/utils': 0.2.2 dev: false - /@floating-ui/react-dom@2.0.8(react-dom@18.3.1)(react@18.3.1): - resolution: {integrity: sha512-HOdqOt3R3OGeTKidaLvJKcgg75S6tibQ3Tif4eyd91QnIJWr0NLvoXFpJA/j8HqkFSL68GDca9AuyWEHlhyClw==} + /@floating-ui/react-dom@2.0.9(react-dom@18.3.1)(react@18.3.1): + resolution: {integrity: sha512-q0umO0+LQK4+p6aGyvzASqKbKOJcAHJ7ycE9CuUvfx3s9zTHWmGJTPOIlM/hmSBfUfg/XfY5YhLBLR/LHwShQQ==} peerDependencies: react: '>=16.8.0' react-dom: '>=16.8.0' dependencies: - '@floating-ui/dom': 1.6.3 + '@floating-ui/dom': 1.6.5 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) dev: false - /@floating-ui/utils@0.2.1: - resolution: {integrity: sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==} + /@floating-ui/utils@0.2.2: + resolution: {integrity: sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw==} dev: false /@graphql-typed-document-node/core@3.2.0(graphql@16.8.1): @@ -314,7 +311,7 @@ packages: resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==} engines: {node: '>=10.10.0'} dependencies: - '@humanwhocodes/object-schema': 2.0.2 + '@humanwhocodes/object-schema': 2.0.3 debug: 4.3.4 minimatch: 3.1.2 transitivePeerDependencies: @@ -324,8 +321,8 @@ packages: resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==} engines: {node: '>=12.22'} - /@humanwhocodes/object-schema@2.0.2: - resolution: {integrity: sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==} + /@humanwhocodes/object-schema@2.0.3: + resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==} /@isaacs/cliui@8.0.2: resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} @@ -343,8 +340,8 @@ packages: resolution: {integrity: sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==} dev: false - /@mui/base@5.0.0-beta.37(react-dom@18.3.1)(react@18.3.1): - resolution: {integrity: sha512-/o3anbb+DeCng8jNsd3704XtmmLDZju1Fo8R2o7ugrVtPQ/QpcqddwKNzKPZwa0J5T8YNW3ZVuHyQgbTnQLisQ==} + /@mui/base@5.0.0-beta.40(react-dom@18.3.1)(react@18.3.1): + resolution: {integrity: sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ==} engines: {node: '>=12.0.0'} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 @@ -354,23 +351,23 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.24.0 - '@floating-ui/react-dom': 2.0.8(react-dom@18.3.1)(react@18.3.1) - '@mui/types': 7.2.13 - '@mui/utils': 5.15.11(react@18.3.1) + '@babel/runtime': 7.24.5 + '@floating-ui/react-dom': 2.0.9(react-dom@18.3.1)(react@18.3.1) + '@mui/types': 7.2.14 + '@mui/utils': 5.15.14(react@18.3.1) '@popperjs/core': 2.11.8 - clsx: 2.1.0 + clsx: 2.1.1 prop-types: 15.8.1 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) dev: false - /@mui/core-downloads-tracker@5.15.11: - resolution: {integrity: sha512-JVrJ9Jo4gyU707ujnRzmE8ABBWpXd6FwL9GYULmwZRtfPg89ggXs/S3MStQkpJ1JRWfdLL6S5syXmgQGq5EDAw==} + /@mui/core-downloads-tracker@5.15.17: + resolution: {integrity: sha512-DVAejDQkjNnIac7MfP8sLzuo7fyrBPxNdXe+6bYqOqg1z2OPTlfFAejSNzWe7UenRMuFu9/AyFXj/X2vN2w6dA==} dev: false - /@mui/material@5.15.11(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react-dom@18.3.1)(react@18.3.1): - resolution: {integrity: sha512-FA3eEuEZaDaxgN3CgfXezMWbCZ4VCeU/sv0F0/PK5n42qIgsPVD6q+j71qS7/62sp6wRFMHtDMpXRlN+tT/7NA==} + /@mui/material@5.15.17(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react-dom@18.3.1)(react@18.3.1): + resolution: {integrity: sha512-ru/MLvTkCh0AZXmqwIpqGTOoVBS/sX48zArXq/DvktxXZx4fskiRA2PEc7Rk5ZlFiZhKh4moL4an+l8zZwq49Q==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 @@ -386,26 +383,26 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.5 '@emotion/react': 11.11.4(react@18.3.1) '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(react@18.3.1) - '@mui/base': 5.0.0-beta.37(react-dom@18.3.1)(react@18.3.1) - '@mui/core-downloads-tracker': 5.15.11 - '@mui/system': 5.15.11(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react@18.3.1) - '@mui/types': 7.2.13 - '@mui/utils': 5.15.11(react@18.3.1) + '@mui/base': 5.0.0-beta.40(react-dom@18.3.1)(react@18.3.1) + '@mui/core-downloads-tracker': 5.15.17 + '@mui/system': 5.15.15(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react@18.3.1) + '@mui/types': 7.2.14 + '@mui/utils': 5.15.14(react@18.3.1) '@types/react-transition-group': 4.4.10 - clsx: 2.1.0 + clsx: 2.1.1 csstype: 3.1.3 prop-types: 15.8.1 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - react-is: 18.2.0 + react-is: 18.3.1 react-transition-group: 4.4.5(react-dom@18.3.1)(react@18.3.1) dev: false - /@mui/private-theming@5.15.11(react@18.3.1): - resolution: {integrity: sha512-jY/696SnSxSzO1u86Thym7ky5T9CgfidU3NFJjguldqK4f3Z5S97amZ6nffg8gTD0HBjY9scB+4ekqDEUmxZOA==} + /@mui/private-theming@5.15.14(react@18.3.1): + resolution: {integrity: sha512-UH0EiZckOWcxiXLX3Jbb0K7rC8mxTr9L9l6QhOZxYc4r8FHUkefltV9VDGLrzCaWh30SQiJvAEd7djX3XXY6Xw==} engines: {node: '>=12.0.0'} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 @@ -414,14 +411,14 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.24.0 - '@mui/utils': 5.15.11(react@18.3.1) + '@babel/runtime': 7.24.5 + '@mui/utils': 5.15.14(react@18.3.1) prop-types: 15.8.1 react: 18.3.1 dev: false - /@mui/styled-engine@5.15.11(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react@18.3.1): - resolution: {integrity: sha512-So21AhAngqo07ces4S/JpX5UaMU2RHXpEA6hNzI6IQjd/1usMPxpgK8wkGgTe3JKmC2KDmH8cvoycq5H3Ii7/w==} + /@mui/styled-engine@5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react@18.3.1): + resolution: {integrity: sha512-RILkuVD8gY6PvjZjqnWhz8fu68dVkqhM5+jYWfB5yhlSQKg+2rHkmEwm75XIeAqI3qwOndK6zELK5H6Zxn4NHw==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.4.1 @@ -433,7 +430,7 @@ packages: '@emotion/styled': optional: true dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.5 '@emotion/cache': 11.11.0 '@emotion/react': 11.11.4(react@18.3.1) '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(react@18.3.1) @@ -442,8 +439,8 @@ packages: react: 18.3.1 dev: false - /@mui/system@5.15.11(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react@18.3.1): - resolution: {integrity: sha512-9j35suLFq+MgJo5ktVSHPbkjDLRMBCV17NMBdEQurh6oWyGnLM4uhU4QGZZQ75o0vuhjJghOCA1jkO3+79wKsA==} + /@mui/system@5.15.15(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react@18.3.1): + resolution: {integrity: sha512-aulox6N1dnu5PABsfxVGOZffDVmlxPOVgj56HrUnJE8MCSh8lOvvkd47cebIVQQYAjpwieXQXiDPj5pwM40jTQ==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 @@ -458,21 +455,21 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.5 '@emotion/react': 11.11.4(react@18.3.1) '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(react@18.3.1) - '@mui/private-theming': 5.15.11(react@18.3.1) - '@mui/styled-engine': 5.15.11(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react@18.3.1) - '@mui/types': 7.2.13 - '@mui/utils': 5.15.11(react@18.3.1) - clsx: 2.1.0 + '@mui/private-theming': 5.15.14(react@18.3.1) + '@mui/styled-engine': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react@18.3.1) + '@mui/types': 7.2.14 + '@mui/utils': 5.15.14(react@18.3.1) + clsx: 2.1.1 csstype: 3.1.3 prop-types: 15.8.1 react: 18.3.1 dev: false - /@mui/types@7.2.13: - resolution: {integrity: sha512-qP9OgacN62s+l8rdDhSFRe05HWtLLJ5TGclC9I1+tQngbssu0m2dmFZs+Px53AcOs9fD7TbYd4gc9AXzVqO/+g==} + /@mui/types@7.2.14: + resolution: {integrity: sha512-MZsBZ4q4HfzBsywtXgM1Ksj6HDThtiwmOKUXH1pKYISI9gAVXCNHNpo7TlGoGrBaYWZTdNoirIN7JsQcQUjmQQ==} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 peerDependenciesMeta: @@ -480,8 +477,8 @@ packages: optional: true dev: false - /@mui/utils@5.15.11(react@18.3.1): - resolution: {integrity: sha512-D6bwqprUa9Stf8ft0dcMqWyWDKEo7D+6pB1k8WajbqlYIRA8J8Kw9Ra7PSZKKePGBGWO+/xxrX1U8HpG/aXQCw==} + /@mui/utils@5.15.14(react@18.3.1): + resolution: {integrity: sha512-0lF/7Hh/ezDv5X7Pry6enMsbYyGKjADzvHyo3Qrc/SSlTsQ1VkbDMbH0m2t3OR5iIVLwMoxwM7yGd+6FCMtTFA==} engines: {node: '>=12.0.0'} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 @@ -490,11 +487,11 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.24.0 - '@types/prop-types': 15.7.11 + '@babel/runtime': 7.24.5 + '@types/prop-types': 15.7.12 prop-types: 15.8.1 react: 18.3.1 - react-is: 18.2.0 + react-is: 18.3.1 dev: false /@nodelib/fs.scandir@2.1.5: @@ -542,16 +539,16 @@ packages: resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} dev: false - /@types/lodash@4.17.0: - resolution: {integrity: sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==} + /@types/lodash@4.17.1: + resolution: {integrity: sha512-X+2qazGS3jxLAIz5JDXDzglAF3KpijdhFxlf/V1+hEsOUc+HnWi81L/uv/EvGuV90WY+7mPGFCUDGfQC3Gj95Q==} dev: false /@types/node@18.16.1: resolution: {integrity: sha512-DZxSZWXxFfOlx7k7Rv4LAyiMroaxa3Ly/7OOzZO8cBNho0YzAi4qlbrx8W27JGqG57IgR/6J7r+nOJWw6kcvZA==} dev: true - /@types/node@20.11.21: - resolution: {integrity: sha512-/ySDLGscFPNasfqStUuWWPfL78jompfIoVzLJPVVAHBh6rpG68+pI2Gk+fNLeI8/f1yPYL4s46EleVIc20F1Ow==} + /@types/node@20.12.11: + resolution: {integrity: sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==} dependencies: undici-types: 5.26.5 dev: false @@ -560,28 +557,23 @@ packages: resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==} dev: false - /@types/prop-types@15.7.11: - resolution: {integrity: sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==} + /@types/prop-types@15.7.12: + resolution: {integrity: sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==} dev: false /@types/react-transition-group@4.4.10: resolution: {integrity: sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==} dependencies: - '@types/react': 18.2.60 + '@types/react': 18.3.1 dev: false - /@types/react@18.2.60: - resolution: {integrity: sha512-dfiPj9+k20jJrLGOu9Nf6eqxm2EyJRrq2NvwOFsfbb7sFExZ9WELPs67UImHj3Ayxg8ruTtKtNnbjaF8olPq0A==} + /@types/react@18.3.1: + resolution: {integrity: sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==} dependencies: - '@types/prop-types': 15.7.11 - '@types/scheduler': 0.16.8 + '@types/prop-types': 15.7.12 csstype: 3.1.3 dev: false - /@types/scheduler@0.16.8: - resolution: {integrity: sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==} - dev: false - /@ungap/structured-clone@1.2.0: resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} @@ -609,7 +601,7 @@ packages: engines: {node: '>=0.4.0'} hasBin: true - /ajv-formats@2.1.1(ajv@8.12.0): + /ajv-formats@2.1.1(ajv@8.13.0): resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==} peerDependencies: ajv: ^8.0.0 @@ -617,7 +609,7 @@ packages: ajv: optional: true dependencies: - ajv: 8.12.0 + ajv: 8.13.0 dev: false /ajv@6.12.6: @@ -637,8 +629,8 @@ packages: uri-js: 4.4.1 dev: false - /ajv@8.12.0: - resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==} + /ajv@8.13.0: + resolution: {integrity: sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==} dependencies: fast-deep-equal: 3.1.3 json-schema-traverse: 1.0.0 @@ -712,7 +704,7 @@ packages: resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==} engines: {node: '>=10', npm: '>=6'} dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.5 cosmiconfig: 7.1.0 resolve: 1.22.8 dev: false @@ -755,7 +747,7 @@ packages: dev: false /bytes@3.0.0: - resolution: {integrity: sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==} + resolution: {integrity: sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=} engines: {node: '>= 0.8'} dev: false @@ -829,7 +821,7 @@ packages: resolution: {integrity: sha512-zlnpg0jNcibNrO7GG9IeHH7maWFeCz+Ja1wx/7tZNU5ASSSSZ+/qZciM0/LHCYxSdqv5h2sdbQ/PXYdOuetXvA==} engines: {node: '>=0.10'} dependencies: - d: 1.0.1 + d: 1.0.2 es5-ext: 0.10.64 es6-iterator: 2.0.3 memoizee: 0.4.15 @@ -853,8 +845,8 @@ packages: wrap-ansi: 7.0.0 dev: false - /clsx@2.1.0: - resolution: {integrity: sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg==} + /clsx@2.1.1: + resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==} engines: {node: '>=6'} dev: false @@ -907,10 +899,10 @@ packages: dev: false /concat-map@0.0.1: - resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} + resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=} /content-disposition@0.5.2: - resolution: {integrity: sha512-kRGRZw3bLlFISDBgwTSA1TMBFN6J6GWDeubmDE3AF+3+yXL8hTWv8r5rkLbqYXY4RjPk/EzHnClI3zQf1cFmHA==} + resolution: {integrity: sha1-DPaLud318r55YcOoUXjLhdunjLQ=} engines: {node: '>= 0.6'} dev: false @@ -981,11 +973,12 @@ packages: resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} dev: false - /d@1.0.1: - resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==} + /d@1.0.2: + resolution: {integrity: sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==} + engines: {node: '>=0.12'} dependencies: es5-ext: 0.10.64 - type: 1.2.0 + type: 2.7.2 dev: false /data-uri-to-buffer@4.0.1: @@ -1038,9 +1031,9 @@ packages: resolution: {integrity: sha512-4SbcbedPXTciySXiSnNNLuJXpvxFe5nqivbiEHXyL8P/w0wx2uW7YXNjnYgjW0e2e6vy+L/tMISU/oAiXCl57Q==} engines: {node: '>=10'} dependencies: - '@types/node': 20.11.21 + '@types/node': 20.12.11 jszip: 3.10.1 - nanoid: 5.0.6 + nanoid: 5.0.7 xml: 1.0.1 xml-js: 1.6.11 dev: false @@ -1048,7 +1041,7 @@ packages: /dom-helpers@5.2.1: resolution: {integrity: sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==} dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.5 csstype: 3.1.3 dev: false @@ -1119,7 +1112,7 @@ packages: requiresBuild: true dependencies: es6-iterator: 2.0.3 - es6-symbol: 3.1.3 + es6-symbol: 3.1.4 esniff: 2.0.1 next-tick: 1.1.0 dev: false @@ -1127,25 +1120,26 @@ packages: /es6-iterator@2.0.3: resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==} dependencies: - d: 1.0.1 + d: 1.0.2 es5-ext: 0.10.64 - es6-symbol: 3.1.3 + es6-symbol: 3.1.4 dev: false - /es6-symbol@3.1.3: - resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==} + /es6-symbol@3.1.4: + resolution: {integrity: sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==} + engines: {node: '>=0.12'} dependencies: - d: 1.0.1 + d: 1.0.2 ext: 1.7.0 dev: false /es6-weak-map@2.0.3: resolution: {integrity: sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==} dependencies: - d: 1.0.1 + d: 1.0.2 es5-ext: 0.10.64 es6-iterator: 2.0.3 - es6-symbol: 3.1.3 + es6-symbol: 3.1.4 dev: false /escalade@3.1.2: @@ -1226,7 +1220,7 @@ packages: lodash.merge: 4.6.2 minimatch: 3.1.2 natural-compare: 1.4.0 - optionator: 0.9.3 + optionator: 0.9.4 strip-ansi: 6.0.1 text-table: 0.2.0 transitivePeerDependencies: @@ -1272,7 +1266,7 @@ packages: lodash.merge: 4.6.2 minimatch: 3.1.2 natural-compare: 1.4.0 - optionator: 0.9.3 + optionator: 0.9.4 strip-ansi: 6.0.1 text-table: 0.2.0 transitivePeerDependencies: @@ -1283,7 +1277,7 @@ packages: resolution: {integrity: sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==} engines: {node: '>=0.10'} dependencies: - d: 1.0.1 + d: 1.0.2 es5-ext: 0.10.64 event-emitter: 0.3.5 type: 2.7.2 @@ -1320,7 +1314,7 @@ packages: /event-emitter@0.3.5: resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==} dependencies: - d: 1.0.1 + d: 1.0.2 es5-ext: 0.10.64 dev: false @@ -1473,16 +1467,16 @@ packages: dependencies: is-glob: 4.0.3 - /glob@10.3.12: - resolution: {integrity: sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==} + /glob@10.3.14: + resolution: {integrity: sha512-4fkAqu93xe9Mk7le9v0y3VrPDqLKHarNi2s4Pv7f2yOvfhWfhc7hRPHC/JyqMqb8B/Dt/eGS4n7ykwf3fOsl8g==} engines: {node: '>=16 || 14 >=14.17'} hasBin: true dependencies: foreground-child: 3.1.1 jackspeak: 2.3.6 minimatch: 9.0.4 - minipass: 7.0.4 - path-scurry: 1.10.2 + minipass: 7.1.1 + path-scurry: 1.11.0 dev: false /glob@7.2.3: @@ -1530,8 +1524,8 @@ packages: resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} engines: {node: '>=8'} - /hasown@2.0.1: - resolution: {integrity: sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==} + /hasown@2.0.2: + resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} engines: {node: '>= 0.4'} dependencies: function-bind: 1.1.2 @@ -1596,7 +1590,7 @@ packages: /is-core-module@2.13.1: resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==} dependencies: - hasown: 2.0.1 + hasown: 2.0.2 dev: false /is-docker@2.2.1: @@ -1696,11 +1690,11 @@ packages: engines: {node: '>=16.0.0'} hasBin: true dependencies: - '@apidevtools/json-schema-ref-parser': 11.6.0 + '@apidevtools/json-schema-ref-parser': 11.6.1 '@types/json-schema': 7.0.15 - '@types/lodash': 4.17.0 + '@types/lodash': 4.17.1 cli-color: 2.0.4 - glob: 10.3.12 + glob: 10.3.14 is-glob: 4.0.3 js-yaml: 4.1.0 lodash: 4.17.21 @@ -1734,7 +1728,7 @@ packages: lodash.isstring: 4.0.1 lodash.once: 4.1.1 ms: 2.1.3 - semver: 7.6.0 + semver: 7.6.2 dev: false /jszip@3.10.1: @@ -1831,18 +1825,11 @@ packages: js-tokens: 4.0.0 dev: false - /lru-cache@10.2.0: - resolution: {integrity: sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==} + /lru-cache@10.2.2: + resolution: {integrity: sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==} engines: {node: 14 || >=16.14} dev: false - /lru-cache@6.0.0: - resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} - engines: {node: '>=10'} - dependencies: - yallist: 4.0.0 - dev: false - /lru-queue@0.1.0: resolution: {integrity: sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==} dependencies: @@ -1858,7 +1845,7 @@ packages: /memoizee@0.4.15: resolution: {integrity: sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==} dependencies: - d: 1.0.1 + d: 1.0.2 es5-ext: 0.10.64 es6-weak-map: 2.0.3 event-emitter: 0.3.5 @@ -1917,8 +1904,8 @@ packages: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} dev: false - /minipass@7.0.4: - resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==} + /minipass@7.1.1: + resolution: {integrity: sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==} engines: {node: '>=16 || 14 >=14.17'} dev: false @@ -1953,8 +1940,8 @@ packages: thenify-all: 1.6.0 dev: false - /nanoid@5.0.6: - resolution: {integrity: sha512-rRq0eMHoGZxlvaFOUdK1Ev83Bd1IgzzR+WJ3IbDJ7QOSdAxYjlurSPqFs9s4lJg29RT6nPwizFtJhQS6V5xgiA==} + /nanoid@5.0.7: + resolution: {integrity: sha512-oLxFY2gd2IqnjcYyOXD8XGCftpGtZP2AbHbOkthDkvRywH5ayNtPVy9YlOPcHckXzbLTCHpkb7FB+yuxKV13pQ==} engines: {node: ^18 || >=20} hasBin: true dev: false @@ -2039,16 +2026,16 @@ packages: mimic-fn: 2.1.0 dev: false - /optionator@0.9.3: - resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==} + /optionator@0.9.4: + resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==} engines: {node: '>= 0.8.0'} dependencies: - '@aashutoshrathi/word-wrap': 1.2.6 deep-is: 0.1.4 fast-levenshtein: 2.0.6 levn: 0.4.1 prelude-ls: 1.2.1 type-check: 0.4.0 + word-wrap: 1.2.5 /p-limit@3.1.0: resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} @@ -2076,7 +2063,7 @@ packages: resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} engines: {node: '>=8'} dependencies: - '@babel/code-frame': 7.23.5 + '@babel/code-frame': 7.24.2 error-ex: 1.3.2 json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 @@ -2115,12 +2102,12 @@ packages: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} dev: false - /path-scurry@1.10.2: - resolution: {integrity: sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==} + /path-scurry@1.11.0: + resolution: {integrity: sha512-LNHTaVkzaYaLGlO+0u3rQTz7QrHTFOuKyba9JMTQutkmtNew8dw8wOD7mTU/5fCPZzCWpfW0XnQKzY61P0aTaw==} engines: {node: '>=16 || 14 >=14.17'} dependencies: - lru-cache: 10.2.0 - minipass: 7.0.4 + lru-cache: 10.2.2 + minipass: 7.1.1 dev: false /path-to-regexp@2.2.1: @@ -2132,6 +2119,10 @@ packages: engines: {node: '>=8'} dev: false + /picocolors@1.0.0: + resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} + dev: false + /playwright-core@1.40.1: resolution: {integrity: sha512-+hkOycxPiV534c4HhpfX6yrlawqVUzITRKwHAmYfmsVreltEl6fAZJ3DPfLMOODw0H3s1Itd6MDCWmP1fl/QvQ==} engines: {node: '>=16'} @@ -2214,8 +2205,8 @@ packages: resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==} dev: false - /react-is@18.2.0: - resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} + /react-is@18.3.1: + resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==} dev: false /react-transition-group@4.4.5(react-dom@18.3.1)(react@18.3.1): @@ -2224,7 +2215,7 @@ packages: react: '>=16.6.0' react-dom: '>=16.6.0' dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.5 dom-helpers: 5.2.1 loose-envify: 1.4.0 prop-types: 15.8.1 @@ -2272,7 +2263,7 @@ packages: dev: false /registry-url@3.1.0: - resolution: {integrity: sha512-ZbgR5aZEdf4UKZVBPYIgaglBmSF2Hi94s2PcIHhRGFjKYu+chjJdYfHn4rt3hB6eCKLJ8giVIIfgMa1ehDfZKA==} + resolution: {integrity: sha1-PU74cPc93h138M+aOBQyRE4XSUI=} engines: {node: '>=0.10.0'} dependencies: rc: 1.2.8 @@ -2334,12 +2325,10 @@ packages: loose-envify: 1.4.0 dev: false - /semver@7.6.0: - resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==} + /semver@7.6.2: + resolution: {integrity: sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==} engines: {node: '>=10'} hasBin: true - dependencies: - lru-cache: 6.0.0 dev: false /serve-handler@6.1.5: @@ -2543,10 +2532,6 @@ packages: engines: {node: '>=16'} dev: false - /type@1.2.0: - resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==} - dev: false - /type@2.7.2: resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==} dev: false @@ -2620,6 +2605,10 @@ packages: string-width: 5.1.2 dev: false + /word-wrap@1.2.5: + resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==} + engines: {node: '>=0.10.0'} + /wrap-ansi@7.0.0: resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} engines: {node: '>=10'} @@ -2662,10 +2651,6 @@ packages: engines: {node: '>=10'} dev: false - /yallist@4.0.0: - resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - dev: false - /yaml@1.10.2: resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} engines: {node: '>= 6'} @@ -2693,12 +2678,12 @@ packages: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} - /zod@3.23.6: - resolution: {integrity: sha512-RTHJlZhsRbuA8Hmp/iNL7jnfc4nZishjsanDAfEY1QpDQZCahUp3xDzl+zfweE9BklxMUcgBgS1b7Lvie/ZVwA==} + /zod@3.23.8: + resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} dev: false - github.com/theopensystemslab/planx-core/f2f918d: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/f2f918d} + github.com/theopensystemslab/planx-core/d8acbea: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/d8acbea} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true @@ -2706,10 +2691,10 @@ packages: dependencies: '@emotion/react': 11.11.4(react@18.3.1) '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(react@18.3.1) - '@mui/material': 5.15.11(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react-dom@18.3.1)(react@18.3.1) + '@mui/material': 5.15.17(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react-dom@18.3.1)(react@18.3.1) '@types/geojson': 7946.0.14 - ajv: 8.12.0 - ajv-formats: 2.1.1(ajv@8.12.0) + ajv: 8.13.0 + ajv-formats: 2.1.1(ajv@8.13.0) cheerio: 1.0.0-rc.12 copyfiles: 2.4.1 docx: 8.5.0 @@ -2725,7 +2710,7 @@ packages: react-dom: 18.3.1(react@18.3.1) type-fest: 4.18.2 uuid: 9.0.1 - zod: 3.23.6 + zod: 3.23.8 transitivePeerDependencies: - '@types/react' - encoding diff --git a/editor.planx.uk/package.json b/editor.planx.uk/package.json index 84e91aab7f..f527cb1af7 100644 --- a/editor.planx.uk/package.json +++ b/editor.planx.uk/package.json @@ -11,8 +11,8 @@ "@mui/icons-material": "^5.15.2", "@mui/material": "^5.15.2", "@mui/utils": "^5.15.2", - "@opensystemslab/map": "^0.8.1", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#f2f918d", + "@opensystemslab/map": "^0.8.2", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d8acbea", "@tiptap/core": "^2.0.3", "@tiptap/extension-bold": "^2.0.3", "@tiptap/extension-bubble-menu": "^2.1.13", diff --git a/editor.planx.uk/pnpm-lock.yaml b/editor.planx.uk/pnpm-lock.yaml index 33bcfdb92f..009ade247f 100644 --- a/editor.planx.uk/pnpm-lock.yaml +++ b/editor.planx.uk/pnpm-lock.yaml @@ -35,11 +35,11 @@ dependencies: specifier: ^5.15.2 version: 5.15.2(@types/react@18.2.45)(react@18.2.0) '@opensystemslab/map': - specifier: ^0.8.1 - version: 0.8.1 + specifier: ^0.8.2 + version: 0.8.2 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#f2f918d - version: github.com/theopensystemslab/planx-core/f2f918d(@types/react@18.2.45) + specifier: git+https://github.com/theopensystemslab/planx-core#d8acbea + version: github.com/theopensystemslab/planx-core/d8acbea(@types/react@18.2.45) '@tiptap/core': specifier: ^2.0.3 version: 2.0.3(@tiptap/pm@2.0.3) @@ -216,7 +216,7 @@ dependencies: version: 0.15.0(navi@0.15.0)(react-dom@18.2.0)(react-navi@0.15.0)(react@18.2.0) react-scripts: specifier: ^5.0.1 - version: 5.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.23.4)(@swc/core@1.4.17)(esbuild@0.14.54)(eslint@8.44.0)(react@18.2.0)(sass@1.71.1)(typescript@5.4.3) + version: 5.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.23.4)(@swc/core@1.5.5)(esbuild@0.14.54)(eslint@8.44.0)(react@18.2.0)(sass@1.71.1)(typescript@5.4.3) react-toastify: specifier: ^9.1.3 version: 9.1.3(react-dom@18.2.0)(react@18.2.0) @@ -284,7 +284,7 @@ devDependencies: version: 7.23.3(@babel/core@7.22.5) '@craco/craco': specifier: ^7.1.0 - version: 7.1.0(@swc/core@1.4.17)(@types/node@17.0.45)(postcss@8.4.32)(react-scripts@5.0.1)(typescript@5.4.3) + version: 7.1.0(@swc/core@1.5.5)(@types/node@17.0.45)(postcss@8.4.32)(react-scripts@5.0.1)(typescript@5.4.3) '@react-theming/storybook-addon': specifier: ^1.1.10 version: 1.1.10(@storybook/addons@7.6.7)(@storybook/react@7.6.7)(@storybook/theming@7.6.7)(react-dom@18.2.0)(react@18.2.0) @@ -314,7 +314,7 @@ devDependencies: version: 7.6.7(react-dom@18.2.0)(react@18.2.0)(typescript@5.4.3) '@storybook/react-webpack5': specifier: ^7.6.7 - version: 7.6.7(@babel/core@7.22.5)(@swc/core@1.4.17)(esbuild@0.14.54)(react-dom@18.2.0)(react@18.2.0)(typescript@5.4.3) + version: 7.6.7(@babel/core@7.22.5)(@swc/core@1.5.5)(esbuild@0.14.54)(react-dom@18.2.0)(react@18.2.0)(typescript@5.4.3) '@storybook/testing-library': specifier: ^0.2.2 version: 0.2.2 @@ -461,7 +461,7 @@ devDependencies: version: 5.4.3 webpack: specifier: ^5.91.0 - version: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + version: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) packages: @@ -1036,7 +1036,6 @@ packages: /@babel/plugin-proposal-logical-assignment-operators@7.20.7(@babel/core@7.22.5): resolution: {integrity: sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==} engines: {node: '>=6.9.0'} - deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-logical-assignment-operators instead. peerDependencies: '@babel/core': ^7.0.0-0 dependencies: @@ -3261,7 +3260,7 @@ packages: dev: true optional: true - /@craco/craco@7.1.0(@swc/core@1.4.17)(@types/node@17.0.45)(postcss@8.4.32)(react-scripts@5.0.1)(typescript@5.4.3): + /@craco/craco@7.1.0(@swc/core@1.5.5)(@types/node@17.0.45)(postcss@8.4.32)(react-scripts@5.0.1)(typescript@5.4.3): resolution: {integrity: sha512-oRAcPIKYrfPXp9rSzlsDNeOaVtDiKhoyqSXUoqiK24jCkHr4T8m/a2f74yXIzCbIheoUWDOIfWZyRgFgT+cpqA==} engines: {node: '>=6'} hasBin: true @@ -3270,11 +3269,11 @@ packages: dependencies: autoprefixer: 10.4.16(postcss@8.4.32) cosmiconfig: 7.1.0 - cosmiconfig-typescript-loader: 1.0.9(@swc/core@1.4.17)(@types/node@17.0.45)(cosmiconfig@7.1.0)(typescript@5.4.3) + cosmiconfig-typescript-loader: 1.0.9(@swc/core@1.5.5)(@types/node@17.0.45)(cosmiconfig@7.1.0)(typescript@5.4.3) cross-spawn: 7.0.3 lodash: 4.17.21 - react-scripts: 5.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.23.4)(@swc/core@1.4.17)(esbuild@0.14.54)(eslint@8.44.0)(react@18.2.0)(sass@1.71.1)(typescript@5.4.3) - semver: 7.6.0 + react-scripts: 5.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.23.4)(@swc/core@1.5.5)(esbuild@0.14.54)(eslint@8.44.0)(react@18.2.0)(sass@1.71.1)(typescript@5.4.3) + semver: 7.6.2 webpack-merge: 5.10.0 transitivePeerDependencies: - '@swc/core' @@ -4169,8 +4168,8 @@ packages: dependencies: '@floating-ui/utils': 0.2.2 - /@floating-ui/dom@1.6.4: - resolution: {integrity: sha512-0G8R+zOvQsAG1pg2Q99P21jiqxqGBW1iRe/iXHsBRBxnpXKFI8QwbB4x5KmYLggNO5m34IQgOIu9SCRfR/WWiQ==} + /@floating-ui/dom@1.6.5: + resolution: {integrity: sha512-Nsdud2X65Dz+1RHjAIP0t8z5e2ff/IRbei6BqFrl1urT8sDVzM1HMQ+R0XcU5ceRfyO3I6ayeqIfh+6Wb8LGTw==} dependencies: '@floating-ui/core': 1.6.1 '@floating-ui/utils': 0.2.2 @@ -4181,7 +4180,7 @@ packages: react: '>=16.8.0' react-dom: '>=16.8.0' dependencies: - '@floating-ui/dom': 1.6.4 + '@floating-ui/dom': 1.6.5 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -4191,7 +4190,7 @@ packages: react: '>=16.8.0' react-dom: '>=16.8.0' dependencies: - '@floating-ui/dom': 1.6.4 + '@floating-ui/dom': 1.6.5 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) dev: false @@ -4833,8 +4832,8 @@ packages: react-dom: 18.3.1(react@18.3.1) dev: false - /@mui/core-downloads-tracker@5.15.16: - resolution: {integrity: sha512-PTIbMJs5C/vYMfyJNW8ArOezh4eyHkg2pTeA7bBxh2kLP1Uzs0Nm+krXWbWGJPwTWjM8EhnDrr4aCF26+2oleg==} + /@mui/core-downloads-tracker@5.15.17: + resolution: {integrity: sha512-DVAejDQkjNnIac7MfP8sLzuo7fyrBPxNdXe+6bYqOqg1z2OPTlfFAejSNzWe7UenRMuFu9/AyFXj/X2vN2w6dA==} dev: false /@mui/icons-material@5.15.2(@mui/material@5.15.2)(@types/react@18.2.45)(react@18.2.0): @@ -4875,7 +4874,7 @@ packages: '@emotion/react': 11.11.1(@types/react@18.2.45)(react@18.2.0) '@emotion/styled': 11.11.0(@emotion/react@11.11.1)(@types/react@18.2.45)(react@18.2.0) '@mui/base': 5.0.0-beta.29(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) - '@mui/core-downloads-tracker': 5.15.16 + '@mui/core-downloads-tracker': 5.15.17 '@mui/system': 5.15.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.45)(react@18.2.0) '@mui/types': 7.2.14(@types/react@18.2.45) '@mui/utils': 5.15.2(@types/react@18.2.45)(react@18.2.0) @@ -4911,7 +4910,7 @@ packages: '@emotion/react': 11.11.4(@types/react@18.2.45)(react@18.3.1) '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.45)(react@18.3.1) '@mui/base': 5.0.0-beta.29(@types/react@18.2.45)(react-dom@18.3.1)(react@18.3.1) - '@mui/core-downloads-tracker': 5.15.16 + '@mui/core-downloads-tracker': 5.15.17 '@mui/system': 5.15.15(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.45)(react@18.3.1) '@mui/types': 7.2.14(@types/react@18.2.45) '@mui/utils': 5.15.2(@types/react@18.2.45)(react@18.3.1) @@ -5186,8 +5185,8 @@ packages: resolution: {integrity: sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==} dev: true - /@opensystemslab/map@0.8.1: - resolution: {integrity: sha512-AMEkKN7uEzGN20gGmNbV+mpZDa7F8XY74Ttj7LgGwEAJ3ZeGRwx1d4ffjObjf4QY/bXTdOOCab1c4viaxfbozw==} + /@opensystemslab/map@0.8.2: + resolution: {integrity: sha512-bNWGX4AlJCTVvMymubrEmkBcZIdB5nXLw4ALJlEtZvAnsSJVYlhjG6OiN4GXqRuZTBDpI/l4gu/6giaidEjdwQ==} dependencies: '@turf/union': 6.5.0 accessible-autocomplete: 2.0.4 @@ -5195,9 +5194,9 @@ packages: govuk-frontend: 5.3.1 jspdf: 2.5.1 lit: 3.1.3 - ol: 7.5.2 - ol-ext: 4.0.18(ol@7.5.2) - ol-mapbox-style: 12.3.2(ol@7.5.2) + ol: 9.1.0 + ol-ext: 4.0.18(ol@9.1.0) + ol-mapbox-style: 12.3.2(ol@9.1.0) postcode: 5.1.0 proj4: 2.11.0 rambda: 8.6.0 @@ -5247,7 +5246,7 @@ packages: react-refresh: 0.11.0 schema-utils: 3.3.0 source-map: 0.7.4 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) webpack-dev-server: 4.15.2(webpack@5.91.0) /@pmmmwh/react-refresh-webpack-plugin@0.5.13(react-refresh@0.14.0)(webpack@5.91.0): @@ -5284,7 +5283,7 @@ packages: react-refresh: 0.14.0 schema-utils: 3.3.0 source-map: 0.7.4 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) dev: true /@popperjs/core@2.11.8: @@ -6025,7 +6024,7 @@ packages: resolution: {integrity: sha512-poT2oXIYDwLnhqn6g9ACTQ+7gi8QDHVlib4TQANdcozC/qYg+Bs6Pd99wT6rT4lrC/npVNTSKKwLw+3oXqlCxg==} dependencies: '@storybook/addon-highlight': 7.6.7 - axe-core: 4.9.0 + axe-core: 4.9.1 dev: true /@storybook/addon-actions@7.6.7: @@ -6158,7 +6157,7 @@ packages: react: optional: true dependencies: - '@storybook/csf': 0.1.6 + '@storybook/csf': 0.1.7 '@storybook/global': 5.0.0 react: 18.2.0 ts-dedent: 2.2.0 @@ -6209,14 +6208,14 @@ packages: '@storybook/client-logger': 7.6.7 '@storybook/components': 7.6.7(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@storybook/core-events': 7.6.7 - '@storybook/csf': 0.1.6 + '@storybook/csf': 0.1.7 '@storybook/docs-tools': 7.6.7 '@storybook/global': 5.0.0 '@storybook/manager-api': 7.6.7(react-dom@18.2.0)(react@18.2.0) '@storybook/preview-api': 7.6.7 '@storybook/theming': 7.6.7(react-dom@18.2.0)(react@18.2.0) '@storybook/types': 7.6.7 - '@types/lodash': 4.17.0 + '@types/lodash': 4.14.202 color-convert: 2.0.1 dequal: 2.0.3 lodash: 4.17.21 @@ -6227,7 +6226,7 @@ packages: react-colorful: 5.6.1(react-dom@18.2.0)(react@18.2.0) react-dom: 18.2.0(react@18.2.0) telejson: 7.2.0 - tocbot: 4.27.18 + tocbot: 4.27.20 ts-dedent: 2.2.0 util-deprecate: 1.0.2 transitivePeerDependencies: @@ -6278,8 +6277,8 @@ packages: '@storybook/node-logger': 7.6.7 '@storybook/preview': 7.6.7 '@storybook/preview-api': 7.6.7 - '@swc/core': 1.4.17 - '@types/node': 18.19.31 + '@swc/core': 1.5.5 + '@types/node': 18.19.33 '@types/semver': 7.5.8 babel-loader: 9.1.3(@babel/core@7.24.5)(webpack@5.91.0) browser-assert: 1.2.1 @@ -6294,16 +6293,16 @@ packages: magic-string: 0.30.10 path-browserify: 1.0.1 process: 0.11.10 - semver: 7.6.0 + semver: 7.6.2 style-loader: 3.3.4(webpack@5.91.0) - swc-loader: 0.2.6(@swc/core@1.4.17)(webpack@5.91.0) - terser-webpack-plugin: 5.3.10(@swc/core@1.4.17)(esbuild@0.14.54)(webpack@5.91.0) + swc-loader: 0.2.6(@swc/core@1.5.5)(webpack@5.91.0) + terser-webpack-plugin: 5.3.10(@swc/core@1.5.5)(esbuild@0.14.54)(webpack@5.91.0) ts-dedent: 2.2.0 typescript: 5.4.3 url: 0.11.3 util: 0.12.5 util-deprecate: 1.0.2 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) webpack-dev-middleware: 6.1.3(webpack@5.91.0) webpack-hot-middleware: 2.26.1 webpack-virtual-modules: 0.5.0 @@ -6367,7 +6366,7 @@ packages: prompts: 2.4.2 puppeteer-core: 2.1.1 read-pkg-up: 7.0.1 - semver: 7.6.0 + semver: 7.6.2 simple-update-notifier: 2.0.0 strip-json-comments: 3.1.1 tempy: 1.0.1 @@ -6399,7 +6398,7 @@ packages: '@babel/core': 7.24.5 '@babel/preset-env': 7.24.5(@babel/core@7.24.5) '@babel/types': 7.24.5 - '@storybook/csf': 0.1.6 + '@storybook/csf': 0.1.7 '@storybook/csf-tools': 7.6.7 '@storybook/node-logger': 7.6.7 '@storybook/types': 7.6.7 @@ -6423,7 +6422,7 @@ packages: '@radix-ui/react-select': 1.2.2(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-toolbar': 1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@storybook/client-logger': 7.6.7 - '@storybook/csf': 0.1.6 + '@storybook/csf': 0.1.7 '@storybook/global': 5.0.0 '@storybook/theming': 7.6.7(react-dom@18.2.0)(react@18.2.0) '@storybook/types': 7.6.7 @@ -6451,7 +6450,7 @@ packages: '@storybook/node-logger': 7.6.7 '@storybook/types': 7.6.7 '@types/find-cache-dir': 3.2.1 - '@types/node': 18.19.31 + '@types/node': 18.19.33 '@types/node-fetch': 2.6.11 '@types/pretty-hrtime': 1.0.3 chalk: 4.1.2 @@ -6461,7 +6460,7 @@ packages: find-cache-dir: 3.3.2 find-up: 5.0.0 fs-extra: 11.2.0 - glob: 10.3.12 + glob: 10.3.14 handlebars: 4.7.8 lazy-universal-dotenv: 4.0.0 node-fetch: 2.7.0 @@ -6496,7 +6495,7 @@ packages: '@storybook/channels': 7.6.7 '@storybook/core-common': 7.6.7 '@storybook/core-events': 7.6.7 - '@storybook/csf': 0.1.6 + '@storybook/csf': 0.1.7 '@storybook/csf-tools': 7.6.7 '@storybook/docs-mdx': 0.1.0 '@storybook/global': 5.0.0 @@ -6506,14 +6505,14 @@ packages: '@storybook/telemetry': 7.6.7 '@storybook/types': 7.6.7 '@types/detect-port': 1.3.5 - '@types/node': 18.19.31 + '@types/node': 18.19.33 '@types/pretty-hrtime': 1.0.3 '@types/semver': 7.5.8 better-opn: 3.0.2 chalk: 4.1.2 cli-table3: 0.6.4 compression: 1.7.4 - detect-port: 1.5.1 + detect-port: 1.6.1 express: 4.19.2 fs-extra: 11.2.0 globby: 11.1.0 @@ -6523,7 +6522,7 @@ packages: pretty-hrtime: 1.0.3 prompts: 2.4.2 read-pkg-up: 7.0.1 - semver: 7.6.0 + semver: 7.6.2 telejson: 7.2.0 tiny-invariant: 1.3.3 ts-dedent: 2.2.0 @@ -6544,7 +6543,7 @@ packages: '@storybook/core-common': 7.6.7 '@storybook/node-logger': 7.6.7 '@storybook/types': 7.6.7 - '@types/node': 18.19.31 + '@types/node': 18.19.33 ts-dedent: 2.2.0 transitivePeerDependencies: - encoding @@ -6567,7 +6566,7 @@ packages: '@babel/parser': 7.24.5 '@babel/traverse': 7.24.5 '@babel/types': 7.24.5 - '@storybook/csf': 0.1.6 + '@storybook/csf': 0.1.7 '@storybook/types': 7.6.7 fs-extra: 11.2.0 recast: 0.23.6 @@ -6576,8 +6575,8 @@ packages: - supports-color dev: true - /@storybook/csf@0.1.6: - resolution: {integrity: sha512-JjWnBptVhBYJ14yq+cHs66BXjykRUWQ5TlD1RhPxMOtavynYyV/Q+QR98/N+XB+mcPtFMm5I2DvNkpj0/Dk8Mw==} + /@storybook/csf@0.1.7: + resolution: {integrity: sha512-53JeLZBibjQxi0Ep+/AJTfxlofJlxy1jXcSKENlnKxHjWEYyHQCumMP5yTFjf7vhNnMjEpV3zx6t23ssFiGRyw==} dependencies: type-fest: 2.19.0 dev: true @@ -6611,7 +6610,7 @@ packages: '@storybook/channels': 7.6.7 '@storybook/client-logger': 7.6.7 '@storybook/core-events': 7.6.7 - '@storybook/csf': 0.1.6 + '@storybook/csf': 0.1.7 '@storybook/global': 5.0.0 '@storybook/router': 7.6.7 '@storybook/theming': 7.6.7(react-dom@18.2.0)(react@18.2.0) @@ -6656,8 +6655,8 @@ packages: '@types/babel__core': 7.20.5 '@types/semver': 7.5.8 pnp-webpack-plugin: 1.7.0(typescript@5.4.3) - react-scripts: 5.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.23.4)(@swc/core@1.4.17)(esbuild@0.14.54)(eslint@8.44.0)(react@18.2.0)(sass@1.71.1)(typescript@5.4.3) - semver: 7.6.0 + react-scripts: 5.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.23.4)(@swc/core@1.5.5)(esbuild@0.14.54)(eslint@8.44.0)(react@18.2.0)(sass@1.71.1)(typescript@5.4.3) + semver: 7.6.2 transitivePeerDependencies: - '@types/webpack' - react-refresh @@ -6671,7 +6670,7 @@ packages: - webpack-plugin-serve dev: true - /@storybook/preset-react-webpack@7.6.7(@babel/core@7.22.5)(@swc/core@1.4.17)(esbuild@0.14.54)(react-dom@18.2.0)(react@18.2.0)(typescript@5.4.3): + /@storybook/preset-react-webpack@7.6.7(@babel/core@7.22.5)(@swc/core@1.5.5)(esbuild@0.14.54)(react-dom@18.2.0)(react@18.2.0)(typescript@5.4.3): resolution: {integrity: sha512-olKTivJmbyuiPIa99/4Gx3zxbBplyXgbNso9ZAXHnSf7rBD0irV5oRqk+gFlEFJDHkK9vnpWMenly7vzX8QCXQ==} engines: {node: '>=16.0.0'} peerDependencies: @@ -6694,7 +6693,7 @@ packages: '@storybook/node-logger': 7.6.7 '@storybook/react': 7.6.7(react-dom@18.2.0)(react@18.2.0)(typescript@5.4.3) '@storybook/react-docgen-typescript-plugin': 1.0.6--canary.9.0c3f3b7.0(typescript@5.4.3)(webpack@5.91.0) - '@types/node': 18.19.31 + '@types/node': 18.19.33 '@types/semver': 7.5.8 babel-plugin-add-react-displayname: 0.0.5 fs-extra: 11.2.0 @@ -6703,9 +6702,9 @@ packages: react-docgen: 7.0.3 react-dom: 18.2.0(react@18.2.0) react-refresh: 0.14.0 - semver: 7.6.0 + semver: 7.6.2 typescript: 5.4.3 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) transitivePeerDependencies: - '@swc/core' - '@types/webpack' @@ -6727,7 +6726,7 @@ packages: '@storybook/channels': 7.6.7 '@storybook/client-logger': 7.6.7 '@storybook/core-events': 7.6.7 - '@storybook/csf': 0.1.6 + '@storybook/csf': 0.1.7 '@storybook/global': 5.0.0 '@storybook/types': 7.6.7 '@types/qs': 6.9.15 @@ -6758,7 +6757,7 @@ packages: react-docgen-typescript: 2.2.2(typescript@5.4.3) tslib: 2.6.2 typescript: 5.4.3 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) transitivePeerDependencies: - supports-color dev: true @@ -6773,7 +6772,7 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: true - /@storybook/react-webpack5@7.6.7(@babel/core@7.22.5)(@swc/core@1.4.17)(esbuild@0.14.54)(react-dom@18.2.0)(react@18.2.0)(typescript@5.4.3): + /@storybook/react-webpack5@7.6.7(@babel/core@7.22.5)(@swc/core@1.5.5)(esbuild@0.14.54)(react-dom@18.2.0)(react@18.2.0)(typescript@5.4.3): resolution: {integrity: sha512-/HK+v8vmeApN4WI5RyaDdhPhjFuEQfMQmvZLl+ewpamhJNMRr4nvrdvxOSfBw46zFubKgieuxEcW+VxHwvZ1og==} engines: {node: '>=16.0.0'} peerDependencies: @@ -6789,9 +6788,9 @@ packages: dependencies: '@babel/core': 7.22.5 '@storybook/builder-webpack5': 7.6.7(esbuild@0.14.54)(typescript@5.4.3) - '@storybook/preset-react-webpack': 7.6.7(@babel/core@7.22.5)(@swc/core@1.4.17)(esbuild@0.14.54)(react-dom@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@storybook/preset-react-webpack': 7.6.7(@babel/core@7.22.5)(@swc/core@1.5.5)(esbuild@0.14.54)(react-dom@18.2.0)(react@18.2.0)(typescript@5.4.3) '@storybook/react': 7.6.7(react-dom@18.2.0)(react@18.2.0)(typescript@5.4.3) - '@types/node': 18.19.31 + '@types/node': 18.19.33 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) typescript: 5.4.3 @@ -6832,7 +6831,7 @@ packages: '@storybook/types': 7.6.7 '@types/escodegen': 0.0.6 '@types/estree': 0.0.51 - '@types/node': 18.19.31 + '@types/node': 18.19.33 acorn: 7.4.1 acorn-jsx: 5.3.2(acorn@7.4.1) acorn-walk: 7.2.0 @@ -7024,88 +7023,88 @@ packages: transitivePeerDependencies: - supports-color - /@swc/core-darwin-arm64@1.4.17: - resolution: {integrity: sha512-HVl+W4LezoqHBAYg2JCqR+s9ife9yPfgWSj37iIawLWzOmuuJ7jVdIB7Ee2B75bEisSEKyxRlTl6Y1Oq3owBgw==} + /@swc/core-darwin-arm64@1.5.5: + resolution: {integrity: sha512-Ol5ZwZYdTOZsv2NwjcT/qVVALKzVFeh+IJ4GNarr3P99+38Dkwi81OqCI1o/WaDXQYKAQC/V+CzMbkEuJJfq9Q==} engines: {node: '>=10'} cpu: [arm64] os: [darwin] requiresBuild: true optional: true - /@swc/core-darwin-x64@1.4.17: - resolution: {integrity: sha512-WYRO9Fdzq4S/he8zjW5I95G1zcvyd9yyD3Tgi4/ic84P5XDlSMpBDpBLbr/dCPjmSg7aUXxNQqKqGkl6dQxYlA==} + /@swc/core-darwin-x64@1.5.5: + resolution: {integrity: sha512-XHWpKBIPKYLgh5/lV2PYjO84lkzf5JR51kjiloyz2Pa9HIV8tHoAP8bYdJwm4nUp2I7KcEh3pPH0AVu5LpxMKw==} engines: {node: '>=10'} cpu: [x64] os: [darwin] requiresBuild: true optional: true - /@swc/core-linux-arm-gnueabihf@1.4.17: - resolution: {integrity: sha512-cgbvpWOvtMH0XFjvwppUCR+Y+nf6QPaGu6AQ5hqCP+5Lv2zO5PG0RfasC4zBIjF53xgwEaaWmGP5/361P30X8Q==} + /@swc/core-linux-arm-gnueabihf@1.5.5: + resolution: {integrity: sha512-vtoWNCWAe+CNSqtqIwFnIH48qgPPlUZKoQ4EVFeMM+7/kDi6SeNxoh5TierJs5bKAWxD49VkPvRoWFCk6V62mA==} engines: {node: '>=10'} cpu: [arm] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-gnu@1.4.17: - resolution: {integrity: sha512-l7zHgaIY24cF9dyQ/FOWbmZDsEj2a9gRFbmgx2u19e3FzOPuOnaopFj0fRYXXKCmtdx+anD750iBIYnTR+pq/Q==} + /@swc/core-linux-arm64-gnu@1.5.5: + resolution: {integrity: sha512-L4l7M78U6h/rCAxId+y5Vu+1KfDRF6dJZtitFcaT293guiUQFwJv8gLxI4Jh5wFtZ0fYd0QaCuvh2Ip79CzGMg==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-musl@1.4.17: - resolution: {integrity: sha512-qhH4gr9gAlVk8MBtzXbzTP3BJyqbAfUOATGkyUtohh85fPXQYuzVlbExix3FZXTwFHNidGHY8C+ocscI7uDaYw==} + /@swc/core-linux-arm64-musl@1.5.5: + resolution: {integrity: sha512-DkzJc13ukXa7oJpyn24BjIgsiOybYrc+IxjsQyfNlDrrs1QXP4elStcpkD02SsIuSyHjZV8Hw2HFBMQB3OHPrA==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-gnu@1.4.17: - resolution: {integrity: sha512-vRDFATL1oN5oZMImkwbgSHEkp8xG1ofEASBypze01W1Tqto8t+yo6gsp69wzCZBlxldsvPpvFZW55Jq0Rn+UnA==} + /@swc/core-linux-x64-gnu@1.5.5: + resolution: {integrity: sha512-kj4ZwWJGeBEUzHrRQP2VudN+kkkYH7OI1dPVDc6kWQx5X4329JeKOas4qY0l7gDVjBbRwN9IbbPI6TIn2KfAug==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-musl@1.4.17: - resolution: {integrity: sha512-zQNPXAXn3nmPqv54JVEN8k2JMEcMTQ6veVuU0p5O+A7KscJq+AGle/7ZQXzpXSfUCXlLMX4wvd+rwfGhh3J4cw==} + /@swc/core-linux-x64-musl@1.5.5: + resolution: {integrity: sha512-6pTorCs4mYhPhYtC4jNOnhGgjNd3DZcRoZ9P0tzXXP69aCbYjvlgNH/NRvAROp9AaVFeZ7a7PmCWb6+Rbe7NKg==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-win32-arm64-msvc@1.4.17: - resolution: {integrity: sha512-z86n7EhOwyzxwm+DLE5NoLkxCTme2lq7QZlDjbQyfCxOt6isWz8rkW5QowTX8w9Rdmk34ncrjSLvnHOeLY17+w==} + /@swc/core-win32-arm64-msvc@1.5.5: + resolution: {integrity: sha512-o0/9pstmEjwZyrY/bA+mymF0zH7E+GT/XCVqdKeWW9Wn3gTTyWa5MZnrFgI2THQ+AXwdglMB/Zo76ARQPaz/+A==} engines: {node: '>=10'} cpu: [arm64] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-ia32-msvc@1.4.17: - resolution: {integrity: sha512-JBwuSTJIgiJJX6wtr4wmXbfvOswHFj223AumUrK544QV69k60FJ9q2adPW9Csk+a8wm1hLxq4HKa2K334UHJ/g==} + /@swc/core-win32-ia32-msvc@1.5.5: + resolution: {integrity: sha512-B+nypUwsmCuaH6RtKWgiPCb+ENjxstJPPJeMJvBqlJqyCaIkZzN4M07Ozi3xVv1VG21SRkd6G3xIqRoalrNc0Q==} engines: {node: '>=10'} cpu: [ia32] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-x64-msvc@1.4.17: - resolution: {integrity: sha512-jFkOnGQamtVDBm3MF5Kq1lgW8vx4Rm1UvJWRUfg+0gx7Uc3Jp3QMFeMNw/rDNQYRDYPG3yunCC+2463ycd5+dg==} + /@swc/core-win32-x64-msvc@1.5.5: + resolution: {integrity: sha512-ry83ki9ZX0Q+GWGnqc2J618Z+FvKE8Ajn42F8EYi8Wj0q6Jz3mj+pJzgzakk2INm2ldEZ+FaRPipn4ozsZDcBg==} engines: {node: '>=10'} cpu: [x64] os: [win32] requiresBuild: true optional: true - /@swc/core@1.4.17: - resolution: {integrity: sha512-tq+mdWvodMBNBBZbwFIMTVGYHe9N7zvEaycVVjfvAx20k1XozHbHhRv+9pEVFJjwRxLdXmtvFZd3QZHRAOpoNQ==} + /@swc/core@1.5.5: + resolution: {integrity: sha512-M8O22EEgdSONLd+7KRrXj8pn+RdAZZ7ISnPjE9KCQQlI0kkFNEquWR+uFdlFxQfwlyCe/Zb6uGXGDvtcov4IMg==} engines: {node: '>=10'} requiresBuild: true peerDependencies: @@ -7117,16 +7116,16 @@ packages: '@swc/counter': 0.1.3 '@swc/types': 0.1.6 optionalDependencies: - '@swc/core-darwin-arm64': 1.4.17 - '@swc/core-darwin-x64': 1.4.17 - '@swc/core-linux-arm-gnueabihf': 1.4.17 - '@swc/core-linux-arm64-gnu': 1.4.17 - '@swc/core-linux-arm64-musl': 1.4.17 - '@swc/core-linux-x64-gnu': 1.4.17 - '@swc/core-linux-x64-musl': 1.4.17 - '@swc/core-win32-arm64-msvc': 1.4.17 - '@swc/core-win32-ia32-msvc': 1.4.17 - '@swc/core-win32-x64-msvc': 1.4.17 + '@swc/core-darwin-arm64': 1.5.5 + '@swc/core-darwin-x64': 1.5.5 + '@swc/core-linux-arm-gnueabihf': 1.5.5 + '@swc/core-linux-arm64-gnu': 1.5.5 + '@swc/core-linux-arm64-musl': 1.5.5 + '@swc/core-linux-x64-gnu': 1.5.5 + '@swc/core-linux-x64-musl': 1.5.5 + '@swc/core-win32-arm64-msvc': 1.5.5 + '@swc/core-win32-ia32-msvc': 1.5.5 + '@swc/core-win32-x64-msvc': 1.5.5 /@swc/counter@0.1.3: resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==} @@ -7254,8 +7253,8 @@ packages: '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) dev: false - /@tiptap/extension-floating-menu@2.3.1(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3): - resolution: {integrity: sha512-3+dONthHRMFzJjLF9JtRbm9u4XJs8txCoChsZjwD0wBf8XfPtUGZQn9W5xNJG+5pozrOQhj9KC1UZL4tuvSRkg==} + /@tiptap/extension-floating-menu@2.3.2(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3): + resolution: {integrity: sha512-7MerFtr+7y0lThKEcNeM0B5LMWqP3RqmMZYJEOCIL20mIINYz5JzSIMQQujmeU5tcqI12O1u7jbRoxRmZrsXxw==} peerDependencies: '@tiptap/core': ^2.0.0 '@tiptap/pm': ^2.0.0 @@ -7399,13 +7398,13 @@ packages: prosemirror-keymap: 1.2.2 prosemirror-markdown: 1.12.0 prosemirror-menu: 1.2.4 - prosemirror-model: 1.20.0 + prosemirror-model: 1.21.0 prosemirror-schema-basic: 1.2.2 prosemirror-schema-list: 1.3.0 prosemirror-state: 1.4.3 prosemirror-tables: 1.3.7 - prosemirror-trailing-node: 2.0.8(prosemirror-model@1.20.0)(prosemirror-state@1.4.3)(prosemirror-view@1.33.6) - prosemirror-transform: 1.8.0 + prosemirror-trailing-node: 2.0.8(prosemirror-model@1.21.0)(prosemirror-state@1.4.3)(prosemirror-view@1.33.6) + prosemirror-transform: 1.9.0 prosemirror-view: 1.33.6 dev: false @@ -7419,7 +7418,7 @@ packages: dependencies: '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) '@tiptap/extension-bubble-menu': 2.1.13(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3) - '@tiptap/extension-floating-menu': 2.3.1(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3) + '@tiptap/extension-floating-menu': 2.3.2(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3) '@tiptap/pm': 2.0.3(@tiptap/core@2.0.3) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -7753,8 +7752,9 @@ packages: /@types/lodash@4.14.202: resolution: {integrity: sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==} - /@types/lodash@4.17.0: - resolution: {integrity: sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==} + /@types/lodash@4.17.1: + resolution: {integrity: sha512-X+2qazGS3jxLAIz5JDXDzglAF3KpijdhFxlf/V1+hEsOUc+HnWi81L/uv/EvGuV90WY+7mPGFCUDGfQC3Gj95Q==} + dev: false /@types/mdast@3.0.15: resolution: {integrity: sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==} @@ -7792,14 +7792,14 @@ packages: /@types/node@17.0.45: resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==} - /@types/node@18.19.31: - resolution: {integrity: sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==} + /@types/node@18.19.33: + resolution: {integrity: sha512-NR9+KrpSajr2qBVp/Yt5TU/rp+b5Mayi3+OlMlcg2cVCfRmcG5PWZ7S4+MG9PZ5gWBoc9Pd0BKSRViuBCRPu0A==} dependencies: undici-types: 5.26.5 dev: true - /@types/node@20.12.8: - resolution: {integrity: sha512-NU0rJLJnshZWdE/097cdCBbyW1h4hEg0xpovcoAQYHl8dnEyp/NAOiE45pvc+Bd1Dt+2r94v2eGFpQJ4R7g+2w==} + /@types/node@20.12.11: + resolution: {integrity: sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==} dependencies: undici-types: 5.26.5 dev: false @@ -8019,7 +8019,7 @@ packages: grapheme-splitter: 1.0.4 ignore: 5.3.1 natural-compare-lite: 1.4.0 - semver: 7.6.0 + semver: 7.6.2 tsutils: 3.21.0(typescript@5.4.3) typescript: 5.4.3 transitivePeerDependencies: @@ -8111,7 +8111,7 @@ packages: debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 - semver: 7.6.0 + semver: 7.6.2 tsutils: 3.21.0(typescript@5.4.3) typescript: 5.4.3 transitivePeerDependencies: @@ -8131,7 +8131,7 @@ packages: debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 - semver: 7.6.0 + semver: 7.6.2 tsutils: 3.21.0(typescript@5.4.3) typescript: 5.4.3 transitivePeerDependencies: @@ -8151,7 +8151,7 @@ packages: '@typescript-eslint/typescript-estree': 5.58.0(typescript@5.4.3) eslint: 8.44.0 eslint-scope: 5.1.1 - semver: 7.6.0 + semver: 7.6.2 transitivePeerDependencies: - supports-color - typescript @@ -8170,7 +8170,7 @@ packages: '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.4.3) eslint: 8.44.0 eslint-scope: 5.1.1 - semver: 7.6.0 + semver: 7.6.2 transitivePeerDependencies: - supports-color - typescript @@ -8827,7 +8827,7 @@ packages: postcss: ^8.1.0 dependencies: browserslist: 4.23.0 - caniuse-lite: 1.0.30001615 + caniuse-lite: 1.0.30001617 fraction.js: 4.3.7 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -8850,8 +8850,8 @@ packages: engines: {node: '>=4'} dev: true - /axe-core@4.9.0: - resolution: {integrity: sha512-H5orY+M2Fr56DWmMFpMrq5Ge93qjNdPVqzBv5gWK3aD1OvjBEJlEzxf09z93dGVQeI0LiW+aCMIx1QtShC/zUw==} + /axe-core@4.9.1: + resolution: {integrity: sha512-QbUdXJVTpvUTHU7871ppZkdOLBeGUKBQWHkHrvN2V9IQWGMt61zf3B45BtzjxEJzYuj0JBjBZP/hmYS/R9pmAw==} engines: {node: '>=4'} /axios@1.6.8: @@ -8926,7 +8926,7 @@ packages: loader-utils: 2.0.4 make-dir: 3.1.0 schema-utils: 2.7.1 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) /babel-loader@9.1.3(@babel/core@7.24.5)(webpack@5.91.0): resolution: {integrity: sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==} @@ -8938,7 +8938,7 @@ packages: '@babel/core': 7.24.5 find-cache-dir: 4.0.0 schema-utils: 4.2.0 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) dev: true /babel-plugin-add-react-displayname@0.0.5: @@ -9220,7 +9220,7 @@ packages: dev: true /batch@0.6.1: - resolution: {integrity: sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==} + resolution: {integrity: sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=} /better-opn@3.0.2: resolution: {integrity: sha512-aVNobHnJqLiUelTaHat9DZ1qM2w0C0Eym4LPI/3JxOnSokGVdsl1T1kN7TFvsEAD8G47A6VKQ0TVHqbBnYMJlQ==} @@ -9358,10 +9358,10 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001615 - electron-to-chromium: 1.4.754 + caniuse-lite: 1.0.30001617 + electron-to-chromium: 1.4.762 node-releases: 2.0.14 - update-browserslist-db: 1.0.14(browserslist@4.23.0) + update-browserslist-db: 1.0.15(browserslist@4.23.0) /bser@2.1.1: resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==} @@ -9393,7 +9393,7 @@ packages: engines: {node: '>=6'} /bytes@3.0.0: - resolution: {integrity: sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==} + resolution: {integrity: sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=} engines: {node: '>= 0.8'} /bytes@3.1.2: @@ -9446,7 +9446,7 @@ packages: camelcase: 8.0.0 map-obj: 5.0.0 quick-lru: 6.1.2 - type-fest: 4.18.1 + type-fest: 4.18.2 dev: false /camelcase@5.3.1: @@ -9466,12 +9466,12 @@ packages: resolution: {integrity: sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==} dependencies: browserslist: 4.23.0 - caniuse-lite: 1.0.30001615 + caniuse-lite: 1.0.30001617 lodash.memoize: 4.1.2 lodash.uniq: 4.5.0 - /caniuse-lite@1.0.30001615: - resolution: {integrity: sha512-1IpazM5G3r38meiae0bHRnPhz+CBQ3ZLqbQMtrg+AsTPKAXgW38JNsXkyZ+v8waCsDmPq87lmfun5Q2AGysNEQ==} + /caniuse-lite@1.0.30001617: + resolution: {integrity: sha512-mLyjzNI9I+Pix8zwcrpxEbGlfqOkF9kM3ptzmKNw5tizSyYwMe+nGLTqMK9cO+0E+Bh6TsBxNAaHWEM8xwSsmA==} /canvg@3.0.10: resolution: {integrity: sha512-qwR2FRNO9NlzTeKIPIKpnTY6fqwuYSequ8Ru8c0YkYU7U0oW+hLUvWadLvAu1Rl72OMNiFhoLu4f8eUjQ7l/+Q==} @@ -9763,12 +9763,23 @@ packages: /color-name@1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} + /color-name@2.0.0: + resolution: {integrity: sha512-SbtvAMWvASO5TE2QP07jHBMXKafgdZz8Vrsrn96fiL+O92/FN/PLARzUW5sKt013fjAprK2d2iCn2hk2Xb5oow==} + engines: {node: '>=12.20'} + dev: false + /color-parse@1.4.3: resolution: {integrity: sha512-BADfVl/FHkQkyo8sRBwMYBqemqsgnu7JZAwUgvBvuwwuNUZAhSvLTbsEErS5bQXzOjDR0dWzJ4vXN2Q+QoPx0A==} dependencies: color-name: 1.1.4 dev: true + /color-parse@2.0.2: + resolution: {integrity: sha512-eCtOz5w5ttWIUcaKLiktF+DxZO1R9KLNY/xhbV6CkhM7sR3GhVghmt6X6yOnzeaM24po+Z9/S1apbXMwA3Iepw==} + dependencies: + color-name: 2.0.0 + dev: false + /color-rgba@2.4.0: resolution: {integrity: sha512-Nti4qbzr/z2LbUWySr7H9dk3Rl7gZt7ihHAxlgT4Ho90EXWkjtkL1avTleu9yeGuqrt/chxTB6GKK8nZZ6V0+Q==} dependencies: @@ -9776,9 +9787,15 @@ packages: color-space: 2.0.1 dev: true + /color-rgba@3.0.0: + resolution: {integrity: sha512-PPwZYkEY3M2THEHHV6Y95sGUie77S7X8v+h1r6LSAPF3/LL2xJ8duUXSrkic31Nzc4odPwHgUbiX/XuTYzQHQg==} + dependencies: + color-parse: 2.0.2 + color-space: 2.0.1 + dev: false + /color-space@2.0.1: resolution: {integrity: sha512-nKqUYlo0vZATVOFHY810BSYjmCARrG7e5R3UE3CQlyjJTvv5kSSmPG1kzm/oDyyqjehM+lW1RnEt9It9GNa5JA==} - dev: true /color-string@1.9.1: resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==} @@ -9938,7 +9955,7 @@ packages: dev: true /cookie-signature@1.0.6: - resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==} + resolution: {integrity: sha1-4wOogrNCzD7oylE6eZmXNNqzriw=} /cookie@0.6.0: resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==} @@ -9990,7 +10007,7 @@ packages: /core-util-is@1.0.3: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} - /cosmiconfig-typescript-loader@1.0.9(@swc/core@1.4.17)(@types/node@17.0.45)(cosmiconfig@7.1.0)(typescript@5.4.3): + /cosmiconfig-typescript-loader@1.0.9(@swc/core@1.5.5)(@types/node@17.0.45)(cosmiconfig@7.1.0)(typescript@5.4.3): resolution: {integrity: sha512-tRuMRhxN4m1Y8hP9SNYfz7jRwt8lZdWxdjg/ohg5esKmsndJIn4yT96oJVcf5x0eA11taXl+sIp+ielu529k6g==} engines: {node: '>=12', npm: '>=6'} peerDependencies: @@ -10000,7 +10017,7 @@ packages: dependencies: '@types/node': 17.0.45 cosmiconfig: 7.1.0 - ts-node: 10.9.2(@swc/core@1.4.17)(@types/node@17.0.45)(typescript@5.4.3) + ts-node: 10.9.2(@swc/core@1.5.5)(@types/node@17.0.45)(typescript@5.4.3) typescript: 5.4.3 transitivePeerDependencies: - '@swc/core' @@ -10033,10 +10050,10 @@ packages: '@craco/craco': ^6.0.0 || ^7.0.0 || ^7.0.0-alpha react-scripts: ^5.0.0 dependencies: - '@craco/craco': 7.1.0(@swc/core@1.4.17)(@types/node@17.0.45)(postcss@8.4.32)(react-scripts@5.0.1)(typescript@5.4.3) + '@craco/craco': 7.1.0(@swc/core@1.5.5)(@types/node@17.0.45)(postcss@8.4.32)(react-scripts@5.0.1)(typescript@5.4.3) esbuild-jest: 0.5.0(esbuild@0.14.54) esbuild-loader: 2.21.0(webpack@5.91.0) - react-scripts: 5.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.23.4)(@swc/core@1.4.17)(esbuild@0.14.54)(eslint@8.44.0)(react@18.2.0)(sass@1.71.1)(typescript@5.4.3) + react-scripts: 5.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.23.4)(@swc/core@1.5.5)(esbuild@0.14.54)(eslint@8.44.0)(react@18.2.0)(sass@1.71.1)(typescript@5.4.3) transitivePeerDependencies: - esbuild - supports-color @@ -10150,8 +10167,8 @@ packages: postcss-modules-scope: 3.2.0(postcss@8.4.38) postcss-modules-values: 4.0.0(postcss@8.4.38) postcss-value-parser: 4.2.0 - semver: 7.6.0 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + semver: 7.6.2 + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) /css-minimizer-webpack-plugin@3.4.1(esbuild@0.14.54)(webpack@5.91.0): resolution: {integrity: sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==} @@ -10179,7 +10196,7 @@ packages: schema-utils: 4.2.0 serialize-javascript: 6.0.2 source-map: 0.6.1 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) /css-prefers-color-scheme@6.0.3(postcss@8.4.32): resolution: {integrity: sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==} @@ -10628,8 +10645,9 @@ packages: transitivePeerDependencies: - supports-color - /detect-port@1.5.1: - resolution: {integrity: sha512-aBzdj76lueB6uUst5iAs7+0H/oOjqI5D16XUWxlWMIMROhcM0rfsNVk93zTngq1dDNpoXRr++Sus7ETAExppAQ==} + /detect-port@1.6.1: + resolution: {integrity: sha512-CmnVc+Hek2egPx1PeTFVta2W78xy2K/9Rkf6cC4T59S50tVnzKj+tnx5mmx5lwvCkujZ4uRrpRSuV+IVs3f90Q==} + engines: {node: '>= 4.0.0'} hasBin: true dependencies: address: 1.2.2 @@ -10699,7 +10717,7 @@ packages: resolution: {integrity: sha512-4SbcbedPXTciySXiSnNNLuJXpvxFe5nqivbiEHXyL8P/w0wx2uW7YXNjnYgjW0e2e6vy+L/tMISU/oAiXCl57Q==} engines: {node: '>=10'} dependencies: - '@types/node': 20.12.8 + '@types/node': 20.12.11 jszip: 3.10.1 nanoid: 5.0.7 xml: 1.0.1 @@ -10858,21 +10876,21 @@ packages: '@one-ini/wasm': 0.1.1 commander: 10.0.1 minimatch: 9.0.1 - semver: 7.6.0 + semver: 7.6.2 dev: true /ee-first@1.1.1: - resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} + resolution: {integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=} /ejs@3.1.10: resolution: {integrity: sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==} engines: {node: '>=0.10.0'} hasBin: true dependencies: - jake: 10.8.7 + jake: 10.9.1 - /electron-to-chromium@1.4.754: - resolution: {integrity: sha512-7Kr5jUdns5rL/M9wFFmMZAgFDuL2YOnanFH4OI4iFzUqyh3XOL7nAGbSlSMZdzKMIyyTpNSbqZsWG9odwLeKvA==} + /electron-to-chromium@1.4.762: + resolution: {integrity: sha512-rrFvGweLxPwwSwJOjIopy3Vr+J3cIPtZzuc74bmlvmBIgQO3VYJDvVrlj94iKZ3ukXUH64Ex31hSfRTLqvjYJQ==} /emittery@0.10.2: resolution: {integrity: sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==} @@ -10910,8 +10928,8 @@ packages: objectorarray: 1.0.5 dev: true - /enhanced-resolve@5.16.0: - resolution: {integrity: sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==} + /enhanced-resolve@5.16.1: + resolution: {integrity: sha512-4U5pNsuDl0EhuZpq46M5xPslstkviJuhrdobaRDBk2Jy2KO37FDAJl4lb2KlNabxT0m4MTK2UHNrsAcphE8nyw==} engines: {node: '>=10.13.0'} dependencies: graceful-fs: 4.2.11 @@ -11243,7 +11261,7 @@ packages: json5: 2.2.3 loader-utils: 2.0.4 tapable: 2.2.1 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) webpack-sources: 1.4.3 dev: true @@ -11604,7 +11622,7 @@ packages: array-includes: 3.1.8 array.prototype.flatmap: 1.3.2 ast-types-flow: 0.0.7 - axe-core: 4.9.0 + axe-core: 4.9.1 axobject-query: 3.2.1 damerau-levenshtein: 1.0.8 emoji-regex: 9.2.2 @@ -11706,7 +11724,7 @@ packages: micromatch: 4.0.5 normalize-path: 3.0.0 schema-utils: 4.2.0 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) /eslint@8.44.0: resolution: {integrity: sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A==} @@ -12182,7 +12200,7 @@ packages: dependencies: loader-utils: 2.0.4 schema-utils: 3.3.0 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) /file-saver@2.0.5: resolution: {integrity: sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==} @@ -12313,8 +12331,8 @@ packages: /flatted@3.3.1: resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==} - /flow-parser@0.235.1: - resolution: {integrity: sha512-s04193L4JE+ntEcQXbD6jxRRlyj9QXcgEl2W6xSjH4l9x4b0eHoCHfbYHjqf9LdZFUiM5LhgpiqsvLj/AyOyYQ==} + /flow-parser@0.236.0: + resolution: {integrity: sha512-0OEk9Gr+Yj7wjDW2KgaNYUypKau71jAfFyeLQF5iVtxqc6uJHag/MT7pmaEApf4qM7u86DkBcd4ualddYMfbLw==} engines: {node: '>=0.4.0'} dev: true @@ -12382,10 +12400,10 @@ packages: memfs: 3.5.3 minimatch: 3.1.2 schema-utils: 2.7.0 - semver: 7.6.0 + semver: 7.6.2 tapable: 1.1.3 typescript: 5.4.3 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) /fork-ts-checker-webpack-plugin@8.0.0(typescript@5.4.3)(webpack@5.91.0): resolution: {integrity: sha512-mX3qW3idpueT2klaQXBzrIM/pHw+T0B/V9KHEvNrqijTq9NFnMZU6oreVxDYcf33P8a5cW+67PjodNHthGnNVg==} @@ -12404,10 +12422,10 @@ packages: minimatch: 3.1.2 node-abort-controller: 3.1.1 schema-utils: 3.3.0 - semver: 7.6.0 + semver: 7.6.2 tapable: 2.2.1 typescript: 5.4.3 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) dev: true /form-data@2.5.1: @@ -12473,7 +12491,7 @@ packages: dev: true /fresh@0.5.2: - resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==} + resolution: {integrity: sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=} engines: {node: '>= 0.6'} /fs-constants@1.0.0: @@ -12666,16 +12684,16 @@ packages: /glob-to-regexp@0.4.1: resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} - /glob@10.3.12: - resolution: {integrity: sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==} + /glob@10.3.14: + resolution: {integrity: sha512-4fkAqu93xe9Mk7le9v0y3VrPDqLKHarNi2s4Pv7f2yOvfhWfhc7hRPHC/JyqMqb8B/Dt/eGS4n7ykwf3fOsl8g==} engines: {node: '>=16 || 14 >=14.17'} hasBin: true dependencies: foreground-child: 3.1.1 jackspeak: 2.3.6 minimatch: 9.0.4 - minipass: 7.0.4 - path-scurry: 1.10.2 + minipass: 7.1.1 + path-scurry: 1.11.0 /glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} @@ -12993,7 +13011,7 @@ packages: lodash: 4.17.21 pretty-error: 4.0.0 tapable: 2.2.1 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) /html2canvas@1.4.1: resolution: {integrity: sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==} @@ -13733,8 +13751,8 @@ packages: optionalDependencies: '@pkgjs/parseargs': 0.11.0 - /jake@10.8.7: - resolution: {integrity: sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==} + /jake@10.9.1: + resolution: {integrity: sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==} engines: {node: '>=10'} hasBin: true dependencies: @@ -14236,7 +14254,7 @@ packages: jest-util: 27.5.1 natural-compare: 1.4.0 pretty-format: 27.5.1 - semver: 7.6.0 + semver: 7.6.2 transitivePeerDependencies: - supports-color @@ -14407,9 +14425,9 @@ packages: dependencies: config-chain: 1.1.13 editorconfig: 1.0.4 - glob: 10.3.12 + glob: 10.3.14 js-cookie: 3.0.5 - nopt: 7.2.0 + nopt: 7.2.1 dev: true /js-cookie@2.2.1: @@ -14458,7 +14476,7 @@ packages: '@babel/register': 7.23.7(@babel/core@7.24.5) babel-core: 7.0.0-bridge.0(@babel/core@7.24.5) chalk: 4.1.2 - flow-parser: 0.235.1 + flow-parser: 0.236.0 graceful-fs: 4.2.11 micromatch: 4.0.5 neo-async: 2.6.2 @@ -14533,9 +14551,9 @@ packages: dependencies: '@apidevtools/json-schema-ref-parser': 11.6.1 '@types/json-schema': 7.0.15 - '@types/lodash': 4.17.0 + '@types/lodash': 4.17.1 cli-color: 2.0.4 - glob: 10.3.12 + glob: 10.3.14 is-glob: 4.0.3 js-yaml: 4.1.0 lodash: 4.17.21 @@ -14725,7 +14743,7 @@ packages: resolution: {integrity: sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==} /language-tags@1.0.5: - resolution: {integrity: sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==} + resolution: {integrity: sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=} dependencies: language-subtag-registry: 0.3.22 @@ -14966,12 +14984,6 @@ packages: dependencies: yallist: 3.1.1 - /lru-cache@6.0.0: - resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} - engines: {node: '>=10'} - dependencies: - yallist: 4.0.0 - /lru-queue@0.1.0: resolution: {integrity: sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==} dependencies: @@ -15012,7 +15024,7 @@ packages: resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==} engines: {node: '>=10'} dependencies: - semver: 7.6.0 + semver: 7.6.2 /make-error@1.3.6: resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} @@ -15161,7 +15173,7 @@ packages: dev: false /media-typer@0.3.0: - resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==} + resolution: {integrity: sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=} engines: {node: '>= 0.6'} /memfs@3.5.3: @@ -15194,7 +15206,7 @@ packages: dev: true /merge-descriptors@1.0.1: - resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==} + resolution: {integrity: sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=} /merge-stream@2.0.0: resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} @@ -15463,7 +15475,7 @@ packages: dependencies: schema-utils: 4.2.0 tapable: 2.2.1 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) /minimalistic-assert@1.0.1: resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==} @@ -15507,8 +15519,8 @@ packages: engines: {node: '>=8'} dev: true - /minipass@7.0.4: - resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==} + /minipass@7.1.1: + resolution: {integrity: sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==} engines: {node: '>=16 || 14 >=14.17'} /minizlib@2.1.2: @@ -15737,8 +15749,8 @@ packages: readable-stream: 1.0.34 dev: false - /nopt@7.2.0: - resolution: {integrity: sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==} + /nopt@7.2.1: + resolution: {integrity: sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} hasBin: true dependencies: @@ -15932,38 +15944,31 @@ packages: resolution: {integrity: sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw==} dev: true - /ol-ext@4.0.18(ol@7.5.2): + /ol-ext@4.0.18(ol@9.1.0): resolution: {integrity: sha512-zzeTAoCg9IocaM7LlXiLNnVCgVmfxxLzlDTWvYn3Y2gFxtICHSfRrIQl/8vumgBjftBksVl1Fds8P5uFReTmew==} peerDependencies: ol: '>= 5.3.0' dependencies: - ol: 7.5.2 + ol: 9.1.0 dev: false - /ol-mapbox-style@10.7.0: - resolution: {integrity: sha512-S/UdYBuOjrotcR95Iq9AejGYbifKeZE85D9VtH11ryJLQPTZXZSW1J5bIXcr4AlAH6tyjPPHTK34AdkwB32Myw==} - dependencies: - '@mapbox/mapbox-gl-style-spec': 13.28.0 - mapbox-to-css-font: 2.4.4 - ol: 7.5.2 - dev: false - - /ol-mapbox-style@12.3.2(ol@7.5.2): + /ol-mapbox-style@12.3.2(ol@9.1.0): resolution: {integrity: sha512-Qw9I6+WHz9zBsLNm8zWWb707Y/hXrQP1fcwK86pxcX/FklwyDxAhfJAdTkINHncZ331CBEWcqvi2tzoN23dgwg==} peerDependencies: ol: '*' dependencies: '@mapbox/mapbox-gl-style-spec': 13.28.0 mapbox-to-css-font: 2.4.4 - ol: 7.5.2 + ol: 9.1.0 dev: false - /ol@7.5.2: - resolution: {integrity: sha512-HJbb3CxXrksM6ct367LsP3N+uh+iBBMdP3DeGGipdV9YAYTP0vTJzqGnoqQ6C2IW4qf8krw9yuyQbc9fjOIaOQ==} + /ol@9.1.0: + resolution: {integrity: sha512-nDrkJ2tzZNpo/wzN/PpHV5zdxbnXZaFktoMaD2cFLEc6gCwlgLY21Yd8wnt/4FjaVYwLBnbN9USXSwIBGcyksQ==} dependencies: + color-rgba: 3.0.0 + color-space: 2.0.1 earcut: 2.2.4 geotiff: 2.1.3 - ol-mapbox-style: 10.7.0 pbf: 3.2.1 rbush: 3.0.1 dev: false @@ -16231,15 +16236,15 @@ packages: /path-parse@1.0.7: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} - /path-scurry@1.10.2: - resolution: {integrity: sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==} + /path-scurry@1.11.0: + resolution: {integrity: sha512-LNHTaVkzaYaLGlO+0u3rQTz7QrHTFOuKyba9JMTQutkmtNew8dw8wOD7mTU/5fCPZzCWpfW0XnQKzY61P0aTaw==} engines: {node: '>=16 || 14 >=14.17'} dependencies: lru-cache: 10.2.2 - minipass: 7.0.4 + minipass: 7.1.1 /path-to-regexp@0.1.7: - resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==} + resolution: {integrity: sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=} /path-type@4.0.0: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} @@ -16657,8 +16662,8 @@ packages: cosmiconfig: 7.1.0 klona: 2.0.6 postcss: 8.4.32 - semver: 7.6.0 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + semver: 7.6.2 + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) /postcss-logical@5.0.4(postcss@8.4.32): resolution: {integrity: sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==} @@ -17210,7 +17215,7 @@ packages: /prosemirror-changeset@2.2.1: resolution: {integrity: sha512-J7msc6wbxB4ekDFj+n9gTW/jav/p53kdlivvuppHsrZXCaQdVgRghoZbSS3kwrRyAstRVQ4/+u5k7YfLgkkQvQ==} dependencies: - prosemirror-transform: 1.8.0 + prosemirror-transform: 1.9.0 dev: false /prosemirror-collab@1.3.1: @@ -17222,16 +17227,16 @@ packages: /prosemirror-commands@1.5.2: resolution: {integrity: sha512-hgLcPaakxH8tu6YvVAaILV2tXYsW3rAdDR8WNkeKGcgeMVQg3/TMhPdVoh7iAmfgVjZGtcOSjKiQaoeKjzd2mQ==} dependencies: - prosemirror-model: 1.20.0 + prosemirror-model: 1.21.0 prosemirror-state: 1.4.3 - prosemirror-transform: 1.8.0 + prosemirror-transform: 1.9.0 dev: false /prosemirror-dropcursor@1.8.1: resolution: {integrity: sha512-M30WJdJZLyXHi3N8vxN6Zh5O8ZBbQCz0gURTfPmTIBNQ5pxrdU7A58QkNqfa98YEjSAL1HUyyU34f6Pm5xBSGw==} dependencies: prosemirror-state: 1.4.3 - prosemirror-transform: 1.8.0 + prosemirror-transform: 1.9.0 prosemirror-view: 1.33.6 dev: false @@ -17239,7 +17244,7 @@ packages: resolution: {integrity: sha512-wtjswVBd2vaQRrnYZaBCbyDqr232Ed4p2QPtRIUK5FuqHYKGWkEwl08oQM4Tw7DOR0FsasARV5uJFvMZWxdNxQ==} dependencies: prosemirror-keymap: 1.2.2 - prosemirror-model: 1.20.0 + prosemirror-model: 1.21.0 prosemirror-state: 1.4.3 prosemirror-view: 1.33.6 dev: false @@ -17248,7 +17253,7 @@ packages: resolution: {integrity: sha512-UUiGzDVcqo1lovOPdi9YxxUps3oBFWAIYkXLu3Ot+JPv1qzVogRbcizxK3LhHmtaUxclohgiOVesRw5QSlMnbQ==} dependencies: prosemirror-state: 1.4.3 - prosemirror-transform: 1.8.0 + prosemirror-transform: 1.9.0 prosemirror-view: 1.33.6 rope-sequence: 1.3.4 dev: false @@ -17257,7 +17262,7 @@ packages: resolution: {integrity: sha512-6ygpPRuTJ2lcOXs9JkefieMst63wVJBgHZGl5QOytN7oSZs3Co/BYbc3Yx9zm9H37Bxw8kVzCnDsihsVsL4yEg==} dependencies: prosemirror-state: 1.4.3 - prosemirror-transform: 1.8.0 + prosemirror-transform: 1.9.0 dev: false /prosemirror-keymap@1.2.2: @@ -17271,7 +17276,7 @@ packages: resolution: {integrity: sha512-6F5HS8Z0HDYiS2VQDZzfZP6A0s/I0gbkJy8NCzzDMtcsz3qrfqyroMMeoSjAmOhDITyon11NbXSzztfKi+frSQ==} dependencies: markdown-it: 14.1.0 - prosemirror-model: 1.20.0 + prosemirror-model: 1.21.0 dev: false /prosemirror-menu@1.2.4: @@ -17283,8 +17288,8 @@ packages: prosemirror-state: 1.4.3 dev: false - /prosemirror-model@1.20.0: - resolution: {integrity: sha512-q7AY7vMjKYqDCeoedgUiAgrLabliXxndJuuFmcmc2+YU1SblvnOiG2WEACF2lwAZsMlfLpiAilA3L+TWlDqIsQ==} + /prosemirror-model@1.21.0: + resolution: {integrity: sha512-zLpS1mVCZLA7VTp82P+BfMiYVPcX1/z0Mf3gsjKZtzMWubwn2pN7CceMV0DycjlgE5JeXPR7UF4hJPbBV98oWA==} dependencies: orderedmap: 2.1.1 dev: false @@ -17292,22 +17297,22 @@ packages: /prosemirror-schema-basic@1.2.2: resolution: {integrity: sha512-/dT4JFEGyO7QnNTe9UaKUhjDXbTNkiWTq/N4VpKaF79bBjSExVV2NXmJpcM7z/gD7mbqNjxbmWW5nf1iNSSGnw==} dependencies: - prosemirror-model: 1.20.0 + prosemirror-model: 1.21.0 dev: false /prosemirror-schema-list@1.3.0: resolution: {integrity: sha512-Hz/7gM4skaaYfRPNgr421CU4GSwotmEwBVvJh5ltGiffUJwm7C8GfN/Bc6DR1EKEp5pDKhODmdXXyi9uIsZl5A==} dependencies: - prosemirror-model: 1.20.0 + prosemirror-model: 1.21.0 prosemirror-state: 1.4.3 - prosemirror-transform: 1.8.0 + prosemirror-transform: 1.9.0 dev: false /prosemirror-state@1.4.3: resolution: {integrity: sha512-goFKORVbvPuAQaXhpbemJFRKJ2aixr+AZMGiquiqKxaucC6hlpHNZHWgz5R7dS4roHiwq9vDctE//CZ++o0W1Q==} dependencies: - prosemirror-model: 1.20.0 - prosemirror-transform: 1.8.0 + prosemirror-model: 1.21.0 + prosemirror-transform: 1.9.0 prosemirror-view: 1.33.6 dev: false @@ -17315,13 +17320,13 @@ packages: resolution: {integrity: sha512-oEwX1wrziuxMtwFvdDWSFHVUWrFJWt929kVVfHvtTi8yvw+5ppxjXZkMG/fuTdFo+3DXyIPSKfid+Be1npKXDA==} dependencies: prosemirror-keymap: 1.2.2 - prosemirror-model: 1.20.0 + prosemirror-model: 1.21.0 prosemirror-state: 1.4.3 - prosemirror-transform: 1.8.0 + prosemirror-transform: 1.9.0 prosemirror-view: 1.33.6 dev: false - /prosemirror-trailing-node@2.0.8(prosemirror-model@1.20.0)(prosemirror-state@1.4.3)(prosemirror-view@1.33.6): + /prosemirror-trailing-node@2.0.8(prosemirror-model@1.21.0)(prosemirror-state@1.4.3)(prosemirror-view@1.33.6): resolution: {integrity: sha512-ujRYhSuhQb1Jsarh1IHqb2KoSnRiD7wAMDGucP35DN7j5af6X7B18PfdPIrbwsPTqIAj0fyOvxbuPsWhNvylmA==} peerDependencies: prosemirror-model: ^1.19.0 @@ -17330,23 +17335,23 @@ packages: dependencies: '@remirror/core-constants': 2.0.2 escape-string-regexp: 4.0.0 - prosemirror-model: 1.20.0 + prosemirror-model: 1.21.0 prosemirror-state: 1.4.3 prosemirror-view: 1.33.6 dev: false - /prosemirror-transform@1.8.0: - resolution: {integrity: sha512-BaSBsIMv52F1BVVMvOmp1yzD3u65uC3HTzCBQV1WDPqJRQ2LuHKcyfn0jwqodo8sR9vVzMzZyI+Dal5W9E6a9A==} + /prosemirror-transform@1.9.0: + resolution: {integrity: sha512-5UXkr1LIRx3jmpXXNKDhv8OyAOeLTGuXNwdVfg8x27uASna/wQkr9p6fD3eupGOi4PLJfbezxTyi/7fSJypXHg==} dependencies: - prosemirror-model: 1.20.0 + prosemirror-model: 1.21.0 dev: false /prosemirror-view@1.33.6: resolution: {integrity: sha512-zRLUNgLIQfd8IfGprsXxWTjdA8xEAFJe8cDNrOptj6Mop9sj+BMeVbJvceyAYCm5G2dOdT2prctH7K9dfnpIMw==} dependencies: - prosemirror-model: 1.20.0 + prosemirror-model: 1.21.0 prosemirror-state: 1.4.3 - prosemirror-transform: 1.8.0 + prosemirror-transform: 1.9.0 dev: false /proto-list@1.2.4: @@ -17523,7 +17528,7 @@ packages: peerDependencies: react-scripts: '>=2.1.3' dependencies: - react-scripts: 5.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.23.4)(@swc/core@1.4.17)(esbuild@0.14.54)(eslint@8.44.0)(react@18.2.0)(sass@1.71.1)(typescript@5.4.3) + react-scripts: 5.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.23.4)(@swc/core@1.5.5)(esbuild@0.14.54)(eslint@8.44.0)(react@18.2.0)(sass@1.71.1)(typescript@5.4.3) semver: 5.7.2 dev: true @@ -17614,7 +17619,7 @@ packages: strip-ansi: 6.0.1 text-table: 0.2.0 typescript: 5.4.3 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) transitivePeerDependencies: - eslint - supports-color @@ -17914,7 +17919,7 @@ packages: use-sidecar: 1.1.2(@types/react@18.2.45)(react@18.2.0) dev: true - /react-scripts@5.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.23.4)(@swc/core@1.4.17)(esbuild@0.14.54)(eslint@8.44.0)(react@18.2.0)(sass@1.71.1)(typescript@5.4.3): + /react-scripts@5.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.23.4)(@swc/core@1.5.5)(esbuild@0.14.54)(eslint@8.44.0)(react@18.2.0)(sass@1.71.1)(typescript@5.4.3): resolution: {integrity: sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==} engines: {node: '>=14.0.0'} hasBin: true @@ -17965,13 +17970,13 @@ packages: resolve: 1.22.8 resolve-url-loader: 4.0.0 sass-loader: 12.6.0(sass@1.71.1)(webpack@5.91.0) - semver: 7.6.0 + semver: 7.6.2 source-map-loader: 3.0.2(webpack@5.91.0) style-loader: 3.3.4(webpack@5.91.0) tailwindcss: 3.4.3 - terser-webpack-plugin: 5.3.10(@swc/core@1.4.17)(esbuild@0.14.54)(webpack@5.91.0) + terser-webpack-plugin: 5.3.10(@swc/core@1.5.5)(esbuild@0.14.54)(webpack@5.91.0) typescript: 5.4.3 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) webpack-dev-server: 4.15.2(webpack@5.91.0) webpack-manifest-plugin: 4.1.1(webpack@5.91.0) workbox-webpack-plugin: 6.6.0(webpack@5.91.0) @@ -18646,7 +18651,7 @@ packages: klona: 2.0.6 neo-async: 2.6.2 sass: 1.71.1 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) /sass-loader@13.3.2(sass@1.71.1)(webpack@5.91.0): resolution: {integrity: sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==} @@ -18669,7 +18674,7 @@ packages: dependencies: neo-async: 2.6.2 sass: 1.71.1 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) dev: true /sass@1.71.1: @@ -18766,12 +18771,10 @@ packages: resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} hasBin: true - /semver@7.6.0: - resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==} + /semver@7.6.2: + resolution: {integrity: sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==} engines: {node: '>=10'} hasBin: true - dependencies: - lru-cache: 6.0.0 /send@0.18.0: resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==} @@ -18944,7 +18947,7 @@ packages: resolution: {integrity: sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==} engines: {node: '>=10'} dependencies: - semver: 7.6.0 + semver: 7.6.2 dev: true /sisteransi@1.0.5: @@ -19057,7 +19060,7 @@ packages: abab: 2.0.6 iconv-lite: 0.6.3 source-map-js: 1.2.0 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) /source-map-resolve@0.5.3: resolution: {integrity: sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==} @@ -19462,7 +19465,7 @@ packages: peerDependencies: webpack: ^5.0.0 dependencies: - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) /style-mod@4.1.2: resolution: {integrity: sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==} @@ -19516,7 +19519,7 @@ packages: dependencies: '@jridgewell/gen-mapping': 0.3.5 commander: 4.1.1 - glob: 10.3.12 + glob: 10.3.14 lines-and-columns: 1.2.4 mz: 2.7.0 pirates: 4.0.6 @@ -19593,15 +19596,15 @@ packages: picocolors: 1.0.0 stable: 0.1.8 - /swc-loader@0.2.6(@swc/core@1.4.17)(webpack@5.91.0): + /swc-loader@0.2.6(@swc/core@1.5.5)(webpack@5.91.0): resolution: {integrity: sha512-9Zi9UP2YmDpgmQVbyOPJClY0dwf58JDyDMQ7uRc4krmc72twNI2fvlBWHLqVekBpPc7h5NJkGVT1zNDxFrqhvg==} peerDependencies: '@swc/core': ^1.2.147 webpack: '>=2' dependencies: - '@swc/core': 1.4.17 + '@swc/core': 1.5.5 '@swc/counter': 0.1.3 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) dev: true /swr@2.2.4(react@18.2.0): @@ -19751,7 +19754,7 @@ packages: ansi-escapes: 4.3.2 supports-hyperlinks: 2.3.0 - /terser-webpack-plugin@5.3.10(@swc/core@1.4.17)(esbuild@0.14.54)(webpack@5.91.0): + /terser-webpack-plugin@5.3.10(@swc/core@1.5.5)(esbuild@0.14.54)(webpack@5.91.0): resolution: {integrity: sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==} engines: {node: '>= 10.13.0'} peerDependencies: @@ -19768,13 +19771,13 @@ packages: optional: true dependencies: '@jridgewell/trace-mapping': 0.3.25 - '@swc/core': 1.4.17 + '@swc/core': 1.5.5 esbuild: 0.14.54 jest-worker: 27.5.1 schema-utils: 3.3.0 serialize-javascript: 6.0.2 terser: 5.31.0 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) /terser@5.31.0: resolution: {integrity: sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==} @@ -19900,8 +19903,8 @@ packages: safe-regex: 1.1.0 dev: true - /tocbot@4.27.18: - resolution: {integrity: sha512-NYydMLcFjN5Yd7BY1cbnSKpoS3lpkCMAs2zx+UrFfDAm2LOu+mKK1zysZYcaVrY+mRU6diTCW2tSefwdSRFFUg==} + /tocbot@4.27.20: + resolution: {integrity: sha512-6M78FT20+FA5edtx7KowLvhG3gbZ6GRcEkL/0b2TcPbn6Ba+1ayI3SEVxe25zjkWGs0jd04InImaO81Hd8Hukw==} dev: true /toggle-selection@1.0.6: @@ -19969,7 +19972,7 @@ packages: tslib: 2.6.2 dev: false - /ts-node@10.9.2(@swc/core@1.4.17)(@types/node@17.0.45)(typescript@5.4.3): + /ts-node@10.9.2(@swc/core@1.5.5)(@types/node@17.0.45)(typescript@5.4.3): resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} hasBin: true peerDependencies: @@ -19984,7 +19987,7 @@ packages: optional: true dependencies: '@cspotcode/source-map-support': 0.8.1 - '@swc/core': 1.4.17 + '@swc/core': 1.5.5 '@tsconfig/node10': 1.0.11 '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 @@ -20022,7 +20025,7 @@ packages: engines: {node: '>=10.13.0'} dependencies: chalk: 4.1.2 - enhanced-resolve: 5.16.0 + enhanced-resolve: 5.16.1 tsconfig-paths: 4.2.0 dev: true @@ -20105,11 +20108,6 @@ packages: engines: {node: '>=12.20'} dev: true - /type-fest@4.18.1: - resolution: {integrity: sha512-qXhgeNsX15bM63h5aapNFcQid9jRF/l3ojDoDFmekDQEUufZ9U4ErVt6SjDxnHp48Ltrw616R8yNc3giJ3KvVQ==} - engines: {node: '>=16'} - dev: false - /type-fest@4.18.2: resolution: {integrity: sha512-+suCYpfJLAe4OXS6+PPXjW3urOS4IoP9waSiLuXfLgqZODKw/aWwASvzqE886wA0kQgGy0mIWyhd87VpqIy6Xg==} engines: {node: '>=16'} @@ -20363,8 +20361,8 @@ packages: resolution: {integrity: sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==} engines: {node: '>=4'} - /update-browserslist-db@1.0.14(browserslist@4.23.0): - resolution: {integrity: sha512-JixKH8GR2pWYshIPUg/NujK3JO7JiqEEUiNArE86NQyrgUuZeTlZQN3xuS/yiV5Kb48ev9K6RqNkaJjXsdg7Jw==} + /update-browserslist-db@1.0.15(browserslist@4.23.0): + resolution: {integrity: sha512-K9HWH62x3/EalU1U6sjSZiylm9C8tgq2mSvshZpqc7QE69RaA2qjhkW2HlNA0tFpEbtyFz7HTqbSdN4MSwUodA==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' @@ -20636,7 +20634,7 @@ packages: mime-types: 2.1.35 range-parser: 1.2.1 schema-utils: 4.2.0 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) /webpack-dev-middleware@6.1.3(webpack@5.91.0): resolution: {integrity: sha512-A4ChP0Qj8oGociTs6UdlRUGANIGrCDL3y+pmQMc+dSsraXHCatFpmMey4mYELA+juqwUqwQsUgJJISXl1KWmiw==} @@ -20652,7 +20650,7 @@ packages: mime-types: 2.1.35 range-parser: 1.2.1 schema-utils: 4.2.0 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) dev: true /webpack-dev-server@4.15.2(webpack@5.91.0): @@ -20696,7 +20694,7 @@ packages: serve-index: 1.9.1 sockjs: 0.3.24 spdy: 4.0.2 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) webpack-dev-middleware: 5.3.4(webpack@5.91.0) ws: 8.17.0 transitivePeerDependencies: @@ -20720,7 +20718,7 @@ packages: webpack: ^4.44.2 || ^5.47.0 dependencies: tapable: 2.2.1 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) webpack-sources: 2.3.1 /webpack-merge@5.10.0: @@ -20757,7 +20755,7 @@ packages: resolution: {integrity: sha512-poXpCylU7ExuvZK8z+On3kX+S8o/2dQ/SVYueKA0D4WEMXROXgY8Ez50/bQEUmvoSMMrWcrJqCHuhAbsiwg7Dg==} dev: true - /webpack@5.91.0(@swc/core@1.4.17)(esbuild@0.14.54): + /webpack@5.91.0(@swc/core@1.5.5)(esbuild@0.14.54): resolution: {integrity: sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==} engines: {node: '>=10.13.0'} hasBin: true @@ -20776,7 +20774,7 @@ packages: acorn-import-assertions: 1.9.0(acorn@8.11.3) browserslist: 4.23.0 chrome-trace-event: 1.0.3 - enhanced-resolve: 5.16.0 + enhanced-resolve: 5.16.1 es-module-lexer: 1.5.2 eslint-scope: 5.1.1 events: 3.3.0 @@ -20788,7 +20786,7 @@ packages: neo-async: 2.6.2 schema-utils: 3.3.0 tapable: 2.2.1 - terser-webpack-plugin: 5.3.10(@swc/core@1.4.17)(esbuild@0.14.54)(webpack@5.91.0) + terser-webpack-plugin: 5.3.10(@swc/core@1.5.5)(esbuild@0.14.54)(webpack@5.91.0) watchpack: 2.4.1 webpack-sources: 3.2.3 transitivePeerDependencies: @@ -20991,6 +20989,7 @@ packages: /workbox-google-analytics@6.6.0: resolution: {integrity: sha512-p4DJa6OldXWd6M9zRl0H6vB9lkrmqYFkRQ2xEiNdBFp9U0LhsGO7hsBscVEyH9H2/3eZZt8c97NB2FD9U2NJ+Q==} + deprecated: It is not compatible with newer versions of GA starting with v4, as long as you are using GAv3 it should be ok, but the package is not longer being maintained dependencies: workbox-background-sync: 6.6.0 workbox-core: 6.6.0 @@ -21052,7 +21051,7 @@ packages: fast-json-stable-stringify: 2.1.0 pretty-bytes: 5.6.0 upath: 1.2.0 - webpack: 5.91.0(@swc/core@1.4.17)(esbuild@0.14.54) + webpack: 5.91.0(@swc/core@1.5.5)(esbuild@0.14.54) webpack-sources: 1.4.3 workbox-build: 6.6.0 transitivePeerDependencies: @@ -21189,6 +21188,7 @@ packages: /yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} + dev: true /yaml@1.10.2: resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} @@ -21270,8 +21270,8 @@ packages: resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} dev: false - /zod@3.23.6: - resolution: {integrity: sha512-RTHJlZhsRbuA8Hmp/iNL7jnfc4nZishjsanDAfEY1QpDQZCahUp3xDzl+zfweE9BklxMUcgBgS1b7Lvie/ZVwA==} + /zod@3.23.8: + resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} dev: false /zstddec@0.1.0: @@ -21295,9 +21295,9 @@ packages: use-sync-external-store: 1.2.0(react@18.2.0) dev: false - github.com/theopensystemslab/planx-core/f2f918d(@types/react@18.2.45): - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/f2f918d} - id: github.com/theopensystemslab/planx-core/f2f918d + github.com/theopensystemslab/planx-core/d8acbea(@types/react@18.2.45): + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/d8acbea} + id: github.com/theopensystemslab/planx-core/d8acbea name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true @@ -21324,7 +21324,7 @@ packages: react-dom: 18.3.1(react@18.3.1) type-fest: 4.18.2 uuid: 9.0.1 - zod: 3.23.6 + zod: 3.23.8 transitivePeerDependencies: - '@types/react' - encoding diff --git a/editor.planx.uk/src/@planx/components/DrawBoundary/Public/index.tsx b/editor.planx.uk/src/@planx/components/DrawBoundary/Public/index.tsx index 69697144be..84ecd9d1e8 100644 --- a/editor.planx.uk/src/@planx/components/DrawBoundary/Public/index.tsx +++ b/editor.planx.uk/src/@planx/components/DrawBoundary/Public/index.tsx @@ -195,6 +195,7 @@ export default function Component(props: Props) { {/* @ts-ignore */}