fix(ui): roll back utility-types

It's `Required` util does not distribute over unions as expected. Also we have `ts-toolbelt` already for some utils.
This commit is contained in:
psychedelicious 2024-02-22 22:42:57 +11:00
parent 3ed2963f43
commit abc569c2dd
3 changed files with 2 additions and 12 deletions

View File

@ -145,7 +145,6 @@
"ts-toolbelt": "^9.6.0", "ts-toolbelt": "^9.6.0",
"tsafe": "^1.6.6", "tsafe": "^1.6.6",
"typescript": "^5.3.3", "typescript": "^5.3.3",
"utility-types": "^3.11.0",
"vite": "^5.1.3", "vite": "^5.1.3",
"vite-plugin-css-injected-by-js": "^3.4.0", "vite-plugin-css-injected-by-js": "^3.4.0",
"vite-plugin-dts": "^3.7.2", "vite-plugin-dts": "^3.7.2",

View File

@ -268,9 +268,6 @@ devDependencies:
typescript: typescript:
specifier: ^5.3.3 specifier: ^5.3.3
version: 5.3.3 version: 5.3.3
utility-types:
specifier: ^3.11.0
version: 3.11.0
vite: vite:
specifier: ^5.1.3 specifier: ^5.1.3
version: 5.1.3(@types/node@20.11.19) version: 5.1.3(@types/node@20.11.19)
@ -14147,11 +14144,6 @@ packages:
which-typed-array: 1.1.14 which-typed-array: 1.1.14
dev: true dev: true
/utility-types@3.11.0:
resolution: {integrity: sha512-6Z7Ma2aVEWisaL6TvBCy7P8rm2LQoPv6dJ7ecIaIixHcwfbJ0x7mWdbcwlIM5IGQxPZSFYeqRCqlOOeKoJYMkw==}
engines: {node: '>= 4'}
dev: true
/utils-merge@1.0.1: /utils-merge@1.0.1:
resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==} resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==}
engines: {node: '>= 0.4.0'} engines: {node: '>= 0.4.0'}

View File

@ -2,7 +2,6 @@ import type { UseToastOptions } from '@invoke-ai/ui-library';
import type { EntityState } from '@reduxjs/toolkit'; import type { EntityState } from '@reduxjs/toolkit';
import type { components, paths } from 'services/api/schema'; import type { components, paths } from 'services/api/schema';
import type { O } from 'ts-toolbelt'; import type { O } from 'ts-toolbelt';
import type { Overwrite } from 'utility-types';
export type S = components['schemas']; export type S = components['schemas'];
@ -72,8 +71,8 @@ export type TextualInversionModelConfig = S['TextualInversionConfig'];
export type DiffusersModelConfig = S['MainDiffusersConfig']; export type DiffusersModelConfig = S['MainDiffusersConfig'];
export type CheckpointModelConfig = S['MainCheckpointConfig']; export type CheckpointModelConfig = S['MainCheckpointConfig'];
export type MainModelConfig = DiffusersModelConfig | CheckpointModelConfig; export type MainModelConfig = DiffusersModelConfig | CheckpointModelConfig;
export type RefinerMainModelConfig = Overwrite<MainModelConfig, { base: 'sdxl-refiner' }>; export type RefinerMainModelConfig = Omit<MainModelConfig, 'base'> & { base: 'sdxl-refiner' };
export type NonRefinerMainModelConfig = Overwrite<MainModelConfig, { base: 'any' | 'sd-1' | 'sd-2' | 'sdxl' }>; export type NonRefinerMainModelConfig = Omit<MainModelConfig, 'base'> & { base: 'any' | 'sd-1' | 'sd-2' | 'sdxl' };
export type AnyModelConfig = export type AnyModelConfig =
| LoRAModelConfig | LoRAModelConfig
| VAEModelConfig | VAEModelConfig