From f8d029040a9583006d4c078cd56434362e5a2588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Wed, 31 Mar 2021 13:44:56 +0200 Subject: [PATCH] fix type cycle bug in vite --- packages/core/src/Extension.ts | 3 ++- packages/core/src/Mark.ts | 8 ++------ packages/core/src/Node.ts | 2 +- packages/core/src/helpers/getSchema.ts | 8 ++------ packages/core/src/index.ts | 1 + packages/core/src/types.ts | 14 +------------- 6 files changed, 9 insertions(+), 27 deletions(-) diff --git a/packages/core/src/Extension.ts b/packages/core/src/Extension.ts index ea046cb2..db0af867 100644 --- a/packages/core/src/Extension.ts +++ b/packages/core/src/Extension.ts @@ -4,7 +4,8 @@ import { InputRule } from 'prosemirror-inputrules' import { Editor } from './Editor' import { Node } from './Node' import mergeDeep from './utilities/mergeDeep' -import { GlobalAttributes, RawCommands, ExtensionConfig } from './types' +import { GlobalAttributes, RawCommands } from './types' +import { ExtensionConfig } from '.' declare module '@tiptap/core' { interface ExtensionConfig { diff --git a/packages/core/src/Mark.ts b/packages/core/src/Mark.ts index abc03820..39b18346 100644 --- a/packages/core/src/Mark.ts +++ b/packages/core/src/Mark.ts @@ -8,12 +8,8 @@ import { Plugin, Transaction } from 'prosemirror-state' import { Command as ProseMirrorCommand } from 'prosemirror-commands' import { InputRule } from 'prosemirror-inputrules' import mergeDeep from './utilities/mergeDeep' -import { - Attributes, - RawCommands, - GlobalAttributes, - MarkConfig, -} from './types' +import { Attributes, RawCommands, GlobalAttributes } from './types' +import { MarkConfig } from '.' import { Editor } from './Editor' declare module '@tiptap/core' { diff --git a/packages/core/src/Node.ts b/packages/core/src/Node.ts index 12477355..315b38cc 100644 --- a/packages/core/src/Node.ts +++ b/packages/core/src/Node.ts @@ -13,8 +13,8 @@ import { NodeViewRenderer, GlobalAttributes, RawCommands, - NodeConfig, } from './types' +import { NodeConfig } from '.' import { Editor } from './Editor' declare module '@tiptap/core' { diff --git a/packages/core/src/helpers/getSchema.ts b/packages/core/src/helpers/getSchema.ts index de1fd11c..d61b13bb 100644 --- a/packages/core/src/helpers/getSchema.ts +++ b/packages/core/src/helpers/getSchema.ts @@ -1,10 +1,6 @@ import { NodeSpec, MarkSpec, Schema } from 'prosemirror-model' -import { - Extensions, - ExtensionConfig, - NodeConfig, - MarkConfig, -} from '../types' +import { Extensions } from '../types' +import { ExtensionConfig, NodeConfig, MarkConfig } from '..' import splitExtensions from './splitExtensions' import getAttributesFromExtensions from './getAttributesFromExtensions' import getRenderedAttributes from './getRenderedAttributes' diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 1bd2c738..78e57616 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -11,6 +11,7 @@ export { default as markPasteRule } from './pasteRules/markPasteRule' export { default as callOrReturn } from './utilities/callOrReturn' export { default as mergeAttributes } from './utilities/mergeAttributes' + export { default as generateHTML } from './helpers/generateHTML' export { default as getSchema } from './helpers/getSchema' export { default as getHTMLFromFragment } from './helpers/getHTMLFromFragment' diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts index 7bcc038d..6a382c9d 100644 --- a/packages/core/src/types.ts +++ b/packages/core/src/types.ts @@ -14,19 +14,7 @@ import { Extension } from './Extension' import { Node } from './Node' import { Mark } from './Mark' import { Editor } from './Editor' -import { - Commands, - ExtensionConfig, - NodeConfig, - MarkConfig, -} from '.' - -export { - Commands, - ExtensionConfig, - NodeConfig, - MarkConfig, -} +import { Commands } from '.' export type Extensions = (Extension | Node | Mark)[]