fix(react-formio): use @formio/js package instead formiojs

tsedio · Dec 29, 2024 · c8128c5 · c8128c5
1 parent 43742f1
commit c8128c5
Show file tree

Hide file tree

Showing 40 changed files with 104 additions and 104 deletions.
diff --git a/package.json b/package.json
@@ -35,6 +35,7 @@
   },
   "dependencies": {
     "@formio/choices.js": "^9.0.1",
+    "@formio/js": "4.21.6",
     "@types/classnames": "^2.2.11",
     "@types/react": "^18.2.8",
     "@types/react-dnd": "3.0.2",
@@ -45,7 +46,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
@@ -14,7 +14,7 @@
   },
   "peerDependencies": {
     "@formio/choices.js": ">=9.0.1",
-    "formiojs": ">=4.0.0",
+    "@formio/js": ">=4.0.0",
     "lodash": ">=4.17.20",
     "react": ">=16.14.0",
     "react-dnd": ">=16.0.1",

diff --git 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": "^4.21.6",
     "@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
     },

diff --git 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": ">=4.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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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": ">=4.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.schema.ts b/packages/react-formio/src/components/form-access/formAccess.schema.ts
@@ -1,4 +1,4 @@
-import { ExtendedComponentSchema } from "formiojs";
+import { ExtendedComponentSchema } from "@formio/js";
 
 import { FormSchema } from "../../interfaces/FormSchema";
 

diff --git a/packages/react-formio/src/components/form-access/formAccess.utils.ts b/packages/react-formio/src/components/form-access/formAccess.utils.ts
@@ -1,4 +1,4 @@
-import { ExtendedComponentSchema } from "formiojs";
+import { ExtendedComponentSchema } from "@formio/js";
 import cloneDeep from "lodash/cloneDeep";
 import isEqual from "lodash/isEqual";
 import noop from "lodash/noop";

diff --git a/packages/react-formio/src/components/form-builder/formBuilder.component.tsx b/packages/react-formio/src/components/form-builder/formBuilder.component.tsx
@@ -1,4 +1,4 @@
-import { ComponentSchema } from "formiojs";
+import { ComponentSchema } from "@formio/js";
 import AllComponents from "formiojs/components";
 import Components from "formiojs/components/Components";
 import FormioFormBuilder from "formiojs/FormBuilder";

diff --git a/packages/react-formio/src/components/form/form.component.tsx b/packages/react-formio/src/components/form/form.component.tsx
@@ -1,4 +1,4 @@
-import { Components } from "formiojs";
+import { Components } from "@formio/js";
 import AllComponents from "formiojs/components";
 
 import { useForm, UseFormHookProps } from "./useForm.hook";

diff --git a/packages/react-formio/src/components/form/useForm.hook.ts b/packages/react-formio/src/components/form/useForm.hook.ts
@@ -1,4 +1,4 @@
-import { ExtendedComponentSchema, Form } from "formiojs";
+import { ExtendedComponentSchema, Form } from "@formio/js";
 import cloneDeep from "lodash/cloneDeep";
 import isEqual from "lodash/isEqual";
 import { useEffect, useRef } from "react";

diff --git a/packages/react-formio/src/components/table/utils/mapFormToColumns.tsx b/packages/react-formio/src/components/table/utils/mapFormToColumns.tsx
@@ -1,5 +1,5 @@
-import { Components, ExtendedComponentSchema } from "formiojs";
-import FormioUtils from "formiojs/utils";
+import { Components, ExtendedComponentSchema } from "@formio/js";
+import FormioUtils from "@formio/js/utils";
 
 import { FormSchema } from "../../../interfaces";
 import { DefaultCell } from "../components/defaultCell.component";

diff --git a/packages/react-formio/src/index.ts b/packages/react-formio/src/index.ts
@@ -17,4 +17,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/FormSchema.ts b/packages/react-formio/src/interfaces/FormSchema.ts
@@ -1,4 +1,4 @@
-import { ExtendedComponentSchema } from "formiojs";
+import { ExtendedComponentSchema } from "@formio/js";
 
 export type FormSchema = {
   _id?: string;

diff --git a/packages/react-formio/src/typings.d.ts b/packages/react-formio/src/typings.d.ts
@@ -1,3 +1,3 @@
-declare module "formiojs/*" {
+declare module "@formio/js/*" {
   export = {} as any;
 }
diff --git 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;