From ca65280b93efe03da064127134d1b190bfd6bf62 Mon Sep 17 00:00:00 2001 From: Cole Lawrence Date: Wed, 13 Jul 2022 09:53:22 -0400 Subject: [PATCH] Fix local imports of same module for @theatre/core --- theatre/core/src/coreExports.ts | 13 +++++-------- theatre/core/src/index.ts | 13 +++++-------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/theatre/core/src/coreExports.ts b/theatre/core/src/coreExports.ts index b4262c1..e30d73d 100644 --- a/theatre/core/src/coreExports.ts +++ b/theatre/core/src/coreExports.ts @@ -1,12 +1,9 @@ -import projectsSingleton from '@theatre/core/projects/projectsSingleton' -import type {OnDiskState} from '@theatre/core/projects/store/storeTypes' -import type { - IProject, - IProjectConfig, -} from '@theatre/core/projects/TheatreProject' -import TheatreProject from '@theatre/core/projects/TheatreProject' +import projectsSingleton from './projects/projectsSingleton' +import type {OnDiskState} from './projects/store/storeTypes' +import type {IProject, IProjectConfig} from './projects/TheatreProject' +import TheatreProject from './projects/TheatreProject' import globals from '@theatre/shared/globals' -import * as types from '@theatre/core/propTypes' +import * as types from './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/index.ts b/theatre/core/src/index.ts index 10e7177..09e70fb 100644 --- a/theatre/core/src/index.ts +++ b/theatre/core/src/index.ts @@ -5,14 +5,11 @@ */ export * from './coreExports' -export type { - IProject, - IProjectConfig, -} from '@theatre/core/projects/TheatreProject' -export type {ISequence} from '@theatre/core/sequences/TheatreSequence' -export type {ISheetObject} from '@theatre/core/sheetObjects/TheatreSheetObject' -export type {ISheet} from '@theatre/core/sheets/TheatreSheet' -export type {UnknownShorthandCompoundProps} from '@theatre/core/propTypes' +export type {IProject, IProjectConfig} from './projects/TheatreProject' +export type {ISequence} from './sequences/TheatreSequence' +export type {ISheetObject} from './sheetObjects/TheatreSheetObject' +export type {ISheet} from './sheets/TheatreSheet' +export type {UnknownShorthandCompoundProps} from './propTypes' import * as globalVariableNames from '@theatre/shared/globalVariableNames' import type StudioBundle from '@theatre/studio/StudioBundle' import CoreBundle from './CoreBundle'