From a414e97af0032b53ef6ca1a818cc4aec11d91303 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sun, 29 Dec 2024 13:03:52 +0100 Subject: [PATCH] fix(react-formio): use @formio/js v5+ --- .storybook/styles/index.css | 2 +- package.json | 3 +- packages/integration/package.json | 2 +- packages/integration/src/styles/index.css | 2 +- packages/react-formio-container/package.json | 11 +- .../src/interfaces/FormioContainerOptions.ts | 30 +- .../src/react-app-env.d.ts | 1 - .../src/utils/ExportClient.ts | 10 +- .../react-formio-container/tsconfig.app.json | 2 +- packages/react-formio-container/tsconfig.json | 3 + .../react-formio-container/tsconfig.node.json | 13 + packages/react-formio-stores/package.json | 2 +- .../action-info/action-info.actions.spec.ts | 4 +- .../stores/action-info/action-info.actions.ts | 2 +- .../src/stores/action/action.actions.spec.ts | 4 +- .../src/stores/action/action.actions.ts | 2 +- .../stores/actions/actions.actions.spec.ts | 4 +- .../src/stores/actions/actions.actions.ts | 2 +- .../src/stores/auth/getAccess.action.spec.ts | 2 +- .../src/stores/auth/getAccess.action.ts | 2 +- .../stores/auth/getProjectAccess.action.ts | 2 +- .../src/stores/auth/initAuth.action.spec.ts | 2 +- .../src/stores/auth/initAuth.action.ts | 2 +- .../src/stores/auth/logout.action.spec.ts | 4 +- .../src/stores/auth/logout.action.ts | 2 +- .../src/stores/auth/setUser.action.spec.ts | 2 +- .../src/stores/auth/setUser.action.ts | 2 +- .../src/stores/form/form.actions.spec.ts | 4 +- .../src/stores/form/form.actions.ts | 2 +- .../src/stores/forms/forms.actions.spec.ts | 4 +- .../src/stores/forms/forms.actions.ts | 2 +- .../submission/submission.actions.spec.ts | 4 +- .../stores/submission/submission.actions.ts | 2 +- .../submissions/submissions.actions.spec.ts | 4 +- .../stores/submissions/submissions.actions.ts | 2 +- packages/react-formio-stores/src/utils/url.ts | 2 +- .../react-formio-stores/tsconfig.app.json | 2 +- packages/react-formio-stores/tsconfig.json | 3 + .../react-formio-stores/tsconfig.node.json | 13 + packages/react-formio/package.json | 2 +- .../form-access/formAccess.component.tsx | 5 +- .../form-access/formAccess.schema.ts | 10 +- .../form-access/formAccess.stories.tsx | 1 - .../form-access/formAccess.utils.spec.ts | 7 +- .../form-access/formAccess.utils.ts | 14 +- .../form-action/formAction.component.tsx | 2 +- .../form-builder/formBuilder.component.tsx | 17 +- .../components/form-edit/formEdit.reducer.ts | 13 +- .../form-edit/formParameters.component.tsx | 4 +- .../components/form-edit/useFormEdit.hook.ts | 10 +- .../formSettings.component.spec.tsx | 1 + .../form-settings/formSettings.component.tsx | 5 +- .../form-settings/formSettings.schema.ts | 4 +- .../form-settings/formSettings.utils.ts | 7 +- .../src/components/form/form.component.tsx | 5 - .../src/components/form/useForm.hook.ts | 13 +- .../components/formCell.component.tsx | 4 +- .../forms-table/formsTable.component.tsx | 5 +- .../submissionsTable.component.tsx | 6 +- .../defaultCellHeader.component.tsx | 10 +- .../filters/defaultColumnFilter.component.tsx | 8 +- .../filters/selectColumnFilter.component.tsx | 6 +- .../table/hooks/useCustomTable.hook.tsx | 8 +- .../src/components/table/table.component.tsx | 5 +- .../table/utils/mapFormToColumns.tsx | 12 +- packages/react-formio/src/index.ts | 19 +- .../src/interfaces/ActionSchema.ts | 4 +- .../react-formio/src/interfaces/FormSchema.ts | 17 +- packages/react-formio/src/react-app-env.d.ts | 1 - packages/react-formio/src/typings.d.ts | 3 - packages/react-formio/src/utils/iconClass.ts | 2 +- packages/react-formio/tsconfig.app.json | 2 +- packages/react-formio/tsconfig.json | 3 + packages/react-formio/tsconfig.node.json | 13 + packages/redux-utils/package.json | 3 +- packages/redux-utils/src/react-app-env.d.ts | 1 - packages/redux-utils/tsconfig.app.json | 2 +- packages/redux-utils/tsconfig.json | 3 + packages/redux-utils/tsconfig.node.json | 13 + packages/tailwind-formio/package.json | 5 +- packages/tailwind-formio/readme.md | 4 +- .../src/templates/stories/builder.stories.jsx | 4 +- .../src/templates/stories/wizard.stories.jsx | 4 +- packages/tailwind-formio/tsconfig.app.json | 2 +- packages/tailwind-formio/tsconfig.json | 3 + packages/tailwind-formio/tsconfig.node.json | 13 + packages/tailwind-formio/vite.config.mts | 1 + tools/typescript/package.json | 5 +- tools/typescript/tsconfig.web.json | 1 - tools/vitest/package.json | 4 +- yarn.lock | 354 ++++++++---------- 91 files changed, 437 insertions(+), 396 deletions(-) delete mode 100644 packages/react-formio-container/src/react-app-env.d.ts create mode 100644 packages/react-formio-container/tsconfig.node.json create mode 100644 packages/react-formio-stores/tsconfig.node.json delete mode 100644 packages/react-formio/src/react-app-env.d.ts delete mode 100644 packages/react-formio/src/typings.d.ts create mode 100644 packages/react-formio/tsconfig.node.json delete mode 100644 packages/redux-utils/src/react-app-env.d.ts create mode 100644 packages/redux-utils/tsconfig.node.json create mode 100644 packages/tailwind-formio/tsconfig.node.json diff --git a/.storybook/styles/index.css b/.storybook/styles/index.css index acd912a5..57ae56e4 100644 --- a/.storybook/styles/index.css +++ b/.storybook/styles/index.css @@ -1,6 +1,6 @@ @import "tailwind.css"; @import "fonts/index.css"; @import "typography.css"; -@import "../../node_modules/formiojs/dist/formio.full.css"; +@import "../../node_modules/@formio/js/dist/formio.full.css"; @import "../../packages/tailwind-formio/styles/index.css"; diff --git a/package.json b/package.json index 04305e66..4ac9c7c7 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,9 @@ }, "dependencies": { "@formio/choices.js": "^9.0.1", + "@formio/js": "5.0.0", "@types/classnames": "^2.2.11", + "@types/lodash": "4.17.13", "@types/react": "^18.2.8", "@types/react-dnd": "3.0.2", "@types/react-dnd-html5-backend": "3.0.2", @@ -45,7 +47,6 @@ "@types/react-router-dom": "^5.3.3", "@types/react-table": "^7.7.14", "connected-react-router": "6.9.1", - "formiojs": "4.21.6", "history": "5.3.0", "lerna": "8.1.2", "lodash": "4.17.21", diff --git a/packages/integration/package.json b/packages/integration/package.json index c5ada4dd..9d8d1c84 100644 --- a/packages/integration/package.json +++ b/packages/integration/package.json @@ -14,7 +14,7 @@ }, "peerDependencies": { "@formio/choices.js": ">=9.0.1", - "formiojs": ">=4.0.0", + "@formio/js": ">=5.0.0", "lodash": ">=4.17.20", "react": ">=16.14.0", "react-dnd": ">=16.0.1", diff --git a/packages/integration/src/styles/index.css b/packages/integration/src/styles/index.css index 25033417..cae2fd5e 100644 --- a/packages/integration/src/styles/index.css +++ b/packages/integration/src/styles/index.css @@ -1,6 +1,6 @@ @import "tailwind.css"; @import "fonts/index.css"; @import "typography.css"; -@import "formiojs/dist/formio.full.css"; +@import "@formio/js/dist/formio.full.css"; @import "@tsed/tailwind-formio/styles/index.css"; diff --git a/packages/react-formio-container/package.json b/packages/react-formio-container/package.json index 4cdfa135..94b68fcf 100644 --- a/packages/react-formio-container/package.json +++ b/packages/react-formio-container/package.json @@ -26,12 +26,12 @@ }, "peerDependencies": { "@formio/choices.js": "^9.0.1", + "@formio/js": "^5.0.0", "@tsed/react-formio": "3.0.0-alpha.1", "@tsed/react-formio-stores": "3.0.0-alpha.1", "classnames": "^2.3.1", "connected-react-router": "^6.9.1", "file-saver": "^2.0.5", - "formiojs": "^4.21.6", "lodash": "^4.17.21", "react": "^18.3.1", "react-dom": "^18.3.1", @@ -52,6 +52,9 @@ "vitest": "2.1.8" }, "peerDependenciesMeta": { + "@formio/js": { + "optional": false + }, "choices.js": { "optional": false }, @@ -64,9 +67,6 @@ "file-saver": { "optional": false }, - "formiojs": { - "optional": false - }, "lodash": { "optional": false }, @@ -97,6 +97,5 @@ "tooltip.js": { "optional": false } - }, - "dependencies": {} + } } diff --git a/packages/react-formio-container/src/interfaces/FormioContainerOptions.ts b/packages/react-formio-container/src/interfaces/FormioContainerOptions.ts index d034e793..c96921cb 100644 --- a/packages/react-formio-container/src/interfaces/FormioContainerOptions.ts +++ b/packages/react-formio-container/src/interfaces/FormioContainerOptions.ts @@ -1,4 +1,6 @@ -import { FormSchema, Submission } from "@tsed/react-formio"; +import type { Form } from "@formio/core"; +import { Submission } from "@tsed/react-formio"; +import { ComponentType } from "react"; import { FormRoute } from "../views/form.routes"; @@ -54,7 +56,7 @@ export interface FormioContainerOptions extends Record { * Handler called when an event is an error */ onError?: FormioErrorHandler; - onSubmitForm?: (type: string, form: FormSchema) => void; + onSubmitForm?: (type: string, form: Form) => void; onSubmitSubmission?: (submissionType: string, formId: string, submission: Submission) => void; /** * i18n function to translate sentences @@ -62,16 +64,16 @@ export interface FormioContainerOptions extends Record { i18n?: (f: string) => string; // override components - FormsComponent?: React.ComponentType; - FormComponent?: React.ComponentType; - FormActionsComponent?: React.ComponentType; - FormActionComponent?: React.ComponentType; - FormExportComponent?: React.ComponentType; - FormEditComponent?: React.ComponentType; - FormSettingsComponent?: React.ComponentType; - FormAccessComponent?: React.ComponentType; - SubmissionComponent?: React.ComponentType; - SubmissionsComponent?: React.ComponentType; - RemoveModalComponent?: React.ComponentType; - LoaderComponent?: React.ComponentType; + FormsComponent?: ComponentType; + FormComponent?: ComponentType; + FormActionsComponent?: ComponentType; + FormActionComponent?: ComponentType; + FormExportComponent?: ComponentType; + FormEditComponent?: ComponentType; + FormSettingsComponent?: ComponentType; + FormAccessComponent?: ComponentType; + SubmissionComponent?: ComponentType; + SubmissionsComponent?: ComponentType; + RemoveModalComponent?: ComponentType; + LoaderComponent?: ComponentType; } diff --git a/packages/react-formio-container/src/react-app-env.d.ts b/packages/react-formio-container/src/react-app-env.d.ts deleted file mode 100644 index 6431bc5f..00000000 --- a/packages/react-formio-container/src/react-app-env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// diff --git a/packages/react-formio-container/src/utils/ExportClient.ts b/packages/react-formio-container/src/utils/ExportClient.ts index 0ab5144d..6e42a4b0 100644 --- a/packages/react-formio-container/src/utils/ExportClient.ts +++ b/packages/react-formio-container/src/utils/ExportClient.ts @@ -1,4 +1,4 @@ -import { FormSchema } from "@tsed/react-formio"; +import type { Form } from "@formio/core"; import FileSaver from "file-saver"; import moment from "moment"; @@ -8,12 +8,12 @@ async function getDatabase() { return httpClient.get("/export"); } -async function exportForm(form: FormSchema) { +async function exportForm(form: Form) { const database = await getDatabase(); return database.forms[form.machineName!] || database.resources[form.machineName!]; } -async function exportActions(form: FormSchema) { +async function exportActions(form: Form) { const database = await getDatabase(); return Object.entries(database.actions).reduce((obj, [machineName, action]) => { @@ -25,9 +25,9 @@ async function exportActions(form: FormSchema) { }, {}); } -async function getContent(form: FormSchema, type: string, format = "json") { +async function getContent(form: Form, type: string, format = "json") { let result; - console.log(form, type, format); + switch (type) { case "schema": result = await exportForm(form); diff --git a/packages/react-formio-container/tsconfig.app.json b/packages/react-formio-container/tsconfig.app.json index 85f0596c..ee6ad461 100644 --- a/packages/react-formio-container/tsconfig.app.json +++ b/packages/react-formio-container/tsconfig.app.json @@ -6,6 +6,6 @@ "declaration": false, "composite": false }, - "include": ["src/**/*.ts", "src/**/*.tsx", "vite.config.mts"], + "include": ["src/**/*.ts", "src/**/*.tsx"], "exclude": ["node_modules", "dist", "src/**/*.spec.ts", "src/**/*.spec.tsx"] } diff --git a/packages/react-formio-container/tsconfig.json b/packages/react-formio-container/tsconfig.json index a42fc695..9255ac0e 100644 --- a/packages/react-formio-container/tsconfig.json +++ b/packages/react-formio-container/tsconfig.json @@ -11,6 +11,9 @@ { "path": "./tsconfig.app.json" }, + { + "path": "./tsconfig.node.json" + }, { "path": "./tsconfig.spec.json" } diff --git a/packages/react-formio-container/tsconfig.node.json b/packages/react-formio-container/tsconfig.node.json new file mode 100644 index 00000000..4e75ad79 --- /dev/null +++ b/packages/react-formio-container/tsconfig.node.json @@ -0,0 +1,13 @@ +{ + "extends": "@tsed/typescript/tsconfig.web.json", + "compilerOptions": { + "module": "NodeNext", + "moduleResolution": "NodeNext", + "baseUrl": ".", + "noEmit": true, + "declaration": false, + "composite": false + }, + "include": ["vite.config.mts"], + "exclude": ["node_modules", "dist", "src/**/*.spec.ts", "src/**/*.spec.tsx"] +} diff --git a/packages/react-formio-stores/package.json b/packages/react-formio-stores/package.json index c7964d24..0ddd08ac 100644 --- a/packages/react-formio-stores/package.json +++ b/packages/react-formio-stores/package.json @@ -24,7 +24,7 @@ }, "peerDependencies": { "@formio/choices.js": ">=9.0.1", - "formiojs": ">=4.0.0", + "@formio/js": ">=5.0.0", "lodash": ">=4.17.20", "react": ">=16.14.0", "react-dom": ">=16.14.0", diff --git a/packages/react-formio-stores/src/stores/action-info/action-info.actions.spec.ts b/packages/react-formio-stores/src/stores/action-info/action-info.actions.spec.ts index 55c97ac3..63ccdf45 100644 --- a/packages/react-formio-stores/src/stores/action-info/action-info.actions.spec.ts +++ b/packages/react-formio-stores/src/stores/action-info/action-info.actions.spec.ts @@ -1,8 +1,8 @@ -import { Formio } from "formiojs"; +import { Formio } from "@formio/js"; import { getActionInfo, receiveActionInfo, requestActionInfo } from "./action-info.actions"; -vi.mock("formiojs", async (originalImport) => { +vi.mock("@formio/js", async (originalImport) => { return { ...(await originalImport()), Formio: class { diff --git a/packages/react-formio-stores/src/stores/action-info/action-info.actions.ts b/packages/react-formio-stores/src/stores/action-info/action-info.actions.ts index 63137884..5e8f509d 100644 --- a/packages/react-formio-stores/src/stores/action-info/action-info.actions.ts +++ b/packages/react-formio-stores/src/stores/action-info/action-info.actions.ts @@ -1,5 +1,5 @@ +import { Formio } from "@formio/js"; import { createAction } from "@tsed/redux-utils"; -import { Formio } from "formiojs"; import noop from "lodash/noop"; import { getFormUrl } from "../../utils/url"; diff --git a/packages/react-formio-stores/src/stores/action/action.actions.spec.ts b/packages/react-formio-stores/src/stores/action/action.actions.spec.ts index bc19b00a..2b4b78ac 100644 --- a/packages/react-formio-stores/src/stores/action/action.actions.spec.ts +++ b/packages/react-formio-stores/src/stores/action/action.actions.spec.ts @@ -1,4 +1,4 @@ -import { Formio } from "formiojs"; +import { Formio } from "@formio/js"; import { getActionInfo } from "../action-info"; import { @@ -12,7 +12,7 @@ import { sendAction } from "./action.actions"; -vi.mock("formiojs", async (originalImport) => { +vi.mock("@formio/js", async (originalImport) => { return { ...(await originalImport()), Formio: class { diff --git a/packages/react-formio-stores/src/stores/action/action.actions.ts b/packages/react-formio-stores/src/stores/action/action.actions.ts index 7f6f2b71..a3271635 100644 --- a/packages/react-formio-stores/src/stores/action/action.actions.ts +++ b/packages/react-formio-stores/src/stores/action/action.actions.ts @@ -1,5 +1,5 @@ +import { Formio } from "@formio/js"; import { createAction } from "@tsed/redux-utils"; -import { Formio } from "formiojs"; import get from "lodash/get"; import noop from "lodash/noop"; diff --git a/packages/react-formio-stores/src/stores/actions/actions.actions.spec.ts b/packages/react-formio-stores/src/stores/actions/actions.actions.spec.ts index 9cf945be..bede56dd 100644 --- a/packages/react-formio-stores/src/stores/actions/actions.actions.spec.ts +++ b/packages/react-formio-stores/src/stores/actions/actions.actions.spec.ts @@ -1,8 +1,8 @@ -import { Formio } from "formiojs"; +import { Formio } from "@formio/js"; import { getActions, receiveActions, requestActions, resetActions } from "./actions.actions"; -vi.mock("formiojs", async (originalImport) => { +vi.mock("@formio/js", async (originalImport) => { return { ...(await originalImport()), Formio: class { diff --git a/packages/react-formio-stores/src/stores/actions/actions.actions.ts b/packages/react-formio-stores/src/stores/actions/actions.actions.ts index d087a33b..eeea69c9 100644 --- a/packages/react-formio-stores/src/stores/actions/actions.actions.ts +++ b/packages/react-formio-stores/src/stores/actions/actions.actions.ts @@ -1,5 +1,5 @@ +import { Formio } from "@formio/js"; import { createAction } from "@tsed/redux-utils"; -import { Formio } from "formiojs"; import noop from "lodash/noop"; import { getFormUrl } from "../../utils/url"; diff --git a/packages/react-formio-stores/src/stores/auth/getAccess.action.spec.ts b/packages/react-formio-stores/src/stores/auth/getAccess.action.spec.ts index 91f1f65c..e3aa59f2 100644 --- a/packages/react-formio-stores/src/stores/auth/getAccess.action.spec.ts +++ b/packages/react-formio-stores/src/stores/auth/getAccess.action.spec.ts @@ -1,4 +1,4 @@ -import { Formio } from "formiojs"; +import { Formio } from "@formio/js"; import { formAccessUser, submissionAccessUser, userForms, userRoles } from "./auth.actions"; import { AUTH } from "./auth.constant"; diff --git a/packages/react-formio-stores/src/stores/auth/getAccess.action.ts b/packages/react-formio-stores/src/stores/auth/getAccess.action.ts index 1476d75f..8778f9e7 100644 --- a/packages/react-formio-stores/src/stores/auth/getAccess.action.ts +++ b/packages/react-formio-stores/src/stores/auth/getAccess.action.ts @@ -1,5 +1,5 @@ +import { Formio } from "@formio/js"; import type { FormSchema, RoleSchema } from "@tsed/react-formio"; -import { Formio } from "formiojs"; import { formAccessUser, submissionAccessUser, userForms, userRoles } from "./auth.actions"; import { AUTH } from "./auth.constant"; diff --git a/packages/react-formio-stores/src/stores/auth/getProjectAccess.action.ts b/packages/react-formio-stores/src/stores/auth/getProjectAccess.action.ts index b6162c2d..32d889ac 100644 --- a/packages/react-formio-stores/src/stores/auth/getProjectAccess.action.ts +++ b/packages/react-formio-stores/src/stores/auth/getProjectAccess.action.ts @@ -1,4 +1,4 @@ -import { Formio } from "formiojs"; +import { Formio } from "@formio/js"; import { projectAccessUser } from "./auth.actions"; import { AUTH } from "./auth.constant"; diff --git a/packages/react-formio-stores/src/stores/auth/initAuth.action.spec.ts b/packages/react-formio-stores/src/stores/auth/initAuth.action.spec.ts index e7ed661e..e85c6bd0 100644 --- a/packages/react-formio-stores/src/stores/auth/initAuth.action.spec.ts +++ b/packages/react-formio-stores/src/stores/auth/initAuth.action.spec.ts @@ -1,4 +1,4 @@ -import { Formio } from "formiojs"; +import { Formio } from "@formio/js"; import { requestUser } from "./auth.actions"; import { AUTH } from "./auth.constant"; diff --git a/packages/react-formio-stores/src/stores/auth/initAuth.action.ts b/packages/react-formio-stores/src/stores/auth/initAuth.action.ts index f987f57d..9d2e7315 100644 --- a/packages/react-formio-stores/src/stores/auth/initAuth.action.ts +++ b/packages/react-formio-stores/src/stores/auth/initAuth.action.ts @@ -1,4 +1,4 @@ -import { Formio } from "formiojs"; +import { Formio } from "@formio/js"; import noop from "lodash/noop"; import { failUser, requestUser } from "./auth.actions"; diff --git a/packages/react-formio-stores/src/stores/auth/logout.action.spec.ts b/packages/react-formio-stores/src/stores/auth/logout.action.spec.ts index bf7e4f00..995925d1 100644 --- a/packages/react-formio-stores/src/stores/auth/logout.action.spec.ts +++ b/packages/react-formio-stores/src/stores/auth/logout.action.spec.ts @@ -1,11 +1,11 @@ -import { Formio } from "formiojs"; +import { Formio } from "@formio/js"; import { logoutUser } from "./auth.actions"; import { AUTH } from "./auth.constant"; import { logout } from "./logout.action"; vi.mock("./auth.actions"); -vi.mock("formiojs"); +vi.mock("@formio/js"); describe("logout()", () => { beforeEach(() => { diff --git a/packages/react-formio-stores/src/stores/auth/logout.action.ts b/packages/react-formio-stores/src/stores/auth/logout.action.ts index 201b1688..5674a442 100644 --- a/packages/react-formio-stores/src/stores/auth/logout.action.ts +++ b/packages/react-formio-stores/src/stores/auth/logout.action.ts @@ -1,4 +1,4 @@ -import { Formio } from "formiojs"; +import { Formio } from "@formio/js"; import { logoutUser } from "./auth.actions"; import { AUTH } from "./auth.constant"; diff --git a/packages/react-formio-stores/src/stores/auth/setUser.action.spec.ts b/packages/react-formio-stores/src/stores/auth/setUser.action.spec.ts index aa3c134f..25596a8f 100644 --- a/packages/react-formio-stores/src/stores/auth/setUser.action.spec.ts +++ b/packages/react-formio-stores/src/stores/auth/setUser.action.spec.ts @@ -1,4 +1,4 @@ -import { Formio } from "formiojs"; +import { Formio } from "@formio/js"; import { receiveUser } from "./auth.actions"; import { AUTH } from "./auth.constant"; diff --git a/packages/react-formio-stores/src/stores/auth/setUser.action.ts b/packages/react-formio-stores/src/stores/auth/setUser.action.ts index f60fd8f4..c1965d39 100644 --- a/packages/react-formio-stores/src/stores/auth/setUser.action.ts +++ b/packages/react-formio-stores/src/stores/auth/setUser.action.ts @@ -1,4 +1,4 @@ -import { Formio } from "formiojs"; +import { Formio } from "@formio/js"; import { receiveUser } from "./auth.actions"; import { AUTH } from "./auth.constant"; diff --git a/packages/react-formio-stores/src/stores/form/form.actions.spec.ts b/packages/react-formio-stores/src/stores/form/form.actions.spec.ts index 3a216f23..19fa4573 100644 --- a/packages/react-formio-stores/src/stores/form/form.actions.spec.ts +++ b/packages/react-formio-stores/src/stores/form/form.actions.spec.ts @@ -1,8 +1,8 @@ -import { Formio } from "formiojs"; +import { Formio } from "@formio/js"; import { deleteForm, failForm, getForm, receiveForm, requestForm, resetForm, saveForm, sendForm } from "./form.actions"; -vi.mock("formiojs", async (originalImport) => { +vi.mock("@formio/js", async (originalImport) => { return { ...(await originalImport()), Formio: class { diff --git a/packages/react-formio-stores/src/stores/form/form.actions.ts b/packages/react-formio-stores/src/stores/form/form.actions.ts index 3386ec3c..f7736860 100644 --- a/packages/react-formio-stores/src/stores/form/form.actions.ts +++ b/packages/react-formio-stores/src/stores/form/form.actions.ts @@ -1,6 +1,6 @@ +import { Formio } from "@formio/js"; import type { FormSchema } from "@tsed/react-formio"; import { createAction } from "@tsed/redux-utils"; -import { Formio } from "formiojs"; import noop from "lodash/noop"; import { getFormUrl } from "../../utils/url"; diff --git a/packages/react-formio-stores/src/stores/forms/forms.actions.spec.ts b/packages/react-formio-stores/src/stores/forms/forms.actions.spec.ts index 4f02eb32..9494eeaf 100644 --- a/packages/react-formio-stores/src/stores/forms/forms.actions.spec.ts +++ b/packages/react-formio-stores/src/stores/forms/forms.actions.spec.ts @@ -1,9 +1,9 @@ -import { Formio } from "formiojs"; +import { Formio } from "@formio/js"; import { mapRequestParams } from "../../utils/mapRequestParams"; import { failForms, getForms, receiveForms, requestForms } from "./forms.actions"; -vi.mock("formiojs", async (originalImport) => { +vi.mock("@formio/js", async (originalImport) => { return { ...(await originalImport()), Formio: class { diff --git a/packages/react-formio-stores/src/stores/forms/forms.actions.ts b/packages/react-formio-stores/src/stores/forms/forms.actions.ts index f10383ec..39bef337 100644 --- a/packages/react-formio-stores/src/stores/forms/forms.actions.ts +++ b/packages/react-formio-stores/src/stores/forms/forms.actions.ts @@ -1,6 +1,6 @@ +import { Formio } from "@formio/js"; import type { FormSchema } from "@tsed/react-formio"; import { createAction } from "@tsed/redux-utils"; -import { Formio } from "formiojs"; import noop from "lodash/noop"; import { mapRequestParams, RequestParamsOptions } from "../../utils/mapRequestParams"; diff --git a/packages/react-formio-stores/src/stores/submission/submission.actions.spec.ts b/packages/react-formio-stores/src/stores/submission/submission.actions.spec.ts index 0fc203e7..9e2d4215 100644 --- a/packages/react-formio-stores/src/stores/submission/submission.actions.spec.ts +++ b/packages/react-formio-stores/src/stores/submission/submission.actions.spec.ts @@ -1,4 +1,4 @@ -import { Formio } from "formiojs"; +import { Formio } from "@formio/js"; import { clearSubmissionError, @@ -12,7 +12,7 @@ import { sendSubmission } from "./submission.actions"; -vi.mock("formiojs", async (originalImport) => { +vi.mock("@formio/js", async (originalImport) => { return { ...(await originalImport()), Formio: class { diff --git a/packages/react-formio-stores/src/stores/submission/submission.actions.ts b/packages/react-formio-stores/src/stores/submission/submission.actions.ts index 6fd90f5f..5038a0f9 100644 --- a/packages/react-formio-stores/src/stores/submission/submission.actions.ts +++ b/packages/react-formio-stores/src/stores/submission/submission.actions.ts @@ -1,6 +1,6 @@ +import { Formio } from "@formio/js"; import { Submission } from "@tsed/react-formio"; import { createAction } from "@tsed/redux-utils"; -import { Formio } from "formiojs"; import noop from "lodash/noop"; import { getSubmissionUrl } from "../../utils/url"; diff --git a/packages/react-formio-stores/src/stores/submissions/submissions.actions.spec.ts b/packages/react-formio-stores/src/stores/submissions/submissions.actions.spec.ts index d3beca4b..1d566a91 100644 --- a/packages/react-formio-stores/src/stores/submissions/submissions.actions.spec.ts +++ b/packages/react-formio-stores/src/stores/submissions/submissions.actions.spec.ts @@ -1,9 +1,9 @@ -import { Formio } from "formiojs"; +import { Formio } from "@formio/js"; import { mapRequestParams } from "../../utils/mapRequestParams"; import { failSubmissions, getSubmissions, receiveSubmissions, requestSubmissions } from "./submissions.actions"; -vi.mock("formiojs", async (originalImport) => { +vi.mock("@formio/js", async (originalImport) => { return { ...(await originalImport()), Formio: class { diff --git a/packages/react-formio-stores/src/stores/submissions/submissions.actions.ts b/packages/react-formio-stores/src/stores/submissions/submissions.actions.ts index 8f1ad4c8..b956e601 100644 --- a/packages/react-formio-stores/src/stores/submissions/submissions.actions.ts +++ b/packages/react-formio-stores/src/stores/submissions/submissions.actions.ts @@ -1,5 +1,5 @@ +import { Formio } from "@formio/js"; import { createAction } from "@tsed/redux-utils"; -import { Formio } from "formiojs"; import noop from "lodash/noop"; import { mapRequestParams } from "../../utils/mapRequestParams"; diff --git a/packages/react-formio-stores/src/utils/url.ts b/packages/react-formio-stores/src/utils/url.ts index b2e7aa25..db684bc4 100644 --- a/packages/react-formio-stores/src/utils/url.ts +++ b/packages/react-formio-stores/src/utils/url.ts @@ -1,4 +1,4 @@ -import { Formio, Utils } from "formiojs"; +import { Formio, Utils } from "@formio/js"; export function getFormUrl(formId: string): string { const url = [Formio.getProjectUrl()]; diff --git a/packages/react-formio-stores/tsconfig.app.json b/packages/react-formio-stores/tsconfig.app.json index 85f0596c..ee6ad461 100644 --- a/packages/react-formio-stores/tsconfig.app.json +++ b/packages/react-formio-stores/tsconfig.app.json @@ -6,6 +6,6 @@ "declaration": false, "composite": false }, - "include": ["src/**/*.ts", "src/**/*.tsx", "vite.config.mts"], + "include": ["src/**/*.ts", "src/**/*.tsx"], "exclude": ["node_modules", "dist", "src/**/*.spec.ts", "src/**/*.spec.tsx"] } diff --git a/packages/react-formio-stores/tsconfig.json b/packages/react-formio-stores/tsconfig.json index 5cdf9478..7f5afa49 100644 --- a/packages/react-formio-stores/tsconfig.json +++ b/packages/react-formio-stores/tsconfig.json @@ -11,6 +11,9 @@ { "path": "./tsconfig.app.json" }, + { + "path": "./tsconfig.node.json" + }, { "path": "./tsconfig.spec.json" } diff --git a/packages/react-formio-stores/tsconfig.node.json b/packages/react-formio-stores/tsconfig.node.json new file mode 100644 index 00000000..4e75ad79 --- /dev/null +++ b/packages/react-formio-stores/tsconfig.node.json @@ -0,0 +1,13 @@ +{ + "extends": "@tsed/typescript/tsconfig.web.json", + "compilerOptions": { + "module": "NodeNext", + "moduleResolution": "NodeNext", + "baseUrl": ".", + "noEmit": true, + "declaration": false, + "composite": false + }, + "include": ["vite.config.mts"], + "exclude": ["node_modules", "dist", "src/**/*.spec.ts", "src/**/*.spec.tsx"] +} diff --git a/packages/react-formio/package.json b/packages/react-formio/package.json index ea881244..2b132b0f 100644 --- a/packages/react-formio/package.json +++ b/packages/react-formio/package.json @@ -30,7 +30,7 @@ }, "peerDependencies": { "@formio/choices.js": ">=9.0.1", - "formiojs": ">=4.0.0", + "@formio/js": ">=5.0.0", "lodash": ">=4.17.20", "moment": ">=2.30.1", "react": ">=16.14.0", diff --git a/packages/react-formio/src/components/form-access/formAccess.component.tsx b/packages/react-formio/src/components/form-access/formAccess.component.tsx index 6f0a8243..2dc87521 100644 --- a/packages/react-formio/src/components/form-access/formAccess.component.tsx +++ b/packages/react-formio/src/components/form-access/formAccess.component.tsx @@ -1,6 +1,7 @@ +import type { Form as FormType } from "@formio/core"; import { PropsWithChildren, useCallback, useEffect, useMemo, useState } from "react"; -import type { FormOptions, FormSchema, Submission } from "../../interfaces"; +import type { FormOptions, Submission } from "../../interfaces"; import { Card } from "../card/card.component"; import { Form } from "../form/form.component"; import { ChangedSubmission } from "../form/useForm.hook"; @@ -16,7 +17,7 @@ import { } from "./formAccess.utils"; export interface FormAccessProps { - form: Partial; + form: Partial; roles: any; onSubmit?: Function; options?: FormOptions; diff --git a/packages/react-formio/src/components/form-access/formAccess.schema.ts b/packages/react-formio/src/components/form-access/formAccess.schema.ts index b04844cc..55777168 100644 --- a/packages/react-formio/src/components/form-access/formAccess.schema.ts +++ b/packages/react-formio/src/components/form-access/formAccess.schema.ts @@ -1,8 +1,6 @@ -import { ExtendedComponentSchema } from "formiojs"; +import type { Form as FormType } from "@formio/core"; -import { FormSchema } from "../../interfaces/FormSchema"; - -export function getRoleComponent({ label, key, description, choices, data }: any): ExtendedComponentSchema { +export function getRoleComponent({ label, key, description, choices, data }: any) { return { label, key, @@ -34,7 +32,7 @@ function toDescription(description: string, hr = true): string { return '' + description + " " + (hr ? '
' : ""); } -export function getSubmissionPermissionForm({ choices }: any): FormSchema { +export function getSubmissionPermissionForm({ choices }: any): FormType & { description: string } { return { description: "Elevated permissions allow users to access and modify other user's entities. Assign with caution.", components: [ @@ -107,7 +105,7 @@ export function getSubmissionPermissionForm({ choices }: any): FormSchema { }; } -export function getAccessPermissionForm({ choices }: any): FormSchema { +export function getAccessPermissionForm({ choices }: any): FormType & { description: string } { return { description: "Elevated permissions allow users to access and modify other user's entities. Assign with caution.", components: [ diff --git a/packages/react-formio/src/components/form-access/formAccess.stories.tsx b/packages/react-formio/src/components/form-access/formAccess.stories.tsx index 423fd6d4..1c7d09fa 100644 --- a/packages/react-formio/src/components/form-access/formAccess.stories.tsx +++ b/packages/react-formio/src/components/form-access/formAccess.stories.tsx @@ -57,7 +57,6 @@ export const Sandbox: Story = { ], controller: "", properties: {}, - settings: {}, name: "textField", path: "textfield", machineName: "tcspjwhsevrzpcd:textField" diff --git a/packages/react-formio/src/components/form-access/formAccess.utils.spec.ts b/packages/react-formio/src/components/form-access/formAccess.utils.spec.ts index 8cd95fbf..5c070fa0 100644 --- a/packages/react-formio/src/components/form-access/formAccess.utils.spec.ts +++ b/packages/react-formio/src/components/form-access/formAccess.utils.spec.ts @@ -1,4 +1,5 @@ -import { FormSchema } from "../../interfaces"; +import type { Form } from "@formio/core"; + import { dataAccessToSubmissions, getFormAccess, SubmissionAccess, submissionsToDataAccess, updateSubmissions } from "./formAccess.utils"; const roles: any[] = [ @@ -13,7 +14,7 @@ const roles: any[] = [ describe("formAccess.utils", () => { describe("dataAccessToSubmissions()", () => { it("should map data access to form submissions", () => { - const data: FormSchema = { + const data: Form = { _id: "id", components: [], access: [ @@ -85,7 +86,7 @@ describe("formAccess.utils", () => { } }; - const originalForm: FormSchema = { + const originalForm: Form = { _id: "id", components: [], access: [ diff --git a/packages/react-formio/src/components/form-access/formAccess.utils.ts b/packages/react-formio/src/components/form-access/formAccess.utils.ts index a5cd696d..b38ed599 100644 --- a/packages/react-formio/src/components/form-access/formAccess.utils.ts +++ b/packages/react-formio/src/components/form-access/formAccess.utils.ts @@ -1,9 +1,9 @@ -import { ExtendedComponentSchema } from "formiojs"; +import type { BaseComponent, Form } from "@formio/core"; import cloneDeep from "lodash/cloneDeep"; import isEqual from "lodash/isEqual"; import noop from "lodash/noop"; -import { FormSchema, Submission } from "../../interfaces"; +import { Submission } from "../../interfaces"; import { RoleSchema } from "../../interfaces/RoleSchema"; import { getAccessPermissionForm, getSubmissionPermissionForm } from "./formAccess.schema"; @@ -20,8 +20,8 @@ export interface Access { export type AccessRoles = Record; export type FormAccessSchema = { - access: FormSchema; - submissionAccess: FormSchema; + access: Form; + submissionAccess: Form; }; export type SubmissionAccess = { @@ -79,8 +79,8 @@ export function getFormAccess(roles: RoleSchema[]): FormAccessSchema { }; } -export function dataAccessToSubmissions(form: Partial, formAccess: FormAccessSchema): SubmissionAccess { - const getKeys = (components: ExtendedComponentSchema[]) => components.map(({ key }) => key); +export function dataAccessToSubmissions(form: Partial
, formAccess: FormAccessSchema): SubmissionAccess { + const getKeys = (components: BaseComponent[]) => components.map(({ key }) => key); return { access: { @@ -92,7 +92,7 @@ export function dataAccessToSubmissions(form: Partial, formAccess: F }; } -export function submissionsToDataAccess(form: Partial, submissions: SubmissionAccess): Partial { +export function submissionsToDataAccess(form: Partial, submissions: SubmissionAccess): Partial { return { ...cloneDeep(form), access: hashToAccess(submissions.access.data), diff --git a/packages/react-formio/src/components/form-action/formAction.component.tsx b/packages/react-formio/src/components/form-action/formAction.component.tsx index ad411a52..0709449b 100644 --- a/packages/react-formio/src/components/form-action/formAction.component.tsx +++ b/packages/react-formio/src/components/form-action/formAction.component.tsx @@ -1,4 +1,4 @@ -import FormioUtils from "formiojs/utils"; +import FormioUtils from "@formio/js/utils"; import { PropsWithChildren, ReactElement } from "react"; import { ActionDefaultsSchema, ActionSchema, FormOptions, Submission } from "../../interfaces"; diff --git a/packages/react-formio/src/components/form-builder/formBuilder.component.tsx b/packages/react-formio/src/components/form-builder/formBuilder.component.tsx index fc0f92e3..24918f68 100755 --- a/packages/react-formio/src/components/form-builder/formBuilder.component.tsx +++ b/packages/react-formio/src/components/form-builder/formBuilder.component.tsx @@ -1,14 +1,15 @@ -import { ComponentSchema } from "formiojs"; -import AllComponents from "formiojs/components"; -import Components from "formiojs/components/Components"; -import FormioFormBuilder from "formiojs/FormBuilder"; +import type { BaseComponent as FormComponent } from "@formio/core"; +import { FormBuilder as FormioFormBuilder } from "@formio/js"; import cloneDeep from "lodash/cloneDeep"; import noop from "lodash/noop"; import { Component } from "react"; import { callLast } from "../../utils/callLast"; -Components.setComponents(AllComponents); +/** + * @deprecated use Component from @formio/core + */ +export type ComponentSchema = FormComponent; const EVENTS = [ "addComponent", @@ -25,7 +26,7 @@ const EVENTS = [ const EVENTS_CHANGE = ["addComponent", "saveComponent", "updateComponent", "removeComponent"]; -async function createBuilder(el: Element, { components = [], display, options, onChange, events = {} }: any): Promise { +async function createBuilder(el: HTMLElement, { components = [], display, options, onChange, events = {} }: any): Promise { const form = { display, components: [...components] @@ -53,11 +54,11 @@ async function createBuilder(el: Element, { components = [], display, options, o } export interface FormBuilderProps { - components: ComponentSchema[]; + components: FormComponent[]; display?: string; options?: any; builder?: any; - onChange?: (components: ComponentSchema[]) => void; + onChange?: (components: FormComponent[]) => void; onAddComponent?: Function; onUpdateComponent?: Function; onRemoveComponent?: Function; diff --git a/packages/react-formio/src/components/form-edit/formEdit.reducer.ts b/packages/react-formio/src/components/form-edit/formEdit.reducer.ts index 1675daf0..94f67d74 100644 --- a/packages/react-formio/src/components/form-edit/formEdit.reducer.ts +++ b/packages/react-formio/src/components/form-edit/formEdit.reducer.ts @@ -1,16 +1,15 @@ +import type { Form } from "@formio/core"; import camelCase from "lodash/camelCase"; import cloneDeep from "lodash/cloneDeep"; import isEqual from "lodash/isEqual"; -import { FormSchema } from "../../interfaces"; - -export const hasChanged = (form: Partial, value: Partial): boolean => !isEqual(form, value); +export const hasChanged = (form: Partial, value: Partial): boolean => !isEqual(form, value); export interface FormEditState { - past: Partial[]; - future: Partial[]; - current: Partial; - original: Partial; + past: Partial[]; + future: Partial[]; + current: Partial; + original: Partial; } export function createInitialState(props: any): FormEditState { diff --git a/packages/react-formio/src/components/form-edit/formParameters.component.tsx b/packages/react-formio/src/components/form-edit/formParameters.component.tsx index 9c340f72..df37b4d4 100644 --- a/packages/react-formio/src/components/form-edit/formParameters.component.tsx +++ b/packages/react-formio/src/components/form-edit/formParameters.component.tsx @@ -1,6 +1,6 @@ +import type { Form } from "@formio/core"; import { ReactElement } from "react"; -import { FormSchema } from "../../interfaces/FormSchema"; import { InputTags } from "../input-tags/inputTags.component"; import { InputText } from "../input-text/inputText.component"; import { Select } from "../select/select.component"; @@ -13,7 +13,7 @@ export const defaultDisplayChoices = [ export interface FormParametersProps { onChange?: (name: string, value: any) => void; - form: Partial; + form: Partial; typeChoices?: { label: string; value: any }[]; displayChoices?: { label: string; value: any }[]; enableTags?: boolean; diff --git a/packages/react-formio/src/components/form-edit/useFormEdit.hook.ts b/packages/react-formio/src/components/form-edit/useFormEdit.hook.ts index fcc774fe..8d465043 100644 --- a/packages/react-formio/src/components/form-edit/useFormEdit.hook.ts +++ b/packages/react-formio/src/components/form-edit/useFormEdit.hook.ts @@ -1,16 +1,16 @@ +import type { Form } from "@formio/core"; import cloneDeep from "lodash/cloneDeep"; import { useEffect, useReducer } from "react"; -import { FormSchema } from "../../interfaces/FormSchema"; import { createInitialState, hasChanged, reducer } from "./formEdit.reducer"; export interface UseFormEditHookProps extends Record { - form?: Partial; + form?: Partial; typeChoices?: { label: string; value: any }[]; displayChoices?: { label: string; value: any }[]; enableTags?: boolean; - onSubmit?: (form: Partial) => void; - onCopy?: (form: Partial) => void; + onSubmit?: (form: Partial) => void; + onCopy?: (form: Partial) => void; } export function useFormEdit(props: UseFormEditHookProps) { @@ -33,7 +33,7 @@ export function useFormEdit(props: UseFormEditHookProps) { } }, [props.form]); - const formChange = (newForm: Partial) => { + const formChange = (newForm: Partial) => { if (hasChanged(current, { ...current, ...newForm })) { dispatchFormAction({ type: "formChange", value: newForm }); } diff --git a/packages/react-formio/src/components/form-settings/formSettings.component.spec.tsx b/packages/react-formio/src/components/form-settings/formSettings.component.spec.tsx index 4a862e43..501b5ce8 100644 --- a/packages/react-formio/src/components/form-settings/formSettings.component.spec.tsx +++ b/packages/react-formio/src/components/form-settings/formSettings.component.spec.tsx @@ -48,6 +48,7 @@ describe("FormSettings", () => { }); it("should render form settings with i18n options", () => { render( + // @ts-ignore ; + form: Partial; onSubmit?: Function; options?: FormOptions; } diff --git a/packages/react-formio/src/components/form-settings/formSettings.schema.ts b/packages/react-formio/src/components/form-settings/formSettings.schema.ts index 11103bc0..5362fa5d 100644 --- a/packages/react-formio/src/components/form-settings/formSettings.schema.ts +++ b/packages/react-formio/src/components/form-settings/formSettings.schema.ts @@ -1,6 +1,6 @@ -import { FormSchema } from "../../interfaces"; +import type { Form as FormType } from "@formio/core"; -export function getFormSettingsSchema(): FormSchema { +export function getFormSettingsSchema(): FormType { return { type: "form", tags: [], diff --git a/packages/react-formio/src/components/form-settings/formSettings.utils.ts b/packages/react-formio/src/components/form-settings/formSettings.utils.ts index 6ee0f051..68d20db7 100644 --- a/packages/react-formio/src/components/form-settings/formSettings.utils.ts +++ b/packages/react-formio/src/components/form-settings/formSettings.utils.ts @@ -1,6 +1,7 @@ +import type { Form as FormType } from "@formio/core"; import cloneDeep from "lodash/cloneDeep"; -import { FormSchema, Submission } from "../../interfaces"; +import { Submission } from "../../interfaces"; export type FormSettingsSchema = { action: string; @@ -8,7 +9,7 @@ export type FormSettingsSchema = { properties: Record; }; -export function formSettingsToSubmission(form: Partial): Submission { +export function formSettingsToSubmission(form: Partial): Submission { return { data: { action: form.action!, @@ -18,7 +19,7 @@ export function formSettingsToSubmission(form: Partial): Submission< }; } -export function submissionToFormSettings(form: Partial, submission: Submission): Partial { +export function submissionToFormSettings(form: Partial, submission: Submission): Partial { return { ...cloneDeep(form), tags: submission.data.tags, diff --git a/packages/react-formio/src/components/form/form.component.tsx b/packages/react-formio/src/components/form/form.component.tsx index 4bde4f4c..a04a332a 100755 --- a/packages/react-formio/src/components/form/form.component.tsx +++ b/packages/react-formio/src/components/form/form.component.tsx @@ -1,10 +1,5 @@ -import { Components } from "formiojs"; -import AllComponents from "formiojs/components"; - import { useForm, UseFormHookProps } from "./useForm.hook"; -Components.setComponents(AllComponents); - export interface FormProps extends UseFormHookProps { name?: string; /** diff --git a/packages/react-formio/src/components/form/useForm.hook.ts b/packages/react-formio/src/components/form/useForm.hook.ts index d2f4b2a4..1e93f268 100644 --- a/packages/react-formio/src/components/form/useForm.hook.ts +++ b/packages/react-formio/src/components/form/useForm.hook.ts @@ -1,13 +1,14 @@ -import { ExtendedComponentSchema, Form } from "formiojs"; +import type { BaseComponent, Form as FormType } from "@formio/core"; +import { Form } from "@formio/js"; import cloneDeep from "lodash/cloneDeep"; import isEqual from "lodash/isEqual"; import { useEffect, useRef } from "react"; -import { FormOptions, FormSchema, Submission } from "../../interfaces"; +import { FormOptions, Submission } from "../../interfaces"; export interface ChangedSubmission extends Submission { changed: { - component: ExtendedComponentSchema; + component: BaseComponent; instance: any; value: any; } & Record; @@ -28,7 +29,7 @@ export interface UseFormHookProps extends Record { /** * Raw form object */ - form?: Partial; + form?: Partial; /** * Configuration option */ @@ -43,8 +44,8 @@ export interface UseFormHookProps extends Record { onNextPage?: (obj: FormPageChangeProps) => void; onCancel?: Function; onChange?: (submission: ChangedSubmission) => void; - onCustomEvent?: (obj: { type: string; event: string; component: ExtendedComponentSchema; data: any }) => void; - onComponentChange?: (component: ExtendedComponentSchema) => void; + onCustomEvent?: (obj: { type: string; event: string; component: BaseComponent; data: any }) => void; + onComponentChange?: (component: BaseComponent) => void; onSubmit?: (submission: Submission) => void; onAsyncSubmit?: (submission: Submission) => Promise; onSubmitDone?: (submission: Submission) => void; diff --git a/packages/react-formio/src/components/forms-table/components/formCell.component.tsx b/packages/react-formio/src/components/forms-table/components/formCell.component.tsx index 00131282..7c53c612 100644 --- a/packages/react-formio/src/components/forms-table/components/formCell.component.tsx +++ b/packages/react-formio/src/components/forms-table/components/formCell.component.tsx @@ -1,12 +1,12 @@ +import type { Form as FormType } from "@formio/core"; import classnames from "classnames"; import moment from "moment"; import { CellProps } from "react-table"; -import { FormSchema } from "../../../interfaces"; import { iconClass } from "../../../utils/iconClass"; import { stopPropagationWrapper } from "../../../utils/stopPropagationWrapper"; -export function FormsCell(props: CellProps & { icon: string; i18n: (f: string) => string }) { +export function FormsCell(props: CellProps & { icon: string; i18n: (f: string) => string }) { const { icon = "server", row: { original: form } diff --git a/packages/react-formio/src/components/forms-table/formsTable.component.tsx b/packages/react-formio/src/components/forms-table/formsTable.component.tsx index d412a0b5..2b1c8283 100644 --- a/packages/react-formio/src/components/forms-table/formsTable.component.tsx +++ b/packages/react-formio/src/components/forms-table/formsTable.component.tsx @@ -1,11 +1,12 @@ -import { FormSchema } from "../../interfaces"; +import type { Form as FormType } from "@formio/core"; + import { DefaultColumnFilter } from "../table/filters/defaultColumnFilter.component"; import { SelectColumnFilter } from "../table/filters/selectColumnFilter.component"; import { TableProps } from "../table/hooks/useCustomTable.hook"; import { Table } from "../table/table.component"; import { FormsCell as DefaultFormCell } from "./components/formCell.component"; -export type FormsTableProps = Omit, "columns"> & { +export type FormsTableProps = Omit, "columns"> & { icon?: string; tags?: { label: string; value: string }[]; }; diff --git a/packages/react-formio/src/components/submissions-table/submissionsTable.component.tsx b/packages/react-formio/src/components/submissions-table/submissionsTable.component.tsx index fe481dc6..68ccaf8b 100644 --- a/packages/react-formio/src/components/submissions-table/submissionsTable.component.tsx +++ b/packages/react-formio/src/components/submissions-table/submissionsTable.component.tsx @@ -1,10 +1,12 @@ -import { FormSchema, Submission } from "../../interfaces"; +import type { Form as FormType } from "@formio/core"; + +import { Submission } from "../../interfaces"; import { TableProps } from "../table/hooks/useCustomTable.hook"; import { Table } from "../table/table.component"; import { mapFormToColumns } from "../table/utils/mapFormToColumns"; export type SubmissionsTableProps = Omit, "columns"> & { - form?: FormSchema; + form?: FormType; }; export function SubmissionsTable({ form, ...props }: SubmissionsTableProps) { diff --git a/packages/react-formio/src/components/table/components/defaultCellHeader.component.tsx b/packages/react-formio/src/components/table/components/defaultCellHeader.component.tsx index fb313aee..441e9e5a 100644 --- a/packages/react-formio/src/components/table/components/defaultCellHeader.component.tsx +++ b/packages/react-formio/src/components/table/components/defaultCellHeader.component.tsx @@ -4,7 +4,15 @@ export interface DefaultCellHeaderProps extends Recor column: HeaderGroup; } -export function DefaultCellHeader = {}>({ column }: DefaultCellHeaderProps) { +export function DefaultCellHeader = {}>({ + column +}: DefaultCellHeaderProps & { + column: { + getSortByToggleProps: any; + canFilter: boolean; + render: (key: string) => any; + }; +}) { return (
diff --git a/packages/react-formio/src/components/table/filters/defaultColumnFilter.component.tsx b/packages/react-formio/src/components/table/filters/defaultColumnFilter.component.tsx index 09d236ed..22942dfa 100644 --- a/packages/react-formio/src/components/table/filters/defaultColumnFilter.component.tsx +++ b/packages/react-formio/src/components/table/filters/defaultColumnFilter.component.tsx @@ -4,7 +4,11 @@ import { FilterProps } from "react-table"; import { InputText } from "../../input-text/inputText.component"; export function DefaultColumnFilter = {}>( - props: FilterProps & { filterId: string; setFilterId: any } + props: FilterProps & { + filterId: string; + setFilterId: any; + column: { id: string; filterValue: any; setFilter: any }; + } ) { const { filterId, @@ -15,7 +19,7 @@ export function DefaultColumnFilter = {}>( const [value, setValue] = useState(filterValue || ""); const onChange = useCallback( - (name: string, value: any) => { + (_: string, value: any) => { setValue(value); setFilterId(id); setFilter(value || undefined); diff --git a/packages/react-formio/src/components/table/filters/selectColumnFilter.component.tsx b/packages/react-formio/src/components/table/filters/selectColumnFilter.component.tsx index 4b0f3dfa..9369f56b 100644 --- a/packages/react-formio/src/components/table/filters/selectColumnFilter.component.tsx +++ b/packages/react-formio/src/components/table/filters/selectColumnFilter.component.tsx @@ -4,9 +4,9 @@ import { Select } from "../../select/select.component"; export function useSelectColumnFilter = {}>(props: FilterProps) { const { column } = props; - const { id, preFilteredRows } = column; + const { id, preFilteredRows } = column as any; const { choices: customChoices } = column as any; - const { filterValue, setFilter } = column; + const { filterValue, setFilter } = column as any; const choices = (() => { if (customChoices) { @@ -16,7 +16,7 @@ export function useSelectColumnFilter = {}>(pr return customChoices; } - return [...new Set(preFilteredRows.map((row) => row.values[id]))] + return [...new Set(preFilteredRows.map((row: any) => row.values[id]))] .filter((value) => value) .map((value) => ({ label: value, diff --git a/packages/react-formio/src/components/table/hooks/useCustomTable.hook.tsx b/packages/react-formio/src/components/table/hooks/useCustomTable.hook.tsx index d99ca71f..9077794e 100644 --- a/packages/react-formio/src/components/table/hooks/useCustomTable.hook.tsx +++ b/packages/react-formio/src/components/table/hooks/useCustomTable.hook.tsx @@ -90,15 +90,15 @@ export interface TableProps extends TableOptions; /** * Custom Loader */ - Loader?: ComponentType; + Loader?: ComponentType; /** * Custom Loader */ - Pagination?: ComponentType; + Pagination?: ComponentType; /** * Disable filters */ @@ -230,7 +230,7 @@ export function useCustomTable(props: PropsWithChildre const { setPageSize, state: { pageIndex, pageSize, sortBy, filters } - } = tableInstance; + } = tableInstance as any; useEffect(() => { onChange({ diff --git a/packages/react-formio/src/components/table/table.component.tsx b/packages/react-formio/src/components/table/table.component.tsx index 2083b408..84b48886 100644 --- a/packages/react-formio/src/components/table/table.component.tsx +++ b/packages/react-formio/src/components/table/table.component.tsx @@ -1,6 +1,7 @@ import classnames from "classnames"; import { PropsWithChildren } from "react"; +import { PaginationProps } from "../pagination/pagination.component"; import { DrapNDropContainer } from "./components/dragNDropContainer"; import { TableProps, useCustomTable } from "./hooks/useCustomTable.hook"; @@ -60,7 +61,7 @@ export function Table(props: PropsWithChildren {!isLoading ? ( - {tableInstance.page.map((row, index) => { + {(tableInstance as unknown as { page: any[] }).page.map((row: any, index: number) => { tableInstance.prepareRow(row); return ( @@ -82,7 +83,7 @@ export function Table(props: PropsWithChildren { + FormioUtils.eachComponent(form.components, (component: BaseComponent & { title: string; dataSrc: string; data: any }) => { if (component.tableView && component.key) { - const cmp: any = Components.create(component, {}, null, true); + const cmp: any = Components.create(component, {}, null); const column: ExtendedColumn = { Header: component.label || component.title || component.key, diff --git a/packages/react-formio/src/index.ts b/packages/react-formio/src/index.ts index a7f13584..a9f92269 100644 --- a/packages/react-formio/src/index.ts +++ b/packages/react-formio/src/index.ts @@ -1,14 +1,9 @@ -import Webform from "formiojs/Webform"; -import WebformBuilder from "formiojs/WebformBuilder"; -import Wizard from "formiojs/Wizard"; -import WizardBuilder from "formiojs/WizardBuilder"; -export { - Webform, - WebformBuilder, - Wizard, - WizardBuilder - // editFormUtils, -}; +import { Formio } from "@formio/js"; + +export const Webform = Formio.Webform; +export const WebformBuilder = Formio.WebformBuilder; +export const Wizard = Formio.Wizard; +export const WizardBuilder = Formio.WizardBuilder; export * from "./components"; export * from "./hooks/useTooltip"; @@ -17,4 +12,4 @@ export * from "./utils/callLast"; export * from "./utils/iconClass"; export * from "./utils/mapPagination"; export * from "./utils/stopPropagationWrapper"; -export { Components, Formio, Templates, Utils } from "formiojs"; +export { Components, Formio, Templates, Utils } from "@formio/js"; diff --git a/packages/react-formio/src/interfaces/ActionSchema.ts b/packages/react-formio/src/interfaces/ActionSchema.ts index 3c034bb1..659a5459 100644 --- a/packages/react-formio/src/interfaces/ActionSchema.ts +++ b/packages/react-formio/src/interfaces/ActionSchema.ts @@ -1,4 +1,4 @@ -import { FormSchema } from "./FormSchema"; +import type { Form as FormType } from "@formio/core"; export interface ActionDefaultsSchema { handler: string[]; @@ -18,7 +18,7 @@ export interface ActionInfoSchema extends Record { export interface ActionSchema extends ActionInfoSchema { _id?: string; - settingsForm: Partial; + settingsForm: Partial; access?: { handler: boolean; method: boolean; diff --git a/packages/react-formio/src/interfaces/FormSchema.ts b/packages/react-formio/src/interfaces/FormSchema.ts index b1696396..6008f683 100644 --- a/packages/react-formio/src/interfaces/FormSchema.ts +++ b/packages/react-formio/src/interfaces/FormSchema.ts @@ -1,13 +1,6 @@ -import { ExtendedComponentSchema } from "formiojs"; +import type { Form } from "@formio/core"; -export type FormSchema = { - _id?: string; - title?: string; - name?: string; - machineName?: string; - components: ExtendedComponentSchema[]; - tags?: string[]; - action?: string; - properties?: Record; - [key: string]: any; -}; +/** + * @deprecated use Form from @formio/core + */ +export type FormSchema = Form; diff --git a/packages/react-formio/src/react-app-env.d.ts b/packages/react-formio/src/react-app-env.d.ts deleted file mode 100644 index 6431bc5f..00000000 --- a/packages/react-formio/src/react-app-env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// diff --git a/packages/react-formio/src/typings.d.ts b/packages/react-formio/src/typings.d.ts deleted file mode 100644 index 5bc2bd11..00000000 --- a/packages/react-formio/src/typings.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -declare module "formiojs/*" { - export = {} as any; -} diff --git a/packages/react-formio/src/utils/iconClass.ts b/packages/react-formio/src/utils/iconClass.ts index 5ffdda35..d9bc68a8 100644 --- a/packages/react-formio/src/utils/iconClass.ts +++ b/packages/react-formio/src/utils/iconClass.ts @@ -1,4 +1,4 @@ -import * as formio from "formiojs"; +import * as formio from "@formio/js"; const { Templates } = formio; diff --git a/packages/react-formio/tsconfig.app.json b/packages/react-formio/tsconfig.app.json index 85f0596c..ee6ad461 100644 --- a/packages/react-formio/tsconfig.app.json +++ b/packages/react-formio/tsconfig.app.json @@ -6,6 +6,6 @@ "declaration": false, "composite": false }, - "include": ["src/**/*.ts", "src/**/*.tsx", "vite.config.mts"], + "include": ["src/**/*.ts", "src/**/*.tsx"], "exclude": ["node_modules", "dist", "src/**/*.spec.ts", "src/**/*.spec.tsx"] } diff --git a/packages/react-formio/tsconfig.json b/packages/react-formio/tsconfig.json index 87a1eaad..75cdc567 100644 --- a/packages/react-formio/tsconfig.json +++ b/packages/react-formio/tsconfig.json @@ -11,6 +11,9 @@ { "path": "./tsconfig.app.json" }, + { + "path": "./tsconfig.node.json" + }, { "path": "./tsconfig.spec.json" } diff --git a/packages/react-formio/tsconfig.node.json b/packages/react-formio/tsconfig.node.json new file mode 100644 index 00000000..4e75ad79 --- /dev/null +++ b/packages/react-formio/tsconfig.node.json @@ -0,0 +1,13 @@ +{ + "extends": "@tsed/typescript/tsconfig.web.json", + "compilerOptions": { + "module": "NodeNext", + "moduleResolution": "NodeNext", + "baseUrl": ".", + "noEmit": true, + "declaration": false, + "composite": false + }, + "include": ["vite.config.mts"], + "exclude": ["node_modules", "dist", "src/**/*.spec.ts", "src/**/*.spec.tsx"] +} diff --git a/packages/redux-utils/package.json b/packages/redux-utils/package.json index 3d5f4edf..62b981c7 100644 --- a/packages/redux-utils/package.json +++ b/packages/redux-utils/package.json @@ -27,6 +27,5 @@ "peerDependencies": { "react": "^18.3.1", "redux": "^4.0.5" - }, - "dependencies": {} + } } diff --git a/packages/redux-utils/src/react-app-env.d.ts b/packages/redux-utils/src/react-app-env.d.ts deleted file mode 100644 index 6431bc5f..00000000 --- a/packages/redux-utils/src/react-app-env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// diff --git a/packages/redux-utils/tsconfig.app.json b/packages/redux-utils/tsconfig.app.json index 85f0596c..ee6ad461 100644 --- a/packages/redux-utils/tsconfig.app.json +++ b/packages/redux-utils/tsconfig.app.json @@ -6,6 +6,6 @@ "declaration": false, "composite": false }, - "include": ["src/**/*.ts", "src/**/*.tsx", "vite.config.mts"], + "include": ["src/**/*.ts", "src/**/*.tsx"], "exclude": ["node_modules", "dist", "src/**/*.spec.ts", "src/**/*.spec.tsx"] } diff --git a/packages/redux-utils/tsconfig.json b/packages/redux-utils/tsconfig.json index 1980d5af..23c5595e 100644 --- a/packages/redux-utils/tsconfig.json +++ b/packages/redux-utils/tsconfig.json @@ -8,6 +8,9 @@ { "path": "./tsconfig.app.json" }, + { + "path": "./tsconfig.node.json" + }, { "path": "./tsconfig.spec.json" } diff --git a/packages/redux-utils/tsconfig.node.json b/packages/redux-utils/tsconfig.node.json new file mode 100644 index 00000000..4e75ad79 --- /dev/null +++ b/packages/redux-utils/tsconfig.node.json @@ -0,0 +1,13 @@ +{ + "extends": "@tsed/typescript/tsconfig.web.json", + "compilerOptions": { + "module": "NodeNext", + "moduleResolution": "NodeNext", + "baseUrl": ".", + "noEmit": true, + "declaration": false, + "composite": false + }, + "include": ["vite.config.mts"], + "exclude": ["node_modules", "dist", "src/**/*.spec.ts", "src/**/*.spec.tsx"] +} diff --git a/packages/tailwind-formio/package.json b/packages/tailwind-formio/package.json index 7d19b9cc..dc9f5968 100644 --- a/packages/tailwind-formio/package.json +++ b/packages/tailwind-formio/package.json @@ -31,6 +31,7 @@ "clean:tailwind:viewer": "rimraf build/index.html build/favicon.ico" }, "devDependencies": { + "@types/lodash": "4.17.13", "cross-env": "7.0.3", "rimraf": "3.0.2", "tailwind-config-viewer": "2.0.4", @@ -49,7 +50,5 @@ "last 1 firefox version", "last 1 safari version" ] - }, - "dependencies": {}, - "peerDependencies": {} + } } diff --git a/packages/tailwind-formio/readme.md b/packages/tailwind-formio/readme.md index 483a487e..33773c99 100644 --- a/packages/tailwind-formio/readme.md +++ b/packages/tailwind-formio/readme.md @@ -138,7 +138,7 @@ Then create a `tailwind.css` in `styles` directory and add the following lines: Import the `tailwind.css` in the `index.css` created by create-react-app: ```css -@import "~formiojs/dist/formio.full.css"; +@import "~@formio/js/dist/formio.full.css"; @import "./tailwind.css"; @import "~@tsed/tailwind-formio/styles/index.css"; ``` @@ -146,7 +146,7 @@ Import the `tailwind.css` in the `index.css` created by create-react-app: Optionally, you can import fonts and icons: ```diff -@import "~formiojs/dist/formio.full.css"; +@import "~@formio/js/dist/formio.full.css"; @import "./tailwind.css"; +@import "./fonts/source-sans-pro/index.css"; +@import "./fonts/inconsolata/index.css"; diff --git a/packages/tailwind-formio/src/templates/stories/builder.stories.jsx b/packages/tailwind-formio/src/templates/stories/builder.stories.jsx index 5cde4f5c..0f9c5229 100644 --- a/packages/tailwind-formio/src/templates/stories/builder.stories.jsx +++ b/packages/tailwind-formio/src/templates/stories/builder.stories.jsx @@ -1,4 +1,4 @@ -import FormioFormBuilder from "formiojs/FormBuilder.js"; +import { FormBuilder } from "@formio/js"; import React, { useEffect, useRef } from "react"; function WrapperFormBuilder({ options, form }) { @@ -8,7 +8,7 @@ function WrapperFormBuilder({ options, form }) { options = Object.assign({}, options); form = Object.assign({}, form); - const builder = new FormioFormBuilder(ref.current, form, options); + const builder = new FormBuilder(ref.current, form, options); builder.ready.then(() => { // onChange(); // builderEvents.forEach(({name, action}) => builder.instance.on(name, action)); diff --git a/packages/tailwind-formio/src/templates/stories/wizard.stories.jsx b/packages/tailwind-formio/src/templates/stories/wizard.stories.jsx index 214c4004..5bde70b7 100644 --- a/packages/tailwind-formio/src/templates/stories/wizard.stories.jsx +++ b/packages/tailwind-formio/src/templates/stories/wizard.stories.jsx @@ -1,4 +1,4 @@ -import FormioFormBuilder from "formiojs/FormBuilder"; +import { FormBuilder } from "@formio/js"; import React, { useEffect, useRef } from "react"; function WrapperFormBuilder({ options, form }) { @@ -8,7 +8,7 @@ function WrapperFormBuilder({ options, form }) { options = Object.assign({}, options); form = Object.assign({}, form); - const builder = new FormioFormBuilder(ref.current, form, options); + const builder = new FormBuilder(ref.current, form, options); builder.ready.then(() => { // onChange(); // builderEvents.forEach(({name, action}) => builder.instance.on(name, action)); diff --git a/packages/tailwind-formio/tsconfig.app.json b/packages/tailwind-formio/tsconfig.app.json index b30956b7..ee6ad461 100644 --- a/packages/tailwind-formio/tsconfig.app.json +++ b/packages/tailwind-formio/tsconfig.app.json @@ -6,6 +6,6 @@ "declaration": false, "composite": false }, - "include": ["src/**/*.ts", "src/**/*.tsx", "vite.config.mts", "tailwind.config.ts"], + "include": ["src/**/*.ts", "src/**/*.tsx"], "exclude": ["node_modules", "dist", "src/**/*.spec.ts", "src/**/*.spec.tsx"] } diff --git a/packages/tailwind-formio/tsconfig.json b/packages/tailwind-formio/tsconfig.json index c9cfa84a..77d6ab0c 100644 --- a/packages/tailwind-formio/tsconfig.json +++ b/packages/tailwind-formio/tsconfig.json @@ -8,6 +8,9 @@ "references": [ { "path": "./tsconfig.app.json" + }, + { + "path": "./tsconfig.node.json" } ] } diff --git a/packages/tailwind-formio/tsconfig.node.json b/packages/tailwind-formio/tsconfig.node.json new file mode 100644 index 00000000..bd6ba178 --- /dev/null +++ b/packages/tailwind-formio/tsconfig.node.json @@ -0,0 +1,13 @@ +{ + "extends": "@tsed/typescript/tsconfig.web.json", + "compilerOptions": { + "module": "NodeNext", + "moduleResolution": "NodeNext", + "baseUrl": ".", + "noEmit": true, + "declaration": false, + "composite": false + }, + "include": ["vite.config.mts", "tailwind.config.ts"], + "exclude": ["node_modules", "dist", "src/**/*.spec.ts", "src/**/*.spec.tsx"] +} diff --git a/packages/tailwind-formio/vite.config.mts b/packages/tailwind-formio/vite.config.mts index 2c982e74..39af901f 100644 --- a/packages/tailwind-formio/vite.config.mts +++ b/packages/tailwind-formio/vite.config.mts @@ -1,4 +1,5 @@ import {fileURLToPath} from "node:url"; +// @ts-ignore import compile from "lodash/template"; import {globbySync} from "globby"; import {extname, relative} from "path"; diff --git a/tools/typescript/package.json b/tools/typescript/package.json index 3b3931b2..be0c2907 100644 --- a/tools/typescript/package.json +++ b/tools/typescript/package.json @@ -7,8 +7,5 @@ "main": "index.js", "exports": { "./tsconfig.web.json": "./tsconfig.web.json" - }, - "dependencies": {}, - "devDependencies": {}, - "peerDependencies": {} + } } diff --git a/tools/typescript/tsconfig.web.json b/tools/typescript/tsconfig.web.json index e7f767eb..65d4d884 100644 --- a/tools/typescript/tsconfig.web.json +++ b/tools/typescript/tsconfig.web.json @@ -1,7 +1,6 @@ { "compilerOptions": { "target": "ESNext", - "module": "NodeNext", "moduleResolution": "Bundler", "lib": ["DOM", "DOM.Iterable", "ESNext"], "useDefineForClassFields": false, diff --git a/tools/vitest/package.json b/tools/vitest/package.json index 0d7f1e90..7c669980 100644 --- a/tools/vitest/package.json +++ b/tools/vitest/package.json @@ -14,7 +14,5 @@ }, "scripts": { "generate": "node index.js" - }, - "dependencies": {}, - "peerDependencies": {} + } } diff --git a/yarn.lock b/yarn.lock index 9ffe03a3..3192d7cb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1670,15 +1670,6 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.20.6": - version: 7.26.0 - resolution: "@babel/runtime@npm:7.26.0" - dependencies: - regenerator-runtime: "npm:^0.14.0" - checksum: 10c0/12c01357e0345f89f4f7e8c0e81921f2a3e3e101f06e8eaa18a382b517376520cd2fa8c237726eb094dab25532855df28a7baaf1c26342b52782f6936b07c287 - languageName: node - linkType: hard - "@babel/template@npm:^7.18.10, @babel/template@npm:^7.20.7, @babel/template@npm:^7.21.9, @babel/template@npm:^7.3.3": version: 7.21.9 resolution: "@babel/template@npm:7.21.9" @@ -2418,16 +2409,14 @@ __metadata: languageName: node linkType: hard -"@formio/bootstrap3@npm:2.12.4-rc.1": - version: 2.12.4-rc.1 - resolution: "@formio/bootstrap3@npm:2.12.4-rc.1" - dependencies: - resize-observer-polyfill: "npm:^1.5.1" - checksum: 10c0/22dd4449026f3d87f47dc706de9eef77846da3f0a97abf62a5747a69234943a3f7fdde4d6692e0e0d1239adfd8ecc33b2680963880696b73aed533ed1209ebb0 +"@formio/bootstrap@npm:3.0.0": + version: 3.0.0 + resolution: "@formio/bootstrap@npm:3.0.0" + checksum: 10c0/0344461235603066dedc6ff58fee73c8709da0e46547688ffe6de2e47221bd98006476c95732d7663249f91e2290b572b2f1a6d89bb6383d58d36fa65cfecef6 languageName: node linkType: hard -"@formio/choices.js@npm:10.2.1": +"@formio/choices.js@npm:^10.2.1": version: 10.2.1 resolution: "@formio/choices.js@npm:10.2.1" dependencies: @@ -2449,14 +2438,70 @@ __metadata: languageName: node linkType: hard -"@formio/semantic@npm:2.6.1": - version: 2.6.1 - resolution: "@formio/semantic@npm:2.6.1" - checksum: 10c0/295c372a1c2385920d5871f5ee8028fb2a8bd94fad1cedc285da477eb98c96a58fca7c2f03f376a575c635288922411522f3c01b562a80b14076747cdf5bf53b +"@formio/core@npm:2.3.0": + version: 2.3.0 + resolution: "@formio/core@npm:2.3.0" + dependencies: + "@types/json-logic-js": "npm:^2.0.7" + browser-cookies: "npm:^1.2.0" + core-js: "npm:^3.37.1" + dayjs: "npm:^1.11.11" + dompurify: "npm:^3.1.4" + eventemitter3: "npm:^5.0.0" + fast-json-patch: "npm:^3.1.1" + fetch-ponyfill: "npm:^7.1.0" + inputmask: "npm:^5.0.9" + json-logic-js: "npm:^2.0.2" + lodash: "npm:^4.17.21" + moment: "npm:^2.29.4" + checksum: 10c0/ac8e0d96a628e550f0805468902bac82f190ce5686ca3147b3b91e90a06d2b8430bcd0d94705eb9150378306c68a977e2d76c6838c81aa9204687774f478bc46 languageName: node linkType: hard -"@formio/text-mask-addons@npm:^3.8.0-formio.4": +"@formio/js@npm:5.0.0": + version: 5.0.0 + resolution: "@formio/js@npm:5.0.0" + dependencies: + "@formio/bootstrap": "npm:3.0.0" + "@formio/choices.js": "npm:^10.2.1" + "@formio/core": "npm:2.3.0" + "@formio/text-mask-addons": "npm:^3.8.0-formio.3" + "@formio/vanilla-text-mask": "npm:^5.1.1-formio.1" + abortcontroller-polyfill: "npm:^1.7.5" + autocompleter: "npm:^8.0.4" + bootstrap: "npm:^5.3.3" + browser-cookies: "npm:^1.2.0" + browser-md5-file: "npm:^1.1.1" + compare-versions: "npm:^6.0.0-rc.2" + core-js: "npm:^3.37.1" + dialog-polyfill: "npm:^0.5.6" + dom-autoscroller: "npm:^2.3.4" + dompurify: "npm:^3.1.3" + downloadjs: "npm:^1.4.7" + dragula: "npm:^3.7.3" + eventemitter3: "npm:^5.0.1" + fast-deep-equal: "npm:^3.1.3" + fast-json-patch: "npm:^3.1.1" + idb: "npm:^7.1.1" + inputmask: "npm:^5.0.8" + ismobilejs: "npm:^1.1.1" + json-logic-js: "npm:^2.0.2" + jstimezonedetect: "npm:^1.0.7" + jwt-decode: "npm:^3.1.2" + lodash: "npm:^4.17.21" + moment: "npm:^2.29.4" + moment-timezone: "npm:^0.5.44" + quill: "npm:^2.0.2" + signature_pad: "npm:^4.2.0" + string-hash: "npm:^1.1.3" + tippy.js: "npm:^6.3.7" + uuid: "npm:^9.0.0" + vanilla-picker: "npm:^2.12.3" + checksum: 10c0/40d622cac3da5d1ad9474c4f7c701bb06eb0f1a8b9ec6fe1627d15e4f84c820242ab795cf6cf5fb2ec5951d4ba85b37cd285e7864d2c5aeb219231861882196d + languageName: node + linkType: hard + +"@formio/text-mask-addons@npm:^3.8.0-formio.3": version: 3.8.0-formio.4 resolution: "@formio/text-mask-addons@npm:3.8.0-formio.4" checksum: 10c0/a594dcce0ddb289700fdc906114a54102e8726c98bcba108607f4641c16c012fcdd25219353b1b837b179ebf1da1f99df2715faffa79fdb93df2b172c2446525 @@ -5346,12 +5391,12 @@ __metadata: vitest: "npm:2.1.8" peerDependencies: "@formio/choices.js": ^9.0.1 + "@formio/js": ^5.0.0 "@tsed/react-formio": 3.0.0-alpha.1 "@tsed/react-formio-stores": 3.0.0-alpha.1 classnames: ^2.3.1 connected-react-router: ^6.9.1 file-saver: ^2.0.5 - formiojs: ^4.21.6 lodash: ^4.17.21 react: ^18.3.1 react-dom: ^18.3.1 @@ -5363,6 +5408,8 @@ __metadata: redux-thunk: ^2.4.1 tooltip.js: ^1.3.3 peerDependenciesMeta: + "@formio/js": + optional: false choices.js: optional: false classnames: @@ -5371,8 +5418,6 @@ __metadata: optional: false file-saver: optional: false - formiojs: - optional: false lodash: optional: false react: @@ -5410,7 +5455,7 @@ __metadata: vitest: "npm:2.1.8" peerDependencies: "@formio/choices.js": ">=9.0.1" - formiojs: ">=4.0.0" + "@formio/js": ">=5.0.0" lodash: ">=4.17.20" react: ">=16.14.0" react-dnd: ">=16.0.1" @@ -5432,7 +5477,7 @@ __metadata: vitest: "npm:2.1.8" peerDependencies: "@formio/choices.js": ">=9.0.1" - formiojs: ">=4.0.0" + "@formio/js": ">=5.0.0" lodash: ">=4.17.20" react: ">=16.14.0" react-dom: ">=16.14.0" @@ -5454,7 +5499,7 @@ __metadata: vitest: "npm:2.1.8" peerDependencies: "@formio/choices.js": ">=9.0.1" - formiojs: ">=4.0.0" + "@formio/js": ">=5.0.0" lodash: ">=4.17.20" moment: ">=2.30.1" react: ">=16.14.0" @@ -5486,6 +5531,7 @@ __metadata: "@commitlint/cli": "npm:19.6.1" "@commitlint/config-conventional": "npm:19.6.0" "@formio/choices.js": "npm:^9.0.1" + "@formio/js": "npm:5.0.0" "@storybook/addon-a11y": "npm:^8.4.7" "@storybook/addon-essentials": "npm:^8.4.7" "@storybook/addon-interactions": "npm:^8.4.7" @@ -5536,7 +5582,6 @@ __metadata: eslint-plugin-storybook: "npm:0.11.1" eslint-plugin-testing-library: "npm:7.1.1" eslint-plugin-workspaces: "npm:0.10.1" - formiojs: "npm:4.21.6" fs-extra: "npm:10.1.0" globby: "npm:^14.0.2" history: "npm:5.3.0" @@ -5576,6 +5621,7 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/tailwind-formio@workspace:packages/tailwind-formio" dependencies: + "@types/lodash": "npm:4.17.13" cross-env: "npm:7.0.3" rimraf: "npm:3.0.2" tailwind-config-viewer: "npm:2.0.4" @@ -5840,6 +5886,13 @@ __metadata: languageName: node linkType: hard +"@types/json-logic-js@npm:^2.0.7": + version: 2.0.8 + resolution: "@types/json-logic-js@npm:2.0.8" + checksum: 10c0/b1fc0b39242b8f1f939c86f47bfda213e1eb57686ee4dfbe11057df88fad0dbe0abc3582b72429975e8fb07b0267959d98341e5079ba945345931973538d2f43 + languageName: node + linkType: hard + "@types/json-schema@npm:^7.0.15": version: 7.0.15 resolution: "@types/json-schema@npm:7.0.15" @@ -5854,6 +5907,13 @@ __metadata: languageName: node linkType: hard +"@types/lodash@npm:4.17.13": + version: 4.17.13 + resolution: "@types/lodash@npm:4.17.13" + checksum: 10c0/c3d0b7efe7933ac0369b99f2f7bff9240d960680fdb74b41ed4bd1b3ca60cca1e31fe4046d9abbde778f941a41bc2a75eb629abf8659fa6c27b66efbbb0802a9 + languageName: node + linkType: hard + "@types/mdast@npm:^3.0.0": version: 3.0.11 resolution: "@types/mdast@npm:3.0.11" @@ -7210,10 +7270,10 @@ __metadata: languageName: node linkType: hard -"autocompleter@npm:^7.0.1": - version: 7.1.0 - resolution: "autocompleter@npm:7.1.0" - checksum: 10c0/3d94711b86089cd075a06478af60a1b9a207f0b6ce1be802b452057602238a2b246865847562ea92d218762a323975fed0c090848ffa9aacb2e503495bba2dbb +"autocompleter@npm:^8.0.4": + version: 8.0.4 + resolution: "autocompleter@npm:8.0.4" + checksum: 10c0/5118f1ffeb1a3d469dcd4ed08755484f623c559c77ac53daa8b674b0893abba91987ed08e8ebd110d7557a8e75aece6a439687ba26103349c0ab4477ab5ac4f6 languageName: node linkType: hard @@ -7516,6 +7576,15 @@ __metadata: languageName: node linkType: hard +"bootstrap@npm:^5.3.3": + version: 5.3.3 + resolution: "bootstrap@npm:5.3.3" + peerDependencies: + "@popperjs/core": ^2.11.8 + checksum: 10c0/bb68ca7b763977b9cce40cb5b8c676ae19a716d2f5d15009fa7bdbcec9dea426968e3cb748fbed7592fbf10edd7c749aea841c2920996a7c1aa5e0a6e2d4c2ad + languageName: node + linkType: hard + "bottleneck@npm:^2.15.3": version: 2.19.5 resolution: "bottleneck@npm:2.19.5" @@ -8299,13 +8368,6 @@ __metadata: languageName: node linkType: hard -"clone@npm:^2.1.2": - version: 2.1.2 - resolution: "clone@npm:2.1.2" - checksum: 10c0/ed0601cd0b1606bc7d82ee7175b97e68d1dd9b91fd1250a3617b38d34a095f8ee0431d40a1a611122dcccb4f93295b4fdb94942aa763392b5fe44effa50c2d5e - languageName: node - linkType: hard - "cmd-shim@npm:6.0.1": version: 6.0.1 resolution: "cmd-shim@npm:6.0.1" @@ -8488,14 +8550,7 @@ __metadata: languageName: node linkType: hard -"compare-versions@npm:^5.0.1": - version: 5.0.3 - resolution: "compare-versions@npm:5.0.3" - checksum: 10c0/e2518d09bedc9b561342d65bca9eaff68bf8248b4ff2b53b371d1759c617995ef80a4af77282b7bf9d4245c38c44286f0e64f08177dbd98975fa42f005368c2f - languageName: node - linkType: hard - -"compare-versions@npm:^6.1.1": +"compare-versions@npm:^6.0.0-rc.2, compare-versions@npm:^6.1.1": version: 6.1.1 resolution: "compare-versions@npm:6.1.1" checksum: 10c0/415205c7627f9e4f358f571266422980c9fe2d99086be0c9a48008ef7c771f32b0fbe8e97a441ffedc3910872f917a0675fe0fe3c3b6d331cda6d8690be06338 @@ -8775,7 +8830,7 @@ __metadata: languageName: node linkType: hard -"core-js@npm:^3.26.1": +"core-js@npm:^3.37.1": version: 3.39.0 resolution: "core-js@npm:3.39.0" checksum: 10c0/f7602069b6afb2e3298eec612a5c1e0c3e6a458930fbfc7a4c5f9ac03426507f49ce395eecdd2d9bae9024f820e44582b67ffe16f2272395af26964f174eeb6b @@ -9068,13 +9123,6 @@ __metadata: languageName: node linkType: hard -"custom-event-polyfill@npm:^1.0.7": - version: 1.0.7 - resolution: "custom-event-polyfill@npm:1.0.7" - checksum: 10c0/b73c90d646d78f4acdff5453fa0f165f6d5506e32d074ca57d27f2bb7d9412356dab8cec7c00a0956b069e4987a8546a2c2c4b866d155e9fc4c27d223a225b78 - languageName: node - linkType: hard - "custom-event@npm:^1.0.0": version: 1.0.1 resolution: "custom-event@npm:1.0.1" @@ -9163,6 +9211,13 @@ __metadata: languageName: node linkType: hard +"dayjs@npm:^1.11.11": + version: 1.11.13 + resolution: "dayjs@npm:1.11.13" + checksum: 10c0/a3caf6ac8363c7dade9d1ee797848ddcf25c1ace68d9fe8678ecf8ba0675825430de5d793672ec87b24a69bf04a1544b176547b2539982275d5542a7955f35b7 + languageName: node + linkType: hard + "de-indent@npm:^1.0.2": version: 1.0.2 resolution: "de-indent@npm:1.0.2" @@ -9262,21 +9317,7 @@ __metadata: languageName: node linkType: hard -"deep-equal@npm:^1.0.1": - version: 1.1.1 - resolution: "deep-equal@npm:1.1.1" - dependencies: - is-arguments: "npm:^1.0.4" - is-date-object: "npm:^1.0.1" - is-regex: "npm:^1.0.4" - object-is: "npm:^1.0.1" - object-keys: "npm:^1.1.1" - regexp.prototype.flags: "npm:^1.2.0" - checksum: 10c0/473d5dd1d707afd5ad3068864765590591b049d0e0d9a01931599dbbd820e35f09d0a42faa6e4644deb7cf6b7dc90f7bfdf5559f42279d67f714209b62036212 - languageName: node - linkType: hard - -"deep-equal@npm:^2.0.2, deep-equal@npm:^2.0.5": +"deep-equal@npm:^2.0.5": version: 2.2.1 resolution: "deep-equal@npm:2.2.1" dependencies: @@ -9656,7 +9697,7 @@ __metadata: languageName: node linkType: hard -"dompurify@npm:^3.0.5": +"dompurify@npm:^3.1.3, dompurify@npm:^3.1.4": version: 3.2.3 resolution: "dompurify@npm:3.2.3" dependencies: @@ -10723,14 +10764,14 @@ __metadata: languageName: node linkType: hard -"eventemitter3@npm:^4.0.0, eventemitter3@npm:^4.0.4, eventemitter3@npm:^4.0.7": +"eventemitter3@npm:^4.0.4": version: 4.0.7 resolution: "eventemitter3@npm:4.0.7" checksum: 10c0/5f6d97cbcbac47be798e6355e3a7639a84ee1f7d9b199a07017f1d2f1e2fe236004d14fa5dfaeba661f94ea57805385e326236a6debbc7145c8877fbc0297c6b languageName: node linkType: hard -"eventemitter3@npm:^5.0.1": +"eventemitter3@npm:^5.0.0, eventemitter3@npm:^5.0.1": version: 5.0.1 resolution: "eventemitter3@npm:5.0.1" checksum: 10c0/4ba5c00c506e6c786b4d6262cfbce90ddc14c10d4667e5c83ae993c9de88aa856033994dd2b35b83e8dc1170e224e66a319fa80adc4c32adcd2379bbc75da814 @@ -10855,7 +10896,7 @@ __metadata: languageName: node linkType: hard -"extend@npm:^3.0.0, extend@npm:^3.0.2": +"extend@npm:^3.0.0": version: 3.0.2 resolution: "extend@npm:3.0.2" checksum: 10c0/73bf6e27406e80aa3e85b0d1c4fd987261e628064e170ca781125c0b635a3dabad5e05adbf07595ea0cf1e6c5396cacb214af933da7cbaf24fe75ff14818e8f9 @@ -10889,14 +10930,7 @@ __metadata: languageName: node linkType: hard -"fast-diff@npm:1.2.0": - version: 1.2.0 - resolution: "fast-diff@npm:1.2.0" - checksum: 10c0/2fbcb23957fb0bc920832a94ba627b860400f9cce45e1594e931dabf62e858369a58c6c2603e2ecc4f7679580f710b5b5b6e698a355a9a9bfcfd93c06c7c4350 - languageName: node - linkType: hard - -"fast-diff@npm:^1.1.2": +"fast-diff@npm:^1.1.2, fast-diff@npm:^1.3.0": version: 1.3.0 resolution: "fast-diff@npm:1.3.0" checksum: 10c0/5c19af237edb5d5effda008c891a18a585f74bf12953be57923f17a3a4d0979565fc64dbc73b9e20926b9d895f5b690c618cbb969af0cf022e3222471220ad29 @@ -11271,52 +11305,6 @@ __metadata: languageName: node linkType: hard -"formiojs@npm:4.21.6": - version: 4.21.6 - resolution: "formiojs@npm:4.21.6" - dependencies: - "@formio/bootstrap3": "npm:2.12.4-rc.1" - "@formio/choices.js": "npm:10.2.1" - "@formio/semantic": "npm:2.6.1" - "@formio/text-mask-addons": "npm:^3.8.0-formio.4" - "@formio/vanilla-text-mask": "npm:^5.1.1-formio.1" - abortcontroller-polyfill: "npm:^1.7.5" - autocompleter: "npm:^7.0.1" - browser-cookies: "npm:^1.2.0" - browser-md5-file: "npm:^1.1.1" - compare-versions: "npm:^5.0.1" - core-js: "npm:^3.26.1" - custom-event-polyfill: "npm:^1.0.7" - dialog-polyfill: "npm:^0.5.6" - dom-autoscroller: "npm:^2.3.4" - dompurify: "npm:^3.0.5" - downloadjs: "npm:^1.4.7" - dragula: "npm:^3.7.3" - eventemitter3: "npm:^4.0.7" - fast-deep-equal: "npm:^3.1.3" - fast-json-patch: "npm:^3.1.1" - fetch-ponyfill: "npm:^7.1.0" - i18next: "npm:22.4.12" - idb: "npm:^7.1.1" - inputmask: "npm:^5.0.9" - ismobilejs: "npm:^1.1.1" - json-logic-js: "npm:^2.0.2" - jstimezonedetect: "npm:^1.0.7" - jwt-decode: "npm:^3.1.2" - lodash: "npm:^4.17.21" - moment: "npm:^2.29.4" - moment-timezone: "npm:^0.5.40" - native-promise-only: "npm:^0.8.1" - quill: "npm:^2.0.0-dev.3" - signature_pad: "npm:^4.1.4" - string-hash: "npm:^1.1.3" - tippy.js: "npm:^6.3.7" - uuid: "npm:^9.0.0" - vanilla-picker: "npm:^2.12.1" - checksum: 10c0/2293e1a8cc7d4c7eb478e3b5caec175e70b285ba13e013a9c8a1767afd81add7d208bc60604e2ec5e7b5fa70310d825f82dcd42d5293da425f1e3146171f0ca4 - languageName: node - linkType: hard - "fraction.js@npm:^4.2.0": version: 4.2.0 resolution: "fraction.js@npm:4.2.0" @@ -12553,15 +12541,6 @@ __metadata: languageName: node linkType: hard -"i18next@npm:22.4.12": - version: 22.4.12 - resolution: "i18next@npm:22.4.12" - dependencies: - "@babel/runtime": "npm:^7.20.6" - checksum: 10c0/df425c315a6a937e3fa4752846620aec1ca165bccfb4b48f04a0faef7ef8283611f6c10a0287f5d00b3d0bcae60a1a17ee7c5713b2e6324e2ea79d78bb589bc8 - languageName: node - linkType: hard - "iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2": version: 0.6.3 resolution: "iconv-lite@npm:0.6.3" @@ -12830,7 +12809,7 @@ __metadata: languageName: node linkType: hard -"inputmask@npm:^5.0.9": +"inputmask@npm:^5.0.8, inputmask@npm:^5.0.9": version: 5.0.9 resolution: "inputmask@npm:5.0.9" checksum: 10c0/12a8c350df5c9af101864a916fe12f997b103c4ae04037150564c9f8df31324460d775fe920d19d624a5df6e6cb1cdb43ecc24a6d07505d1f31b9fba6c7ec89d @@ -13355,7 +13334,7 @@ __metadata: languageName: node linkType: hard -"is-regex@npm:^1.0.4, is-regex@npm:^1.1.4": +"is-regex@npm:^1.1.4": version: 1.1.4 resolution: "is-regex@npm:1.1.4" dependencies: @@ -15323,6 +15302,13 @@ __metadata: languageName: node linkType: hard +"lodash.clonedeep@npm:^4.5.0": + version: 4.5.0 + resolution: "lodash.clonedeep@npm:4.5.0" + checksum: 10c0/2caf0e4808f319d761d2939ee0642fa6867a4bbf2cfce43276698828380756b99d4c4fa226d881655e6ac298dd453fe12a5ec8ba49861777759494c534936985 + languageName: node + linkType: hard + "lodash.debounce@npm:^4.0.8": version: 4.0.8 resolution: "lodash.debounce@npm:4.0.8" @@ -15344,6 +15330,13 @@ __metadata: languageName: node linkType: hard +"lodash.isequal@npm:^4.5.0": + version: 4.5.0 + resolution: "lodash.isequal@npm:4.5.0" + checksum: 10c0/dfdb2356db19631a4b445d5f37868a095e2402292d59539a987f134a8778c62a2810c2452d11ae9e6dcac71fc9de40a6fedcb20e2952a15b431ad8b29e50e28f + languageName: node + linkType: hard + "lodash.isequalwith@npm:^4.4.0": version: 4.4.0 resolution: "lodash.isequalwith@npm:4.4.0" @@ -16838,12 +16831,12 @@ __metadata: languageName: node linkType: hard -"moment-timezone@npm:^0.5.40": - version: 0.5.43 - resolution: "moment-timezone@npm:0.5.43" +"moment-timezone@npm:^0.5.44": + version: 0.5.46 + resolution: "moment-timezone@npm:0.5.46" dependencies: moment: "npm:^2.29.4" - checksum: 10c0/6f42174e01398d135883fb45aa820e57f34b25aab5ea6c50998139d06f975ee4457275b5e331466b14bff4d830e681c267f9cc462f445eb9c2b84d04add829f6 + checksum: 10c0/003fd278d1aa3e63afff340a318735db80157b7a343e3f807cac10e026def214f0e71b52d582b89a11ee0a19f5d9f0da2752b7959d855429f2b715d4859d3722 languageName: node linkType: hard @@ -16938,13 +16931,6 @@ __metadata: languageName: node linkType: hard -"native-promise-only@npm:^0.8.1": - version: 0.8.1 - resolution: "native-promise-only@npm:0.8.1" - checksum: 10c0/c1b41128ca9806818e12d0b84f7c71e88b1fa00f0f4857767d96206dbdd0af6755305103f55c583b045533185ffca863b0c34116ade507ff7ba2e417e076a5ac - languageName: node - linkType: hard - "natural-compare@npm:^1.4.0": version: 1.4.0 resolution: "natural-compare@npm:1.4.0" @@ -17637,7 +17623,7 @@ __metadata: languageName: node linkType: hard -"object-is@npm:^1.0.1, object-is@npm:^1.1.5": +"object-is@npm:^1.1.5": version: 1.1.5 resolution: "object-is@npm:1.1.5" dependencies: @@ -18095,10 +18081,10 @@ __metadata: languageName: node linkType: hard -"parchment@npm:2.0.0-dev.2": - version: 2.0.0-dev.2 - resolution: "parchment@npm:2.0.0-dev.2" - checksum: 10c0/163c021e7dd5df53c5cfe8a2337bdafcd7e1969d8274da6da87a7a5290f93df5a91031a4061b6daea786b3f1a2a9fb8e7367e13aae406a038f557c1608a64648 +"parchment@npm:^3.0.0": + version: 3.0.0 + resolution: "parchment@npm:3.0.0" + checksum: 10c0/83cc55756a899d6769e42b345ae55738f7e93f9027bb0095f518bc75b81d44ba2b69a76bc25f259974d972f8e250066419c3f92e3ded7518f144fc9c1b47430d languageName: node linkType: hard @@ -19294,28 +19280,26 @@ __metadata: languageName: node linkType: hard -"quill-delta@npm:4.2.1": - version: 4.2.1 - resolution: "quill-delta@npm:4.2.1" +"quill-delta@npm:^5.1.0": + version: 5.1.0 + resolution: "quill-delta@npm:5.1.0" dependencies: - deep-equal: "npm:^1.0.1" - extend: "npm:^3.0.2" - fast-diff: "npm:1.2.0" - checksum: 10c0/a947f3bf818d3fe6289857f1f97f8c9939fd611db8aebc53fb735f085c4fa6bb3159e9634f2e040714c192081223adfb2530b5b4d0942698e1dcf4fb061211d8 + fast-diff: "npm:^1.3.0" + lodash.clonedeep: "npm:^4.5.0" + lodash.isequal: "npm:^4.5.0" + checksum: 10c0/a99462b96177f4559e5a659be0f51bbfe090c11b61c53aa19afabd3fdf8a6495173bbacd84b75acce680ed7c157a024907e74ff077ddd6a135b4da15bf71ada2 languageName: node linkType: hard -"quill@npm:^2.0.0-dev.3": - version: 2.0.0-dev.4 - resolution: "quill@npm:2.0.0-dev.4" +"quill@npm:^2.0.2": + version: 2.0.3 + resolution: "quill@npm:2.0.3" dependencies: - clone: "npm:^2.1.2" - deep-equal: "npm:^2.0.2" - eventemitter3: "npm:^4.0.0" - extend: "npm:^3.0.2" - parchment: "npm:2.0.0-dev.2" - quill-delta: "npm:4.2.1" - checksum: 10c0/85cbc18d20d07150b7f5d15a0e08d03d5f9a36af3b3cc06e1b5617600161ca8c95dbacfa85ee38fe7db63d4a703748832f5041a62658e54e50d9a8f6b4c0823d + eventemitter3: "npm:^5.0.1" + lodash-es: "npm:^4.17.21" + parchment: "npm:^3.0.0" + quill-delta: "npm:^5.1.0" + checksum: 10c0/9897468b3e2b0fbf9c91471deea745d7b6494f866cb8caace63267769b2c4c6128e49da0988c4ed64f1a91a171fbf91c84009b663b1256a3caca0755204bb6b5 languageName: node linkType: hard @@ -19781,13 +19765,6 @@ __metadata: languageName: node linkType: hard -"regenerator-runtime@npm:^0.14.0": - version: 0.14.1 - resolution: "regenerator-runtime@npm:0.14.1" - checksum: 10c0/1b16eb2c4bceb1665c89de70dcb64126a22bc8eb958feef3cd68fe11ac6d2a4899b5cd1b80b0774c7c03591dc57d16631a7f69d2daa2ec98100e2f29f7ec4cc4 - languageName: node - linkType: hard - "regenerator-transform@npm:^0.15.1": version: 0.15.1 resolution: "regenerator-transform@npm:0.15.1" @@ -19797,7 +19774,7 @@ __metadata: languageName: node linkType: hard -"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.4.3, regexp.prototype.flags@npm:^1.5.0": +"regexp.prototype.flags@npm:^1.4.3, regexp.prototype.flags@npm:^1.5.0": version: 1.5.0 resolution: "regexp.prototype.flags@npm:1.5.0" dependencies: @@ -19969,13 +19946,6 @@ __metadata: languageName: node linkType: hard -"resize-observer-polyfill@npm:^1.5.1": - version: 1.5.1 - resolution: "resize-observer-polyfill@npm:1.5.1" - checksum: 10c0/5e882475067f0b97dc07e0f37c3e335ac5bc3520d463f777cec7e894bb273eddbfecb857ae668e6fb6881fd6f6bb7148246967172139302da50fa12ea3a15d95 - languageName: node - linkType: hard - "resolve-cwd@npm:^3.0.0": version: 3.0.0 resolution: "resolve-cwd@npm:3.0.0" @@ -20821,7 +20791,7 @@ __metadata: languageName: node linkType: hard -"signature_pad@npm:^4.1.4": +"signature_pad@npm:^4.2.0": version: 4.2.0 resolution: "signature_pad@npm:4.2.0" checksum: 10c0/9b7792c90fea0d90b095ddb724d046ecaea20ce2de9845c270f08407ca8402888e0b04b9bab2865271e7d18fe765e1954d4a142e0cbfd551f428e9298f3fb890 @@ -22957,12 +22927,12 @@ __metadata: languageName: node linkType: hard -"vanilla-picker@npm:^2.12.1": - version: 2.12.1 - resolution: "vanilla-picker@npm:2.12.1" +"vanilla-picker@npm:^2.12.3": + version: 2.12.3 + resolution: "vanilla-picker@npm:2.12.3" dependencies: "@sphinxxxx/color-conversion": "npm:^2.2.2" - checksum: 10c0/ecc6da11f1b5facd842c395e6ad1e8c688fe1e8bfc523d1cee06077a3b07a38077a3ae1ff83b9e0304f5ef55176c93cccf8883547f0ddae2ef8b59c72cb58c1b + checksum: 10c0/306237ab0178ca0b8138ba86093302a33d98a505b34e427d3844717173033d9286ba93e07e7fb3162c3dc6c206c0ae4b786b4194833b2f69b690e93583d184bb languageName: node linkType: hard