diff --git a/package.json b/package.json index bba86c653c..8bdb1f7c49 100644 --- a/package.json +++ b/package.json @@ -261,8 +261,8 @@ "@types/pify": "5.0.4", "@types/pixelmatch": "5.2.6", "@types/pngjs": "6.0.5", - "@types/react": "17.0.45", - "@types/react-dom": "17.0.17", + "@types/react": "18.3.20", + "@types/react-dom": "18.3.6", "@types/react-redux": "7.1.34", "@types/react-virtualized": "9.22.2", "@types/redux-logger": "3.0.13", @@ -344,13 +344,11 @@ "pnpm": { "overrides": { "@storybook/core>node-fetch": "$node-fetch", - "@types/react": "18.3.20", - "@types/react-dom": "18.3.6", "eslint-config-airbnb-typescript-prettier>eslint-plugin-prettier": "5.2.1", "canvas": "-", "jsdom": "-", "thenify-all>thenify": "3.3.1", - "@electron/rebuild@3.7.0>@electron/node-gyp": "10.2.0-electron.2", + "@electron/rebuild@3.7.2>@electron/node-gyp": "10.2.0-electron.2", "react-contextmenu>react": "18.3.1", "react-contextmenu>react-dom": "18.3.1" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 99b5d15d03..6d75e01ffd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,13 +6,11 @@ settings: overrides: '@storybook/core>node-fetch': 2.6.7 - '@types/react': 18.3.20 - '@types/react-dom': 18.3.6 eslint-config-airbnb-typescript-prettier>eslint-plugin-prettier: 5.2.1 canvas: '-' jsdom: '-' thenify-all>thenify: 3.3.1 - '@electron/rebuild@3.7.0>@electron/node-gyp': 10.2.0-electron.2 + '@electron/rebuild@3.7.2>@electron/node-gyp': 10.2.0-electron.2 react-contextmenu>react: 18.3.1 react-contextmenu>react-dom: 18.3.1 @@ -3131,7 +3129,7 @@ packages: '@types/react-dom@18.3.6': resolution: {integrity: sha512-nf22//wEbKXusP6E9pfOCDwFdHAX4u172eaJI4YkDRQEZiorm6KfYnSC2SWLDMVWUOWPERmJnN0ujeAfTBLvrw==} peerDependencies: - '@types/react': 18.3.20 + '@types/react': ^18.0.0 '@types/react-redux@7.1.34': resolution: {integrity: sha512-GdFaVjEbYv4Fthm2ZLvj1VSCedV7TqE5y1kNwnjSdBOTXuRSgowux6J8TAct15T3CKBr63UMk+2CO7ilRhyrAQ==} @@ -7954,7 +7952,7 @@ packages: react-redux@9.2.0: resolution: {integrity: sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g==} peerDependencies: - '@types/react': 18.3.20 + '@types/react': ^18.2.25 || ^19 react: ^18.0 || ^19 redux: ^5.0.0 peerDependenciesMeta: diff --git a/sticker-creator/package.json b/sticker-creator/package.json index 1bfa6d327e..8478832e45 100644 --- a/sticker-creator/package.json +++ b/sticker-creator/package.json @@ -24,7 +24,7 @@ "dependencies": { "@formatjs/fast-memoize": "1.2.8", "@indutny/emoji-picker-react": "4.10.0", - "@popperjs/core": "2.11.7", + "@popperjs/core": "2.11.8", "@react-aria/interactions": "3.19.0", "@reduxjs/toolkit": "1.9.5", "@stablelib/x25519": "1.0.3", @@ -37,8 +37,8 @@ "protobufjs": "7.2.5", "protobufjs-cli": "1.1.1", "qrcode-generator": "1.4.4", - "react": "18.2.0", - "react-dom": "18.2.0", + "react": "18.3.1", + "react-dom": "18.3.1", "react-dropzone": "14.2.3", "react-intl": "6.4.1", "react-popper": "2.3.0", @@ -54,8 +54,8 @@ "@types/debug": "4.1.7", "@types/lodash": "4.14.194", "@types/memoizee": "0.4.8", - "@types/react": "18.0.37", - "@types/react-dom": "18.0.11", + "@types/react": "18.3.20", + "@types/react-dom": "18.3.6", "@types/sortablejs": "1.15.1", "@typescript-eslint/eslint-plugin": "5.59.0", "@typescript-eslint/parser": "5.59.0", diff --git a/sticker-creator/pnpm-lock.yaml b/sticker-creator/pnpm-lock.yaml index 4b85affd86..52d2206596 100644 --- a/sticker-creator/pnpm-lock.yaml +++ b/sticker-creator/pnpm-lock.yaml @@ -13,16 +13,16 @@ importers: version: 1.2.8 '@indutny/emoji-picker-react': specifier: 4.10.0 - version: 4.10.0(react@18.2.0) + version: 4.10.0(react@18.3.1) '@popperjs/core': - specifier: 2.11.7 - version: 2.11.7 + specifier: 2.11.8 + version: 2.11.8 '@react-aria/interactions': specifier: 3.19.0 - version: 3.19.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0) + version: 3.19.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@reduxjs/toolkit': specifier: 1.9.5 - version: 1.9.5(react-redux@8.0.5(@types/react-dom@18.0.11)(@types/react@18.0.37)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(redux@4.2.1))(react@18.2.0) + version: 1.9.5(react-redux@8.0.5(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(redux@4.2.1))(react@18.3.1) '@stablelib/x25519': specifier: 1.0.3 version: 1.0.3 @@ -37,7 +37,7 @@ importers: version: 4.3.4 focus-trap-react: specifier: 10.1.1 - version: 10.1.1(prop-types@15.8.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) + version: 10.1.1(prop-types@15.8.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) memoizee: specifier: 0.4.15 version: 0.4.15 @@ -54,29 +54,29 @@ importers: specifier: 1.4.4 version: 1.4.4 react: - specifier: 18.2.0 - version: 18.2.0 + specifier: 18.3.1 + version: 18.3.1 react-dom: - specifier: 18.2.0 - version: 18.2.0(react@18.2.0) + specifier: 18.3.1 + version: 18.3.1(react@18.3.1) react-dropzone: specifier: 14.2.3 - version: 14.2.3(react@18.2.0) + version: 14.2.3(react@18.3.1) react-intl: specifier: 6.4.1 - version: 6.4.1(react@18.2.0)(typescript@5.0.4) + version: 6.4.1(react@18.3.1)(typescript@5.0.4) react-popper: specifier: 2.3.0 - version: 2.3.0(@popperjs/core@2.11.7)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) + version: 2.3.0(@popperjs/core@2.11.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-redux: specifier: 8.0.5 - version: 8.0.5(@types/react-dom@18.0.11)(@types/react@18.0.37)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(redux@4.2.1) + version: 8.0.5(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(redux@4.2.1) react-router-dom: specifier: 6.10.0 - version: 6.10.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0) + version: 6.10.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-sortablejs: specifier: 6.1.4 - version: 6.1.4(@types/sortablejs@1.15.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(sortablejs@1.15.0) + version: 6.1.4(@types/sortablejs@1.15.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sortablejs@1.15.0) redux: specifier: 4.2.1 version: 4.2.1 @@ -100,11 +100,11 @@ importers: specifier: 0.4.8 version: 0.4.8 '@types/react': - specifier: 18.0.37 - version: 18.0.37 + specifier: 18.3.20 + version: 18.3.20 '@types/react-dom': - specifier: 18.0.11 - version: 18.0.11 + specifier: 18.3.6 + version: 18.3.6(@types/react@18.3.20) '@types/sortablejs': specifier: 1.15.1 version: 1.15.1 @@ -478,8 +478,8 @@ packages: resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} engines: {node: '>= 8'} - '@popperjs/core@2.11.7': - resolution: {integrity: sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw==} + '@popperjs/core@2.11.8': + resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} '@protobufjs/aspromise@1.1.2': resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==} @@ -625,14 +625,13 @@ packages: '@types/prop-types@15.7.14': resolution: {integrity: sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==} - '@types/react-dom@18.0.11': - resolution: {integrity: sha512-O38bPbI2CWtgw/OoQoY+BRelw7uysmXbWvw3nLWO21H1HSh+GOlqPuXshJfjmpNlKiiSDG9cc1JZAaMmVdcTlw==} + '@types/react-dom@18.3.6': + resolution: {integrity: sha512-nf22//wEbKXusP6E9pfOCDwFdHAX4u172eaJI4YkDRQEZiorm6KfYnSC2SWLDMVWUOWPERmJnN0ujeAfTBLvrw==} + peerDependencies: + '@types/react': ^18.0.0 - '@types/react@18.0.37': - resolution: {integrity: sha512-4yaZZtkRN3ZIQD3KSEwkfcik8s0SWV+82dlJot1AbGYHCzJkWP3ENBY6wYeDRmKZ6HkrgoGAmR2HqdwYGp6OEw==} - - '@types/scheduler@0.23.0': - resolution: {integrity: sha512-YIoDCTH3Af6XM5VuwGG/QL/CJqga1Zm3NkU3HZ4ZHK2fRMPYP1VczsTUqtsf43PH/iJNVlPHAo2oWX7BSdB2Hw==} + '@types/react@18.3.20': + resolution: {integrity: sha512-IPaCZN7PShZK/3t6Q87pfTkRm6oLTd4vztyoj+cbHUF1g3FfVb2tFIL79uCRKEfv16AhqDMBywP2VW3KIZUvcg==} '@types/semver@7.5.8': resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} @@ -2043,10 +2042,10 @@ packages: queue-microtask@1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} - react-dom@18.2.0: - resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==} + react-dom@18.3.1: + resolution: {integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==} peerDependencies: - react: ^18.2.0 + react: ^18.3.1 react-dropzone@14.2.3: resolution: {integrity: sha512-O3om8I+PkFKbxCukfIR3QAGftYXDZfOE2N1mr/7qebQJHs7U+/RSL/9xomJNpRg9kM5h9soQSdf0Gc7OHF5Fug==} @@ -2128,8 +2127,8 @@ packages: react-dom: '>=16.9.0' sortablejs: '1' - react@18.2.0: - resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==} + react@18.3.1: + resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==} engines: {node: '>=0.10.0'} read-pkg@3.0.0: @@ -2954,10 +2953,10 @@ snapshots: '@humanwhocodes/object-schema@2.0.3': {} - '@indutny/emoji-picker-react@4.10.0(react@18.2.0)': + '@indutny/emoji-picker-react@4.10.0(react@18.3.1)': dependencies: flairup: 0.0.39 - react: 18.2.0 + react: 18.3.1 '@jridgewell/gen-mapping@0.3.8': dependencies: @@ -2992,7 +2991,7 @@ snapshots: '@nodelib/fs.scandir': 2.1.5 fastq: 1.19.0 - '@popperjs/core@2.11.7': {} + '@popperjs/core@2.11.8': {} '@protobufjs/aspromise@1.1.2': {} @@ -3017,49 +3016,49 @@ snapshots: '@protobufjs/utf8@1.1.0': {} - '@react-aria/interactions@3.19.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': + '@react-aria/interactions@3.19.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@react-aria/ssr': 3.9.7(react@18.2.0) - '@react-aria/utils': 3.27.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0) - '@react-types/shared': 3.27.0(react@18.2.0) + '@react-aria/ssr': 3.9.7(react@18.3.1) + '@react-aria/utils': 3.27.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@react-types/shared': 3.27.0(react@18.3.1) '@swc/helpers': 0.5.15 - react: 18.2.0 + react: 18.3.1 transitivePeerDependencies: - react-dom - '@react-aria/ssr@3.9.7(react@18.2.0)': + '@react-aria/ssr@3.9.7(react@18.3.1)': dependencies: '@swc/helpers': 0.5.15 - react: 18.2.0 + react: 18.3.1 - '@react-aria/utils@3.27.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': + '@react-aria/utils@3.27.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@react-aria/ssr': 3.9.7(react@18.2.0) - '@react-stately/utils': 3.10.5(react@18.2.0) - '@react-types/shared': 3.27.0(react@18.2.0) + '@react-aria/ssr': 3.9.7(react@18.3.1) + '@react-stately/utils': 3.10.5(react@18.3.1) + '@react-types/shared': 3.27.0(react@18.3.1) '@swc/helpers': 0.5.15 clsx: 2.1.1 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) - '@react-stately/utils@3.10.5(react@18.2.0)': + '@react-stately/utils@3.10.5(react@18.3.1)': dependencies: '@swc/helpers': 0.5.15 - react: 18.2.0 + react: 18.3.1 - '@react-types/shared@3.27.0(react@18.2.0)': + '@react-types/shared@3.27.0(react@18.3.1)': dependencies: - react: 18.2.0 + react: 18.3.1 - '@reduxjs/toolkit@1.9.5(react-redux@8.0.5(@types/react-dom@18.0.11)(@types/react@18.0.37)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(redux@4.2.1))(react@18.2.0)': + '@reduxjs/toolkit@1.9.5(react-redux@8.0.5(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(redux@4.2.1))(react@18.3.1)': dependencies: immer: 9.0.21 redux: 4.2.1 redux-thunk: 2.4.2(redux@4.2.1) reselect: 4.1.8 optionalDependencies: - react: 18.2.0 - react-redux: 8.0.5(@types/react-dom@18.0.11)(@types/react@18.0.37)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(redux@4.2.1) + react: 18.3.1 + react-redux: 8.0.5(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(redux@4.2.1) '@remix-run/router@1.5.0': {} @@ -3108,7 +3107,7 @@ snapshots: '@types/hoist-non-react-statics@3.3.6': dependencies: - '@types/react': 18.0.37 + '@types/react': 18.3.20 hoist-non-react-statics: 3.3.2 '@types/json-schema@7.0.15': {} @@ -3136,18 +3135,15 @@ snapshots: '@types/prop-types@15.7.14': {} - '@types/react-dom@18.0.11': + '@types/react-dom@18.3.6(@types/react@18.3.20)': dependencies: - '@types/react': 18.0.37 + '@types/react': 18.3.20 - '@types/react@18.0.37': + '@types/react@18.3.20': dependencies: '@types/prop-types': 15.7.14 - '@types/scheduler': 0.23.0 csstype: 3.1.3 - '@types/scheduler@0.23.0': {} - '@types/semver@7.5.8': {} '@types/sortablejs@1.15.1': {} @@ -4066,12 +4062,12 @@ snapshots: flatted@3.3.2: {} - focus-trap-react@10.1.1(prop-types@15.8.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0): + focus-trap-react@10.1.1(prop-types@15.8.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: focus-trap: 7.6.4 prop-types: 15.8.1 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) tabbable: 6.2.0 focus-trap@7.6.4: @@ -4826,22 +4822,22 @@ snapshots: queue-microtask@1.2.3: {} - react-dom@18.2.0(react@18.2.0): + react-dom@18.3.1(react@18.3.1): dependencies: loose-envify: 1.4.0 - react: 18.2.0 + react: 18.3.1 scheduler: 0.23.2 - react-dropzone@14.2.3(react@18.2.0): + react-dropzone@14.2.3(react@18.3.1): dependencies: attr-accept: 2.2.5 file-selector: 0.6.0 prop-types: 15.8.1 - react: 18.2.0 + react: 18.3.1 react-fast-compare@3.2.2: {} - react-intl@6.4.1(react@18.2.0)(typescript@5.0.4): + react-intl@6.4.1(react@18.3.1)(typescript@5.0.4): dependencies: '@formatjs/ecma402-abstract': 1.14.3 '@formatjs/icu-messageformat-parser': 2.3.1 @@ -4849,10 +4845,10 @@ snapshots: '@formatjs/intl-displaynames': 6.3.1 '@formatjs/intl-listformat': 7.2.1 '@types/hoist-non-react-statics': 3.3.6 - '@types/react': 18.0.37 + '@types/react': 18.3.20 hoist-non-react-statics: 3.3.2 intl-messageformat: 10.3.4 - react: 18.2.0 + react: 18.3.1 tslib: 2.8.1 optionalDependencies: typescript: 5.0.4 @@ -4863,53 +4859,53 @@ snapshots: react-is@18.3.1: {} - react-popper@2.3.0(@popperjs/core@2.11.7)(react-dom@18.2.0(react@18.2.0))(react@18.2.0): + react-popper@2.3.0(@popperjs/core@2.11.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: - '@popperjs/core': 2.11.7 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + '@popperjs/core': 2.11.8 + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) react-fast-compare: 3.2.2 warning: 4.0.3 - react-redux@8.0.5(@types/react-dom@18.0.11)(@types/react@18.0.37)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(redux@4.2.1): + react-redux@8.0.5(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(redux@4.2.1): dependencies: '@babel/runtime': 7.26.7 '@types/hoist-non-react-statics': 3.3.6 '@types/use-sync-external-store': 0.0.3 hoist-non-react-statics: 3.3.2 - react: 18.2.0 + react: 18.3.1 react-is: 18.3.1 - use-sync-external-store: 1.4.0(react@18.2.0) + use-sync-external-store: 1.4.0(react@18.3.1) optionalDependencies: - '@types/react': 18.0.37 - '@types/react-dom': 18.0.11 - react-dom: 18.2.0(react@18.2.0) + '@types/react': 18.3.20 + '@types/react-dom': 18.3.6(@types/react@18.3.20) + react-dom: 18.3.1(react@18.3.1) redux: 4.2.1 react-refresh@0.14.2: {} - react-router-dom@6.10.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0): + react-router-dom@6.10.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@remix-run/router': 1.5.0 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - react-router: 6.10.0(react@18.2.0) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + react-router: 6.10.0(react@18.3.1) - react-router@6.10.0(react@18.2.0): + react-router@6.10.0(react@18.3.1): dependencies: '@remix-run/router': 1.5.0 - react: 18.2.0 + react: 18.3.1 - react-sortablejs@6.1.4(@types/sortablejs@1.15.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(sortablejs@1.15.0): + react-sortablejs@6.1.4(@types/sortablejs@1.15.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sortablejs@1.15.0): dependencies: '@types/sortablejs': 1.15.1 classnames: 2.3.1 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) sortablejs: 1.15.0 tiny-invariant: 1.2.0 - react@18.2.0: + react@18.3.1: dependencies: loose-envify: 1.4.0 @@ -5328,9 +5324,9 @@ snapshots: dependencies: punycode: 2.3.1 - use-sync-external-store@1.4.0(react@18.2.0): + use-sync-external-store@1.4.0(react@18.3.1): dependencies: - react: 18.2.0 + react: 18.3.1 validate-npm-package-license@3.0.4: dependencies: