diff --git a/jest.config.js b/jest.config.js index 424806b..ea79c93 100644 --- a/jest.config.js +++ b/jest.config.js @@ -4,7 +4,7 @@ module.exports = { '/theatre/*/src/**/*.test.ts', ], moduleNameMapper: { - ...require('./devEnv/getAliasesFromTSConfig').getAliasesFromTsConfigForJest(), + ...require('./devEnv/getAliasesFromTsConfig').getAliasesFromTsConfigForJest(), '\\.(css)$': 'identity-obj-proxy', 'lodash-es/(.*)': 'lodash/$1', 'react-use/esm/(.*)': 'react-use/lib/$1', diff --git a/packages/plugin-r3f/src/components/editable.tsx b/packages/plugin-r3f/src/components/editable.tsx index 92e5051..5633346 100644 --- a/packages/plugin-r3f/src/components/editable.tsx +++ b/packages/plugin-r3f/src/components/editable.tsx @@ -51,8 +51,9 @@ const editable = < const sheet = useEditorStore((state) => state.sheet) - const [sheetObject, setSheetObject] = - useState>(undefined) + const [sheetObject, setSheetObject] = useState< + undefined | ISheetObject<$FixMe> + >(undefined) useLayoutEffect(() => { if (!sheet) return diff --git a/theatre/core/src/coreExports.ts b/theatre/core/src/coreExports.ts index 12ddb59..0705d83 100644 --- a/theatre/core/src/coreExports.ts +++ b/theatre/core/src/coreExports.ts @@ -5,7 +5,7 @@ import type { IProjectConfig, } from '@theatre/core/projects/TheatreProject' import TheatreProject from '@theatre/core/projects/TheatreProject' -import * as types from '@theatre/shared/src/propTypes' +import * as types from '@theatre/shared/propTypes' import {InvalidArgumentError} from '@theatre/shared/utils/errors' import {validateName} from '@theatre/shared/utils/sanitizers' import userReadableTypeOfValue from '@theatre/shared/utils/userReadableTypeOfValue' diff --git a/theatre/core/src/sheetObjects/TheatreSheetObject.ts b/theatre/core/src/sheetObjects/TheatreSheetObject.ts index 9983a7f..bec4fb6 100644 --- a/theatre/core/src/sheetObjects/TheatreSheetObject.ts +++ b/theatre/core/src/sheetObjects/TheatreSheetObject.ts @@ -12,7 +12,7 @@ import type { } from '@theatre/shared/utils/types' import type {IDerivation, Pointer} from '@theatre/dataverse' import {prism, val} from '@theatre/dataverse' -import type {PropTypeConfig_Compound} from '@theatre/shared/src/propTypes' +import type {PropTypeConfig_Compound} from '@theatre/shared/propTypes' import type SheetObject from './SheetObject' export interface ISheetObject< diff --git a/theatre/core/src/sheetObjects/getPropDefaultsOfSheetObject.ts b/theatre/core/src/sheetObjects/getPropDefaultsOfSheetObject.ts index dbd171d..254c2e6 100644 --- a/theatre/core/src/sheetObjects/getPropDefaultsOfSheetObject.ts +++ b/theatre/core/src/sheetObjects/getPropDefaultsOfSheetObject.ts @@ -9,7 +9,7 @@ import type { PropTypeConfig, PropTypeConfig_Compound, PropTypeConfig_Enum, -} from '@theatre/shared/src/propTypes' +} from '@theatre/shared/propTypes' const cachedDefaults = new WeakMap() diff --git a/theatre/core/src/sheets/TheatreSheet.ts b/theatre/core/src/sheets/TheatreSheet.ts index 9db6fa2..ac82b9c 100644 --- a/theatre/core/src/sheets/TheatreSheet.ts +++ b/theatre/core/src/sheets/TheatreSheet.ts @@ -2,7 +2,7 @@ import {privateAPI, setPrivateAPI} from '@theatre/shared/privateAPIs' import type {IProject} from '@theatre/core/projects/TheatreProject' import type TheatreSequence from '@theatre/core/sequences/TheatreSequence' import type {ISequence} from '@theatre/core/sequences/TheatreSequence' -import type {PropTypeConfig_Compound} from '@theatre/shared/src/propTypes' +import type {PropTypeConfig_Compound} from '@theatre/shared/propTypes' import type {ISheetObject} from '@theatre/core/sheetObjects/TheatreSheetObject' import type Sheet from '@theatre/core/sheets/Sheet' import type {SheetAddress} from '@theatre/shared/utils/addresses' diff --git a/theatre/shared/src/propTypes/utils.ts b/theatre/shared/src/propTypes/utils.ts index 4a79754..b009703 100644 --- a/theatre/shared/src/propTypes/utils.ts +++ b/theatre/shared/src/propTypes/utils.ts @@ -1,4 +1,4 @@ -import type {PropTypeConfig} from '@theatre/shared/src/propTypes' +import type {PropTypeConfig} from '@theatre/shared/propTypes' export function isPropConfigComposite(c: PropTypeConfig): boolean { return c.type === 'compound' || c.type === 'enum' diff --git a/theatre/shared/src/testUtils.ts b/theatre/shared/src/testUtils.ts index 872ec72..0dfeba0 100644 --- a/theatre/shared/src/testUtils.ts +++ b/theatre/shared/src/testUtils.ts @@ -5,7 +5,7 @@ import {privateAPI} from '@theatre/shared/privateAPIs' import type {ProjectState_Historic} from '@theatre/core/projects/store/storeTypes' import type {SheetState_Historic} from '@theatre/core/projects/store/types/SheetState_Historic' import * as t from '@theatre/shared/propTypes' -import getStudio from '@theatre/studio/src/getStudio' +import getStudio from '@theatre/studio/getStudio' import coreTicker from '@theatre/core/coreTicker' /* eslint-enable no-restricted-syntax */ diff --git a/theatre/studio/src/panels/ObjectEditorPanel/propEditors/CompoundPropEditor.tsx b/theatre/studio/src/panels/ObjectEditorPanel/propEditors/CompoundPropEditor.tsx index 498ac7c..b2135b7 100644 --- a/theatre/studio/src/panels/ObjectEditorPanel/propEditors/CompoundPropEditor.tsx +++ b/theatre/studio/src/panels/ObjectEditorPanel/propEditors/CompoundPropEditor.tsx @@ -1,5 +1,5 @@ -import type {PropTypeConfig_Compound} from '@theatre/shared/src/propTypes' -import {isPropConfigComposite} from '@theatre/shared/src/propTypes/utils' +import type {PropTypeConfig_Compound} from '@theatre/shared/propTypes' +import {isPropConfigComposite} from '@theatre/shared/propTypes/utils' import type SheetObject from '@theatre/core/sheetObjects/SheetObject' import {theme} from '@theatre/studio/css' import {voidFn} from '@theatre/shared/utils' diff --git a/theatre/studio/src/panels/ObjectEditorPanel/propEditors/DeterminePropEditor.tsx b/theatre/studio/src/panels/ObjectEditorPanel/propEditors/DeterminePropEditor.tsx index 9674261..b76eae6 100644 --- a/theatre/studio/src/panels/ObjectEditorPanel/propEditors/DeterminePropEditor.tsx +++ b/theatre/studio/src/panels/ObjectEditorPanel/propEditors/DeterminePropEditor.tsx @@ -1,4 +1,4 @@ -import type {PropTypeConfig} from '@theatre/shared/src/propTypes' +import type {PropTypeConfig} from '@theatre/shared/propTypes' import type SheetObject from '@theatre/core/sheetObjects/SheetObject' import {getPointerParts} from '@theatre/dataverse' import React from 'react' diff --git a/theatre/studio/src/panels/ObjectEditorPanel/propEditors/NumberPropEditor.tsx b/theatre/studio/src/panels/ObjectEditorPanel/propEditors/NumberPropEditor.tsx index 9a4a250..1cd58a7 100644 --- a/theatre/studio/src/panels/ObjectEditorPanel/propEditors/NumberPropEditor.tsx +++ b/theatre/studio/src/panels/ObjectEditorPanel/propEditors/NumberPropEditor.tsx @@ -1,4 +1,4 @@ -import type {PropTypeConfig_Number} from '@theatre/shared/src/propTypes' +import type {PropTypeConfig_Number} from '@theatre/shared/propTypes' import type SheetObject from '@theatre/core/sheetObjects/SheetObject' import BasicNumberEditor from '@theatre/studio/uiComponents/BasicNumberEditor' import useContextMenu from '@theatre/studio/uiComponents/simpleContextMenu/useContextMenu' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/layout/tree.ts b/theatre/studio/src/panels/SequenceEditorPanel/layout/tree.ts index 6b136bc..8524a5a 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/layout/tree.ts +++ b/theatre/studio/src/panels/SequenceEditorPanel/layout/tree.ts @@ -3,8 +3,8 @@ import type { PropTypeConfig, PropTypeConfig_AllPrimitives, PropTypeConfig_Compound, -} from '@theatre/shared/src/propTypes' -import {isPropConfigComposite} from '@theatre/shared/src/propTypes/utils' +} from '@theatre/shared/propTypes' +import {isPropConfigComposite} from '@theatre/shared/propTypes/utils' import type SheetObject from '@theatre/core/sheetObjects/SheetObject' import type {IPropPathToTrackIdTree} from '@theatre/core/sheetObjects/SheetObjectTemplate' import type Sheet from '@theatre/core/sheets/Sheet'