From 47629b511bf912a835f9b52fba4c889339004f78 Mon Sep 17 00:00:00 2001 From: Aodhagan Murphy Date: Mon, 30 Sep 2024 13:51:19 +0100 Subject: [PATCH 01/10] fix: bumping plate packages [TOL-2415] --- packages/rich-text/package.json | 24 +- .../rich-text/src/internal/types/editor.ts | 3 +- .../src/plugins/Table/createTablePlugin.ts | 1 + .../rich-text/src/test-utils/assertOutput.ts | 2 +- .../{createEditor.ts => createTestEditor.ts} | 4 +- packages/rich-text/src/test-utils/index.ts | 2 +- yarn.lock | 420 ++++++++---------- 7 files changed, 213 insertions(+), 243 deletions(-) rename packages/rich-text/src/test-utils/{createEditor.ts => createTestEditor.ts} (88%) diff --git a/packages/rich-text/package.json b/packages/rich-text/package.json index 201daae9f..46237089e 100644 --- a/packages/rich-text/package.json +++ b/packages/rich-text/package.json @@ -49,18 +49,18 @@ "@contentful/rich-text-plain-text-renderer": "^16.0.4", "@contentful/rich-text-types": "16.7.0", "@popperjs/core": "^2.11.5", - "@udecode/plate-basic-marks": "30.1.2", - "@udecode/plate-break": "30.1.2", - "@udecode/plate-common": "30.1.2", - "@udecode/plate-core": "30.1.2", - "@udecode/plate-list": "30.1.2", - "@udecode/plate-paragraph": "30.1.2", - "@udecode/plate-reset-node": "30.1.2", - "@udecode/plate-select": "30.1.2", - "@udecode/plate-serializer-docx": "30.1.2", - "@udecode/plate-serializer-html": "30.1.2", - "@udecode/plate-table": "30.1.2", - "@udecode/plate-trailing-block": "30.1.2", + "@udecode/plate-basic-marks": "36.0.0", + "@udecode/plate-break": "36.0.0", + "@udecode/plate-common": "36.0.3", + "@udecode/plate-core": "36.0.3", + "@udecode/plate-list": "36.0.0", + "@udecode/plate-paragraph": "36.0.0", + "@udecode/plate-reset-node": "36.0.0", + "@udecode/plate-select": "36.0.0", + "@udecode/plate-serializer-docx": "36.0.0", + "@udecode/plate-serializer-html": "36.0.0", + "@udecode/plate-table": "36.0.0", + "@udecode/plate-trailing-block": "36.0.0", "constate": "^3.3.2", "fast-deep-equal": "^3.1.3", "is-hotkey": "^0.2.0", diff --git a/packages/rich-text/src/internal/types/editor.ts b/packages/rich-text/src/internal/types/editor.ts index ed13bb931..ded88e02f 100644 --- a/packages/rich-text/src/internal/types/editor.ts +++ b/packages/rich-text/src/internal/types/editor.ts @@ -31,9 +31,10 @@ export interface Element extends p.TElement { } export type Value = Element[]; -export type ReactEditor = p.TReactEditor; +export type ReactEditor = p.PlateEditor; export interface PlateEditor extends p.PlateEditor { tracking: TrackingPluginActions; + f; undo: { (): void; (source: 'toolbar' | 'shortcut'): void; diff --git a/packages/rich-text/src/plugins/Table/createTablePlugin.ts b/packages/rich-text/src/plugins/Table/createTablePlugin.ts index 57d66924c..deecc48f5 100644 --- a/packages/rich-text/src/plugins/Table/createTablePlugin.ts +++ b/packages/rich-text/src/plugins/Table/createTablePlugin.ts @@ -45,6 +45,7 @@ export const createTablePlugin = (): PlatePlugin => const { normalizeNode } = editor; // injects important fixes from plate's original table plugin editor = withDeleteTable(editor); + // @ts-expect-error -- . editor = withGetFragmentTable(editor); editor = withInsertFragmentTable(editor, plugin); // overrides insertFragment to handle table insertion to not add empty paragraph before table diff --git a/packages/rich-text/src/test-utils/assertOutput.ts b/packages/rich-text/src/test-utils/assertOutput.ts index b6526ad2a..6ad270f57 100644 --- a/packages/rich-text/src/test-utils/assertOutput.ts +++ b/packages/rich-text/src/test-utils/assertOutput.ts @@ -1,6 +1,6 @@ import { normalize } from '../internal'; import { PlateEditor } from '../internal/types'; -import { createTestEditor } from './createEditor'; +import { createTestEditor } from './createTestEditor'; import { setEmptyDataAttribute } from './setEmptyDataAttribute'; export const assertOutput = (options: { diff --git a/packages/rich-text/src/test-utils/createEditor.ts b/packages/rich-text/src/test-utils/createTestEditor.ts similarity index 88% rename from packages/rich-text/src/test-utils/createEditor.ts rename to packages/rich-text/src/test-utils/createTestEditor.ts index 608ad08ba..c3aa3d4dc 100644 --- a/packages/rich-text/src/test-utils/createEditor.ts +++ b/packages/rich-text/src/test-utils/createTestEditor.ts @@ -1,6 +1,6 @@ import { FieldAppSDK } from '@contentful/app-sdk'; -import { normalize, createPlateEditor } from '../internal'; +import { normalize, createPlateEditor, PlateEditor } from '../internal'; import { PlatePlugin } from '../internal/types'; import { getPlugins } from '../plugins'; import { RichTextTrackingActionHandler } from '../plugins/Tracking'; @@ -24,7 +24,7 @@ export const createTestEditor = (options: { }); return { - editor, + editor: editor as PlateEditor, normalize: () => normalize(editor), }; }; diff --git a/packages/rich-text/src/test-utils/index.ts b/packages/rich-text/src/test-utils/index.ts index 21ccddf1f..f821feaf7 100644 --- a/packages/rich-text/src/test-utils/index.ts +++ b/packages/rich-text/src/test-utils/index.ts @@ -1,4 +1,4 @@ export * from './jsx'; -export * from './createEditor'; +export * from './createTestEditor'; export * from './mockPlugin'; export * from './assertOutput'; diff --git a/yarn.lock b/yarn.lock index a1216acee..cc71b5662 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5086,6 +5086,11 @@ dependencies: "@babel/runtime" "^7.13.10" +"@radix-ui/react-compose-refs@1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.0.tgz#656432461fc8283d7b591dcf0d79152fae9ecc74" + integrity sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw== + "@radix-ui/react-context@1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-1.0.1.tgz#fe46e67c96b240de59187dcb7a1a50ce3e2ec00c" @@ -5231,7 +5236,7 @@ "@babel/runtime" "^7.13.10" "@radix-ui/react-primitive" "1.0.3" -"@radix-ui/react-slot@1.0.2", "@radix-ui/react-slot@^1.0.2": +"@radix-ui/react-slot@1.0.2": version "1.0.2" resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.0.2.tgz#a9ff4423eade67f501ffb32ec22064bc9d3099ab" integrity sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg== @@ -5239,6 +5244,13 @@ "@babel/runtime" "^7.13.10" "@radix-ui/react-compose-refs" "1.0.1" +"@radix-ui/react-slot@^1.0.2": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.1.0.tgz#7c5e48c36ef5496d97b08f1357bb26ed7c714b84" + integrity sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw== + dependencies: + "@radix-ui/react-compose-refs" "1.1.0" + "@radix-ui/react-tabs@^1.0.1": version "1.0.4" resolved "https://registry.yarnpkg.com/@radix-ui/react-tabs/-/react-tabs-1.0.4.tgz#993608eec55a5d1deddd446fa9978d2bc1053da2" @@ -7799,12 +7811,10 @@ "@typescript-eslint/types" "6.19.0" eslint-visitor-keys "^3.4.1" -"@udecode/plate-basic-marks@30.1.2": - version "30.1.2" - resolved "https://registry.yarnpkg.com/@udecode/plate-basic-marks/-/plate-basic-marks-30.1.2.tgz#321206f402791e4d03dc5c572d65e30797ecfbd8" - integrity sha512-Dlhq8CdWTunkgMxBcQ+QsEzmFoPJo8a5vI+8fi8GTIRmX1E5iCU897f7CU9P/V4q7GxPpw1MdSfbV8Gp8D/UsA== - dependencies: - "@udecode/plate-common" "30.1.2" +"@udecode/plate-basic-marks@36.0.0": + version "36.0.0" + resolved "https://registry.yarnpkg.com/@udecode/plate-basic-marks/-/plate-basic-marks-36.0.0.tgz#2f17559a842cae6515d18fd7d4cd7bbaba1a102f" + integrity sha512-fbeD8t5Gkwz/ZKMg9yv75K3e6i5G5N9IIW3pkwmWya3RJ1darvpxDaEREXC19fRcHeF+eav8W0ZYU5ExHkYxtg== "@udecode/plate-basic-marks@^10.4.0": version "10.5.3" @@ -7813,12 +7823,10 @@ dependencies: "@udecode/plate-core" "10.5.3" -"@udecode/plate-break@30.1.2": - version "30.1.2" - resolved "https://registry.yarnpkg.com/@udecode/plate-break/-/plate-break-30.1.2.tgz#d799d17596be39aecee12139ef9b923dd0ae5e54" - integrity sha512-hJkCQSo7z4cTQTAg0l7gkRA0VKxSMXgR3oavH/WOdd2UzOGcL20Peq2h45HLYu96mGn1E4z1iS1EwHROmo5Fng== - dependencies: - "@udecode/plate-common" "30.1.2" +"@udecode/plate-break@36.0.0": + version "36.0.0" + resolved "https://registry.yarnpkg.com/@udecode/plate-break/-/plate-break-36.0.0.tgz#ffe4d6fa298086e1249b50ac17405c82483c0563" + integrity sha512-c+5yX7HqQQ5lN1Li3tAHEcofi1KMwJ3r0ToTMWyS9Mt/3+/+IX/mlh9m3yvpprN2w7H5iNAArW0upIARsU0UKg== "@udecode/plate-break@^10.4.0": version "10.6.1" @@ -7827,18 +7835,18 @@ dependencies: "@udecode/plate-core" "10.5.3" -"@udecode/plate-common@30.1.2": - version "30.1.2" - resolved "https://registry.yarnpkg.com/@udecode/plate-common/-/plate-common-30.1.2.tgz#d5ae6395a677b496df58b05f645cd97ff951da9e" - integrity sha512-3O100g2s0TNIRWIS8dvwTtXXwY8CdAHOrYfsG/PfuBJ3ZMW+2GAGH8gxjlDoL/AJ5W9amS95NiwkRjsHClwX/A== +"@udecode/plate-common@36.0.3": + version "36.0.3" + resolved "https://registry.yarnpkg.com/@udecode/plate-common/-/plate-common-36.0.3.tgz#d25ede04ed0911304c6ac7c45c745ea9415cd6a7" + integrity sha512-pNJQIxizXUWZ/tykKau87kpZfcEILjnBvJoaoKAXZ/x9c946r1qaQDP8BSIZUbbYM2EPDtigZMgOUdH/8jlKYQ== dependencies: - "@udecode/plate-core" "30.1.2" - "@udecode/plate-utils" "30.1.2" - "@udecode/react-utils" "29.0.1" - "@udecode/slate" "25.0.0" - "@udecode/slate-react" "29.0.1" - "@udecode/slate-utils" "25.0.0" - "@udecode/utils" "24.3.0" + "@udecode/plate-core" "36.0.3" + "@udecode/plate-utils" "36.0.3" + "@udecode/react-utils" "33.0.0" + "@udecode/slate" "32.0.1" + "@udecode/slate-react" "36.0.3" + "@udecode/slate-utils" "34.0.4" + "@udecode/utils" "31.0.0" "@udecode/plate-core@10.5.3", "@udecode/plate-core@^10.4.0": version "10.5.3" @@ -7852,27 +7860,27 @@ use-deep-compare "1.1.0" zustand "3.7.0" -"@udecode/plate-core@30.1.2": - version "30.1.2" - resolved "https://registry.yarnpkg.com/@udecode/plate-core/-/plate-core-30.1.2.tgz#b6257ad8b6f47df979899c1c894f8c728c806252" - integrity sha512-AaYP9HwyloGVJ/J0b4QE4Wmxq0T7wexGAC4tb1zN0nO2EV/QGndLH1EgfhsGrsvFsxyGUwPzWg04sHCDbONfzw== +"@udecode/plate-core@36.0.3": + version "36.0.3" + resolved "https://registry.yarnpkg.com/@udecode/plate-core/-/plate-core-36.0.3.tgz#1f36870e95d2cf21a0bbd195b20a568a54709eb7" + integrity sha512-aC5sff8JsUVHC12BVa4Wf1NuJEdyq4Icsz/PVvKah3Huhd8aOazCSsSVnpy4bjuIvRz8mBC5FTlNZVoW0XNwHA== dependencies: - "@udecode/slate" "25.0.0" - "@udecode/slate-react" "29.0.1" - "@udecode/slate-utils" "25.0.0" - "@udecode/utils" "24.3.0" + "@udecode/slate" "32.0.1" + "@udecode/slate-react" "36.0.3" + "@udecode/slate-utils" "34.0.4" + "@udecode/utils" "31.0.0" clsx "^1.2.1" is-hotkey "^0.2.0" - jotai "^2.6.0" - jotai-optics "0.3.1" - jotai-x "^1.2.1" + jotai "^2.7.1" + jotai-optics "0.3.2" + jotai-x "^1.2.3" lodash "^4.17.21" - nanoid "^3.3.6" + nanoid "^3.3.7" optics-ts "2.4.1" - react-hotkeys-hook "^4.4.1" - use-deep-compare "^1.1.0" - zustand "^4.4.7" - zustand-x "^3.0.1" + react-hotkeys-hook "^4.5.0" + use-deep-compare "^1.2.1" + zustand "^4.5.2" + zustand-x "^3.0.2" "@udecode/plate-heading@10.5.3": version "10.5.3" @@ -7881,12 +7889,10 @@ dependencies: "@udecode/plate-core" "10.5.3" -"@udecode/plate-heading@30.1.2": - version "30.1.2" - resolved "https://registry.yarnpkg.com/@udecode/plate-heading/-/plate-heading-30.1.2.tgz#f321abb6fa8fe1f812493089e6525aa5b133918c" - integrity sha512-Yo2nH+96OUulxLxAha6PQF0zzII/Qdx2OLJGU74vt2xnWFrsVKx3DwJFcdpgNsi2jFcYUWI3elhJoFsxOutKxw== - dependencies: - "@udecode/plate-common" "30.1.2" +"@udecode/plate-heading@36.0.0": + version "36.0.0" + resolved "https://registry.yarnpkg.com/@udecode/plate-heading/-/plate-heading-36.0.0.tgz#ef69cae110c63133fcce6383e9a337c36a4bf441" + integrity sha512-dXYz1iW6+pPyFC57pbvTWJHZjOYAdcxwSo1TAtmajt7BI0xQYGZy3NJ/OjKf0aH/28KdTBRgegF1TE7rZYa+KQ== "@udecode/plate-image@10.7.0": version "10.7.0" @@ -7904,14 +7910,13 @@ "@udecode/plate-indent" "10.5.3" "@udecode/plate-list" "10.5.3" -"@udecode/plate-indent-list@30.1.2": - version "30.1.2" - resolved "https://registry.yarnpkg.com/@udecode/plate-indent-list/-/plate-indent-list-30.1.2.tgz#2bd8d944c843b47836bd24c6077dc24bd55a27f2" - integrity sha512-WIofAVKxx8+8mkQkgCGPL8/aLcm3TCs47w14U2y4cSNP2d4Wldab7JEpjhZ3oOEZWUy5of8gz4GFAFMsSaA1aQ== +"@udecode/plate-indent-list@36.0.0": + version "36.0.0" + resolved "https://registry.yarnpkg.com/@udecode/plate-indent-list/-/plate-indent-list-36.0.0.tgz#55a286b2e8b063bc3d1adaab25f692ea74931ba1" + integrity sha512-ARP+I7011udxWycyIasOQD4sHWfgxByGqlB29VLM2xTo1cD1RlZsG7+eBs/Tb38eYYGP/HuoOpwHRuuhrjHUxQ== dependencies: - "@udecode/plate-common" "30.1.2" - "@udecode/plate-indent" "30.1.2" - "@udecode/plate-list" "30.1.2" + "@udecode/plate-indent" "36.0.0" + "@udecode/plate-list" "36.0.0" clsx "^1.2.1" "@udecode/plate-indent@10.5.3": @@ -7921,12 +7926,10 @@ dependencies: "@udecode/plate-core" "10.5.3" -"@udecode/plate-indent@30.1.2": - version "30.1.2" - resolved "https://registry.yarnpkg.com/@udecode/plate-indent/-/plate-indent-30.1.2.tgz#4ec2e536132b722d34a3a0b969443cbb7c69bc4e" - integrity sha512-W75K9zNpx13PgvzUVl60XISFWIDyNy02c6nfWNqGEHa2fOR8rShik7ebI7JxxCxu8hia5UTFwDQdtBh0GmImkQ== - dependencies: - "@udecode/plate-common" "30.1.2" +"@udecode/plate-indent@36.0.0": + version "36.0.0" + resolved "https://registry.yarnpkg.com/@udecode/plate-indent/-/plate-indent-36.0.0.tgz#139c37b7103b08faeb1daf75027f387dfc822e7d" + integrity sha512-pbeIqrl+K5vKHvPgKm1NS9cVXUuBr3MxfqO9iZKT7NPtZss6j23O1qYPT2uTqZf15FfeXRttQlG9OuISAiSGWQ== "@udecode/plate-list@10.5.3", "@udecode/plate-list@^10.4.0": version "10.5.3" @@ -7936,21 +7939,19 @@ "@udecode/plate-core" "10.5.3" "@udecode/plate-reset-node" "10.5.3" -"@udecode/plate-list@30.1.2": - version "30.1.2" - resolved "https://registry.yarnpkg.com/@udecode/plate-list/-/plate-list-30.1.2.tgz#3e134bfbf939e1b6f1223e10599573f68fd2b6fa" - integrity sha512-+EZm2hAqFIGQG4c/Gtp5QVrlpHv55Zb5moEIP9ETd97QA7heQ5zCB0+yM3sujueNhphzFB+Y+mhpsp8vTGPiDA== +"@udecode/plate-list@36.0.0": + version "36.0.0" + resolved "https://registry.yarnpkg.com/@udecode/plate-list/-/plate-list-36.0.0.tgz#5bdcad4b79832f750a7e0a18defe57dc5a51e0ba" + integrity sha512-6RvRzlwudXxDZIj5993dr9HeprV2qGeVsMnISFWXPqq+2g0D2t4eiy9gZ69XmYUnSKQAtmrTA8E67vTbsgkM8Q== dependencies: - "@udecode/plate-common" "30.1.2" - "@udecode/plate-reset-node" "30.1.2" + "@udecode/plate-reset-node" "36.0.0" lodash "^4.17.21" -"@udecode/plate-media@30.1.2": - version "30.1.2" - resolved "https://registry.yarnpkg.com/@udecode/plate-media/-/plate-media-30.1.2.tgz#369f3f71f2949b15ad35f7e742aa5d2e55548097" - integrity sha512-nHG1MekLs5zpVSs/dC4s9JOTR9HHfTybcaSBVecWuWFQhtZyL4G5o3LbGaLOShIKsNM7fvT0j3PWsfKAGV3oHA== +"@udecode/plate-media@36.0.0": + version "36.0.0" + resolved "https://registry.yarnpkg.com/@udecode/plate-media/-/plate-media-36.0.0.tgz#067722b88f2902650e40cad98c12ea485ba34bad" + integrity sha512-uz/nuWll5Np9rKlTfZdW3xIZfBrHo+Aalv2IGO4BXHOdqwPj48x6GxSh18lJ1STh4XM6zaZW6i96i7pJ3lO9mg== dependencies: - "@udecode/plate-common" "30.1.2" js-video-url-parser "^0.5.1" "@udecode/plate-paragraph@10.5.3", "@udecode/plate-paragraph@^10.4.0": @@ -7960,12 +7961,10 @@ dependencies: "@udecode/plate-core" "10.5.3" -"@udecode/plate-paragraph@30.1.2": - version "30.1.2" - resolved "https://registry.yarnpkg.com/@udecode/plate-paragraph/-/plate-paragraph-30.1.2.tgz#dbce3710175548a7f0ca0d2e7a36cb347e47160c" - integrity sha512-cxAE+36sXKTBI4Gvf1tssU2Jg8GgNSZOuRY5wTtl19Av3X9AwF2FsRNSHAvrR+2TyqEHYtCBjfRBHdMagOrWxA== - dependencies: - "@udecode/plate-common" "30.1.2" +"@udecode/plate-paragraph@36.0.0": + version "36.0.0" + resolved "https://registry.yarnpkg.com/@udecode/plate-paragraph/-/plate-paragraph-36.0.0.tgz#3c3ba38d762504efd39b01995dbd4082c33cea55" + integrity sha512-Zbm76VygSfj4hkP1kfjwaYZisvmF3XP79f1uVTieQfcx/16s+Ln4BCVasCCbS+PO94yjsujW+ww05bUzGqRxpA== "@udecode/plate-reset-node@10.5.3", "@udecode/plate-reset-node@^10.4.0": version "10.5.3" @@ -7974,26 +7973,20 @@ dependencies: "@udecode/plate-core" "10.5.3" -"@udecode/plate-reset-node@30.1.2": - version "30.1.2" - resolved "https://registry.yarnpkg.com/@udecode/plate-reset-node/-/plate-reset-node-30.1.2.tgz#ece9a17f3e465cd2f8eb6ad84da5c536f8f91bde" - integrity sha512-Gn7ELDHLx2+VmM9jskgPv4zqv6DzfpKHdtNX/98oJ1R7KSZLK+OpOLD8EOpQ8v+3lB2kDBrR+IYGjjmZySzfqg== - dependencies: - "@udecode/plate-common" "30.1.2" +"@udecode/plate-reset-node@36.0.0": + version "36.0.0" + resolved "https://registry.yarnpkg.com/@udecode/plate-reset-node/-/plate-reset-node-36.0.0.tgz#062385a1f0754fb549fa0cdc817e025be8ccb1c0" + integrity sha512-gDDc4ak8Gk47TQl6bGoxqy82nzmY94GPtaE9aSVJ5zjNcSTfvqWzPjAU7s2zaNPUJERI7Q01rVMzBJAckbC6Hg== -"@udecode/plate-resizable@30.1.2": - version "30.1.2" - resolved "https://registry.yarnpkg.com/@udecode/plate-resizable/-/plate-resizable-30.1.2.tgz#12aab90fadb04a117b60bdd1c23d52573ffd64a7" - integrity sha512-3Zkl32uMPJwskxeVBJ+ng/Ivd/eF/FbLF211plqy8NIl8+EIBbhuJTaPYQrpctM9gRsvL5ttQQB879rPf3m/gw== - dependencies: - "@udecode/plate-common" "30.1.2" +"@udecode/plate-resizable@36.0.0": + version "36.0.0" + resolved "https://registry.yarnpkg.com/@udecode/plate-resizable/-/plate-resizable-36.0.0.tgz#e98921dc40a6c399dc156f1d571daf623596ddbd" + integrity sha512-q8LDQONh46IAsFaMTiUxOcMNKz4qhKtABwbfi4TvPgTj9r5fDL2UGitvpwxHxMoXPYGfe4l/xvve4ShtutPoyA== -"@udecode/plate-select@30.1.2": - version "30.1.2" - resolved "https://registry.yarnpkg.com/@udecode/plate-select/-/plate-select-30.1.2.tgz#8ebd2f864a72c6fba855ca71911120ab4e6efdc0" - integrity sha512-IexzzkhwBVFFJn2cMPN39cUYlI0Mw0GtU+yNaFDO+QPIx1nKTNTp7W7EFSGZinFuxHO28cLOvAHjTEvCALPZYQ== - dependencies: - "@udecode/plate-common" "30.1.2" +"@udecode/plate-select@36.0.0": + version "36.0.0" + resolved "https://registry.yarnpkg.com/@udecode/plate-select/-/plate-select-36.0.0.tgz#30e9b7fca3d450caecb1f06f08e66e79fbe92770" + integrity sha512-cMP+UXYftb/cTJKbrShltk5K1y9z94J7sCUQCqJllOu+VvLKUVkLOokqQC42Vp2zUhGgvIzjCGcL2pPec9Iexg== "@udecode/plate-select@^10.4.0": version "10.5.3" @@ -8002,19 +7995,18 @@ dependencies: "@udecode/plate-core" "10.5.3" -"@udecode/plate-serializer-docx@30.1.2": - version "30.1.2" - resolved "https://registry.yarnpkg.com/@udecode/plate-serializer-docx/-/plate-serializer-docx-30.1.2.tgz#350137ab57da3cc83d7c1d573d4ce2e2d62d6d32" - integrity sha512-DkpVUXW1ppb5j+whCyE9D4xpmKZtv8fLasbDQGTz37Igv/lL3fG8/gMdTFgd0ax9vWPRL6wCi1mSK3mSvAhCpQ== +"@udecode/plate-serializer-docx@36.0.0": + version "36.0.0" + resolved "https://registry.yarnpkg.com/@udecode/plate-serializer-docx/-/plate-serializer-docx-36.0.0.tgz#2c3d82e5e207fc59c42fd2a2b44c82dc91331818" + integrity sha512-pRfL73iCbOCDbWBWh67HJdT7SNo2cEbLag1XxuckHd70+AiVOO4WGJuEixhHZSfNhHGHkvv1Lg/5ltM3AqUGyg== dependencies: - "@udecode/plate-common" "30.1.2" - "@udecode/plate-heading" "30.1.2" - "@udecode/plate-indent" "30.1.2" - "@udecode/plate-indent-list" "30.1.2" - "@udecode/plate-media" "30.1.2" - "@udecode/plate-paragraph" "30.1.2" - "@udecode/plate-table" "30.1.2" - validator "^13.9.0" + "@udecode/plate-heading" "36.0.0" + "@udecode/plate-indent" "36.0.0" + "@udecode/plate-indent-list" "36.0.0" + "@udecode/plate-media" "36.0.0" + "@udecode/plate-paragraph" "36.0.0" + "@udecode/plate-table" "36.0.0" + validator "^13.11.0" "@udecode/plate-serializer-docx@^10.4.0": version "10.7.0" @@ -8030,13 +8022,12 @@ "@udecode/plate-table" "10.6.3" validator "13.7.0" -"@udecode/plate-serializer-html@30.1.2": - version "30.1.2" - resolved "https://registry.yarnpkg.com/@udecode/plate-serializer-html/-/plate-serializer-html-30.1.2.tgz#4c5c9766e0b4de0f49562d8a58e487cdf7923658" - integrity sha512-8kEURgvLEYyVh22OFDddUJ783cOKyxy7FMpg9P4GKOpbhKFpOwfMkVi89uOIi2MwV+ERfkjXCPmupfuwxaODmQ== +"@udecode/plate-serializer-html@36.0.0": + version "36.0.0" + resolved "https://registry.yarnpkg.com/@udecode/plate-serializer-html/-/plate-serializer-html-36.0.0.tgz#0003a28600cab37188f15651f19f7a8ba64771bf" + integrity sha512-hOIofWtW0DZsfThjRqCw4pECNI1MmxZv8IgbCi/tdu0ROEcac8nwmgdra4DxW0bDEPgu7cEScwX4F6y8nTjm4A== dependencies: - "@udecode/plate-common" "30.1.2" - html-entities "^2.4.0" + html-entities "^2.5.2" "@udecode/plate-table@10.6.3", "@udecode/plate-table@^10.4.0": version "10.6.3" @@ -8045,13 +8036,12 @@ dependencies: "@udecode/plate-core" "10.5.3" -"@udecode/plate-table@30.1.2": - version "30.1.2" - resolved "https://registry.yarnpkg.com/@udecode/plate-table/-/plate-table-30.1.2.tgz#d475d7bb125062a675467ef007d908b486528435" - integrity sha512-eSyt66hec1f5GdHz2lEqDO0fyPFbw5s8+7XxEHjw1rydd27lWGwNp6/CSNGJ13pH7B9N5xlCiD+IvJvIiXvKZA== +"@udecode/plate-table@36.0.0": + version "36.0.0" + resolved "https://registry.yarnpkg.com/@udecode/plate-table/-/plate-table-36.0.0.tgz#e5e3a278f4592e891c97c540f89c2e0c83115385" + integrity sha512-5LqUGSP/hasz13w/eztmmqx0t1dQZ6bbfuXB03A2JHIxhjkcNRyrQW8/cZr5WNSVJ7nOhc8zplwU8RYlIkuMKw== dependencies: - "@udecode/plate-common" "30.1.2" - "@udecode/plate-resizable" "30.1.2" + "@udecode/plate-resizable" "36.0.0" lodash "^4.17.21" "@udecode/plate-test-utils@^3.2.0": @@ -8059,12 +8049,10 @@ resolved "https://registry.yarnpkg.com/@udecode/plate-test-utils/-/plate-test-utils-3.2.0.tgz#889e4ed08b21a85fd20b7c7c084bb4d483da8c78" integrity sha512-TvwSLrsDgzlzpcs+DbYHOV5fnUYI2v+dQ2nysc6QmFjS8cIi8ec1JF3GGb7IfLbEiQdMzxfLNmLkQYexN7gE1Q== -"@udecode/plate-trailing-block@30.1.2": - version "30.1.2" - resolved "https://registry.yarnpkg.com/@udecode/plate-trailing-block/-/plate-trailing-block-30.1.2.tgz#ec73f8c679fef731349e17b4719bef38d3534483" - integrity sha512-bkLW53/7EvgWnqH2wP9Hd0cBDVqKPTzCQVY8Xk09B8xW4Ag+FUC+qWk7kq5WtMy5FuXe7+Bf5rcwO170M90oDw== - dependencies: - "@udecode/plate-common" "30.1.2" +"@udecode/plate-trailing-block@36.0.0": + version "36.0.0" + resolved "https://registry.yarnpkg.com/@udecode/plate-trailing-block/-/plate-trailing-block-36.0.0.tgz#50183e9ddb03c702bb299c968368d5ba57aa756a" + integrity sha512-fHETw5ylT6Cw5hDf0kyXqm3F4bCXfWg32sj+L0D7u2MJt/g0LYY8LY6J76ht9Vp0NyxYzOqZn/efDzBzlQgFqg== "@udecode/plate-trailing-block@^10.4.0": version "10.5.3" @@ -8073,58 +8061,58 @@ dependencies: "@udecode/plate-core" "10.5.3" -"@udecode/plate-utils@30.1.2": - version "30.1.2" - resolved "https://registry.yarnpkg.com/@udecode/plate-utils/-/plate-utils-30.1.2.tgz#d3a388e7d275f8511489f06609e6d33b6484195e" - integrity sha512-Zd9PlkkJAM6tDANeoNsCDFFz70RbpMEDNukHSTTkINeZ+cygqxouM6SHh4UiKPqC6/f0IIu63Tj1RlukD8m50w== - dependencies: - "@udecode/plate-core" "30.1.2" - "@udecode/react-utils" "29.0.1" - "@udecode/slate" "25.0.0" - "@udecode/slate-react" "29.0.1" - "@udecode/slate-utils" "25.0.0" - "@udecode/utils" "24.3.0" +"@udecode/plate-utils@36.0.3": + version "36.0.3" + resolved "https://registry.yarnpkg.com/@udecode/plate-utils/-/plate-utils-36.0.3.tgz#c0f58e796dd740aeded8c01ba1b9deb46244f21a" + integrity sha512-AuzP+vgLCcd89oFs27a7KAhaDhK5R7oXbo6qvZE0wQf4iMceopcuGG+WCMJASrHarqS4C2m7KMiOpCrPDLfxWA== + dependencies: + "@udecode/plate-core" "36.0.3" + "@udecode/react-utils" "33.0.0" + "@udecode/slate" "32.0.1" + "@udecode/slate-react" "36.0.3" + "@udecode/slate-utils" "34.0.4" + "@udecode/utils" "31.0.0" clsx "^1.2.1" lodash "^4.17.21" -"@udecode/react-utils@29.0.1": - version "29.0.1" - resolved "https://registry.yarnpkg.com/@udecode/react-utils/-/react-utils-29.0.1.tgz#b310f91b927fa3ce466af305b58fd88db3768f77" - integrity sha512-+bFJFTDsWArFaC4AZFap0VdCvEbu5ZA16avj4xjjdBBho4TiHOZ7RMDliwTUetA3DOm5LG02dmZ1U4ORNC0m3w== +"@udecode/react-utils@33.0.0": + version "33.0.0" + resolved "https://registry.yarnpkg.com/@udecode/react-utils/-/react-utils-33.0.0.tgz#cf7867a8607ff56236ce985e3d7706f6f268f5df" + integrity sha512-ptFyi2mivkyd/HUVWj1PXCCXLVBecLQ3b6DweNesoabdlf/43aUetL4oHVCXr97TAKck7xi2MZbSUNlMAmLhmA== dependencies: "@radix-ui/react-slot" "^1.0.2" - "@udecode/utils" "24.3.0" + "@udecode/utils" "31.0.0" clsx "^1.2.1" -"@udecode/slate-react@29.0.1": - version "29.0.1" - resolved "https://registry.yarnpkg.com/@udecode/slate-react/-/slate-react-29.0.1.tgz#3141cb59ddcff123970cb1dbd03edfffc85aa034" - integrity sha512-DOiGXxfL43tVyNg0LneTQGQBW/HkF2srwIM8b0Al/x082HHfo2PP2WkFqPqTh1uGUAa2RBRh9xFKmNkKeuyWSw== +"@udecode/slate-react@36.0.3": + version "36.0.3" + resolved "https://registry.yarnpkg.com/@udecode/slate-react/-/slate-react-36.0.3.tgz#c0e204cf27957610e175335c349d49eec5387b70" + integrity sha512-2L8xpiie9CSLyjQmJ2mgalc4t/WYnXRRNldo/iuoh2x1CYYxkpRuiUsF6DWqjgX996DKjnsMaRz6WsJlxii+4g== dependencies: - "@udecode/react-utils" "29.0.1" - "@udecode/slate" "25.0.0" - "@udecode/utils" "24.3.0" + "@udecode/react-utils" "33.0.0" + "@udecode/slate" "32.0.1" + "@udecode/utils" "31.0.0" -"@udecode/slate-utils@25.0.0": - version "25.0.0" - resolved "https://registry.yarnpkg.com/@udecode/slate-utils/-/slate-utils-25.0.0.tgz#6ae957f666da65bfae85d4ede2416bd5521d8f1c" - integrity sha512-H8dECl5Tu44Nt946rkSXCJ1yzsc2R9GXSoA9oNIBmcyNo3jTHZOyG/Ocn3RGgfzAK996A43GBD/keNabJEPtQg== +"@udecode/slate-utils@34.0.4": + version "34.0.4" + resolved "https://registry.yarnpkg.com/@udecode/slate-utils/-/slate-utils-34.0.4.tgz#76a2badd81b48d1ca18d1caad5dd3de02895fc88" + integrity sha512-xaK9rmlPmQuqDzKn5Ub/OpIqACd1oCrjjvOFMSbSYOCcM1TlLSPdnRFEB833FbnFHITIZBj4u2f6kTLQBrLTUg== dependencies: - "@udecode/slate" "25.0.0" - "@udecode/utils" "24.3.0" + "@udecode/slate" "32.0.1" + "@udecode/utils" "31.0.0" lodash "^4.17.21" -"@udecode/slate@25.0.0": - version "25.0.0" - resolved "https://registry.yarnpkg.com/@udecode/slate/-/slate-25.0.0.tgz#11d339ff73ebba55eeb1d87ab4befda28130f9a2" - integrity sha512-mGb9nMDwIygLqERwJ8kTOfo3wIxMQ0xLJEPKn09jrshEIxUCyO3mYj8y/5vOMcrzj6yexOsgQ6VNX8ylS3lnIQ== +"@udecode/slate@32.0.1": + version "32.0.1" + resolved "https://registry.yarnpkg.com/@udecode/slate/-/slate-32.0.1.tgz#5565d5fdb5fc8054f0d05adb2d46f6b928b0f968" + integrity sha512-kmuOF8OZHQTgsU3XLeN5CztI5Q08UMjH4IjtNjSZq+euNGA4DHEcSuVpucaE99r8cLtp1ReT426bmizEa0G1aQ== dependencies: - "@udecode/utils" "24.3.0" + "@udecode/utils" "31.0.0" -"@udecode/utils@24.3.0": - version "24.3.0" - resolved "https://registry.yarnpkg.com/@udecode/utils/-/utils-24.3.0.tgz#28123f519aa4e0162319c6c66c8ff5c1e191be9e" - integrity sha512-/Y2lh/Ih1wx4zN35Ky2Z1G1/5f7cSAS7F6dkhrcbJUnDF0srTidoEIRabK+og/yIK/MCEFfOsQGetoV7Ert5hg== +"@udecode/utils@31.0.0": + version "31.0.0" + resolved "https://registry.yarnpkg.com/@udecode/utils/-/utils-31.0.0.tgz#d530297ee1e87804da9c6d1fd4658005d997f06d" + integrity sha512-06JTl1UAm3mzLLAx8hdMUFw4XRQG727z9JoJ9PeBnmFb9q4Cg3DdmbFnhVJMrBPWlyOwoHtPrBjnanTFeiP36Q== "@udecode/zustood@0.4.4": version "0.4.4" @@ -14301,7 +14289,7 @@ html-encoding-sniffer@^3.0.0: dependencies: whatwg-encoding "^2.0.0" -html-entities@^2.1.0, html-entities@^2.3.2, html-entities@^2.4.0: +html-entities@^2.1.0, html-entities@^2.3.2, html-entities@^2.5.2: version "2.5.2" resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.2.tgz#201a3cf95d3a15be7099521620d19dfb4f65359f" integrity sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA== @@ -16318,25 +16306,25 @@ joi@^17.13.1, joi@^17.4.0: "@sideway/formula" "^3.0.1" "@sideway/pinpoint" "^2.0.0" -jotai-optics@0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/jotai-optics/-/jotai-optics-0.3.1.tgz#7ff38470551429460cc41d9cd1320193665354e0" - integrity sha512-KibUx9IneM2hGWGIYGs/v0KCxU985lg7W2c6dt5RodJCB2XPbmok8rkkLmdVk9+fKsn2shkPMi+AG8XzHgB3+w== +jotai-optics@0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/jotai-optics/-/jotai-optics-0.3.2.tgz#5d2f14be4742dbd905028ed6bfc765796f8d1de6" + integrity sha512-RH6SvqU5hmkVqnHmaqf9zBXvIAs4jLxkDHS4fr5ljuBKHs8+HQ02v+9hX7ahTppxx6dUb0GGUE80jQKJ0kFTLw== -jotai-x@^1.2.1: - version "1.2.3" - resolved "https://registry.yarnpkg.com/jotai-x/-/jotai-x-1.2.3.tgz#d7fdcfcf04f3ae16587b6fa7c53f671fd08d3863" - integrity sha512-hQSO2oKZAHvH2Ndm8sMQQ+MjQfSZOh33ET6C0S/D10WWOvKTlvAvwvDkt6NNj8psENt+J2rYP8+brmbyimdYDw== +jotai-x@^1.2.3: + version "1.2.4" + resolved "https://registry.yarnpkg.com/jotai-x/-/jotai-x-1.2.4.tgz#8dfc8fc40c9a026eca7b532d8fd0ef4f497ae74e" + integrity sha512-FyLrAR/ZDtmaWgif4cNRuJvMam/RSFv+B11/p4T427ws/T+8WhZzwmULwNogG6ZbZq+v1XpH6f9aN1lYqY5dLg== jotai@1.5.3: version "1.5.3" resolved "https://registry.yarnpkg.com/jotai/-/jotai-1.5.3.tgz#0157f962c6cd7d28389f9606a1eefebf223801ed" integrity sha512-iD8MkbehxTjfRUtIJJdyQcjbAe2MqjW1+oFc5lvfgRjLHwjRQyWnZC3gdGAOQCOqUSPZHOBGgWyP/8gBDckaNQ== -jotai@^2.6.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/jotai/-/jotai-2.8.0.tgz#5a6585cd5576c400c2c5f8e157b83ad2ba70b2ab" - integrity sha512-yZNMC36FdLOksOr8qga0yLf14miCJlEThlp5DeFJNnqzm2+ZG7wLcJzoOyij5K6U6Xlc5ljQqPDlJRgqW0Y18g== +jotai@^2.7.1: + version "2.10.0" + resolved "https://registry.yarnpkg.com/jotai/-/jotai-2.10.0.tgz#7483b81ab21ba28778f04b29368728f25efe4e89" + integrity sha512-8W4u0aRlOIwGlLQ0sqfl/c6+eExl5D8lZgAUolirZLktyaj4WnxO/8a0HEPmtriQAB6X5LMhXzZVmw02X0P0qQ== "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" @@ -18578,7 +18566,7 @@ mz@^2.4.0, mz@^2.7.0: object-assign "^4.0.1" thenify-all "^1.0.0" -nanoid@^3.1.3, nanoid@^3.3.6, nanoid@^3.3.7: +nanoid@^3.1.3, nanoid@^3.3.7: version "3.3.7" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== @@ -20943,10 +20931,10 @@ react-focus-lock@^2.9.1: use-callback-ref "^1.3.2" use-sidecar "^1.1.2" -react-hotkeys-hook@^4.4.1: - version "4.5.0" - resolved "https://registry.yarnpkg.com/react-hotkeys-hook/-/react-hotkeys-hook-4.5.0.tgz#807b389b15256daf6a813a1ec09e6698064fe97f" - integrity sha512-Samb85GSgAWFQNvVt3PS90LPPGSf9mkH/r4au81ZP1yOIFayLC3QAvqTgGtJ8YEDMXtPmaVBs6NgipHO6h4Mug== +react-hotkeys-hook@^4.5.0: + version "4.5.1" + resolved "https://registry.yarnpkg.com/react-hotkeys-hook/-/react-hotkeys-hook-4.5.1.tgz#990260ecc7e5a431414148a93b02a2f1a9707897" + integrity sha512-scAEJOh3Irm0g95NIn6+tQVf/OICCjsQsC9NBHfQws/Vxw4sfq1tDQut5fhTEvPraXhu/sHxRd9lOtxzyYuNAg== react-intersection-observer@9.4.0: version "9.4.0" @@ -22946,7 +22934,7 @@ string-natural-compare@^3.0.1: resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4" integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw== -"string-width-cjs@npm:string-width@^4.2.0": +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -22964,15 +22952,6 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - string-width@^2.0.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" @@ -23102,7 +23081,7 @@ stringify-object@^3.3.0: is-obj "^1.0.1" is-regexp "^1.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -23130,13 +23109,6 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^7.0.0, strip-ansi@^7.0.1, strip-ansi@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -24506,10 +24478,10 @@ use-deep-compare@1.1.0: dependencies: dequal "1.0.0" -use-deep-compare@^1.1.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/use-deep-compare/-/use-deep-compare-1.2.1.tgz#076c9865868d98509e619206e27bc8eff0b8ed7c" - integrity sha512-JTnOZAr0fq1ix6CQ4XANoWIh03xAiMFlP/lVAYDdAOZwur6nqBSdATn1/Q9PLIGIW+C7xmFZBCcaA4KLDcQJtg== +use-deep-compare@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/use-deep-compare/-/use-deep-compare-1.3.0.tgz#b36d304072d306e6bf27ca5653f3277dd66d2c0d" + integrity sha512-94iG+dEdEP/Sl3WWde+w9StIunlV8Dgj+vkt5wTwMoFQLaijiEZSXXy8KtcStpmEDtIptRJiNeD4ACTtVvnIKA== dependencies: dequal "2.0.3" @@ -24528,7 +24500,12 @@ use-sidecar@^1.1.2: detect-node-es "^1.1.0" tslib "^2.0.0" -use-sync-external-store@1.2.0, use-sync-external-store@^1.2.0: +use-sync-external-store@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz#c3b6390f3a30eba13200d2302dcdf1e7b57b2ef9" + integrity sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw== + +use-sync-external-store@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a" integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA== @@ -24651,10 +24628,10 @@ validator@13.7.0: resolved "https://registry.yarnpkg.com/validator/-/validator-13.7.0.tgz#4f9658ba13ba8f3d82ee881d3516489ea85c0857" integrity sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw== -validator@^13.9.0: - version "13.11.0" - resolved "https://registry.yarnpkg.com/validator/-/validator-13.11.0.tgz#23ab3fd59290c61248364eabf4067f04955fbb1b" - integrity sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ== +validator@^13.11.0: + version "13.12.0" + resolved "https://registry.yarnpkg.com/validator/-/validator-13.12.0.tgz#7d78e76ba85504da3fee4fd1922b385914d4b35f" + integrity sha512-c1Q0mCiPlgdTVVVIJIrBuxNicYE+t/7oKeI9MWLj3fh/uq2Pxh/3eeWbVZ4OcGW1TUf53At0njHw5SMdA3tmMg== vary@~1.1.2: version "1.1.2" @@ -25390,7 +25367,7 @@ workerpool@^6.5.1: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544" integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -25425,15 +25402,6 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" @@ -25716,10 +25684,10 @@ yocto-queue@^1.0.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251" integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g== -zustand-x@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/zustand-x/-/zustand-x-3.0.2.tgz#e967894009b45e66326e7967c9006f757380cc21" - integrity sha512-tb4qMWbmgrWEdemb+LlrJiHI1ZMxwlQNz7jDHN5iA/vmU8xlpAX80MQZ2FNLP2KejBFEnsA1RWRAO/0D5O0rPw== +zustand-x@^3.0.2: + version "3.0.4" + resolved "https://registry.yarnpkg.com/zustand-x/-/zustand-x-3.0.4.tgz#9d4aa43c44d92681bda169f58f5e098a05283aac" + integrity sha512-dVD8WUEpR/0mMdLah9j8i+r6PMAq9Ii2u+BX/9Bn4MHRt8sSnRQ90YMUlTVonZYAHGb2UHZwPpE2gMb8GtYDDw== dependencies: immer "^10.0.3" lodash.mapvalues "^4.6.0" @@ -25730,12 +25698,12 @@ zustand@3.7.0: resolved "https://registry.yarnpkg.com/zustand/-/zustand-3.7.0.tgz#a5c68fb06bdee9c63ad829de2432635be6d0ce69" integrity sha512-USzVzLGrvZ8VK1/sEsOAmeqa8N7D3OBdZskVaL7DL89Q4QLTYD053iIlZ5KDidyZ+Od80Dttin/f8ZulOLFFDQ== -zustand@^4.4.7: - version "4.5.2" - resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.5.2.tgz#fddbe7cac1e71d45413b3682cdb47b48034c3848" - integrity sha512-2cN1tPkDVkwCy5ickKrI7vijSjPksFRfqS6237NzT0vqSsztTNnQdHw9mmN7uBdk3gceVXU0a+21jFzFzAc9+g== +zustand@^4.5.2: + version "4.5.5" + resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.5.5.tgz#f8c713041543715ec81a2adda0610e1dc82d4ad1" + integrity sha512-+0PALYNJNgK6hldkgDq2vLrw5f6g/jCInz52n9RTpropGgeAf/ioFUCdtsjCqu4gNhW9D01rUQBROoRjdzyn2Q== dependencies: - use-sync-external-store "1.2.0" + use-sync-external-store "1.2.2" zwitch@^2.0.0: version "2.0.4" From 9149e1d4c5bea79dd3df395b9657a30b4f323ee2 Mon Sep 17 00:00:00 2001 From: Aodhagan Murphy Date: Mon, 30 Sep 2024 14:51:56 +0100 Subject: [PATCH 02/10] fix: adding ctx to table plugin function [TOL-2415] --- packages/rich-text/src/plugins/Table/createTablePlugin.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/rich-text/src/plugins/Table/createTablePlugin.ts b/packages/rich-text/src/plugins/Table/createTablePlugin.ts index deecc48f5..3ff14b898 100644 --- a/packages/rich-text/src/plugins/Table/createTablePlugin.ts +++ b/packages/rich-text/src/plugins/Table/createTablePlugin.ts @@ -45,8 +45,7 @@ export const createTablePlugin = (): PlatePlugin => const { normalizeNode } = editor; // injects important fixes from plate's original table plugin editor = withDeleteTable(editor); - // @ts-expect-error -- . - editor = withGetFragmentTable(editor); + editor = withGetFragmentTable(editor, plugin); editor = withInsertFragmentTable(editor, plugin); // overrides insertFragment to handle table insertion to not add empty paragraph before table editor = withInsertFragmentTableOverride(editor); From 98a6c27c99029e9d786f52e36960589c587184e5 Mon Sep 17 00:00:00 2001 From: Aodhagan Murphy Date: Mon, 30 Sep 2024 15:07:39 +0100 Subject: [PATCH 03/10] fix: casting type [TOL-2415] --- packages/rich-text/src/helpers/editor.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rich-text/src/helpers/editor.ts b/packages/rich-text/src/helpers/editor.ts index 14469fcdb..93b9c6775 100644 --- a/packages/rich-text/src/helpers/editor.ts +++ b/packages/rich-text/src/helpers/editor.ts @@ -109,7 +109,7 @@ export function getElementFromCurrentSelection(editor: PlateEditor) { at: editor.selection, match: (node) => isElement(node), }) - ).flat(); + ).flat() as (Path | Node)[]; } export function isList(editor?: PlateEditor) { From 065b84776ba44cbc1366173de90b25a497ac34c8 Mon Sep 17 00:00:00 2001 From: Aodhagan Murphy Date: Mon, 30 Sep 2024 15:18:29 +0100 Subject: [PATCH 04/10] fix: bumping plate packages [TOL-2415] --- packages/rich-text/package.json | 6 +- yarn.lock | 114 ++++++++++++++++---------------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/packages/rich-text/package.json b/packages/rich-text/package.json index 46237089e..b327b98b4 100644 --- a/packages/rich-text/package.json +++ b/packages/rich-text/package.json @@ -51,13 +51,13 @@ "@popperjs/core": "^2.11.5", "@udecode/plate-basic-marks": "36.0.0", "@udecode/plate-break": "36.0.0", - "@udecode/plate-common": "36.0.3", - "@udecode/plate-core": "36.0.3", + "@udecode/plate-common": "36.5.9", + "@udecode/plate-core": "36.5.9", "@udecode/plate-list": "36.0.0", "@udecode/plate-paragraph": "36.0.0", "@udecode/plate-reset-node": "36.0.0", "@udecode/plate-select": "36.0.0", - "@udecode/plate-serializer-docx": "36.0.0", + "@udecode/plate-serializer-docx": "36.0.10", "@udecode/plate-serializer-html": "36.0.0", "@udecode/plate-table": "36.0.0", "@udecode/plate-trailing-block": "36.0.0", diff --git a/yarn.lock b/yarn.lock index cc71b5662..606ba703a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7835,17 +7835,17 @@ dependencies: "@udecode/plate-core" "10.5.3" -"@udecode/plate-common@36.0.3": - version "36.0.3" - resolved "https://registry.yarnpkg.com/@udecode/plate-common/-/plate-common-36.0.3.tgz#d25ede04ed0911304c6ac7c45c745ea9415cd6a7" - integrity sha512-pNJQIxizXUWZ/tykKau87kpZfcEILjnBvJoaoKAXZ/x9c946r1qaQDP8BSIZUbbYM2EPDtigZMgOUdH/8jlKYQ== +"@udecode/plate-common@36.5.9": + version "36.5.9" + resolved "https://registry.yarnpkg.com/@udecode/plate-common/-/plate-common-36.5.9.tgz#8658b8cbcce95b37840889643e63f302000b87a0" + integrity sha512-lQaMkd6ZeCiUd6IBUkdDmbTSIpzzfR2rsynU3irRE0PH3/s8kMDI3cvZSeUS1CgvwokwJoRW6dBcRDChhmAXxw== dependencies: - "@udecode/plate-core" "36.0.3" - "@udecode/plate-utils" "36.0.3" + "@udecode/plate-core" "36.5.9" + "@udecode/plate-utils" "36.5.9" "@udecode/react-utils" "33.0.0" - "@udecode/slate" "32.0.1" - "@udecode/slate-react" "36.0.3" - "@udecode/slate-utils" "34.0.4" + "@udecode/slate" "36.0.6" + "@udecode/slate-react" "36.0.6" + "@udecode/slate-utils" "36.3.9" "@udecode/utils" "31.0.0" "@udecode/plate-core@10.5.3", "@udecode/plate-core@^10.4.0": @@ -7860,14 +7860,14 @@ use-deep-compare "1.1.0" zustand "3.7.0" -"@udecode/plate-core@36.0.3": - version "36.0.3" - resolved "https://registry.yarnpkg.com/@udecode/plate-core/-/plate-core-36.0.3.tgz#1f36870e95d2cf21a0bbd195b20a568a54709eb7" - integrity sha512-aC5sff8JsUVHC12BVa4Wf1NuJEdyq4Icsz/PVvKah3Huhd8aOazCSsSVnpy4bjuIvRz8mBC5FTlNZVoW0XNwHA== +"@udecode/plate-core@36.5.9": + version "36.5.9" + resolved "https://registry.yarnpkg.com/@udecode/plate-core/-/plate-core-36.5.9.tgz#ac6c5c4b8d0f41e880c0fb7be49aafd1f9c41c87" + integrity sha512-CcJ4ZIoyVtT2oWPlpmwWrAWyOKizwsgUjiYTxSlfV3DMXo2hn9dbQAI68hEuMgMqUoUM+FY/VS3bXZ055FV2Yg== dependencies: - "@udecode/slate" "32.0.1" - "@udecode/slate-react" "36.0.3" - "@udecode/slate-utils" "34.0.4" + "@udecode/slate" "36.0.6" + "@udecode/slate-react" "36.0.6" + "@udecode/slate-utils" "36.3.9" "@udecode/utils" "31.0.0" clsx "^1.2.1" is-hotkey "^0.2.0" @@ -7889,10 +7889,10 @@ dependencies: "@udecode/plate-core" "10.5.3" -"@udecode/plate-heading@36.0.0": - version "36.0.0" - resolved "https://registry.yarnpkg.com/@udecode/plate-heading/-/plate-heading-36.0.0.tgz#ef69cae110c63133fcce6383e9a337c36a4bf441" - integrity sha512-dXYz1iW6+pPyFC57pbvTWJHZjOYAdcxwSo1TAtmajt7BI0xQYGZy3NJ/OjKf0aH/28KdTBRgegF1TE7rZYa+KQ== +"@udecode/plate-heading@36.0.9": + version "36.0.9" + resolved "https://registry.yarnpkg.com/@udecode/plate-heading/-/plate-heading-36.0.9.tgz#32f5c3b00ba8f1a23a0bdbb11212781a50854a50" + integrity sha512-Bfe3AyKRQrjW+ug9M0FQAK/PUKdTq9My+mJGOp08fXxt7J4263IKJXcySvVJI/k4WcOK0W2/bjp4fPVcNUchfQ== "@udecode/plate-image@10.7.0": version "10.7.0" @@ -7910,10 +7910,10 @@ "@udecode/plate-indent" "10.5.3" "@udecode/plate-list" "10.5.3" -"@udecode/plate-indent-list@36.0.0": - version "36.0.0" - resolved "https://registry.yarnpkg.com/@udecode/plate-indent-list/-/plate-indent-list-36.0.0.tgz#55a286b2e8b063bc3d1adaab25f692ea74931ba1" - integrity sha512-ARP+I7011udxWycyIasOQD4sHWfgxByGqlB29VLM2xTo1cD1RlZsG7+eBs/Tb38eYYGP/HuoOpwHRuuhrjHUxQ== +"@udecode/plate-indent-list@36.0.1": + version "36.0.1" + resolved "https://registry.yarnpkg.com/@udecode/plate-indent-list/-/plate-indent-list-36.0.1.tgz#14c986fa5a8c6eefdd353738b248a822f4de4a44" + integrity sha512-ZbFCjs65Kz5X2sb3OShO8W3VpYPbeIXh/wD5FzR9HwfbgJR+Ns4B0brh1j/JoPQ/X+o3zgWsrDH5kht/syVU7g== dependencies: "@udecode/plate-indent" "36.0.0" "@udecode/plate-list" "36.0.0" @@ -7947,10 +7947,10 @@ "@udecode/plate-reset-node" "36.0.0" lodash "^4.17.21" -"@udecode/plate-media@36.0.0": - version "36.0.0" - resolved "https://registry.yarnpkg.com/@udecode/plate-media/-/plate-media-36.0.0.tgz#067722b88f2902650e40cad98c12ea485ba34bad" - integrity sha512-uz/nuWll5Np9rKlTfZdW3xIZfBrHo+Aalv2IGO4BXHOdqwPj48x6GxSh18lJ1STh4XM6zaZW6i96i7pJ3lO9mg== +"@udecode/plate-media@36.0.10": + version "36.0.10" + resolved "https://registry.yarnpkg.com/@udecode/plate-media/-/plate-media-36.0.10.tgz#eefe247ea7ce509652510c346bb82505c08c202e" + integrity sha512-MNZsYPk+FDVvkRkbf1strNdrmBc0E+/yYOzEAqt70Snjg4V4uUC6MTQ8dF3He7mtk18mYfTZN8p43K0FwSjvEA== dependencies: js-video-url-parser "^0.5.1" @@ -7995,15 +7995,15 @@ dependencies: "@udecode/plate-core" "10.5.3" -"@udecode/plate-serializer-docx@36.0.0": - version "36.0.0" - resolved "https://registry.yarnpkg.com/@udecode/plate-serializer-docx/-/plate-serializer-docx-36.0.0.tgz#2c3d82e5e207fc59c42fd2a2b44c82dc91331818" - integrity sha512-pRfL73iCbOCDbWBWh67HJdT7SNo2cEbLag1XxuckHd70+AiVOO4WGJuEixhHZSfNhHGHkvv1Lg/5ltM3AqUGyg== +"@udecode/plate-serializer-docx@36.0.10": + version "36.0.10" + resolved "https://registry.yarnpkg.com/@udecode/plate-serializer-docx/-/plate-serializer-docx-36.0.10.tgz#4e5bb97bd1093e74d47e566c485be936d966ba49" + integrity sha512-v5jaEyz731iisvBQ3KK6FWCOrmV79LVXgIgnOEfm56ubbvnG/oIbIyi+a97k01rCpns4yyXkWqlJZ7Ywf3gM4w== dependencies: - "@udecode/plate-heading" "36.0.0" + "@udecode/plate-heading" "36.0.9" "@udecode/plate-indent" "36.0.0" - "@udecode/plate-indent-list" "36.0.0" - "@udecode/plate-media" "36.0.0" + "@udecode/plate-indent-list" "36.0.1" + "@udecode/plate-media" "36.0.10" "@udecode/plate-paragraph" "36.0.0" "@udecode/plate-table" "36.0.0" validator "^13.11.0" @@ -8061,16 +8061,16 @@ dependencies: "@udecode/plate-core" "10.5.3" -"@udecode/plate-utils@36.0.3": - version "36.0.3" - resolved "https://registry.yarnpkg.com/@udecode/plate-utils/-/plate-utils-36.0.3.tgz#c0f58e796dd740aeded8c01ba1b9deb46244f21a" - integrity sha512-AuzP+vgLCcd89oFs27a7KAhaDhK5R7oXbo6qvZE0wQf4iMceopcuGG+WCMJASrHarqS4C2m7KMiOpCrPDLfxWA== +"@udecode/plate-utils@36.5.9": + version "36.5.9" + resolved "https://registry.yarnpkg.com/@udecode/plate-utils/-/plate-utils-36.5.9.tgz#dd0eed9f6ba38466d1f9e84e43f5c55b31c972b4" + integrity sha512-cYv7oGNG8ag/Q13Wo9zwSJ4TqiPxfoEc2uEplYvIueFfzNR2fXRy0wO4yJYdwkVass8eew2P9PjvXIWnfYPAeQ== dependencies: - "@udecode/plate-core" "36.0.3" + "@udecode/plate-core" "36.5.9" "@udecode/react-utils" "33.0.0" - "@udecode/slate" "32.0.1" - "@udecode/slate-react" "36.0.3" - "@udecode/slate-utils" "34.0.4" + "@udecode/slate" "36.0.6" + "@udecode/slate-react" "36.0.6" + "@udecode/slate-utils" "36.3.9" "@udecode/utils" "31.0.0" clsx "^1.2.1" lodash "^4.17.21" @@ -8084,28 +8084,28 @@ "@udecode/utils" "31.0.0" clsx "^1.2.1" -"@udecode/slate-react@36.0.3": - version "36.0.3" - resolved "https://registry.yarnpkg.com/@udecode/slate-react/-/slate-react-36.0.3.tgz#c0e204cf27957610e175335c349d49eec5387b70" - integrity sha512-2L8xpiie9CSLyjQmJ2mgalc4t/WYnXRRNldo/iuoh2x1CYYxkpRuiUsF6DWqjgX996DKjnsMaRz6WsJlxii+4g== +"@udecode/slate-react@36.0.6": + version "36.0.6" + resolved "https://registry.yarnpkg.com/@udecode/slate-react/-/slate-react-36.0.6.tgz#bec2978be150261886e5bbc0e031af7bc84fb3e6" + integrity sha512-kJ9MbUWwlYinroDdDevN5jW/pW3FmxOs6QOSL74vlhxe6wB5SeyvARO2NRF8/MEcE89Il8cjT4rrh+q1RiHc7Q== dependencies: "@udecode/react-utils" "33.0.0" - "@udecode/slate" "32.0.1" + "@udecode/slate" "36.0.6" "@udecode/utils" "31.0.0" -"@udecode/slate-utils@34.0.4": - version "34.0.4" - resolved "https://registry.yarnpkg.com/@udecode/slate-utils/-/slate-utils-34.0.4.tgz#76a2badd81b48d1ca18d1caad5dd3de02895fc88" - integrity sha512-xaK9rmlPmQuqDzKn5Ub/OpIqACd1oCrjjvOFMSbSYOCcM1TlLSPdnRFEB833FbnFHITIZBj4u2f6kTLQBrLTUg== +"@udecode/slate-utils@36.3.9": + version "36.3.9" + resolved "https://registry.yarnpkg.com/@udecode/slate-utils/-/slate-utils-36.3.9.tgz#7569cdb055c39207368ece3102a2296e2c8f064c" + integrity sha512-fIlmDf3etL1HdqHLnuxvloL0AiXv2U6nSaWfuZADeE+1ELU0f2tisCT+MGDJBZws6CCyELLDezMxNDCBwAPwtQ== dependencies: - "@udecode/slate" "32.0.1" + "@udecode/slate" "36.0.6" "@udecode/utils" "31.0.0" lodash "^4.17.21" -"@udecode/slate@32.0.1": - version "32.0.1" - resolved "https://registry.yarnpkg.com/@udecode/slate/-/slate-32.0.1.tgz#5565d5fdb5fc8054f0d05adb2d46f6b928b0f968" - integrity sha512-kmuOF8OZHQTgsU3XLeN5CztI5Q08UMjH4IjtNjSZq+euNGA4DHEcSuVpucaE99r8cLtp1ReT426bmizEa0G1aQ== +"@udecode/slate@36.0.6": + version "36.0.6" + resolved "https://registry.yarnpkg.com/@udecode/slate/-/slate-36.0.6.tgz#7286f1e7c296febece974f47f6410b28ca00dcea" + integrity sha512-b5K/7vOkzHDmjX+Nyz7gk6Z9drC7w+FNKfhKLM3SI991Vvat5KVoew9kGF5Sc4etjwDI5oQVNAehYOS/N7lHxA== dependencies: "@udecode/utils" "31.0.0" From e9ab71a50346195ff0941fbbb0882fce5b01687a Mon Sep 17 00:00:00 2001 From: Aodhagan Murphy Date: Mon, 30 Sep 2024 15:30:05 +0100 Subject: [PATCH 05/10] fix: bumping rich text table package [TOL-2415] --- packages/rich-text/package.json | 2 +- yarn.lock | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/rich-text/package.json b/packages/rich-text/package.json index b327b98b4..683d86483 100644 --- a/packages/rich-text/package.json +++ b/packages/rich-text/package.json @@ -59,7 +59,7 @@ "@udecode/plate-select": "36.0.0", "@udecode/plate-serializer-docx": "36.0.10", "@udecode/plate-serializer-html": "36.0.0", - "@udecode/plate-table": "36.0.0", + "@udecode/plate-table": "36.5.9", "@udecode/plate-trailing-block": "36.0.0", "constate": "^3.3.2", "fast-deep-equal": "^3.1.3", diff --git a/yarn.lock b/yarn.lock index 606ba703a..73214a9bf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8044,6 +8044,14 @@ "@udecode/plate-resizable" "36.0.0" lodash "^4.17.21" +"@udecode/plate-table@36.5.9": + version "36.5.9" + resolved "https://registry.yarnpkg.com/@udecode/plate-table/-/plate-table-36.5.9.tgz#0c317f15c8c06cadc17ecc75ee53440603916ed5" + integrity sha512-PaqveLFKvo0t3I99JVe0fZFn6gGVEtLFj06pikbnTzLZ/RHpz89YjE0F3zDEeNCMoH4lOmgBqsKt3S4ho9HkGQ== + dependencies: + "@udecode/plate-resizable" "36.0.0" + lodash "^4.17.21" + "@udecode/plate-test-utils@^3.2.0": version "3.2.0" resolved "https://registry.yarnpkg.com/@udecode/plate-test-utils/-/plate-test-utils-3.2.0.tgz#889e4ed08b21a85fd20b7c7c084bb4d483da8c78" From 43b5f7cd2493952e50bc673101450153fcf9a3fe Mon Sep 17 00:00:00 2001 From: Aodhagan Murphy Date: Mon, 30 Sep 2024 16:39:02 +0100 Subject: [PATCH 06/10] chore: updating react version [] --- package.json | 6 ++-- packages/rich-text/package.json | 2 +- yarn.lock | 51 +++++++++++++-------------------- 3 files changed, 24 insertions(+), 35 deletions(-) diff --git a/package.json b/package.json index 9762ce4a1..5a5f8c344 100644 --- a/package.json +++ b/package.json @@ -125,10 +125,10 @@ "webpack": "5.94.0" }, "resolutions": { - "@types/react": "16.14.5", + "@types/react": "18.3.1", "babel-preset-react-app": "9.1.2", - "react": "16.14.0", - "react-dom": "16.14.0", + "react": "18.3.1", + "react-dom": "18.3.1", "@contentful/app-sdk": "4.29.0", "@contentful/rich-text-types": "16.7.0" }, diff --git a/packages/rich-text/package.json b/packages/rich-text/package.json index 683d86483..a789936e6 100644 --- a/packages/rich-text/package.json +++ b/packages/rich-text/package.json @@ -81,7 +81,7 @@ "@types/is-hotkey": "^0.1.6", "@udecode/plate-test-utils": "^3.2.0", "prism-react-renderer": "2.4.0", - "react": ">=16.14.0" + "react": "18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/yarn.lock b/yarn.lock index 73214a9bf..0b5b66350 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7433,13 +7433,12 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@16.14.5", "@types/react@17.0.0", "@types/react@>=16", "@types/react@^17", "@types/react@^17.0.11": - version "16.14.5" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.5.tgz#2c39b5cadefaf4829818f9219e5e093325979f4d" - integrity sha512-YRRv9DNZhaVTVRh9Wmmit7Y0UFhEVqXqCSw3uazRWMxa2x85hWQZ5BN24i7GXZbaclaLXEcodEeIHsjBA8eAMw== +"@types/react@*", "@types/react@17.0.0", "@types/react@18.3.1", "@types/react@>=16", "@types/react@^17", "@types/react@^17.0.11": + version "18.3.1" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.1.tgz#fed43985caa834a2084d002e4771e15dfcbdbe8e" + integrity sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw== dependencies: "@types/prop-types" "*" - "@types/scheduler" "*" csstype "^3.0.2" "@types/resolve@1.17.1": @@ -7466,11 +7465,6 @@ resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== -"@types/scheduler@*": - version "0.23.0" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.23.0.tgz#0a6655b3e2708eaabca00b7372fafd7a792a7b09" - integrity sha512-YIoDCTH3Af6XM5VuwGG/QL/CJqga1Zm3NkU3HZ4ZHK2fRMPYP1VczsTUqtsf43PH/iJNVlPHAo2oWX7BSdB2Hw== - "@types/semver@^7.3.12", "@types/semver@^7.3.4", "@types/semver@^7.5.0": version "7.5.8" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e" @@ -20891,15 +20885,13 @@ react-docgen@^7.0.0: resolve "^1.22.1" strip-indent "^4.0.0" -react-dom@16.14.0, react-dom@17.0.2, react-dom@^17.0.2: - version "16.14.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89" - integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw== +react-dom@17.0.2, react-dom@18.3.1, react-dom@^17.0.2: + version "18.3.1" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4" + integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.19.1" + scheduler "^0.23.2" react-element-to-jsx-string@^15.0.0: version "15.0.0" @@ -21133,14 +21125,12 @@ react-transition-group@^4.4.2: loose-envify "^1.4.0" prop-types "^15.6.2" -react@16.14.0, react@17.0.2, react@>=16.14.0, react@^17.0.2: - version "16.14.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d" - integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g== +react@17.0.2, react@18.3.1, react@^17.0.2: + version "18.3.1" + resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891" + integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" read-cache@^1.0.0: version "1.0.0" @@ -22078,14 +22068,6 @@ saxes@^6.0.0: dependencies: xmlchars "^2.2.0" -scheduler@^0.19.1: - version "0.19.1" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" - integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - scheduler@^0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" @@ -22094,6 +22076,13 @@ scheduler@^0.20.2: loose-envify "^1.1.0" object-assign "^4.1.1" +scheduler@^0.23.2: + version "0.23.2" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3" + integrity sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ== + dependencies: + loose-envify "^1.1.0" + schema-utils@2.7.0: version "2.7.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" From bfce04f970ea7a0d1d8b707975ab534ec8f86d90 Mon Sep 17 00:00:00 2001 From: Aodhagan Murphy Date: Mon, 30 Sep 2024 17:00:17 +0100 Subject: [PATCH 07/10] chore: fixing types [] --- packages/_shared/src/ModalDialogLauncher.tsx | 3 ++- packages/date/src/TimepickerInput.tsx | 11 +++++++---- .../reference/src/common/MultipleReferenceEditor.tsx | 12 ++++++++---- .../reference/src/common/SingleReferenceEditor.tsx | 10 +++++++--- .../resources/MultipleResourceReferenceEditor.tsx | 6 +++--- .../EmbeddedEntityBlock/LinkedEntityBlock.tsx | 2 +- .../EmbeddedEntityInline/LinkedEntityInline.tsx | 2 +- .../EmbeddedResourceBlock/LinkedResourceBlock.tsx | 2 +- .../EmbeddedResourceInline/LinkedResourceInline.tsx | 2 +- .../plugins/Hyperlink/components/EntityHyperlink.tsx | 2 +- .../Hyperlink/components/ResourceHyperlink.tsx | 2 +- .../plugins/Hyperlink/components/UrlHyperlink.tsx | 2 +- packages/tags/src/TagsEditor.tsx | 10 +++++----- 13 files changed, 39 insertions(+), 27 deletions(-) diff --git a/packages/_shared/src/ModalDialogLauncher.tsx b/packages/_shared/src/ModalDialogLauncher.tsx index a4cc7d1e2..febb06f1c 100644 --- a/packages/_shared/src/ModalDialogLauncher.tsx +++ b/packages/_shared/src/ModalDialogLauncher.tsx @@ -23,6 +23,7 @@ export function open(componentRenderer: (params: { onClose: Function; isShown: b let currentConfig = { onClose, isShown: true }; function render({ onClose, isShown }: { onClose: Function; isShown: boolean }) { + // eslint-disable-next-line -- TODO: use createRoot instead here ReactDOM.render(componentRenderer({ onClose, isShown }), getRoot()); } @@ -44,7 +45,7 @@ export function open(componentRenderer: (params: { onClose: Function; isShown: b export function openDialog( options: OpenCustomWidgetOptions, - Component: React.SFC<{ onClose: (result: T) => void }> + Component: React.FC<{ onClose: (result: T) => void }> ) { const key = Date.now(); const size = isNumber(options.width) ? `${options.width}px` : options.width; diff --git a/packages/date/src/TimepickerInput.tsx b/packages/date/src/TimepickerInput.tsx index 0b6a6592d..ffed45481 100644 --- a/packages/date/src/TimepickerInput.tsx +++ b/packages/date/src/TimepickerInput.tsx @@ -71,10 +71,13 @@ export const TimepickerInput = ({ setSelectedTime(e.currentTarget.value); }, []); - const handleFocus = useCallback((e) => { - e.preventDefault(); - e.target.select(); - }, []); + const handleFocus = useCallback( + (e: React.FocusEvent) => { + e.preventDefault(); + e.target.select(); + }, + [] + ); const handleBlur = () => { const parsedTime = parseRawInput(selectedTime); diff --git a/packages/reference/src/common/MultipleReferenceEditor.tsx b/packages/reference/src/common/MultipleReferenceEditor.tsx index 54a8f0770..9264e7748 100644 --- a/packages/reference/src/common/MultipleReferenceEditor.tsx +++ b/packages/reference/src/common/MultipleReferenceEditor.tsx @@ -4,11 +4,11 @@ import { useCallback } from 'react'; import { DragStartEvent } from '@dnd-kit/core'; import { arrayMove } from '@dnd-kit/sortable'; -import { LinkEntityActions } from '../components'; +import { LinkActionsProps, LinkEntityActions } from '../components'; import { useLinkActionsProps } from '../components/LinkActions/LinkEntityActions'; import { ReferenceValue, ContentEntityType, ContentType } from '../types'; import { useSortIDs } from '../utils/useSortIDs'; -import { CustomEntityCardProps } from './customCardTypes'; +import { CustomEntityCardProps, DefaultCardRenderer } from './customCardTypes'; import { ReferenceEditor, ReferenceEditorProps } from './ReferenceEditor'; import { useEditorPermissions } from './useEditorPermissions'; @@ -69,7 +69,7 @@ function Editor(props: EditorProps) { }, []); const onSortEnd = useCallback( - ({ oldIndex, newIndex }) => { + ({ oldIndex, newIndex }: { oldIndex: number; newIndex: number }) => { // custom callback that is invoked *before* we sort the array // e.g. in Compose we want to sort the references in the referenceMap before re-rendering drag and drop onSortingEnd && onSortingEnd({ oldIndex, newIndex }); @@ -110,7 +110,11 @@ function Editor(props: EditorProps) { }); const customCardRenderer = useCallback( - (cardProps: CustomEntityCardProps, _, renderDefaultCard) => + ( + cardProps: CustomEntityCardProps, + _: LinkActionsProps, + renderDefaultCard: DefaultCardRenderer + ) => props.renderCustomCard ? props.renderCustomCard(cardProps, linkActionsProps, renderDefaultCard) : false, diff --git a/packages/reference/src/common/SingleReferenceEditor.tsx b/packages/reference/src/common/SingleReferenceEditor.tsx index 86844136b..3d074a234 100644 --- a/packages/reference/src/common/SingleReferenceEditor.tsx +++ b/packages/reference/src/common/SingleReferenceEditor.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { useCallback } from 'react'; -import { LinkEntityActions } from '../components'; +import { LinkActionsProps, LinkEntityActions } from '../components'; import { useLinkActionsProps } from '../components/LinkActions/LinkEntityActions'; import { ContentType, ContentEntityType, ReferenceValue } from '../types'; -import { CustomEntityCardProps } from './customCardTypes'; +import { CustomEntityCardProps, DefaultCardRenderer } from './customCardTypes'; import { ReferenceEditor, ReferenceEditorProps } from './ReferenceEditor'; import { useEditorPermissions } from './useEditorPermissions'; @@ -49,7 +49,11 @@ function Editor(props: EditorProps) { }); // Inject card actions props into the given custom card renderer const customCardRenderer = useCallback( - (cardProps: CustomEntityCardProps, _, renderDefaultCard) => + ( + cardProps: CustomEntityCardProps, + _: LinkActionsProps, + renderDefaultCard: DefaultCardRenderer + ) => props.renderCustomCard ? props.renderCustomCard(cardProps, linkActionsProps, renderDefaultCard) : false, diff --git a/packages/reference/src/resources/MultipleResourceReferenceEditor.tsx b/packages/reference/src/resources/MultipleResourceReferenceEditor.tsx index eeb2d017a..66972616e 100644 --- a/packages/reference/src/resources/MultipleResourceReferenceEditor.tsx +++ b/packages/reference/src/resources/MultipleResourceReferenceEditor.tsx @@ -36,14 +36,14 @@ function ResourceEditor(props: EditorProps) { const onSortStart = () => noop(); const onSortEnd = useCallback( - ({ oldIndex, newIndex }) => { + ({ oldIndex, newIndex }: { oldIndex: number; newIndex: number }) => { const newItems = arrayMove(items, oldIndex, newIndex); setValue(newItems); }, [items, setValue] ); const onMove = useCallback( - (oldIndex, newIndex) => { + (oldIndex: number, newIndex: number) => { const newItems = arrayMove(items, oldIndex, newIndex); setValue(newItems); }, @@ -51,7 +51,7 @@ function ResourceEditor(props: EditorProps) { ); const onRemoteItemAtIndex = useCallback( - (index) => { + (index: number) => { setValue(items.filter((_v, i) => i !== index)); }, [items, setValue] diff --git a/packages/rich-text/src/plugins/EmbeddedEntityBlock/LinkedEntityBlock.tsx b/packages/rich-text/src/plugins/EmbeddedEntityBlock/LinkedEntityBlock.tsx index d501848d9..b89c872b6 100644 --- a/packages/rich-text/src/plugins/EmbeddedEntityBlock/LinkedEntityBlock.tsx +++ b/packages/rich-text/src/plugins/EmbeddedEntityBlock/LinkedEntityBlock.tsx @@ -76,7 +76,7 @@ export function LinkedEntityBlock(props: LinkedEntityBlockProps) { } link={element.data.target} > - {children} + {children as React.ReactNode} ); } diff --git a/packages/rich-text/src/plugins/EmbeddedEntityInline/LinkedEntityInline.tsx b/packages/rich-text/src/plugins/EmbeddedEntityInline/LinkedEntityInline.tsx index a4611bf29..246a4c48a 100644 --- a/packages/rich-text/src/plugins/EmbeddedEntityInline/LinkedEntityInline.tsx +++ b/packages/rich-text/src/plugins/EmbeddedEntityInline/LinkedEntityInline.tsx @@ -60,7 +60,7 @@ export function LinkedEntityInline(props: LinkedEntityInlineProps) { } link={element.data.target} > - {children} + {children as React.ReactNode} ); } diff --git a/packages/rich-text/src/plugins/EmbeddedResourceBlock/LinkedResourceBlock.tsx b/packages/rich-text/src/plugins/EmbeddedResourceBlock/LinkedResourceBlock.tsx index 8e0103b51..ec6e76327 100644 --- a/packages/rich-text/src/plugins/EmbeddedResourceBlock/LinkedResourceBlock.tsx +++ b/packages/rich-text/src/plugins/EmbeddedResourceBlock/LinkedResourceBlock.tsx @@ -55,7 +55,7 @@ export function LinkedResourceBlock(props: LinkedResourceBlockProps) { /> } > - {children} + {children as React.ReactNode} ); } diff --git a/packages/rich-text/src/plugins/EmbeddedResourceInline/LinkedResourceInline.tsx b/packages/rich-text/src/plugins/EmbeddedResourceInline/LinkedResourceInline.tsx index 5d2da2d19..e0ed7fd0a 100644 --- a/packages/rich-text/src/plugins/EmbeddedResourceInline/LinkedResourceInline.tsx +++ b/packages/rich-text/src/plugins/EmbeddedResourceInline/LinkedResourceInline.tsx @@ -50,7 +50,7 @@ export function LinkedResourceInline(props: LinkedResourceInlineProps) { /> } > - {children} + {children as React.ReactNode} ); } diff --git a/packages/rich-text/src/plugins/Hyperlink/components/EntityHyperlink.tsx b/packages/rich-text/src/plugins/Hyperlink/components/EntityHyperlink.tsx index a05a9d3cd..9bedf8410 100644 --- a/packages/rich-text/src/plugins/Hyperlink/components/EntityHyperlink.tsx +++ b/packages/rich-text/src/plugins/Hyperlink/components/EntityHyperlink.tsx @@ -68,7 +68,7 @@ export function EntityHyperlink(props: HyperlinkElementProps) { data-link-type={target.sys.linkType} data-link-id={target.sys.id} > - {props.children} + {props.children as React.ReactNode} ); diff --git a/packages/rich-text/src/plugins/Hyperlink/components/ResourceHyperlink.tsx b/packages/rich-text/src/plugins/Hyperlink/components/ResourceHyperlink.tsx index 8227de3d8..cfeb57cf9 100644 --- a/packages/rich-text/src/plugins/Hyperlink/components/ResourceHyperlink.tsx +++ b/packages/rich-text/src/plugins/Hyperlink/components/ResourceHyperlink.tsx @@ -63,7 +63,7 @@ export function ResourceHyperlink(props: ResourceHyperlinkProps) { data-resource-link-type={target.sys.linkType} data-resource-link-urn={target.sys.urn} > - {props.children} + {props.children as React.ReactNode} ); diff --git a/packages/rich-text/src/plugins/Hyperlink/components/UrlHyperlink.tsx b/packages/rich-text/src/plugins/Hyperlink/components/UrlHyperlink.tsx index 01240695c..2170fd884 100644 --- a/packages/rich-text/src/plugins/Hyperlink/components/UrlHyperlink.tsx +++ b/packages/rich-text/src/plugins/Hyperlink/components/UrlHyperlink.tsx @@ -54,7 +54,7 @@ export function UrlHyperlink(props: UrlHyperlinkProps) { onClick={(e) => e.preventDefault()} className={styles.hyperlink} > - {props.children} + {props.children as React.ReactNode} ); diff --git a/packages/tags/src/TagsEditor.tsx b/packages/tags/src/TagsEditor.tsx index acf3d3be0..4434ee679 100644 --- a/packages/tags/src/TagsEditor.tsx +++ b/packages/tags/src/TagsEditor.tsx @@ -2,7 +2,7 @@ import React, { useCallback, useState } from 'react'; import { DragHandle, Pill, TextInput } from '@contentful/f36-components'; import tokens from '@contentful/f36-tokens'; -import { DndContext } from '@dnd-kit/core'; +import { DndContext, DragEndEvent } from '@dnd-kit/core'; import { restrictToParentElement } from '@dnd-kit/modifiers'; import { arrayMove, SortableContext, useSortable } from '@dnd-kit/sortable'; import { CSS } from '@dnd-kit/utilities'; @@ -84,7 +84,7 @@ export function TagsEditor(props: TagsEditorProps) { ); const removeItem = useCallback( - (index) => { + (index: number) => { const newItems = items.filter((_, filterIndex) => index !== filterIndex); onUpdate(newItems); }, @@ -92,10 +92,10 @@ export function TagsEditor(props: TagsEditorProps) { ); const swapItems = useCallback( - ({ active, over }) => { - if (active.id !== over.id) { + ({ active, over }: DragEndEvent) => { + if (active.id !== over?.id) { const oldIndex = itemsMap.findIndex(({ id }) => id === active.id); - const newIndex = itemsMap.findIndex(({ id }) => id === over.id); + const newIndex = itemsMap.findIndex(({ id }) => id === over?.id); const newItems = arrayMove(items, oldIndex, newIndex); onUpdate(newItems); } From cd72f6df7225abeac0c4b383b81f8b23bdde2e92 Mon Sep 17 00:00:00 2001 From: Aodhagan Murphy Date: Mon, 30 Sep 2024 17:09:11 +0100 Subject: [PATCH 08/10] chore: bumping to v17 of react [] --- package.json | 6 ++-- packages/_shared/package.json | 2 +- packages/_test/package.json | 2 +- packages/boolean/package.json | 2 +- packages/checkbox/package.json | 2 +- packages/date/package.json | 2 +- packages/date/src/TimepickerInput.tsx | 11 +++---- packages/default-field-editors/package.json | 2 +- packages/dropdown/package.json | 2 +- packages/json/package.json | 2 +- packages/list/package.json | 2 +- packages/location/package.json | 2 +- packages/markdown/package.json | 2 +- packages/multiple-line/package.json | 2 +- packages/number/package.json | 2 +- packages/radio/package.json | 2 +- packages/rating/package.json | 2 +- packages/reference/package.json | 2 +- packages/rich-text/package.json | 6 ++-- packages/single-line/package.json | 2 +- packages/slug/package.json | 2 +- packages/tags/package.json | 2 +- packages/url/package.json | 2 +- packages/validation-errors/package.json | 2 +- yarn.lock | 35 +++++++++------------ 25 files changed, 46 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index 5a5f8c344..5ee9fa536 100644 --- a/package.json +++ b/package.json @@ -125,10 +125,10 @@ "webpack": "5.94.0" }, "resolutions": { - "@types/react": "18.3.1", + "@types/react": "17.0.2", "babel-preset-react-app": "9.1.2", - "react": "18.3.1", - "react-dom": "18.3.1", + "react": "17.0.2", + "react-dom": "17.0.2", "@contentful/app-sdk": "4.29.0", "@contentful/rich-text-types": "16.7.0" }, diff --git a/packages/_shared/package.json b/packages/_shared/package.json index b25e9c18e..b59f21a87 100644 --- a/packages/_shared/package.json +++ b/packages/_shared/package.json @@ -47,7 +47,7 @@ }, "peerDependencies": { "@contentful/app-sdk": "^4.29.0", - "react": ">=16.8.0" + "react": ">=17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/_test/package.json b/packages/_test/package.json index 955426bcc..d0e19c329 100644 --- a/packages/_test/package.json +++ b/packages/_test/package.json @@ -46,7 +46,7 @@ }, "peerDependencies": { "@contentful/app-sdk": "^4.29.0", - "react": ">=16.8.0" + "react": ">=17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/boolean/package.json b/packages/boolean/package.json index f55ad7e03..229893e50 100644 --- a/packages/boolean/package.json +++ b/packages/boolean/package.json @@ -46,7 +46,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=16.8.0" + "react": ">=17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/checkbox/package.json b/packages/checkbox/package.json index 014bdb425..6fd51f5e7 100644 --- a/packages/checkbox/package.json +++ b/packages/checkbox/package.json @@ -45,7 +45,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=16.8.0" + "react": ">=17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/date/package.json b/packages/date/package.json index 59ac40a36..586e0ed4b 100644 --- a/packages/date/package.json +++ b/packages/date/package.json @@ -49,7 +49,7 @@ "timezoned-date": "^3.0.2" }, "peerDependencies": { - "react": ">=16.8.0" + "react": ">=17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/date/src/TimepickerInput.tsx b/packages/date/src/TimepickerInput.tsx index ffed45481..a78a453bc 100644 --- a/packages/date/src/TimepickerInput.tsx +++ b/packages/date/src/TimepickerInput.tsx @@ -71,13 +71,10 @@ export const TimepickerInput = ({ setSelectedTime(e.currentTarget.value); }, []); - const handleFocus = useCallback( - (e: React.FocusEvent) => { - e.preventDefault(); - e.target.select(); - }, - [] - ); + const handleFocus = useCallback((e: React.FocusEvent) => { + e.preventDefault(); + e.target.select(); + }, []); const handleBlur = () => { const parsedTime = parseRawInput(selectedTime); diff --git a/packages/default-field-editors/package.json b/packages/default-field-editors/package.json index d7538ac89..9ef6b609a 100644 --- a/packages/default-field-editors/package.json +++ b/packages/default-field-editors/package.json @@ -63,7 +63,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=16.8.0" + "react": ">=17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/dropdown/package.json b/packages/dropdown/package.json index 1fcf874bb..79b260fb1 100644 --- a/packages/dropdown/package.json +++ b/packages/dropdown/package.json @@ -47,7 +47,7 @@ "contentful-management": "^11.0.0" }, "peerDependencies": { - "react": ">=16.8.0" + "react": ">=17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/json/package.json b/packages/json/package.json index eece24fab..e446507dd 100644 --- a/packages/json/package.json +++ b/packages/json/package.json @@ -46,7 +46,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=16.8.0" + "react": ">=17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/list/package.json b/packages/list/package.json index df384beca..2a0bdbbf7 100644 --- a/packages/list/package.json +++ b/packages/list/package.json @@ -45,7 +45,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=16.8.0" + "react": ">=17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/location/package.json b/packages/location/package.json index e1a9fb179..79a36c7cc 100644 --- a/packages/location/package.json +++ b/packages/location/package.json @@ -45,7 +45,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=16.8.0" + "react": ">=17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/markdown/package.json b/packages/markdown/package.json index 689f31ae7..abf7b7776 100644 --- a/packages/markdown/package.json +++ b/packages/markdown/package.json @@ -56,7 +56,7 @@ }, "peerDependencies": { "@contentful/app-sdk": "^4.29.0", - "react": ">=16.8.0" + "react": ">=17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/multiple-line/package.json b/packages/multiple-line/package.json index 122e9b534..764babc23 100644 --- a/packages/multiple-line/package.json +++ b/packages/multiple-line/package.json @@ -45,7 +45,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=16.8.0" + "react": ">=17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/number/package.json b/packages/number/package.json index 9ab842a63..d8a2dc058 100644 --- a/packages/number/package.json +++ b/packages/number/package.json @@ -47,7 +47,7 @@ "@testing-library/user-event": "^13.1.9" }, "peerDependencies": { - "react": ">=16.8.0" + "react": ">=17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/radio/package.json b/packages/radio/package.json index c05a38fc5..217c10203 100644 --- a/packages/radio/package.json +++ b/packages/radio/package.json @@ -48,7 +48,7 @@ "contentful-management": "^11.0.0" }, "peerDependencies": { - "react": ">=16.8.0" + "react": ">=17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/rating/package.json b/packages/rating/package.json index 92879a54d..8476ae180 100644 --- a/packages/rating/package.json +++ b/packages/rating/package.json @@ -45,7 +45,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=16.8.0" + "react": ">=17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/reference/package.json b/packages/reference/package.json index 49b042fb5..8735eacf3 100644 --- a/packages/reference/package.json +++ b/packages/reference/package.json @@ -59,7 +59,7 @@ }, "peerDependencies": { "@contentful/app-sdk": "^4.29.0", - "react": ">=16.8.0" + "react": ">=17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/rich-text/package.json b/packages/rich-text/package.json index a789936e6..a9166b512 100644 --- a/packages/rich-text/package.json +++ b/packages/rich-text/package.json @@ -72,8 +72,8 @@ "slate-react": "0.102.0" }, "peerDependencies": { - "react": ">=16.14.0", - "react-dom": ">=16.14.0" + "react": ">=17.0.2", + "react-dom": ">=17.0.2" }, "devDependencies": { "@contentful/field-editor-test-utils": "^1.5.1", @@ -81,7 +81,7 @@ "@types/is-hotkey": "^0.1.6", "@udecode/plate-test-utils": "^3.2.0", "prism-react-renderer": "2.4.0", - "react": "18.3.1" + "react": "17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/single-line/package.json b/packages/single-line/package.json index 215ba47e8..9688edb6d 100644 --- a/packages/single-line/package.json +++ b/packages/single-line/package.json @@ -45,7 +45,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=16.8.0" + "react": ">=17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/slug/package.json b/packages/slug/package.json index 1bbccba18..a67383d89 100644 --- a/packages/slug/package.json +++ b/packages/slug/package.json @@ -51,7 +51,7 @@ }, "peerDependencies": { "@contentful/app-sdk": "^4.29.0", - "react": ">=16.8.0" + "react": ">=17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/tags/package.json b/packages/tags/package.json index b90b626e0..089ddd952 100644 --- a/packages/tags/package.json +++ b/packages/tags/package.json @@ -49,7 +49,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=16.8.0" + "react": ">=17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/url/package.json b/packages/url/package.json index be09387ea..efb030c3c 100644 --- a/packages/url/package.json +++ b/packages/url/package.json @@ -45,7 +45,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=16.8.0" + "react": ">=17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/validation-errors/package.json b/packages/validation-errors/package.json index acb4b8700..05a11af52 100644 --- a/packages/validation-errors/package.json +++ b/packages/validation-errors/package.json @@ -45,7 +45,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=16.8.0" + "react": ">=17.0.2" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/yarn.lock b/yarn.lock index 0b5b66350..04a049bfe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7433,10 +7433,10 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@17.0.0", "@types/react@18.3.1", "@types/react@>=16", "@types/react@^17", "@types/react@^17.0.11": - version "18.3.1" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.1.tgz#fed43985caa834a2084d002e4771e15dfcbdbe8e" - integrity sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw== +"@types/react@*", "@types/react@17.0.0", "@types/react@17.0.2", "@types/react@>=16", "@types/react@^17", "@types/react@^17.0.11": + version "17.0.2" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8" + integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA== dependencies: "@types/prop-types" "*" csstype "^3.0.2" @@ -20885,13 +20885,14 @@ react-docgen@^7.0.0: resolve "^1.22.1" strip-indent "^4.0.0" -react-dom@17.0.2, react-dom@18.3.1, react-dom@^17.0.2: - version "18.3.1" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4" - integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw== +react-dom@17.0.2, react-dom@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" + integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== dependencies: loose-envify "^1.1.0" - scheduler "^0.23.2" + object-assign "^4.1.1" + scheduler "^0.20.2" react-element-to-jsx-string@^15.0.0: version "15.0.0" @@ -21125,12 +21126,13 @@ react-transition-group@^4.4.2: loose-envify "^1.4.0" prop-types "^15.6.2" -react@17.0.2, react@18.3.1, react@^17.0.2: - version "18.3.1" - resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891" - integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ== +react@17.0.2, react@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" + integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== dependencies: loose-envify "^1.1.0" + object-assign "^4.1.1" read-cache@^1.0.0: version "1.0.0" @@ -22076,13 +22078,6 @@ scheduler@^0.20.2: loose-envify "^1.1.0" object-assign "^4.1.1" -scheduler@^0.23.2: - version "0.23.2" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3" - integrity sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ== - dependencies: - loose-envify "^1.1.0" - schema-utils@2.7.0: version "2.7.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" From 016724b0308d1fa2bea63b0bad46e96af67119b9 Mon Sep 17 00:00:00 2001 From: Aodhagan Murphy Date: Mon, 30 Sep 2024 17:35:04 +0100 Subject: [PATCH 09/10] chore: bumping to v18 of react [] --- apps/entry-app-collapsible/package.json | 4 +-- apps/markdown-app/package.json | 4 +-- apps/multiple-references-app/package.json | 4 +-- apps/rich-text-app/package.json | 4 +-- apps/singleline-app/package.json | 4 +-- package.json | 10 +++--- packages/_shared/package.json | 2 +- packages/_test/package.json | 2 +- packages/boolean/package.json | 2 +- packages/checkbox/package.json | 2 +- packages/date/package.json | 2 +- packages/default-field-editors/package.json | 2 +- packages/dropdown/package.json | 2 +- packages/json/package.json | 2 +- packages/list/package.json | 2 +- packages/location/package.json | 2 +- packages/markdown/package.json | 2 +- packages/multiple-line/package.json | 2 +- packages/number/package.json | 2 +- packages/radio/package.json | 2 +- packages/rating/package.json | 2 +- packages/reference/package.json | 2 +- packages/rich-text/package.json | 2 +- packages/single-line/package.json | 2 +- packages/slug/package.json | 2 +- packages/tags/package.json | 2 +- packages/url/package.json | 2 +- packages/validation-errors/package.json | 2 +- yarn.lock | 37 ++++++++++----------- 29 files changed, 54 insertions(+), 57 deletions(-) diff --git a/apps/entry-app-collapsible/package.json b/apps/entry-app-collapsible/package.json index c980cd5aa..18eaa6829 100644 --- a/apps/entry-app-collapsible/package.json +++ b/apps/entry-app-collapsible/package.json @@ -13,8 +13,8 @@ "@contentful/field-editor-single-line": "^0.15.6", "emotion": "^10.0.17", "prop-types": "^15.7.2", - "react": "^17.0.2", - "react-dom": "^17.0.2", + "react": "^18.3.1", + "react-dom": "^18.3.1", "react-sortable-hoc": "^2.0.0" }, "scripts": { diff --git a/apps/markdown-app/package.json b/apps/markdown-app/package.json index 0646c7895..949934033 100644 --- a/apps/markdown-app/package.json +++ b/apps/markdown-app/package.json @@ -9,8 +9,8 @@ "@contentful/field-editor-markdown": "^0.17.1", "@contentful/field-editor-shared": "^0.25.1", "@contentful/field-editor-single-line": "^0.15.6", - "react": "^17.0.2", - "react-dom": "^17.0.2" + "react": "^18.3.1", + "react-dom": "^18.3.1" }, "scripts": { "start": "cross-env SKIP_PREFLIGHT_CHECK=true BROWSER=none react-scripts start", diff --git a/apps/multiple-references-app/package.json b/apps/multiple-references-app/package.json index eec6b2729..f33eb4dc2 100644 --- a/apps/multiple-references-app/package.json +++ b/apps/multiple-references-app/package.json @@ -8,8 +8,8 @@ "@contentful/f36-tokens": "^4.0.0", "@contentful/field-editor-reference": "^2.21.2", "@contentful/field-editor-single-line": "^0.15.6", - "react": "^17.0.2", - "react-dom": "^17.0.2" + "react": "^18.3.1", + "react-dom": "^18.3.1" }, "scripts": { "start": "cross-env SKIP_PREFLIGHT_CHECK=true BROWSER=none react-scripts start", diff --git a/apps/rich-text-app/package.json b/apps/rich-text-app/package.json index 1aa614f4a..16b742a42 100644 --- a/apps/rich-text-app/package.json +++ b/apps/rich-text-app/package.json @@ -8,8 +8,8 @@ "@contentful/f36-tokens": "^4.0.0", "@contentful/field-editor-rich-text": "^3.4.21", "@contentful/field-editor-single-line": "^1.2.0", - "react": "^17.0.2", - "react-dom": "^17.0.2" + "react": "^18.3.1", + "react-dom": "^18.3.1" }, "scripts": { "start": "cross-env SKIP_PREFLIGHT_CHECK=true BROWSER=none react-scripts start", diff --git a/apps/singleline-app/package.json b/apps/singleline-app/package.json index 066687921..90669bc65 100644 --- a/apps/singleline-app/package.json +++ b/apps/singleline-app/package.json @@ -7,8 +7,8 @@ "@contentful/f36-components": "^4.0.27", "@contentful/f36-tokens": "^4.0.0", "@contentful/field-editor-single-line": "^0.15.6", - "react": "^17.0.2", - "react-dom": "^17.0.2" + "react": "^18.3.1", + "react-dom": "^18.3.1" }, "scripts": { "start": "cross-env SKIP_PREFLIGHT_CHECK=true BROWSER=none react-scripts start", diff --git a/package.json b/package.json index 5ee9fa536..a2230a00f 100644 --- a/package.json +++ b/package.json @@ -104,8 +104,8 @@ "mocha": "10.6.0", "prettier": "2.7.1", "process": "0.11.10", - "react": "17.0.2", - "react-dom": "17.0.2", + "react": "18.3.1", + "react-dom": "18.3.1", "react-markdown": "8.0.7", "remark-cli": "12.0.0", "remark-gfm": "3.0.1", @@ -125,10 +125,10 @@ "webpack": "5.94.0" }, "resolutions": { - "@types/react": "17.0.2", + "@types/react": "18.3.1", "babel-preset-react-app": "9.1.2", - "react": "17.0.2", - "react-dom": "17.0.2", + "react": "18.3.1", + "react-dom": "18.3.1", "@contentful/app-sdk": "4.29.0", "@contentful/rich-text-types": "16.7.0" }, diff --git a/packages/_shared/package.json b/packages/_shared/package.json index b59f21a87..b68ca979b 100644 --- a/packages/_shared/package.json +++ b/packages/_shared/package.json @@ -47,7 +47,7 @@ }, "peerDependencies": { "@contentful/app-sdk": "^4.29.0", - "react": ">=17.0.2" + "react": ">=18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/_test/package.json b/packages/_test/package.json index d0e19c329..c80fc93a2 100644 --- a/packages/_test/package.json +++ b/packages/_test/package.json @@ -46,7 +46,7 @@ }, "peerDependencies": { "@contentful/app-sdk": "^4.29.0", - "react": ">=17.0.2" + "react": ">=18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/boolean/package.json b/packages/boolean/package.json index 229893e50..1e69ecaa9 100644 --- a/packages/boolean/package.json +++ b/packages/boolean/package.json @@ -46,7 +46,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=17.0.2" + "react": ">=18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/checkbox/package.json b/packages/checkbox/package.json index 6fd51f5e7..3c46d874c 100644 --- a/packages/checkbox/package.json +++ b/packages/checkbox/package.json @@ -45,7 +45,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=17.0.2" + "react": ">=18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/date/package.json b/packages/date/package.json index 586e0ed4b..84199ce22 100644 --- a/packages/date/package.json +++ b/packages/date/package.json @@ -49,7 +49,7 @@ "timezoned-date": "^3.0.2" }, "peerDependencies": { - "react": ">=17.0.2" + "react": ">=18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/default-field-editors/package.json b/packages/default-field-editors/package.json index 9ef6b609a..c59fbd63d 100644 --- a/packages/default-field-editors/package.json +++ b/packages/default-field-editors/package.json @@ -63,7 +63,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=17.0.2" + "react": ">=18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/dropdown/package.json b/packages/dropdown/package.json index 79b260fb1..02b1bf00a 100644 --- a/packages/dropdown/package.json +++ b/packages/dropdown/package.json @@ -47,7 +47,7 @@ "contentful-management": "^11.0.0" }, "peerDependencies": { - "react": ">=17.0.2" + "react": ">=18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/json/package.json b/packages/json/package.json index e446507dd..b9a3a87d2 100644 --- a/packages/json/package.json +++ b/packages/json/package.json @@ -46,7 +46,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=17.0.2" + "react": ">=18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/list/package.json b/packages/list/package.json index 2a0bdbbf7..08764d7d3 100644 --- a/packages/list/package.json +++ b/packages/list/package.json @@ -45,7 +45,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=17.0.2" + "react": ">=18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/location/package.json b/packages/location/package.json index 79a36c7cc..32479042f 100644 --- a/packages/location/package.json +++ b/packages/location/package.json @@ -45,7 +45,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=17.0.2" + "react": ">=18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/markdown/package.json b/packages/markdown/package.json index abf7b7776..f18a9b241 100644 --- a/packages/markdown/package.json +++ b/packages/markdown/package.json @@ -56,7 +56,7 @@ }, "peerDependencies": { "@contentful/app-sdk": "^4.29.0", - "react": ">=17.0.2" + "react": ">=18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/multiple-line/package.json b/packages/multiple-line/package.json index 764babc23..88931339c 100644 --- a/packages/multiple-line/package.json +++ b/packages/multiple-line/package.json @@ -45,7 +45,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=17.0.2" + "react": ">=18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/number/package.json b/packages/number/package.json index d8a2dc058..17e104018 100644 --- a/packages/number/package.json +++ b/packages/number/package.json @@ -47,7 +47,7 @@ "@testing-library/user-event": "^13.1.9" }, "peerDependencies": { - "react": ">=17.0.2" + "react": ">=18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/radio/package.json b/packages/radio/package.json index 217c10203..5f6b235f3 100644 --- a/packages/radio/package.json +++ b/packages/radio/package.json @@ -48,7 +48,7 @@ "contentful-management": "^11.0.0" }, "peerDependencies": { - "react": ">=17.0.2" + "react": ">=18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/rating/package.json b/packages/rating/package.json index 8476ae180..a720f3649 100644 --- a/packages/rating/package.json +++ b/packages/rating/package.json @@ -45,7 +45,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=17.0.2" + "react": ">=18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/reference/package.json b/packages/reference/package.json index 8735eacf3..46797bdfd 100644 --- a/packages/reference/package.json +++ b/packages/reference/package.json @@ -59,7 +59,7 @@ }, "peerDependencies": { "@contentful/app-sdk": "^4.29.0", - "react": ">=17.0.2" + "react": ">=18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/rich-text/package.json b/packages/rich-text/package.json index a9166b512..625f5f351 100644 --- a/packages/rich-text/package.json +++ b/packages/rich-text/package.json @@ -72,7 +72,7 @@ "slate-react": "0.102.0" }, "peerDependencies": { - "react": ">=17.0.2", + "react": ">=18.3.1", "react-dom": ">=17.0.2" }, "devDependencies": { diff --git a/packages/single-line/package.json b/packages/single-line/package.json index 9688edb6d..068627318 100644 --- a/packages/single-line/package.json +++ b/packages/single-line/package.json @@ -45,7 +45,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=17.0.2" + "react": ">=18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/slug/package.json b/packages/slug/package.json index a67383d89..1bfa6236d 100644 --- a/packages/slug/package.json +++ b/packages/slug/package.json @@ -51,7 +51,7 @@ }, "peerDependencies": { "@contentful/app-sdk": "^4.29.0", - "react": ">=17.0.2" + "react": ">=18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/tags/package.json b/packages/tags/package.json index 089ddd952..20058d57a 100644 --- a/packages/tags/package.json +++ b/packages/tags/package.json @@ -49,7 +49,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=17.0.2" + "react": ">=18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/url/package.json b/packages/url/package.json index efb030c3c..ac03b1f0d 100644 --- a/packages/url/package.json +++ b/packages/url/package.json @@ -45,7 +45,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=17.0.2" + "react": ">=18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/packages/validation-errors/package.json b/packages/validation-errors/package.json index 05a11af52..992c3d525 100644 --- a/packages/validation-errors/package.json +++ b/packages/validation-errors/package.json @@ -45,7 +45,7 @@ "@contentful/field-editor-test-utils": "^1.5.1" }, "peerDependencies": { - "react": ">=17.0.2" + "react": ">=18.3.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com/" diff --git a/yarn.lock b/yarn.lock index 04a049bfe..d77aa6795 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7433,10 +7433,10 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@17.0.0", "@types/react@17.0.2", "@types/react@>=16", "@types/react@^17", "@types/react@^17.0.11": - version "17.0.2" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8" - integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA== +"@types/react@*", "@types/react@17.0.0", "@types/react@18.3.1", "@types/react@>=16", "@types/react@^17", "@types/react@^17.0.11": + version "18.3.1" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.1.tgz#fed43985caa834a2084d002e4771e15dfcbdbe8e" + integrity sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw== dependencies: "@types/prop-types" "*" csstype "^3.0.2" @@ -20885,14 +20885,13 @@ react-docgen@^7.0.0: resolve "^1.22.1" strip-indent "^4.0.0" -react-dom@17.0.2, react-dom@^17.0.2: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" - integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== +react-dom@18.3.1, react-dom@^18.3.1: + version "18.3.1" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4" + integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" - scheduler "^0.20.2" + scheduler "^0.23.2" react-element-to-jsx-string@^15.0.0: version "15.0.0" @@ -21126,13 +21125,12 @@ react-transition-group@^4.4.2: loose-envify "^1.4.0" prop-types "^15.6.2" -react@17.0.2, react@^17.0.2: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" - integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== +react@17.0.2, react@18.3.1, react@^18.3.1: + version "18.3.1" + resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891" + integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" read-cache@^1.0.0: version "1.0.0" @@ -22070,13 +22068,12 @@ saxes@^6.0.0: dependencies: xmlchars "^2.2.0" -scheduler@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" - integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== +scheduler@^0.23.2: + version "0.23.2" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3" + integrity sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" schema-utils@2.7.0: version "2.7.0" From 6d2bd6c8e4bab2ca967d10e7bb8ad8bf78c80b4e Mon Sep 17 00:00:00 2001 From: Aodhagan Murphy Date: Mon, 30 Sep 2024 17:46:16 +0100 Subject: [PATCH 10/10] chore: fixing parallelism for cypress component tests [] --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 07ab96d30..cac00d1fd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -71,7 +71,7 @@ jobs: - run: name: Run cypress component tests command: | - TESTFILES=$(circleci tests glob cypress/component/**/*.ts | circleci tests split --split-by=timings --timings-type=filename | tr '\n' ',') + TESTFILES=$(circleci tests glob cypress/component/**/*.ts | circleci tests split --split-by=timings --timings-type=filename | awk '{if (NR>1) printf ","; printf "%s", $0} END {if (NR>0) printf " "}') npx cypress run --component \ --spec "${TESTFILES}" \ --reporter junit \