diff --git a/editor.planx.uk/package.json b/editor.planx.uk/package.json index d5195c1e33..96fc7eb17b 100644 --- a/editor.planx.uk/package.json +++ b/editor.planx.uk/package.json @@ -15,27 +15,27 @@ "@mui/utils": "^5.14.5", "@opensystemslab/map": "^0.7.5", "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#44420b9", - "@tiptap/core": "^2.0.3", - "@tiptap/extension-bold": "^2.0.3", - "@tiptap/extension-bubble-menu": "^2.1.6", - "@tiptap/extension-bullet-list": "^2.0.3", - "@tiptap/extension-document": "^2.0.3", - "@tiptap/extension-hard-break": "^2.1.6", - "@tiptap/extension-heading": "^2.0.3", - "@tiptap/extension-history": "^2.0.3", - "@tiptap/extension-image": "^2.0.3", - "@tiptap/extension-italic": "^2.0.3", - "@tiptap/extension-link": "^2.0.3", - "@tiptap/extension-list-item": "^2.0.3", - "@tiptap/extension-mention": "^2.1.8", - "@tiptap/extension-ordered-list": "^2.1.8", - "@tiptap/extension-paragraph": "^2.0.3", - "@tiptap/extension-placeholder": "^2.0.3", + "@tiptap/core": "^2.1.11", + "@tiptap/extension-bold": "^2.1.11", + "@tiptap/extension-bubble-menu": "^2.1.11", + "@tiptap/extension-bullet-list": "^2.1.11", + "@tiptap/extension-document": "^2.1.11", + "@tiptap/extension-hard-break": "^2.1.11", + "@tiptap/extension-heading": "^2.1.11", + "@tiptap/extension-history": "^2.1.11", + "@tiptap/extension-image": "^2.1.11", + "@tiptap/extension-italic": "^2.1.11", + "@tiptap/extension-link": "^2.1.11", + "@tiptap/extension-list-item": "^2.1.11", + "@tiptap/extension-mention": "^2.1.11", + "@tiptap/extension-ordered-list": "^2.1.11", + "@tiptap/extension-paragraph": "^2.1.11", + "@tiptap/extension-placeholder": "^2.1.11", "@tiptap/extension-text": "^2.1.11", - "@tiptap/html": "^2.0.3", - "@tiptap/pm": "^2.0.3", - "@tiptap/react": "^2.0.3", - "@tiptap/suggestion": "^2.0.3", + "@tiptap/html": "^2.1.11", + "@tiptap/pm": "^2.1.11", + "@tiptap/react": "^2.1.11", + "@tiptap/suggestion": "^2.1.11", "@turf/buffer": "^6.5.0", "@turf/helpers": "^6.5.0", "array-move": "^4.0.0", diff --git a/editor.planx.uk/pnpm-lock.yaml b/editor.planx.uk/pnpm-lock.yaml index ab8619d7d4..bd4e0697be 100644 --- a/editor.planx.uk/pnpm-lock.yaml +++ b/editor.planx.uk/pnpm-lock.yaml @@ -49,68 +49,68 @@ dependencies: specifier: git+https://github.com/theopensystemslab/planx-core#44420b9 version: github.com/theopensystemslab/planx-core/44420b9(@types/react@18.2.20) '@tiptap/core': - specifier: ^2.0.3 - version: 2.0.3(@tiptap/pm@2.0.3) + specifier: ^2.1.11 + version: 2.1.11(@tiptap/pm@2.1.11) '@tiptap/extension-bold': - specifier: ^2.0.3 - version: 2.0.3(@tiptap/core@2.0.3) + specifier: ^2.1.11 + version: 2.1.11(@tiptap/core@2.1.11) '@tiptap/extension-bubble-menu': - specifier: ^2.1.6 - version: 2.1.6(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3) + specifier: ^2.1.11 + version: 2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11) '@tiptap/extension-bullet-list': - specifier: ^2.0.3 - version: 2.0.3(@tiptap/core@2.0.3) + specifier: ^2.1.11 + version: 2.1.11(@tiptap/core@2.1.11) '@tiptap/extension-document': - specifier: ^2.0.3 - version: 2.0.3(@tiptap/core@2.0.3) + specifier: ^2.1.11 + version: 2.1.11(@tiptap/core@2.1.11) '@tiptap/extension-hard-break': - specifier: ^2.1.6 - version: 2.1.6(@tiptap/core@2.0.3) + specifier: ^2.1.11 + version: 2.1.11(@tiptap/core@2.1.11) '@tiptap/extension-heading': - specifier: ^2.0.3 - version: 2.0.3(@tiptap/core@2.0.3) + specifier: ^2.1.11 + version: 2.1.11(@tiptap/core@2.1.11) '@tiptap/extension-history': - specifier: ^2.0.3 - version: 2.0.3(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3) + specifier: ^2.1.11 + version: 2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11) '@tiptap/extension-image': - specifier: ^2.0.3 - version: 2.0.3(@tiptap/core@2.0.3) + specifier: ^2.1.11 + version: 2.1.11(@tiptap/core@2.1.11) '@tiptap/extension-italic': - specifier: ^2.0.3 - version: 2.0.3(@tiptap/core@2.0.3) + specifier: ^2.1.11 + version: 2.1.11(@tiptap/core@2.1.11) '@tiptap/extension-link': - specifier: ^2.0.3 - version: 2.0.3(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3) + specifier: ^2.1.11 + version: 2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11) '@tiptap/extension-list-item': - specifier: ^2.0.3 - version: 2.0.3(@tiptap/core@2.0.3) + specifier: ^2.1.11 + version: 2.1.11(@tiptap/core@2.1.11) '@tiptap/extension-mention': - specifier: ^2.1.8 - version: 2.1.8(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3)(@tiptap/suggestion@2.0.3) + specifier: ^2.1.11 + version: 2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11)(@tiptap/suggestion@2.1.11) '@tiptap/extension-ordered-list': - specifier: ^2.1.8 - version: 2.1.8(@tiptap/core@2.0.3) + specifier: ^2.1.11 + version: 2.1.11(@tiptap/core@2.1.11) '@tiptap/extension-paragraph': - specifier: ^2.0.3 - version: 2.0.3(@tiptap/core@2.0.3) + specifier: ^2.1.11 + version: 2.1.11(@tiptap/core@2.1.11) '@tiptap/extension-placeholder': - specifier: ^2.0.3 - version: 2.0.3(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3) + specifier: ^2.1.11 + version: 2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11) '@tiptap/extension-text': specifier: ^2.1.11 - version: 2.1.11(@tiptap/core@2.0.3) + version: 2.1.11(@tiptap/core@2.1.11) '@tiptap/html': - specifier: ^2.0.3 - version: 2.0.3(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3) + specifier: ^2.1.11 + version: 2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11) '@tiptap/pm': - specifier: ^2.0.3 - version: 2.0.3(@tiptap/core@2.0.3) + specifier: ^2.1.11 + version: 2.1.11 '@tiptap/react': - specifier: ^2.0.3 - version: 2.0.3(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3)(react-dom@18.2.0)(react@18.2.0) + specifier: ^2.1.11 + version: 2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11)(react-dom@18.2.0)(react@18.2.0) '@tiptap/suggestion': - specifier: ^2.0.3 - version: 2.0.3(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3) + specifier: ^2.1.11 + version: 2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11) '@turf/buffer': specifier: ^6.5.0 version: 6.5.0 @@ -1172,6 +1172,7 @@ packages: /@babel/plugin-proposal-export-namespace-from@7.18.9(@babel/core@7.22.9): resolution: {integrity: sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==} 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-export-namespace-from instead. peerDependencies: '@babel/core': ^7.0.0-0 dependencies: @@ -5038,9 +5039,9 @@ packages: '@babel/core': 7.22.9 '@babel/plugin-proposal-export-namespace-from': 7.18.9(@babel/core@7.22.9) '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.22.9) - '@babel/plugin-transform-modules-commonjs': 7.22.5(@babel/core@7.22.9) + '@babel/plugin-transform-modules-commonjs': 7.23.0(@babel/core@7.22.9) '@babel/traverse': 7.22.8 - '@babel/types': 7.22.5 + '@babel/types': 7.23.0 '@linaria/logger': 4.0.0 babel-merge: 3.0.0(@babel/core@7.22.9) transitivePeerDependencies: @@ -7407,184 +7408,181 @@ packages: '@testing-library/dom': 9.3.1 dev: true - /@tiptap/core@2.0.3(@tiptap/pm@2.0.3): - resolution: {integrity: sha512-jLyVIWAdjjlNzrsRhSE2lVL/7N8228/1R1QtaVU85UlMIwHFAcdzhD8FeiKkqxpTnGpaDVaTy7VNEtEgaYdCyA==} + /@tiptap/core@2.1.11(@tiptap/pm@2.1.11): + resolution: {integrity: sha512-1W2DdjpPwfphHgQ3Qm4s5wzCnEjiXm1TeZ+6/zBl89yKURXgv8Mw1JGdj/NcImQjtDcsNn97MscACK3GKbEJBA==} peerDependencies: '@tiptap/pm': ^2.0.0 dependencies: - '@tiptap/pm': 2.0.3(@tiptap/core@2.0.3) + '@tiptap/pm': 2.1.11 dev: false - /@tiptap/extension-bold@2.0.3(@tiptap/core@2.0.3): - resolution: {integrity: sha512-OGT62fMRovSSayjehumygFWTg2Qn0IDbqyMpigg/RUAsnoOI2yBZFVrdM2gk1StyoSay7gTn2MLw97IUfr7FXg==} + /@tiptap/extension-bold@2.1.11(@tiptap/core@2.1.11): + resolution: {integrity: sha512-vhdkBtvd029ufOYt2ug49Gz+RLKSczO/CCqKYBqBmpIpsifyK7M6jkgamvAQg3c/vYk0LNcKiL2dp0Jp7L+5Gw==} peerDependencies: '@tiptap/core': ^2.0.0 dependencies: - '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) + '@tiptap/core': 2.1.11(@tiptap/pm@2.1.11) dev: false - /@tiptap/extension-bubble-menu@2.1.6(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3): - resolution: {integrity: sha512-13YDJB19xbDL/SZaPs8NvUAA+w5MIWugP8ByKQeIlL8vlcbiJjqoT77YP6v300DtFyVrnLo/iMJh9RMB4NOnwg==} + /@tiptap/extension-bubble-menu@2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11): + resolution: {integrity: sha512-WFJJpZvl9DP94Y5RQZB/THDxvDbrTo8tuhjT7yWlhseJ6zyhWmRXdutt39wfSZNFxitv/As+s7cO9aYLML/TVg==} peerDependencies: '@tiptap/core': ^2.0.0 '@tiptap/pm': ^2.0.0 dependencies: - '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) - '@tiptap/pm': 2.0.3(@tiptap/core@2.0.3) + '@tiptap/core': 2.1.11(@tiptap/pm@2.1.11) + '@tiptap/pm': 2.1.11 tippy.js: 6.3.7 dev: false - /@tiptap/extension-bullet-list@2.0.3(@tiptap/core@2.0.3): - resolution: {integrity: sha512-RtaLiRvZbMTOje+FW5bn+mYogiIgNxOm065wmyLPypnTbLSeHeYkoqVSqzZeqUn+7GLnwgn1shirUe6csVE/BA==} + /@tiptap/extension-bullet-list@2.1.11(@tiptap/core@2.1.11): + resolution: {integrity: sha512-SOOVH2aSmdMtjWL7TTLbN72xbAFz2G5jifT4UCXb7Qx6LsyhNCyDCu0ukOW8rSosGoSdmBXxAsD9sBJ1jEOmZw==} peerDependencies: '@tiptap/core': ^2.0.0 dependencies: - '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) + '@tiptap/core': 2.1.11(@tiptap/pm@2.1.11) dev: false - /@tiptap/extension-document@2.0.3(@tiptap/core@2.0.3): - resolution: {integrity: sha512-PsYeNQQBYIU9ayz1R11Kv/kKNPFNIV8tApJ9pxelXjzcAhkjncNUazPN/dyho60mzo+WpsmS3ceTj/gK3bCtWA==} + /@tiptap/extension-document@2.1.11(@tiptap/core@2.1.11): + resolution: {integrity: sha512-L/iLuqxvJep33ycCFNrnUhdR0VtcZyeNnqB+ZvVHzEwLoRud+LBy44lpEdBrAFsvRm3DG14m/FGYL+TfaD0vxA==} peerDependencies: '@tiptap/core': ^2.0.0 dependencies: - '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) + '@tiptap/core': 2.1.11(@tiptap/pm@2.1.11) dev: false - /@tiptap/extension-floating-menu@2.0.3(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3): - resolution: {integrity: sha512-zN1vRGRvyK3pO2aHRmQSOTpl4UJraXYwKYM009n6WviYKUNm0LPGo+VD4OAtdzUhPXyccnlsTv2p6LIqFty6Bg==} + /@tiptap/extension-floating-menu@2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11): + resolution: {integrity: sha512-ExeoOQ6nT0CY0eWx6WjbG+osurXLXa7XrqIdhCAcTmzBAlGiKt8khX9qaZ+QF+BRK1r1lja2KX+5/fpLK7Dt1g==} peerDependencies: '@tiptap/core': ^2.0.0 '@tiptap/pm': ^2.0.0 dependencies: - '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) - '@tiptap/pm': 2.0.3(@tiptap/core@2.0.3) + '@tiptap/core': 2.1.11(@tiptap/pm@2.1.11) + '@tiptap/pm': 2.1.11 tippy.js: 6.3.7 dev: false - /@tiptap/extension-hard-break@2.1.6(@tiptap/core@2.0.3): - resolution: {integrity: sha512-znFYceEFbrgxhHZF+/wNQlAn3MWG9/VRqQAFxPGne0csewibKZRwZbeSYZQ16x1vSAlAQsKhIaAst/na/2H8LA==} + /@tiptap/extension-hard-break@2.1.11(@tiptap/core@2.1.11): + resolution: {integrity: sha512-qhiPe6FA0b6PPb/ITlgSnY0l9tEVmXZ9e7eSjvks12ORfqL/dofSCLtChHWvhZxugzo92xejG2hXLi6lyOLbkg==} peerDependencies: '@tiptap/core': ^2.0.0 dependencies: - '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) + '@tiptap/core': 2.1.11(@tiptap/pm@2.1.11) dev: false - /@tiptap/extension-heading@2.0.3(@tiptap/core@2.0.3): - resolution: {integrity: sha512-f0IEv5ms6aCzL80WeZ1qLCXTkRVwbpRr1qAETjg3gG4eoJN18+lZNOJYpyZy3P92C5KwF2T3Av00eFyVLIbb8Q==} + /@tiptap/extension-heading@2.1.11(@tiptap/core@2.1.11): + resolution: {integrity: sha512-QBtl0S1aDFB+F1wvTrS5iGdNUEeXp+WuTddj+L2f5EP4KqG2x7sj7e7ENMy20g/l8tbKwzd3AZZydvClH4Ybbw==} peerDependencies: '@tiptap/core': ^2.0.0 dependencies: - '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) + '@tiptap/core': 2.1.11(@tiptap/pm@2.1.11) dev: false - /@tiptap/extension-history@2.0.3(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3): - resolution: {integrity: sha512-00KHIcJ8kivn2ARI6NQYphv2LfllVCXViHGm0EhzDW6NQxCrriJKE3tKDcTFCu7LlC5doMpq9Z6KXdljc4oVeQ==} + /@tiptap/extension-history@2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11): + resolution: {integrity: sha512-88dovV2O9icmBn0IvaArFFeS6X5ts6BxZPu5VbGML8KBL8iAu+Og7RXEPdOy5e13K0K4V21fDpO3n7KdvNOAYQ==} peerDependencies: '@tiptap/core': ^2.0.0 '@tiptap/pm': ^2.0.0 dependencies: - '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) - '@tiptap/pm': 2.0.3(@tiptap/core@2.0.3) + '@tiptap/core': 2.1.11(@tiptap/pm@2.1.11) + '@tiptap/pm': 2.1.11 dev: false - /@tiptap/extension-image@2.0.3(@tiptap/core@2.0.3): - resolution: {integrity: sha512-hS9ZJwz0md07EHsC+o4NuuJkhCZsZn7TuRz/2CvRSj2fWFIz+40CyNAHf/2J0qNugG9ommXaemetsADeEZP9ag==} + /@tiptap/extension-image@2.1.11(@tiptap/core@2.1.11): + resolution: {integrity: sha512-dFFRvzl9F4fEcG95nyka72TeV127C1UVaMm816GHoFlVEFGV4yJ8NKgzT3UEDgFcs6OPwPlt8tuHuDeYm7EVOQ==} peerDependencies: '@tiptap/core': ^2.0.0 dependencies: - '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) + '@tiptap/core': 2.1.11(@tiptap/pm@2.1.11) dev: false - /@tiptap/extension-italic@2.0.3(@tiptap/core@2.0.3): - resolution: {integrity: sha512-cfS5sW0gu7qf4ihwnLtW/QMTBrBEXaT0sJl3RwkhjIBg/65ywJKE5Nz9ewnQHmDeT18hvMJJ1VIb4j4ze9jj9A==} + /@tiptap/extension-italic@2.1.11(@tiptap/core@2.1.11): + resolution: {integrity: sha512-QmDsHtnBBit/1KtQpBPxjSPjDC1mVKtoNTgsEwMWK6YAkCKOKPj7oPEqqjaNZIRMKPPzE5XCsfBoS3jtVmo+6A==} peerDependencies: '@tiptap/core': ^2.0.0 dependencies: - '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) + '@tiptap/core': 2.1.11(@tiptap/pm@2.1.11) dev: false - /@tiptap/extension-link@2.0.3(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3): - resolution: {integrity: sha512-H72tXQ5rkVCkAhFaf08fbEU7EBUCK0uocsqOF+4th9sOlrhfgyJtc8Jv5EXPDpxNgG5jixSqWBo0zKXQm9s9eg==} + /@tiptap/extension-link@2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11): + resolution: {integrity: sha512-Dn8hq4ld8br53fE4/QUZ7/y6ejY/kqAxeNhtud+OZKRs6VRn/CQd0H6A26opL+mKAK0kzrs0rh7rJPpHvahx/Q==} peerDependencies: '@tiptap/core': ^2.0.0 '@tiptap/pm': ^2.0.0 dependencies: - '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) - '@tiptap/pm': 2.0.3(@tiptap/core@2.0.3) + '@tiptap/core': 2.1.11(@tiptap/pm@2.1.11) + '@tiptap/pm': 2.1.11 linkifyjs: 4.1.1 dev: false - /@tiptap/extension-list-item@2.0.3(@tiptap/core@2.0.3): - resolution: {integrity: sha512-p7cUsk0LpM1PfdAuFE8wYBNJ3gvA0UhNGR08Lo++rt9UaCeFLSN1SXRxg97c0oa5+Ski7SrCjIJ5Ynhz0viTjQ==} + /@tiptap/extension-list-item@2.1.11(@tiptap/core@2.1.11): + resolution: {integrity: sha512-YhwHaPGhffsFsg/zjCu1G24//j/BTRDRZbZXmMwp77m1yEqPULcWyoWrI+gUzetQxJRD/ruAucqjLtoLLfICmQ==} peerDependencies: '@tiptap/core': ^2.0.0 dependencies: - '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) + '@tiptap/core': 2.1.11(@tiptap/pm@2.1.11) dev: false - /@tiptap/extension-mention@2.1.8(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3)(@tiptap/suggestion@2.0.3): - resolution: {integrity: sha512-HthABZWnbmUdq4FR1Rv1q/xv4akTH4fKk+xEOxf/Ei2JqAkv+qohgDPh5P9Hae5pa473P2e9ttgfc4J9o074Pw==} + /@tiptap/extension-mention@2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11)(@tiptap/suggestion@2.1.11): + resolution: {integrity: sha512-QMHmAkhiDQEgAdUHdKRfVna0AINcbSbQCrpgwKLIHGWcpbi1zJbAPpm+xngbl0I9ZNxaMzbP4utTAzeQ92pJkw==} peerDependencies: '@tiptap/core': ^2.0.0 '@tiptap/pm': ^2.0.0 '@tiptap/suggestion': ^2.0.0 dependencies: - '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) - '@tiptap/pm': 2.0.3(@tiptap/core@2.0.3) - '@tiptap/suggestion': 2.0.3(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3) + '@tiptap/core': 2.1.11(@tiptap/pm@2.1.11) + '@tiptap/pm': 2.1.11 + '@tiptap/suggestion': 2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11) dev: false - /@tiptap/extension-ordered-list@2.1.8(@tiptap/core@2.0.3): - resolution: {integrity: sha512-qTVSWTlSjFNRwPNmWmfe9TsW9XL3LQCNJsfaBxtVZfhDN9rhoIZ6rPTBO7f2TTiPK1+uyLTvK+znWYvU9RtD5A==} + /@tiptap/extension-ordered-list@2.1.11(@tiptap/core@2.1.11): + resolution: {integrity: sha512-/tghfEJ5U7WFbF8xyOqRJks8KxP/lRjnroMXMglaushSMx8PYPo1dZDB/dJZw7ksy47MAaKJfKlx3gyN2CPXBQ==} peerDependencies: '@tiptap/core': ^2.0.0 dependencies: - '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) + '@tiptap/core': 2.1.11(@tiptap/pm@2.1.11) dev: false - /@tiptap/extension-paragraph@2.0.3(@tiptap/core@2.0.3): - resolution: {integrity: sha512-a+tKtmj4bU3GVCH1NE8VHWnhVexxX5boTVxsHIr4yGG3UoKo1c5AO7YMaeX2W5xB5iIA+BQqOPCDPEAx34dd2A==} + /@tiptap/extension-paragraph@2.1.11(@tiptap/core@2.1.11): + resolution: {integrity: sha512-gXMgJ2CU3X4yh1wKnb8RdbDmhITB76pH6DX0uWprmEgvzNMN3Qw+h5uBD9lgxg1WVghbCmkG9mY9J4PPbPTLxw==} peerDependencies: '@tiptap/core': ^2.0.0 dependencies: - '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) + '@tiptap/core': 2.1.11(@tiptap/pm@2.1.11) dev: false - /@tiptap/extension-placeholder@2.0.3(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3): - resolution: {integrity: sha512-Z42jo0termRAf0S0L8oxrts94IWX5waU4isS2CUw8xCUigYyCFslkhQXkWATO1qRbjNFLKN2C9qvCgGf4UeBrw==} + /@tiptap/extension-placeholder@2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11): + resolution: {integrity: sha512-laHYRFxJWj6m72Yf1v6Q5nF2nvwWpQlKUj6Yu/yluOOoVE92HpLqCAvA8RamqLtPiw5VxR3v3oCY0WNeQRvyIg==} peerDependencies: '@tiptap/core': ^2.0.0 '@tiptap/pm': ^2.0.0 dependencies: - '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) - '@tiptap/pm': 2.0.3(@tiptap/core@2.0.3) + '@tiptap/core': 2.1.11(@tiptap/pm@2.1.11) + '@tiptap/pm': 2.1.11 dev: false - /@tiptap/extension-text@2.1.11(@tiptap/core@2.0.3): + /@tiptap/extension-text@2.1.11(@tiptap/core@2.1.11): resolution: {integrity: sha512-Iey0EXYv9079+lbHMvZtLc6XcYfKrq++msEXuFFNHxvL0i/XzndhGf+qlDhLROLgEtDiiTqzOBBwFCGlFjbDow==} peerDependencies: '@tiptap/core': ^2.0.0 dependencies: - '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) + '@tiptap/core': 2.1.11(@tiptap/pm@2.1.11) dev: false - /@tiptap/html@2.0.3(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3): - resolution: {integrity: sha512-F0mihUTJ+mqqczHl7du9kBmani3pkwYeEuc/xls+DlYobdTzhSqIaF/ce8utHwRxTvDUPwSEM7+ITr93e2PqQA==} + /@tiptap/html@2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11): + resolution: {integrity: sha512-VKmBb1c3YN9hZfBzkV+QERf3ZWBUHHxjv2/BOr/Dw6mbb6+0iA1nxO9vQYPUb+xAmlm0n8vWwc7YQ8rxBwTKWQ==} peerDependencies: '@tiptap/core': ^2.0.0 '@tiptap/pm': ^2.0.0 dependencies: - '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) - '@tiptap/pm': 2.0.3(@tiptap/core@2.0.3) + '@tiptap/core': 2.1.11(@tiptap/pm@2.1.11) + '@tiptap/pm': 2.1.11 zeed-dom: 0.9.26 dev: false - /@tiptap/pm@2.0.3(@tiptap/core@2.0.3): - resolution: {integrity: sha512-I9dsInD89Agdm1QjFRO9dmJtU1ldVSILNPW0pEhv9wYqYVvl4HUj/JMtYNqu2jWrCHNXQcaX/WkdSdvGJtmg5g==} - peerDependencies: - '@tiptap/core': ^2.0.0 + /@tiptap/pm@2.1.11: + resolution: {integrity: sha512-vBIAic+H8fjHfT8r2qJkAOxdx1Iiss9+qMyujAoIdPkiyjEc4+sXcM0qSYgIr6KL5icITyuK8J7x/V62VfB7Uw==} dependencies: - '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) prosemirror-changeset: 2.2.1 prosemirror-collab: 1.3.1 prosemirror-commands: 1.5.2 @@ -7607,30 +7605,30 @@ packages: - supports-color dev: false - /@tiptap/react@2.0.3(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-fiAh8Lk+/NBPAR/PE4Kc/aLiBUbUYI/CpAopz8DI9eInNyV8h8LAGa9uFILJQF/TNu0tclJ4rV0sWc7Se0FZMw==} + /@tiptap/react@2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-OLU4uqMeCE/LKz/GY2P1JRykUgHJDoPROHUa1IOnVpj/1FbbBHDyurT3eomwsVzScTULbrKGwrS3ada6QAmTTA==} peerDependencies: '@tiptap/core': ^2.0.0 '@tiptap/pm': ^2.0.0 react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 dependencies: - '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) - '@tiptap/extension-bubble-menu': 2.1.6(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3) - '@tiptap/extension-floating-menu': 2.0.3(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3) - '@tiptap/pm': 2.0.3(@tiptap/core@2.0.3) + '@tiptap/core': 2.1.11(@tiptap/pm@2.1.11) + '@tiptap/extension-bubble-menu': 2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11) + '@tiptap/extension-floating-menu': 2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11) + '@tiptap/pm': 2.1.11 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@tiptap/suggestion@2.0.3(@tiptap/core@2.0.3)(@tiptap/pm@2.0.3): - resolution: {integrity: sha512-1y3palQStGZq13UtHjouZ50k4sotM+N56cIlFeygIv3gqdai2zGPaPQtqV9FOVVQizXpUbQMTlPSDC5Ej4SPnQ==} + /@tiptap/suggestion@2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11): + resolution: {integrity: sha512-AVMB4x1X3eU7QCO1A8URQK0W7ps5dsVzveIP7+c//Z/GYe8lFSGIUnEbLJdr6bwgPkRL56m7c9+oZqVST5wfjQ==} peerDependencies: '@tiptap/core': ^2.0.0 '@tiptap/pm': ^2.0.0 dependencies: - '@tiptap/core': 2.0.3(@tiptap/pm@2.0.3) - '@tiptap/pm': 2.0.3(@tiptap/core@2.0.3) + '@tiptap/core': 2.1.11(@tiptap/pm@2.1.11) + '@tiptap/pm': 2.1.11 dev: false /@tootallnate/once@1.1.2: diff --git a/editor.planx.uk/src/components/Header.test.tsx b/editor.planx.uk/src/components/Header.test.tsx index 483361cb05..ac64dcebc0 100644 --- a/editor.planx.uk/src/components/Header.test.tsx +++ b/editor.planx.uk/src/components/Header.test.tsx @@ -27,9 +27,9 @@ const mockTeam2: Team = { slug: "closedsystemslab", }; -jest.spyOn(ReactNavi, "useNavigation").mockReturnValue(({ - navigate: jest.fn() -}) as any); +jest.spyOn(ReactNavi, "useNavigation").mockReturnValue({ + navigate: jest.fn(), +} as any); describe("Header Component - Editor Route", () => { beforeAll(() => { diff --git a/editor.planx.uk/src/lib/dataMergedHotfix.ts b/editor.planx.uk/src/lib/dataMergedHotfix.ts index 2e1d40c309..48228f173c 100644 --- a/editor.planx.uk/src/lib/dataMergedHotfix.ts +++ b/editor.planx.uk/src/lib/dataMergedHotfix.ts @@ -25,11 +25,13 @@ const getFlowData = async (id: string) => { // in order to load frontend /preview routes for flows that are not published export const dataMerged = async (id: string, ob: Record = {}) => { // get the primary flow data - const { slug, data }: { slug: string; data: Record } = await getFlowData(id); + const { slug, data }: { slug: string; data: Record } = + await getFlowData(id); // recursively get and flatten internal portals & external portals for (const [nodeId, node] of Object.entries(data)) { - const isExternalPortalRoot = nodeId === "_root" && Object.keys(ob).length > 0; + const isExternalPortalRoot = + nodeId === "_root" && Object.keys(ob).length > 0; const isExternalPortal = node.type === TYPES.ExternalPortal; const isMerged = ob[node.data?.flowId]; diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/externalPortals.test.ts b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/externalPortals.test.ts index 564469d48e..6646cafadd 100644 --- a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/externalPortals.test.ts +++ b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/externalPortals.test.ts @@ -60,4 +60,4 @@ describe("A flow with repeated external portals can be navigated as expected", ( record("withinExternalPortal", { answers: [] }); expect(upcomingCardIds()[0]).toEqual("finalNode"); }); -}); \ No newline at end of file +}); diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/mocks/multipleExternalPortals.json b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/mocks/multipleExternalPortals.json index b2693fa5e4..4ea6daea92 100644 --- a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/mocks/multipleExternalPortals.json +++ b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/mocks/multipleExternalPortals.json @@ -1,15 +1,10 @@ { "_root": { - "edges": [ - "firstNode", - "finalNode" - ] + "edges": ["firstNode", "finalNode"] }, "externalPortal1": { "type": 300, - "edges": [ - "externalFlowId" - ] + "edges": ["externalFlowId"] }, "option3": { "data": { @@ -19,29 +14,21 @@ }, "externalPortal2": { "type": 300, - "edges": [ - "externalFlowId" - ] + "edges": ["externalFlowId"] }, "firstNode": { "data": { "text": "This is a question" }, "type": 100, - "edges": [ - "option1", - "option2", - "option3" - ] + "edges": ["option1", "option2", "option3"] }, "option2": { "data": { "text": "Option 2" }, "type": 200, - "edges": [ - "externalPortal2" - ] + "edges": ["externalPortal2"] }, "finalNode": { "data": { @@ -65,17 +52,13 @@ "text": "Option 1" }, "type": 200, - "edges": [ - "externalPortal1" - ] + "edges": ["externalPortal1"] }, "externalFlowId": { "data": { "text": "daf-external-portal-test" }, "type": 300, - "edges": [ - "withinExternalPortal" - ] + "edges": ["withinExternalPortal"] } -} \ No newline at end of file +} diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/mocks/singleExternalPortal.json b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/mocks/singleExternalPortal.json index dea585a6dc..7b408035a9 100644 --- a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/mocks/singleExternalPortal.json +++ b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/mocks/singleExternalPortal.json @@ -1,9 +1,6 @@ { "_root": { - "edges": [ - "firstNode", - "finalNode" - ] + "edges": ["firstNode", "finalNode"] }, "option2": { "data": { @@ -21,28 +18,21 @@ }, "externalPortal": { "type": 300, - "edges": [ - "externalFlowId" - ] + "edges": ["externalFlowId"] }, "firstNode": { "data": { "text": "This is a question with many options" }, "type": 100, - "edges": [ - "option1", - "option2" - ] + "edges": ["option1", "option2"] }, "option1": { "data": { "text": "Option 1" }, "type": 200, - "edges": [ - "externalPortal" - ] + "edges": ["externalPortal"] }, "withinExternalPortal": { "data": { @@ -58,8 +48,6 @@ "text": "test-external-portal" }, "type": 300, - "edges": [ - "withinExternalPortal" - ] + "edges": ["withinExternalPortal"] } -} \ No newline at end of file +} diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/store/team.ts b/editor.planx.uk/src/pages/FlowEditor/lib/store/team.ts index d120327e6d..8eeaed720d 100644 --- a/editor.planx.uk/src/pages/FlowEditor/lib/store/team.ts +++ b/editor.planx.uk/src/pages/FlowEditor/lib/store/team.ts @@ -7,7 +7,7 @@ import { Team } from "types"; import type { StateCreator } from "zustand"; export interface TeamStore { - teamId: number, + teamId: number; teamTheme?: TeamTheme; teamName: string; teamSettings?: TeamSettings; @@ -88,7 +88,7 @@ export const teamStore: StateCreator = ( get().setTeam(team); }, - clearTeamStore: () => + clearTeamStore: () => set({ teamId: 0, teamTheme: undefined, diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/store/user.ts b/editor.planx.uk/src/pages/FlowEditor/lib/store/user.ts index a102b1f6f5..0f8cec17fd 100644 --- a/editor.planx.uk/src/pages/FlowEditor/lib/store/user.ts +++ b/editor.planx.uk/src/pages/FlowEditor/lib/store/user.ts @@ -35,8 +35,8 @@ export const userStore: StateCreator = ( }, async initUserStore(jwt: string) { - const { getUser, setUser } = get(); - + const { getUser, setUser } = get(); + if (getUser()) return; const id = (jwtDecode(jwt) as any)["sub"]; diff --git a/editor.planx.uk/src/routes/authenticated.tsx b/editor.planx.uk/src/routes/authenticated.tsx index eb6a45ac85..d8a7966536 100644 --- a/editor.planx.uk/src/routes/authenticated.tsx +++ b/editor.planx.uk/src/routes/authenticated.tsx @@ -27,7 +27,7 @@ const editorRoutes = compose( }); useStore.getState().clearTeamStore(); - + return { title: makeTitle("Teams"), view: , diff --git a/editor.planx.uk/src/routes/team.tsx b/editor.planx.uk/src/routes/team.tsx index 3c70c7a521..12e3f355b2 100644 --- a/editor.planx.uk/src/routes/team.tsx +++ b/editor.planx.uk/src/routes/team.tsx @@ -19,7 +19,7 @@ const routes = compose( mount({ "/": route(() => ({ title: makeTitle(useStore.getState().teamName), - view: , + view: , })), "/:flow": lazy(async (req) => { diff --git a/editor.planx.uk/src/routes/views/team.tsx b/editor.planx.uk/src/routes/views/team.tsx index bbf1898d6e..3a2a02d296 100644 --- a/editor.planx.uk/src/routes/views/team.tsx +++ b/editor.planx.uk/src/routes/views/team.tsx @@ -1,7 +1,7 @@ -import { NaviRequest, NotFoundError } from "navi" +import { NaviRequest, NotFoundError } from "navi"; import { useStore } from "pages/FlowEditor/lib/store"; import React from "react"; -import { View } from "react-navi" +import { View } from "react-navi"; import { getTeamFromDomain } from "routes/utils"; /** @@ -10,7 +10,8 @@ import { getTeamFromDomain } from "routes/utils"; */ export const teamView = async (req: NaviRequest) => { const { initTeamStore, teamSlug: currentSlug } = useStore.getState(); - const routeSlug = req.params.team || await getTeamFromDomain(window.location.hostname) + const routeSlug = + req.params.team || (await getTeamFromDomain(window.location.hostname)); if (currentSlug !== routeSlug) { try { @@ -19,6 +20,6 @@ export const teamView = async (req: NaviRequest) => { throw new NotFoundError(`Team not found: ${error}`); } } - - return -} \ No newline at end of file + + return ; +};