Merge branch 'main' into feat/controlnet-control-modes

invokeai/frontend/web/package.json

@@ -55,34 +55,35 @@
   "dependencies": {
     "@chakra-ui/anatomy": "^2.1.1",
     "@chakra-ui/icons": "^2.0.19",
-    "@chakra-ui/react": "^2.6.0",
-    "@chakra-ui/styled-system": "^2.9.0",
-    "@chakra-ui/theme-tools": "^2.0.16",
-    "@dagrejs/graphlib": "^2.1.12",
+    "@chakra-ui/react": "^2.7.1",
+    "@chakra-ui/styled-system": "^2.9.1",
+    "@chakra-ui/theme-tools": "^2.0.18",
+    "@dagrejs/graphlib": "^2.1.13",
     "@dnd-kit/core": "^6.0.8",
     "@dnd-kit/modifiers": "^6.0.1",
     "@emotion/react": "^11.11.1",
-    "@emotion/styled": "^11.10.6",
-    "@floating-ui/react-dom": "^2.0.0",
-    "@fontsource/inter": "^4.5.15",
-    "@mantine/core": "^6.0.13",
-    "@mantine/hooks": "^6.0.13",
+    "@emotion/styled": "^11.11.0",
+    "@floating-ui/react-dom": "^2.0.1",
+    "@fontsource-variable/inter": "^5.0.3",
+    "@fontsource/inter": "^5.0.3",
+    "@mantine/core": "^6.0.14",
+    "@mantine/hooks": "^6.0.14",
     "@reduxjs/toolkit": "^1.9.5",
     "@roarr/browser-log-writer": "^1.1.5",
     "chakra-ui-contextmenu": "^1.0.5",
     "dateformat": "^5.0.3",
     "downshift": "^7.6.0",
-    "formik": "^2.2.9",
-    "framer-motion": "^10.12.4",
+    "formik": "^2.4.2",
+    "framer-motion": "^10.12.17",
     "fuse.js": "^6.6.2",
-    "i18next": "^22.4.15",
-    "i18next-browser-languagedetector": "^7.0.1",
-    "i18next-http-backend": "^2.2.0",
-    "konva": "^9.0.1",
+    "i18next": "^23.2.3",
+    "i18next-browser-languagedetector": "^7.0.2",
+    "i18next-http-backend": "^2.2.1",
+    "konva": "^9.2.0",
     "lodash-es": "^4.17.21",
     "nanostores": "^0.9.2",
     "openapi-fetch": "^0.4.0",
-    "overlayscrollbars": "^2.1.1",
+    "overlayscrollbars": "^2.2.0",
     "overlayscrollbars-react": "^0.5.0",
     "patch-package": "^7.0.0",
     "query-string": "^8.1.0",
@@ -92,21 +93,21 @@
     "react-dom": "^18.2.0",
     "react-dropzone": "^14.2.3",
     "react-hotkeys-hook": "4.4.0",
-    "react-i18next": "^12.2.2",
-    "react-icons": "^4.9.0",
-    "react-konva": "^18.2.7",
-    "react-redux": "^8.0.5",
-    "react-resizable-panels": "^0.0.42",
+    "react-i18next": "^13.0.1",
+    "react-icons": "^4.10.1",
+    "react-konva": "^18.2.10",
+    "react-redux": "^8.1.1",
+    "react-resizable-panels": "^0.0.52",
     "react-use": "^17.4.0",
-    "react-virtuoso": "^4.3.5",
-    "react-zoom-pan-pinch": "^3.0.7",
-    "reactflow": "^11.7.0",
+    "react-virtuoso": "^4.3.11",
+    "react-zoom-pan-pinch": "^3.0.8",
+    "reactflow": "^11.7.4",
     "redux-dynamic-middlewares": "^2.2.0",
     "redux-remember": "^3.3.1",
     "roarr": "^7.15.0",
     "serialize-error": "^11.0.0",
-    "socket.io-client": "^4.6.0",
-    "use-image": "^1.1.0",
+    "socket.io-client": "^4.7.0",
+    "use-image": "^1.1.1",
     "uuid": "^9.0.0",
     "zod": "^3.21.4"
   },
@@ -117,22 +118,22 @@
     "ts-toolbelt": "^9.6.0"
   },
   "devDependencies": {
-    "@chakra-ui/cli": "^2.4.0",
+    "@chakra-ui/cli": "^2.4.1",
     "@types/dateformat": "^5.0.0",
     "@types/lodash-es": "^4.14.194",
-    "@types/node": "^18.16.2",
-    "@types/react": "^18.2.0",
-    "@types/react-dom": "^18.2.1",
+    "@types/node": "^20.3.1",
+    "@types/react": "^18.2.14",
+    "@types/react-dom": "^18.2.6",
     "@types/react-redux": "^7.1.25",
-    "@types/react-transition-group": "^4.4.5",
-    "@types/uuid": "^9.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.59.1",
-    "@typescript-eslint/parser": "^5.59.1",
-    "@vitejs/plugin-react-swc": "^3.3.0",
+    "@types/react-transition-group": "^4.4.6",
+    "@types/uuid": "^9.0.2",
+    "@typescript-eslint/eslint-plugin": "^5.60.0",
+    "@typescript-eslint/parser": "^5.60.0",
+    "@vitejs/plugin-react-swc": "^3.3.2",
     "axios": "^1.4.0",
     "babel-plugin-transform-imports": "^2.0.0",
-    "concurrently": "^8.0.1",
-    "eslint": "^8.39.0",
+    "concurrently": "^8.2.0",
+    "eslint": "^8.43.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.32.2",
@@ -140,16 +141,16 @@
     "form-data": "^4.0.0",
     "husky": "^8.0.3",
     "lint-staged": "^13.2.2",
-    "madge": "^6.0.0",
-    "openapi-types": "^12.1.0",
+    "madge": "^6.1.0",
+    "openapi-types": "^12.1.3",
     "openapi-typescript": "^6.2.8",
     "openapi-typescript-codegen": "^0.24.0",
     "postinstall-postinstall": "^2.1.0",
     "prettier": "^2.8.8",
-    "rollup-plugin-visualizer": "^5.9.0",
-    "terser": "^5.17.1",
+    "rollup-plugin-visualizer": "^5.9.2",
+    "terser": "^5.18.1",
     "ts-toolbelt": "^9.6.0",
-    "vite": "^4.3.3",
+    "vite": "^4.3.9",
     "vite-plugin-css-injected-by-js": "^3.1.1",
     "vite-plugin-dts": "^2.3.0",
     "vite-plugin-eslint": "^1.8.1",

invokeai/frontend/web/patches/@chakra-ui+cli+2.4.0.patch

@@ -1,14 +0,0 @@
-diff --git a/node_modules/@chakra-ui/cli/dist/scripts/read-theme-file.worker.js b/node_modules/@chakra-ui/cli/dist/scripts/read-theme-file.worker.js
-index 937cf0d..7dcc0c0 100644
---- a/node_modules/@chakra-ui/cli/dist/scripts/read-theme-file.worker.js
-+++ b/node_modules/@chakra-ui/cli/dist/scripts/read-theme-file.worker.js
-@@ -50,7 +50,8 @@ async function readTheme(themeFilePath) {
-       project: tsConfig.configFileAbsolutePath,
-       compilerOptions: {
-         module: "CommonJS",
--        esModuleInterop: true
-+        esModuleInterop: true,
-+        jsx: 'react'
-       },
-       transpileOnly: true,
-       swc: true

invokeai/frontend/web/src/app/components/ThemeLocaleProvider.tsx

@@ -14,7 +14,7 @@ import { invokeAIThemeColors } from 'theme/colors/invokeAI';
 import { lightThemeColors } from 'theme/colors/lightTheme';
 import { oceanBlueColors } from 'theme/colors/oceanBlue';
 
-import '@fontsource/inter/variable.css';
+import '@fontsource-variable/inter';
 import { MantineProvider } from '@mantine/core';
 import { mantineTheme } from 'mantine-theme/theme';
 import 'overlayscrollbars/overlayscrollbars.css';

invokeai/frontend/web/src/features/ui/components/InvokeTabs.tsx

@@ -17,7 +17,6 @@ import { setActiveTab, togglePanels } from 'features/ui/store/uiSlice';
 import { memo, MouseEvent, ReactNode, useCallback, useMemo } from 'react';
 import { useHotkeys } from 'react-hotkeys-hook';
 import { MdDeviceHub, MdGridOn } from 'react-icons/md';
-import { GoTextSize } from 'react-icons/go';
 import {
   activeTabIndexSelector,
   activeTabNameSelector,
@@ -33,7 +32,7 @@ import ImageGalleryContent from 'features/gallery/components/ImageGalleryContent
 import TextToImageTab from './tabs/TextToImage/TextToImageTab';
 import UnifiedCanvasTab from './tabs/UnifiedCanvas/UnifiedCanvasTab';
 import NodesTab from './tabs/Nodes/NodesTab';
-import { FaImage } from 'react-icons/fa';
+import { FaFont, FaImage } from 'react-icons/fa';
 import ResizeHandle from './tabs/ResizeHandle';
 import ImageTab from './tabs/ImageToImage/ImageToImageTab';
 import AuxiliaryProgressIndicator from 'app/components/AuxiliaryProgressIndicator';
@@ -47,7 +46,7 @@ export interface InvokeTabInfo {
 const tabs: InvokeTabInfo[] = [
   {
     id: 'txt2img',
-    icon: <Icon as={GoTextSize} sx={{ boxSize: 6, pointerEvents: 'none' }} />,
+    icon: <Icon as={FaFont} sx={{ boxSize: 6, pointerEvents: 'none' }} />,
     content: <TextToImageTab />,
   },
   {