fix: fixes issues with external types dependency

its-devtastic · Feb 2, 2024 · 828b23f · 828b23f
1 parent bfc7cf4
commit 828b23f
Show file tree

Hide file tree

Showing 86 changed files with 6,193 additions and 5,927 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/bridge/package.json b/packages/bridge/package.json
@@ -24,7 +24,7 @@
     "zustand": "^4.4.1"
   },
   "peerDependencies": {
-    "@curatorjs/studio": "latest",
+    "@curatorjs/studio": "^0",
     "react": "latest",
     "react-dom": "latest"
   },

diff --git a/packages/plausible/package.json b/packages/plausible/package.json
@@ -12,6 +12,6 @@
     }
   ],
   "peerDependencies": {
-    "@curatorjs/studio": "latest"
+    "@curatorjs/studio": "^0"
   }
 }
diff --git a/packages/studio/app/hooks/useSession.ts b/packages/studio/app/hooks/useSession.ts
@@ -1,8 +1,8 @@
 import { create } from "zustand";
 import { persist } from "zustand/middleware";
 
-import { SessionUser } from "@/types/session";
-import { AdminProfile } from "@/types/adminUser";
+import { SessionUser } from "@curatorjs/types";
+import { AdminProfile } from "@curatorjs/types";
 
 interface SessionState {
   token: string | null;

diff --git a/packages/studio/app/main.tsx b/packages/studio/app/main.tsx
@@ -5,7 +5,6 @@ import { ConfigProvider, theme } from "antd";
 import * as R from "ramda";
 
 import "flag-icons/css/flag-icons.min.css";
-import "@fontsource/young-serif";
 import "@fontsource-variable/inter";
 
 // Day.js plugins
@@ -21,7 +20,7 @@ import "./index.css";
 import usePreferences from "@/hooks/usePreferences";
 import CuratorProvider from "@/providers/CuratorProvider";
 import StrapiProvider from "@/providers/StrapiProvider";
-import { CuratorConfig } from "@/types/config";
+import { CuratorConfig } from "@curatorjs/types";
 
 dayjs.extend(relativeTime);
 dayjs.extend(localeData);

diff --git a/packages/studio/app/plugins/api-tokens/index.tsx b/packages/studio/app/plugins/api-tokens/index.tsx
@@ -2,8 +2,8 @@ import React from "react";
 import * as R from "ramda";
 import { RouteObject } from "react-router-dom";
 
-import type { InjectionZoneEntry, CuratorConfig } from "@/types/config";
-import { InjectionZone } from "@/types/config";
+import type { InjectionZoneEntry, CuratorConfig } from "@curatorjs/types";
+import { InjectionZone } from "@curatorjs/types";
 
 import MainMenuItem from "./ui/MainMenuItem";
 import ApiTokens from "./routes/ApiTokens";

diff --git a/packages/studio/app/plugins/api-tokens/routes/ApiTokens/ApiTokenForm.tsx b/packages/studio/app/plugins/api-tokens/routes/ApiTokens/ApiTokenForm.tsx
@@ -14,7 +14,7 @@ import { Form, Formik } from "formik";
 import * as R from "ramda";
 import dayjs from "dayjs";
 
-import { ApiToken } from "@/types/apiToken";
+import { ApiToken } from "@curatorjs/types";
 import useStrapi from "@/hooks/useStrapi";
 import Field from "@/ui/Field";
 import FormField from "@/ui/FormField";
@@ -76,8 +76,8 @@ const ApiTokenForm: React.FC<{
               accessKey
                 ? ""
                 : item.id
-                ? item.name
-                : t("api_tokens.create_api_token")
+                  ? item.name
+                  : t("api_tokens.create_api_token")
             }
             closeIcon={!accessKey}
             onCancel={onClose}

diff --git a/packages/studio/app/plugins/api-tokens/routes/ApiTokens/ApiTokens.tsx b/packages/studio/app/plugins/api-tokens/routes/ApiTokens/ApiTokens.tsx
@@ -7,7 +7,7 @@ import * as R from "ramda";
 import { useAsyncRetry } from "react-use";
 import dayjs from "dayjs";
 
-import { ApiToken } from "@/types/apiToken";
+import { ApiToken } from "@curatorjs/types";
 import useStrapi from "@/hooks/useStrapi";
 import Table from "@/ui/Table";
 

diff --git a/packages/studio/app/plugins/api-tokens/routes/ApiTokens/PermissionsSelect.tsx b/packages/studio/app/plugins/api-tokens/routes/ApiTokens/PermissionsSelect.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { Select } from "antd";
 import useStrapi from "@/hooks/useStrapi";
 import { useAsync } from "react-use";
-import { PermissionConfig } from "@/types/permission";
+import { PermissionConfig } from "@curatorjs/types";
 import * as R from "ramda";
 
 const PermissionsSelect: React.FC<{

diff --git a/packages/studio/app/plugins/audit/index.tsx b/packages/studio/app/plugins/audit/index.tsx
@@ -2,8 +2,8 @@ import React from "react";
 import * as R from "ramda";
 import { RouteObject } from "react-router-dom";
 
-import type { InjectionZoneEntry, CuratorConfig } from "@/types/config";
-import { InjectionZone } from "@/types/config";
+import type { InjectionZoneEntry, CuratorConfig } from "@curatorjs/types";
+import { InjectionZone } from "@curatorjs/types";
 
 import MainMenuItem from "./ui/MainMenuItem";
 import AuditScreen from "./routes/AuditScreen";

diff --git a/packages/studio/app/plugins/content-manager/dialogs/CreateContentDialog/index.tsx b/packages/studio/app/plugins/content-manager/dialogs/CreateContentDialog/index.tsx
@@ -7,7 +7,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faClose } from "@fortawesome/free-solid-svg-icons";
 import classNames from "classnames";
 
-import { Entity } from "@/types/content";
+import { Entity } from "@curatorjs/types";
 import useCurator from "@/hooks/useCurator";
 import useStrapi from "@/hooks/useStrapi";
 import useSecrets from "@/hooks/useSecrets";

diff --git a/packages/studio/app/plugins/content-manager/index.tsx b/packages/studio/app/plugins/content-manager/index.tsx
@@ -1,8 +1,8 @@
 import React from "react";
 import * as R from "ramda";
 
-import type { InjectionZoneEntry, CuratorConfig } from "@/types/config";
-import { InjectionZone } from "@/types/config";
+import type { InjectionZoneEntry, CuratorConfig } from "@curatorjs/types";
+import { InjectionZone } from "@curatorjs/types";
 
 import DetailScreen from "./routes/DetailScreen";
 import ContentKindScreen from "./routes/ContentKindScreen";

diff --git a/packages/studio/app/plugins/content-manager/routes/DetailScreen/Actions.tsx b/packages/studio/app/plugins/content-manager/routes/DetailScreen/Actions.tsx
@@ -11,11 +11,11 @@ import {
 } from "@fortawesome/free-solid-svg-icons";
 import * as R from "ramda";
 import { useFormikContext } from "formik";
-import { useParams, useNavigate, unstable_useBlocker } from "react-router-dom";
+import { useParams, useNavigate, useBlocker } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import { useDebounce, useBeforeUnload, useKey } from "react-use";
 
-import { ContentTypeConfig } from "@/types/contentTypeConfig";
+import { ContentTypeConfig } from "@curatorjs/types";
 
 import useStrapi from "@/hooks/useStrapi";
 import useModifierKey from "@/hooks/useModifierKey";
@@ -41,7 +41,7 @@ const Actions: React.FC<{
   const isSingleType = contentType?.kind === "singleType";
   const [modal, contextHolder] = Modal.useModal();
   const { preferences, setPreference } = usePreferences();
-  const blocker = unstable_useBlocker(!R.isNil(values.id) && dirty);
+  const blocker = useBlocker(!R.isNil(values.id) && dirty);
   const modifierKey = useModifierKey();
   /*
    * Versioning is enabled either on the content type level or if one of the

diff --git a/packages/studio/app/plugins/content-manager/routes/DetailScreen/Header.tsx b/packages/studio/app/plugins/content-manager/routes/DetailScreen/Header.tsx
@@ -2,9 +2,9 @@ import React from "react";
 import { Link } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 
-import { Entity } from "@/types/content";
-import { StrapiContentType } from "@/types/contentType";
-import { ContentTypeConfig } from "@/types/contentTypeConfig";
+import { Entity } from "@curatorjs/types";
+import { StrapiContentType } from "@curatorjs/types";
+import { ContentTypeConfig } from "@curatorjs/types";
 import CalendarTime from "@/ui/CalendarTime";
 
 import Actions from "./Actions";

diff --git a/packages/studio/app/plugins/content-manager/routes/DetailScreen/Main.tsx b/packages/studio/app/plugins/content-manager/routes/DetailScreen/Main.tsx
@@ -3,8 +3,8 @@ import * as R from "ramda";
 import { useParams } from "react-router-dom";
 import classNames from "classnames";
 
-import { StrapiContentType } from "@/types/contentType";
-import { ContentTypeConfig } from "@/types/contentTypeConfig";
+import { StrapiContentType } from "@curatorjs/types";
+import { ContentTypeConfig } from "@curatorjs/types";
 
 import FieldRenderer from "../../ui/FieldRenderer";
 import { usePluginOptions } from "../../hooks";

diff --git a/packages/studio/app/plugins/content-manager/routes/DetailScreen/Top.tsx b/packages/studio/app/plugins/content-manager/routes/DetailScreen/Top.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-import { StrapiContentType } from "@/types/contentType";
+import { StrapiContentType } from "@curatorjs/types";
 
 import LanguageSwitcher from "./LanguageSwitcher";
 

diff --git a/packages/studio/app/plugins/content-manager/routes/DetailScreen/index.tsx b/packages/studio/app/plugins/content-manager/routes/DetailScreen/index.tsx
@@ -5,7 +5,7 @@ import { useAsync } from "react-use";
 import { Formik } from "formik";
 import { useParams, useNavigate, useSearchParams } from "react-router-dom";
 
-import { Entity } from "@/types/content";
+import { Entity } from "@curatorjs/types";
 import useSecrets from "@/hooks/useSecrets";
 import useStrapi from "@/hooks/useStrapi";
 import useCurator from "@/hooks/useCurator";

diff --git a/packages/studio/app/plugins/content-manager/routes/ListScreen/FieldFilter.tsx b/packages/studio/app/plugins/content-manager/routes/ListScreen/FieldFilter.tsx
@@ -5,7 +5,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faClose, faPlus } from "@fortawesome/free-solid-svg-icons";
 import { Button } from "antd";
 
-import { Attribute } from "@/types/contentType";
+import { Attribute } from "@curatorjs/types";
 import useCurator from "@/hooks/useCurator";
 import useFilters from "@/hooks/useFilters";
 import Popover from "@/ui/Popover";

diff --git a/packages/studio/app/plugins/content-manager/routes/ListScreen/FilterToolbar.tsx b/packages/studio/app/plugins/content-manager/routes/ListScreen/FilterToolbar.tsx
@@ -6,7 +6,7 @@ import { useTranslation } from "react-i18next";
 import { useSearchParams } from "react-router-dom";
 
 import LanguageSelect from "@/ui/LanguageSelect";
-import { StrapiContentType } from "@/types/contentType";
+import { StrapiContentType } from "@curatorjs/types";
 
 import FieldFilters from "./FieldFilters";
 

diff --git a/packages/studio/app/plugins/content-manager/routes/ListScreen/filters/Date.tsx b/packages/studio/app/plugins/content-manager/routes/ListScreen/filters/Date.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from "react-i18next";
 import { Form, Formik } from "formik";
 import dayjs, { ManipulateType } from "dayjs";
 
-import { Attribute } from "@/types/contentType";
+import { Attribute } from "@curatorjs/types";
 import Field from "@/ui/Field";
 import useFilters from "@/hooks/useFilters";
 

diff --git a/packages/studio/app/plugins/content-manager/routes/ListScreen/filters/Integer.tsx b/packages/studio/app/plugins/content-manager/routes/ListScreen/filters/Integer.tsx
@@ -3,7 +3,7 @@ import { Button, InputNumber, Select } from "antd";
 import { useTranslation } from "react-i18next";
 import { Form, Formik } from "formik";
 
-import { Attribute } from "@/types/contentType";
+import { Attribute } from "@curatorjs/types";
 import Field from "@/ui/Field";
 import useFilters from "@/hooks/useFilters";
 

diff --git a/packages/studio/app/plugins/content-manager/routes/ListScreen/filters/Relation.tsx b/packages/studio/app/plugins/content-manager/routes/ListScreen/filters/Relation.tsx
@@ -6,9 +6,9 @@ import { useAsync } from "react-use";
 import * as R from "ramda";
 import type { TFunction } from "i18next";
 
-import { Attribute } from "@/types/contentType";
-import { RenderContext } from "@/types/contentTypeConfig";
-import { Entity } from "@/types/content";
+import { Attribute } from "@curatorjs/types";
+import { RenderContext } from "@curatorjs/types";
+import { Entity } from "@curatorjs/types";
 import Field from "@/ui/Field";
 import useFilters from "@/hooks/useFilters";
 import useStrapi from "@/hooks/useStrapi";

diff --git a/packages/studio/app/plugins/content-manager/routes/ListScreen/filters/String.tsx b/packages/studio/app/plugins/content-manager/routes/ListScreen/filters/String.tsx
@@ -3,7 +3,7 @@ import { Button, Checkbox, Input, Select } from "antd";
 import { useTranslation } from "react-i18next";
 import { Form, Formik } from "formik";
 
-import { Attribute } from "@/types/contentType";
+import { Attribute } from "@curatorjs/types";
 import Field from "@/ui/Field";
 import useFilters from "@/hooks/useFilters";
 

diff --git a/packages/studio/app/plugins/content-manager/routes/ListScreen/index.tsx b/packages/studio/app/plugins/content-manager/routes/ListScreen/index.tsx
@@ -16,7 +16,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faLanguage } from "@fortawesome/free-solid-svg-icons";
 import { TFunction } from "i18next";
 
-import { Pagination as IPagination } from "@/types/response";
+import { Pagination as IPagination } from "@curatorjs/types";
 
 import useCurator from "@/hooks/useCurator";
 import useStrapi from "@/hooks/useStrapi";

diff --git a/packages/studio/app/plugins/content-manager/ui/FieldRenderer.tsx b/packages/studio/app/plugins/content-manager/ui/FieldRenderer.tsx
@@ -6,8 +6,8 @@ import { useTranslation } from "react-i18next";
 import * as R from "ramda";
 import { useFormikContext } from "formik";
 
-import { FieldDefinition } from "@/types/contentTypeConfig";
-import { Attribute } from "@/types/contentType";
+import { FieldDefinition } from "@curatorjs/types";
+import { Attribute } from "@curatorjs/types";
 
 import useContentPermission from "@/hooks/useContentPermission";
 
@@ -34,8 +34,8 @@ const FieldRenderer: React.FC<{
     typeof field.input !== "string" && !R.isNil(field.input)
       ? field.input
       : inputName
-      ? FIELD_TYPES[inputName]
-      : null;
+        ? FIELD_TYPES[inputName]
+        : null;
 
   // Don't check for field permissions if it's a field inside a component
   const fieldPermission = !field.path?.includes(".") ? field.path : null;

diff --git a/packages/studio/app/plugins/content-manager/ui/fields/Component/index.tsx b/packages/studio/app/plugins/content-manager/ui/fields/Component/index.tsx
@@ -1,8 +1,8 @@
 import React from "react";
 import * as R from "ramda";
 
-import { Attribute } from "@/types/contentType";
-import { FieldDefinition } from "@/types/contentTypeConfig";
+import { Attribute } from "@curatorjs/types";
+import { FieldDefinition } from "@curatorjs/types";
 import useCurator from "@/hooks/useCurator";
 import useStrapi from "@/hooks/useStrapi";
 

diff --git a/packages/studio/app/plugins/content-manager/ui/fields/DynamicZone/index.tsx b/packages/studio/app/plugins/content-manager/ui/fields/DynamicZone/index.tsx
@@ -19,8 +19,8 @@ import { faPlus } from "@fortawesome/free-solid-svg-icons";
 import { Button, Tooltip } from "antd";
 import { useTranslation } from "react-i18next";
 
-import { Attribute } from "@/types/contentType";
-import { FieldDefinition } from "@/types/contentTypeConfig";
+import { Attribute } from "@curatorjs/types";
+import { FieldDefinition } from "@curatorjs/types";
 import useStrapi from "@/hooks/useStrapi";
 import useCurator from "@/hooks/useCurator";
 import Popover from "@/ui/Popover";

diff --git a/packages/studio/app/plugins/content-manager/ui/fields/Relation/ToMany/Item.tsx b/packages/studio/app/plugins/content-manager/ui/fields/Relation/ToMany/Item.tsx
@@ -7,7 +7,7 @@ import { useSortable } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
 import classNames from "classnames";
 
-import { Entity } from "@/types/content";
+import { Entity } from "@curatorjs/types";
 
 const Item: React.FC<{
   item: Entity;

diff --git a/packages/studio/app/plugins/content-manager/ui/fields/Relation/ToMany/RelationSelect.tsx b/packages/studio/app/plugins/content-manager/ui/fields/Relation/ToMany/RelationSelect.tsx
@@ -9,8 +9,8 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faPlus } from "@fortawesome/free-solid-svg-icons";
 
 import useStrapi from "@/hooks/useStrapi";
-import { Entity } from "@/types/content";
-import { FieldDefinition } from "@/types/contentTypeConfig";
+import { Entity } from "@curatorjs/types";
+import { FieldDefinition } from "@curatorjs/types";
 
 import { usePluginOptions } from "../../../../hooks";
 import CreateContentDialog from "../../../../dialogs/CreateContentDialog";

diff --git a/packages/studio/app/plugins/content-manager/ui/fields/Relation/ToMany/index.tsx b/packages/studio/app/plugins/content-manager/ui/fields/Relation/ToMany/index.tsx
@@ -17,8 +17,8 @@ import {
   verticalListSortingStrategy,
 } from "@dnd-kit/sortable";
 
-import { Entity } from "@/types/content";
-import { FieldDefinition } from "@/types/contentTypeConfig";
+import { Entity } from "@curatorjs/types";
+import { FieldDefinition } from "@curatorjs/types";
 import useStrapi from "@/hooks/useStrapi";
 
 import RelationSelect from "./RelationSelect";

diff --git a/packages/studio/app/plugins/content-manager/ui/fields/Relation/ToOne.tsx b/packages/studio/app/plugins/content-manager/ui/fields/Relation/ToOne.tsx
@@ -7,8 +7,8 @@ import { faEdit, faPlus } from "@fortawesome/free-solid-svg-icons";
 import { useTranslation } from "react-i18next";
 import { useFormikContext } from "formik";
 
-import { Entity } from "@/types/content";
-import { FieldDefinition } from "@/types/contentTypeConfig";
+import { Entity } from "@curatorjs/types";
+import { FieldDefinition } from "@curatorjs/types";
 import useStrapi from "@/hooks/useStrapi";
 
 import { usePluginOptions } from "../../../hooks";

diff --git a/packages/studio/app/plugins/content-manager/ui/fields/Relation/index.tsx b/packages/studio/app/plugins/content-manager/ui/fields/Relation/index.tsx
@@ -2,8 +2,8 @@ import React from "react";
 import * as R from "ramda";
 import { useParams } from "react-router-dom";
 
-import { Entity } from "@/types/content";
-import { FieldDefinition } from "@/types/contentTypeConfig";
+import { Entity } from "@curatorjs/types";
+import { FieldDefinition } from "@curatorjs/types";
 
 import useStrapi from "@/hooks/useStrapi";
 

diff --git a/...dio/app/plugins/content-manager/ui/fields/RepeatableComponent/RepeatableComponentItem.tsx b/...dio/app/plugins/content-manager/ui/fields/RepeatableComponent/RepeatableComponentItem.tsx
@@ -12,8 +12,8 @@ import { Button } from "antd";
 import { useSortable } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
 
-import { ComponentConfig } from "@/types/config";
-import { StrapiComponent } from "@/types/contentType";
+import { ComponentConfig } from "@curatorjs/types";
+import { StrapiComponent } from "@curatorjs/types";
 
 import FieldRenderer from "../../FieldRenderer";
 

diff --git a/packages/studio/app/plugins/content-manager/ui/fields/RepeatableComponent/index.tsx b/packages/studio/app/plugins/content-manager/ui/fields/RepeatableComponent/index.tsx
@@ -19,9 +19,9 @@ import { faPlus } from "@fortawesome/free-solid-svg-icons";
 import { Button } from "antd";
 import { useTranslation } from "react-i18next";
 
-import { Entity } from "@/types/content";
-import { Attribute } from "@/types/contentType";
-import { FieldDefinition } from "@/types/contentTypeConfig";
+import { Entity } from "@curatorjs/types";
+import { Attribute } from "@curatorjs/types";
+import { FieldDefinition } from "@curatorjs/types";
 import useStrapi from "@/hooks/useStrapi";
 import useCurator from "@/hooks/useCurator";
 

diff --git a/packages/studio/app/plugins/content-manager/ui/fields/RichText/index.tsx b/packages/studio/app/plugins/content-manager/ui/fields/RichText/index.tsx
@@ -6,8 +6,8 @@ import { Typography } from "@tiptap/extension-typography";
 import { Image } from "@tiptap/extension-image";
 import { EditorProvider } from "@tiptap/react";
 
-import { FieldDefinition } from "@/types/contentTypeConfig";
-import { Attribute } from "@/types/contentType";
+import { FieldDefinition } from "@curatorjs/types";
+import { Attribute } from "@curatorjs/types";
 
 import "./RichtText.css";
 import FormattingMenu from "./components/FormattingMenu";

diff --git a/packages/studio/app/plugins/dashboard/index.tsx b/packages/studio/app/plugins/dashboard/index.tsx
@@ -1,8 +1,8 @@
 import React from "react";
 import * as R from "ramda";
 
-import type { CuratorConfig } from "@/types/config";
-import { InjectionZone, InjectionZoneEntry } from "@/types/config";
+import type { CuratorConfig } from "@curatorjs/types";
+import { InjectionZone, InjectionZoneEntry } from "@curatorjs/types";
 
 import DashboardScreen from "./routes/DashboardScreen";
 import MainMenuItem from "./MainMenuItem";