chore: bump formkit version to 1.5.x (#5395)

#### What type of PR is this?

/area ui
/kind improvement
/milestone 2.13.x

#### What this PR does / why we need it:

升级 FormKit 的依赖版本至 1.5.x

Please see https://formkit.com/changelog#_150

#### Does this PR introduce a user-facing change?

```release-note
升级 FormKit 的依赖版本至 1.5.x
```
pull/5423/head
Ryan Wang 2024-02-29 17:57:39 +08:00 committed by GitHub
parent 11114416fa
commit f5a9889b47
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
18 changed files with 140 additions and 211 deletions

70
ui/env.d.ts vendored
View File

@ -49,5 +49,75 @@ declare module "@formkit/inputs" {
type: "datetime-local";
value?: string;
};
attachmentGroupSelect: {
type: "attachmentGroupSelect";
value?: string;
};
attachmentPolicySelect: {
type: "attachmentPolicySelect";
value?: string;
};
attachment: {
type: "attachment";
value?: string;
};
categoryCheckbox: {
type: "categoryCheckbox";
value?: string[];
};
tagSelect: {
type: "tagSelect";
value?: string | string[];
};
repeater: {
type: "repeater";
value?: Record<string, unknown>[];
};
categorySelect: {
type: "categorySelect";
value?: string | string[];
};
tagCheckbox: {
type: "tagCheckbox";
value?: string[];
};
singlePageSelect: {
type: "singlePageSelect";
value?: string;
};
roleSelect: {
type: "roleSelect";
value?: string;
};
postSelect: {
type: "postSelect";
value?: string;
};
menuRadio: {
type: "menuRadio";
value?: string;
};
menuItemSelect: {
type: "menuItemSelect";
value?: string;
};
menuCheckbox: {
type: "menuCheckbox";
value?: string[];
};
}
}

View File

@ -47,13 +47,13 @@
"@codemirror/state": "^6.1.4",
"@codemirror/view": "^6.5.1",
"@emoji-mart/data": "^1.0.8",
"@formkit/core": "^1.4.0",
"@formkit/i18n": "^1.4.0",
"@formkit/inputs": "^1.4.0",
"@formkit/themes": "^1.4.0",
"@formkit/utils": "^1.4.0",
"@formkit/validation": "^1.4.0",
"@formkit/vue": "^1.4.0",
"@formkit/core": "^1.5.9",
"@formkit/i18n": "^1.5.9",
"@formkit/inputs": "^1.5.9",
"@formkit/themes": "^1.5.9",
"@formkit/utils": "^1.5.9",
"@formkit/validation": "^1.5.9",
"@formkit/vue": "^1.5.9",
"@halo-dev/api-client": "workspace:*",
"@halo-dev/components": "workspace:*",
"@halo-dev/console-shared": "workspace:*",

View File

@ -39,26 +39,26 @@ importers:
specifier: ^1.0.8
version: 1.0.8
'@formkit/core':
specifier: ^1.4.0
version: 1.4.0
specifier: ^1.5.9
version: 1.5.9
'@formkit/i18n':
specifier: ^1.4.0
version: 1.4.0
specifier: ^1.5.9
version: 1.5.9
'@formkit/inputs':
specifier: ^1.4.0
version: 1.4.0
specifier: ^1.5.9
version: 1.5.9
'@formkit/themes':
specifier: ^1.4.0
version: 1.4.0(tailwindcss@3.3.0)
specifier: ^1.5.9
version: 1.5.9(tailwindcss@3.3.0)
'@formkit/utils':
specifier: ^1.4.0
version: 1.4.0
specifier: ^1.5.9
version: 1.5.9
'@formkit/validation':
specifier: ^1.4.0
version: 1.4.0
specifier: ^1.5.9
version: 1.5.9
'@formkit/vue':
specifier: ^1.4.0
version: 1.4.0(tailwindcss@3.3.0)(typescript@5.3.3)
specifier: ^1.5.9
version: 1.5.9(tailwindcss@3.3.0)(typescript@5.3.3)
'@halo-dev/api-client':
specifier: workspace:*
version: link:packages/api-client
@ -3021,51 +3021,51 @@ packages:
resolution: {integrity: sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==}
dev: true
/@formkit/core@1.4.0:
resolution: {integrity: sha512-LQYICzYWTC+ZXPyfizHDRJTBx6WLM3eRk9T4tzU8YPV58AYWPq3E4dbN5CKl7mPApAcJX6NxQOCYuNrdNKZvQA==}
/@formkit/core@1.5.9:
resolution: {integrity: sha512-hkF2uwmXcyeGqrYAO1RN3me77NdRWhuH4pZP+A2xlGZqBLx98nvABYUfTiQsCmdnPv9RkGHHB7qTq9BOvFATHQ==}
dependencies:
'@formkit/utils': 1.4.0
'@formkit/utils': 1.5.9
dev: false
/@formkit/dev@1.4.0:
resolution: {integrity: sha512-y71zSZGAWdqjuj5p7IvptJXgDXYFTZrJSjZ9HeQjNYJ1n3Nwc7latTzJSEQyOHuboSzRWafATYNeB3pqiTvBYg==}
/@formkit/dev@1.5.9:
resolution: {integrity: sha512-aeD53iH6WD/3jKiYyGmZgvocGQv77NHHD4MF5+I/DvApu0IP1gTArsmBFaBDEVr7t5o/xO2zH06Up7sJcA0+mA==}
dependencies:
'@formkit/core': 1.4.0
'@formkit/utils': 1.4.0
'@formkit/core': 1.5.9
'@formkit/utils': 1.5.9
dev: false
/@formkit/i18n@1.4.0:
resolution: {integrity: sha512-NRqw3ummnboUVkxN68jdy/T/mvgnf0/8v76160V3dTdt4OK9Q1Eq0a7pgonm0gBqisezX/0pELRWD0NPgUZSPw==}
/@formkit/i18n@1.5.9:
resolution: {integrity: sha512-4FVqE1YciXSwl2KUuGRvpizZXBnwZACVRMrNjSn2WokVsOPYdmgwP1+35nG6LVU6i8bcOv/8fASCLUO3ADe7mw==}
dependencies:
'@formkit/core': 1.4.0
'@formkit/utils': 1.4.0
'@formkit/validation': 1.4.0
'@formkit/core': 1.5.9
'@formkit/utils': 1.5.9
'@formkit/validation': 1.5.9
dev: false
/@formkit/inputs@1.4.0:
resolution: {integrity: sha512-6IvgjOZnvtYq2oSEXkarDCaabxl4o29FhFmD64d0lC8WTaVLcRPKgo9BsLaVvLYfJgVKDzFyPIMGLFNhTsiJ/Q==}
/@formkit/inputs@1.5.9:
resolution: {integrity: sha512-UYv0MxDMaADSd3w+pXsmt83WwQ0Z00MOABjL3bgTxc4uxDRJ5L6kRV2Qz4Wp82azOuBKnAqXa1Uen17VZb4J/A==}
dependencies:
'@formkit/core': 1.4.0
'@formkit/utils': 1.4.0
'@formkit/core': 1.5.9
'@formkit/utils': 1.5.9
dev: false
/@formkit/observer@1.4.0:
resolution: {integrity: sha512-sNjLqi+deN2TCnuRDWdOJ1OjTyxavFKg9pVK1E1KRrbQr0pvPDaS4qYIjrIIWg0YMsQiea487r03elLVesMWWw==}
/@formkit/observer@1.5.9:
resolution: {integrity: sha512-FrrHFuieSdBUBCYaHZFD4VfGCoK1+qNI8EJguIUgRx4L3p22T1rvfsVr20xGi4Si3Ghq2A9o2M5wou0/8usVTA==}
dependencies:
'@formkit/core': 1.4.0
'@formkit/utils': 1.4.0
'@formkit/core': 1.5.9
'@formkit/utils': 1.5.9
dev: false
/@formkit/rules@1.4.0:
resolution: {integrity: sha512-NEVDjN89Zwx26Ze0gwqd/Bml3d4QIzp3SDps3uND9IE1Ssd3yvvSSjF5jVeHLE7ZMDLUDfOepf5xyqhPE1UbqA==}
/@formkit/rules@1.5.9:
resolution: {integrity: sha512-kslIu91gs6CmStnbUl+wzerLt0Dzm3jb4VisfUTlmrtXfMpQCD4BwF6Dic90weVbbYlEyeFroY3vONvIIRruTw==}
dependencies:
'@formkit/core': 1.4.0
'@formkit/utils': 1.4.0
'@formkit/validation': 1.4.0
'@formkit/core': 1.5.9
'@formkit/utils': 1.5.9
'@formkit/validation': 1.5.9
dev: false
/@formkit/themes@1.4.0(tailwindcss@3.3.0):
resolution: {integrity: sha512-isyHZALh6S3BM+0G5NeRQkI12gydDRXEkI6oGt5uTn3Ju2olLt8RwOXNYgJ9lWSb8HrfuHh7/89SozdIRNVuCA==}
/@formkit/themes@1.5.9(tailwindcss@3.3.0):
resolution: {integrity: sha512-hQ2paR/ycOsq25/44M6WQtniYmri9/WIU59zGyx0c34kPBh1kZTdHOkXNL/Er9nITA5O+Dlax5PseO5UH2/jYQ==}
peerDependencies:
tailwindcss: ^3.2.0
unocss: ^0.31.0
@ -3078,34 +3078,34 @@ packages:
windicss:
optional: true
dependencies:
'@formkit/core': 1.4.0
'@formkit/core': 1.5.9
tailwindcss: 3.3.0(postcss@8.4.21)
dev: false
/@formkit/utils@1.4.0:
resolution: {integrity: sha512-HAkULL7/0PnRZmMJyFHZ3wxxTYl+tuJrSk13/LQyxB77luwlq8sCvlGaF5cz+0JX70HSVVc0ZJjJT4o0uTVeYQ==}
/@formkit/utils@1.5.9:
resolution: {integrity: sha512-Jaa9Q89WovxMkNcRE0IK1G8WfHwg7MDkCx9FJRhqJ+e9wGW0C2+t/vAYp0D3kS42jpNK7TTPIcozh9q2VGSUdg==}
dev: false
/@formkit/validation@1.4.0:
resolution: {integrity: sha512-KF25aU5ouwg+dFryyDGPTEFgik2TzbiT824PkIQJn7Fgepplo3Dj/UvjHmM2u0hBvIE2CS6XtgE0XVhn1kRG+A==}
/@formkit/validation@1.5.9:
resolution: {integrity: sha512-E2d9pVA++PQkiwanLvp4GW+tBGGg0JBsZTAe/Lobjuc8k4Skt3sjaRtczSFQx2Cwf+S8C4OMPvYx9alGF7vl1A==}
dependencies:
'@formkit/core': 1.4.0
'@formkit/observer': 1.4.0
'@formkit/utils': 1.4.0
'@formkit/core': 1.5.9
'@formkit/observer': 1.5.9
'@formkit/utils': 1.5.9
dev: false
/@formkit/vue@1.4.0(tailwindcss@3.3.0)(typescript@5.3.3):
resolution: {integrity: sha512-qxLJLG/rc0Mv75h9aaBu1SIFo8AZq1mMCa+u4aWQdXf0k/e8Mfuyhkch25c9pfbzSjEpFzs7G7L5U1gMuTcmtQ==}
/@formkit/vue@1.5.9(tailwindcss@3.3.0)(typescript@5.3.3):
resolution: {integrity: sha512-4tVYmu22ub2X+qHafmoh7kZgI61DFLDcSIt3A8R+vS1a0593odQY3TIgy8WJSWCFQ6QeS/chOzqdinXyFtuC8g==}
dependencies:
'@formkit/core': 1.4.0
'@formkit/dev': 1.4.0
'@formkit/i18n': 1.4.0
'@formkit/inputs': 1.4.0
'@formkit/observer': 1.4.0
'@formkit/rules': 1.4.0
'@formkit/themes': 1.4.0(tailwindcss@3.3.0)
'@formkit/utils': 1.4.0
'@formkit/validation': 1.4.0
'@formkit/core': 1.5.9
'@formkit/dev': 1.5.9
'@formkit/i18n': 1.5.9
'@formkit/inputs': 1.5.9
'@formkit/observer': 1.5.9
'@formkit/rules': 1.5.9
'@formkit/themes': 1.5.9(tailwindcss@3.3.0)
'@formkit/utils': 1.5.9
'@formkit/validation': 1.5.9
vue: 3.4.19(typescript@5.3.3)
transitivePeerDependencies:
- tailwindcss

View File

@ -1,16 +1,6 @@
import { apiClient } from "@/utils/api-client";
import type { FormKitNode, FormKitTypeDefinition } from "@formkit/core";
import { select, selects, defaultIcon } from "@formkit/inputs";
import type { FormKitInputs } from "@formkit/inputs";
declare module "@formkit/inputs" {
interface FormKitInputProps<Props extends FormKitInputs<Props>> {
attachmentGroupSelect: {
type: "attachmentGroupSelect";
value?: string;
};
}
}
function optionsHandler(node: FormKitNode) {
node.on("created", async () => {

View File

@ -1,16 +1,6 @@
import { apiClient } from "@/utils/api-client";
import type { FormKitNode, FormKitTypeDefinition } from "@formkit/core";
import { select, selects, defaultIcon } from "@formkit/inputs";
import type { FormKitInputs } from "@formkit/inputs";
declare module "@formkit/inputs" {
interface FormKitInputProps<Props extends FormKitInputs<Props>> {
attachmentPolicySelect: {
type: "attachmentPolicySelect";
value?: string;
};
}
}
function optionsHandler(node: FormKitNode) {
node.on("created", async () => {

View File

@ -2,17 +2,6 @@ import { initialValue } from "@formkit/inputs";
import { createInput } from "@formkit/vue";
import AttachmentInput from "./AttachmentInput.vue";
import type { FormKitInputs } from "@formkit/inputs";
declare module "@formkit/inputs" {
interface FormKitInputProps<Props extends FormKitInputs<Props>> {
attachment: {
type: "attachment";
value?: string;
};
}
}
export const attachment = createInput(AttachmentInput, {
type: "input",
props: ["accepts"],

View File

@ -1,16 +1,6 @@
import { apiClient } from "@/utils/api-client";
import type { FormKitNode, FormKitTypeDefinition } from "@formkit/core";
import { checkbox, checkboxes, defaultIcon } from "@formkit/inputs";
import type { FormKitInputs } from "@formkit/inputs";
declare module "@formkit/inputs" {
interface FormKitInputProps<Props extends FormKitInputs<Props>> {
categoryCheckbox: {
type: "categoryCheckbox";
value?: string[];
};
}
}
function optionsHandler(node: FormKitNode) {
node.on("created", async () => {

View File

@ -13,16 +13,6 @@ import {
} from "@formkit/inputs";
import CategorySelect from "./CategorySelect.vue";
import { CategorySelectSection } from "./sections";
import type { FormKitInputs } from "@formkit/inputs";
declare module "@formkit/inputs" {
interface FormKitInputProps<Props extends FormKitInputs<Props>> {
categorySelect: {
type: "categorySelect";
value?: string | string[];
};
}
}
export const categorySelect: FormKitTypeDefinition = {
schema: outer(

View File

@ -1,16 +1,6 @@
import { apiClient } from "@/utils/api-client";
import type { FormKitNode, FormKitTypeDefinition } from "@formkit/core";
import { checkbox, checkboxes, defaultIcon } from "@formkit/inputs";
import type { FormKitInputs } from "@formkit/inputs";
declare module "@formkit/inputs" {
interface FormKitInputProps<Props extends FormKitInputs<Props>> {
menuCheckbox: {
type: "menuCheckbox";
value?: string[];
};
}
}
function optionsHandler(node: FormKitNode) {
node.on("created", async () => {

View File

@ -1,16 +1,6 @@
import { apiClient } from "@/utils/api-client";
import type { FormKitNode, FormKitTypeDefinition } from "@formkit/core";
import { select, selects, defaultIcon } from "@formkit/inputs";
import type { FormKitInputs } from "@formkit/inputs";
declare module "@formkit/inputs" {
interface FormKitInputProps<Props extends FormKitInputs<Props>> {
menuItemSelect: {
type: "menuItemSelect";
value?: string;
};
}
}
function optionsHandler(node: FormKitNode) {
node.on("created", async () => {

View File

@ -1,16 +1,6 @@
import { apiClient } from "@/utils/api-client";
import type { FormKitNode, FormKitTypeDefinition } from "@formkit/core";
import { radio, radios, defaultIcon } from "@formkit/inputs";
import type { FormKitInputs } from "@formkit/inputs";
declare module "@formkit/inputs" {
interface FormKitInputProps<Props extends FormKitInputs<Props>> {
menuRadio: {
type: "menuRadio";
value?: string;
};
}
}
function optionsHandler(node: FormKitNode) {
node.on("created", async () => {

View File

@ -2,16 +2,6 @@ import { postLabels } from "@/constants/labels";
import { apiClient } from "@/utils/api-client";
import type { FormKitNode, FormKitTypeDefinition } from "@formkit/core";
import { select, selects, defaultIcon } from "@formkit/inputs";
import type { FormKitInputs } from "@formkit/inputs";
declare module "@formkit/inputs" {
interface FormKitInputProps<Props extends FormKitInputs<Props>> {
postSelect: {
type: "postSelect";
value?: string;
};
}
}
function optionsHandler(node: FormKitNode) {
node.on("created", async () => {

View File

@ -43,15 +43,6 @@ import {
import AddButton from "./AddButton.vue";
import { i18n } from "@/locales";
declare module "@formkit/inputs" {
interface FormKitInputProps<Props extends FormKitInputs<Props>> {
repeater: {
type: "repeater";
value?: Record<string, unknown>[];
};
}
}
/**
* Input definition for a repeater input.
* @public

View File

@ -4,6 +4,7 @@ import {
type FormKitSchemaNode,
type FormKitExtendableSchemaRoot,
type FormKitSchemaCondition,
type FormKitSectionsSchema,
} from "@formkit/core";
import {
extendSchema,
@ -37,9 +38,7 @@ function createSection(
FormKitSchemaExtendableSection | string | FormKitSchemaCondition
>
) => {
const extendable = (
extensions: Record<string, Partial<FormKitSchemaNode>>
) => {
const extendable = (extensions: FormKitSectionsSchema) => {
const node = !el || typeof el === "string" ? { $el: el } : el();
if ("string" != typeof node) {
if (isDOM(node) || isComponent(node) || "$formkit" in node) {
@ -91,7 +90,7 @@ function createSection(
export function createRoot(
rootSection: FormKitSchemaExtendableSection
): FormKitExtendableSchemaRoot {
return (extensions: Record<string, Partial<FormKitSchemaNode>>) => {
return (extensions: FormKitSectionsSchema) => {
return [rootSection(extensions)];
};
}

View File

@ -4,16 +4,6 @@ import { apiClient } from "@/utils/api-client";
import type { FormKitNode, FormKitTypeDefinition } from "@formkit/core";
import { select, selects, defaultIcon } from "@formkit/inputs";
import { i18n } from "@/locales";
import type { FormKitInputs } from "@formkit/inputs";
declare module "@formkit/inputs" {
interface FormKitInputProps<Props extends FormKitInputs<Props>> {
roleSelect: {
type: "roleSelect";
value?: string;
};
}
}
function optionsHandler(node: FormKitNode) {
node.on("created", async () => {

View File

@ -2,16 +2,6 @@ import { singlePageLabels } from "@/constants/labels";
import { apiClient } from "@/utils/api-client";
import type { FormKitNode, FormKitTypeDefinition } from "@formkit/core";
import { select, selects, defaultIcon } from "@formkit/inputs";
import type { FormKitInputs } from "@formkit/inputs";
declare module "@formkit/inputs" {
interface FormKitInputProps<Props extends FormKitInputs<Props>> {
singlePageSelect: {
type: "singlePageSelect";
value?: string;
};
}
}
function optionsHandler(node: FormKitNode) {
node.on("created", async () => {

View File

@ -1,16 +1,6 @@
import { apiClient } from "@/utils/api-client";
import type { FormKitNode, FormKitTypeDefinition } from "@formkit/core";
import { checkbox, checkboxes, defaultIcon } from "@formkit/inputs";
import type { FormKitInputs } from "@formkit/inputs";
declare module "@formkit/inputs" {
interface FormKitInputProps<Props extends FormKitInputs<Props>> {
tagCheckbox: {
type: "tagCheckbox";
value?: string[];
};
}
}
function optionsHandler(node: FormKitNode) {
node.on("created", async () => {

View File

@ -13,16 +13,6 @@ import {
} from "@formkit/inputs";
import TagSelect from "./TagSelect.vue";
import { TagSelectSection } from "./sections";
import type { FormKitInputs } from "@formkit/inputs";
declare module "@formkit/inputs" {
interface FormKitInputProps<Props extends FormKitInputs<Props>> {
tagSelect: {
type: "tagSelect";
value?: string | string[];
};
}
}
export const tagSelect: FormKitTypeDefinition = {
schema: outer(