diff --git a/web/package.json b/web/package.json index 717be375..5de38678 100644 --- a/web/package.json +++ b/web/package.json @@ -28,7 +28,7 @@ "react-dom": "^18.2.0", "react-hot-toast": "^2.4.1", "react-i18next": "^14.1.0", - "react-redux": "^8.1.3", + "react-redux": "^9.1.0", "react-router-dom": "^6.22.3", "react-use": "^17.5.0", "tailwindcss": "^3.4.3", diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index 65cbde83..00d42694 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -22,7 +22,7 @@ dependencies: version: 5.0.0-beta.32(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.75)(react-dom@18.2.0)(react@18.2.0) '@reduxjs/toolkit': specifier: ^2.2.3 - version: 2.2.3(react-redux@8.1.3)(react@18.2.0) + version: 2.2.3(react-redux@9.1.0)(react@18.2.0) axios: specifier: ^1.6.8 version: 1.6.8 @@ -66,8 +66,8 @@ dependencies: specifier: ^14.1.0 version: 14.1.0(i18next@23.11.1)(react-dom@18.2.0)(react@18.2.0) react-redux: - specifier: ^8.1.3 - version: 8.1.3(@types/react-dom@18.2.24)(@types/react@18.2.75)(react-dom@18.2.0)(react@18.2.0)(redux@5.0.1) + specifier: ^9.1.0 + version: 9.1.0(@types/react@18.2.75)(react@18.2.0)(redux@5.0.1) react-router-dom: specifier: ^6.22.3 version: 6.22.3(react-dom@18.2.0)(react@18.2.0) @@ -1212,7 +1212,7 @@ packages: resolution: {integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==} dev: true - /@reduxjs/toolkit@2.2.3(react-redux@8.1.3)(react@18.2.0): + /@reduxjs/toolkit@2.2.3(react-redux@9.1.0)(react@18.2.0): resolution: {integrity: sha512-76dll9EnJXg4EVcI5YNxZA/9hSAmZsFqzMmNRHvIlzw2WS/twfcVX3ysYrWGJMClwEmChQFC4yRq74tn6fdzRA==} peerDependencies: react: ^16.9.0 || ^17.0.0 || ^18 @@ -1225,7 +1225,7 @@ packages: dependencies: immer: 10.0.4 react: 18.2.0 - react-redux: 8.1.3(@types/react-dom@18.2.24)(@types/react@18.2.75)(react-dom@18.2.0)(react@18.2.0)(redux@5.0.1) + react-redux: 9.1.0(@types/react@18.2.75)(react@18.2.0)(redux@5.0.1) redux: 5.0.1 redux-thunk: 3.1.0(redux@5.0.1) reselect: 5.1.0 @@ -1601,13 +1601,6 @@ packages: resolution: {integrity: sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==} dev: true - /@types/hoist-non-react-statics@3.3.5: - resolution: {integrity: sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==} - dependencies: - '@types/react': 18.2.75 - hoist-non-react-statics: 3.3.2 - dev: false - /@types/js-cookie@2.2.7: resolution: {integrity: sha512-aLkWa0C0vO5b4Sr798E26QgOkss68Un0bLjs7u9qxzPT5CG+8DuNTffWES58YzJs3hrVAOs1wonycqEBqNJubA==} dev: false @@ -1661,6 +1654,7 @@ packages: resolution: {integrity: sha512-cN6upcKd8zkGy4HU9F1+/s98Hrp6D4MOcippK4PoE8OZRngohHZpbJn1GsaDLz87MqvHNoT13nHvNqM9ocRHZg==} dependencies: '@types/react': 18.2.75 + dev: true /@types/react@18.2.75: resolution: {integrity: sha512-+DNnF7yc5y0bHkBTiLKqXFe+L4B3nvOphiMY3tuA5X10esmjqk7smyBZzbGTy2vsiy/Bnzj8yFIBL8xhRacoOg==} @@ -4639,36 +4633,24 @@ packages: resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} dev: false - /react-redux@8.1.3(@types/react-dom@18.2.24)(@types/react@18.2.75)(react-dom@18.2.0)(react@18.2.0)(redux@5.0.1): - resolution: {integrity: sha512-n0ZrutD7DaX/j9VscF+uTALI3oUPa/pO4Z3soOBIjuRn/FzVu6aehhysxZCLi6y7duMf52WNZGMl7CtuK5EnRw==} + /react-redux@9.1.0(@types/react@18.2.75)(react@18.2.0)(redux@5.0.1): + resolution: {integrity: sha512-6qoDzIO+gbrza8h3hjMA9aq4nwVFCKFtY2iLxCtVT38Swyy2C/dJCGBXHeHLtx6qlg/8qzc2MrhOeduf5K32wQ==} peerDependencies: - '@types/react': ^16.8 || ^17.0 || ^18.0 - '@types/react-dom': ^16.8 || ^17.0 || ^18.0 - react: ^16.8 || ^17.0 || ^18.0 - react-dom: ^16.8 || ^17.0 || ^18.0 - react-native: '>=0.59' - redux: ^4 || ^5.0.0-beta.0 + '@types/react': ^18.2.25 + react: ^18.0 + react-native: '>=0.69' + redux: ^5.0.0 peerDependenciesMeta: '@types/react': optional: true - '@types/react-dom': - optional: true - react-dom: - optional: true react-native: optional: true redux: optional: true dependencies: - '@babel/runtime': 7.24.4 - '@types/hoist-non-react-statics': 3.3.5 '@types/react': 18.2.75 - '@types/react-dom': 18.2.24 '@types/use-sync-external-store': 0.0.3 - hoist-non-react-statics: 3.3.2 react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - react-is: 18.2.0 redux: 5.0.1 use-sync-external-store: 1.2.0(react@18.2.0) dev: false diff --git a/web/src/components/Icon.ts b/web/src/components/Icon.tsx similarity index 100% rename from web/src/components/Icon.ts rename to web/src/components/Icon.tsx diff --git a/web/src/components/MemoEditor/ActionButton/MarkdownMenu.tsx b/web/src/components/MemoEditor/ActionButton/MarkdownMenu.tsx index af0b5149..479d3eab 100644 --- a/web/src/components/MemoEditor/ActionButton/MarkdownMenu.tsx +++ b/web/src/components/MemoEditor/ActionButton/MarkdownMenu.tsx @@ -91,7 +91,7 @@ const MarkdownMenu = (props: Props) => { Checkbox