fix: circular references and test failures

Author: KaneFreeman

packages/core/package.json

@@ -26,7 +26,8 @@
     "prepack": "cp ../../README.md ./",
     "postpack": "rm ./README.md",
     "serve": "webpack serve --config-name configMain",
-    "test": "cross-env NODE_ENV=test jest",
+    "test": "cross-env NODE_ENV=test yarn run-s clean test:unit",
+    "test:unit": "jest",
     "test:integration": "cross-env NODE_ENV=test jest -c jest.config.integration.js",
     "test:ci": "cross-env NODE_ENV=test jest --maxWorkers=2 --coverage",
     "test:integration:ci": "cross-env NODE_ENV=test jest -c jest.config.integration.js --maxWorkers=2",

packages/core/src/backends/bitbucket/API.ts

@@ -4,7 +4,7 @@ import get from 'lodash/get';
 import { dirname } from 'path';
 import { parse } from 'what-the-diff';
 
-import { PreviewState } from '@staticcms/core';
+import { PreviewState } from '@staticcms/core/constants/enums';
 import {
   APIError,
   basename,
@@ -31,8 +31,8 @@ import {
   statusToLabel,
 } from '@staticcms/core/lib/util/APIUtils';
 
-import type { WorkflowStatus } from '@staticcms/core/constants/publishModes';
 import type { DataFile, PersistOptions, UnpublishedEntry } from '@staticcms/core';
+import type { WorkflowStatus } from '@staticcms/core/constants/publishModes';
 import type { ApiRequest, FetchError } from '@staticcms/core/lib/util';
 import type AssetProxy from '@staticcms/core/valueObjects/AssetProxy';
 

packages/core/src/backends/git-gateway/implementation.tsx

@@ -5,8 +5,8 @@ import intersection from 'lodash/intersection';
 import pick from 'lodash/pick';
 import React, { useCallback } from 'react';
 
+import { PreviewState } from '@staticcms/core/constants/enums';
 import { WorkflowStatus } from '@staticcms/core/constants/publishModes';
-import { PreviewState } from '@staticcms/core';
 import {
   AccessTokenError,
   APIError,

packages/core/src/backends/github/API.ts

@@ -7,8 +7,8 @@ import trim from 'lodash/trim';
 import trimStart from 'lodash/trimStart';
 import { dirname } from 'path';
 
+import { PreviewState } from '@staticcms/core/constants/enums';
 import { WorkflowStatus } from '@staticcms/core/constants/publishModes';
-import { PreviewState } from '@staticcms/core';
 import {
   APIError,
   EditorialWorkflowError,

packages/core/src/backends/gitlab/API.ts

@@ -4,7 +4,7 @@ import result from 'lodash/result';
 import trimStart from 'lodash/trimStart';
 import { dirname } from 'path';
 
-import { PreviewState } from '@staticcms/core';
+import { PreviewState } from '@staticcms/core/constants/enums';
 import {
   APIError,
   Cursor,
@@ -30,8 +30,8 @@ import {
   statusToLabel,
 } from '@staticcms/core/lib/util/APIUtils';
 
-import type { WorkflowStatus } from '@staticcms/core/constants/publishModes';
 import type { DataFile, PersistOptions, UnpublishedEntry } from '@staticcms/core';
+import type { WorkflowStatus } from '@staticcms/core/constants/publishModes';
 import type { ApiRequest, FetchError } from '@staticcms/core/lib/util';
 import type AssetProxy from '@staticcms/core/valueObjects/AssetProxy';
 

packages/core/src/constants/enums.ts

@@ -0,0 +1,9 @@
+export enum PreviewState {
+  Other = 'other',
+  Success = 'success',
+}
+
+export enum CollectionType {
+  FOLDER,
+  FILES,
+}

packages/core/src/interface.ts

@@ -1350,11 +1350,6 @@ export interface ShortcodeConfig<P = {}> {
   preview: ComponentType<ShortcodePreviewProps>;
 }
 
-export enum CollectionType {
-  FOLDER,
-  FILES,
-}
-
 export type DeepPartial<T> = T extends object
   ? {
       [P in keyof T]?: DeepPartial<T[P]>;
@@ -1441,8 +1436,3 @@ export interface UnpublishedEntryMediaFile {
   id: string;
   path: string;
 }
-
-export enum PreviewState {
-  Other = 'other',
-  Success = 'success',
-}