From e2176f00fdee1f51868cc82fee2a85d37c409c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Thu, 23 Aug 2018 22:08:19 +0200
Subject: [PATCH] move extensions to own package

---
 build/examples/webpack.config.js              |  1 +
 examples/Components/Routes/Embeds/Iframe.js   |  2 +-
 examples/Components/Routes/Embeds/index.vue   | 33 ++++++++++++-
 .../Components/Routes/HidingMenuBar/index.vue | 36 ++++++++++++++-
 examples/Components/Routes/Links/index.vue    | 32 ++++++++++++-
 .../Routes/MarkdownShortcuts/index.vue        | 36 ++++++++++++++-
 examples/Components/Routes/MenuBar/index.vue  | 36 ++++++++++++++-
 .../Components/Routes/MenuBubble/index.vue    | 34 ++++++++++++--
 examples/Components/Routes/ReadOnly/index.vue | 36 ++++++++++++++-
 examples/Components/Routes/TodoList/index.vue | 36 ++++++++++++++-
 packages/tiptap-extensions/package.json       | 26 +++++++++++
 packages/tiptap-extensions/src/index.js       | 14 ++++++
 .../src/marks/Bold.js                         |  2 +-
 .../src/marks/Code.js                         |  2 +-
 .../src/marks/Italic.js                       |  2 +-
 .../src/marks/Link.js                         |  2 +-
 .../src/nodes/Blockquote.js                   |  2 +-
 .../src/nodes/BulletList.js                   |  2 +-
 .../src/nodes/CodeBlock.js                    |  2 +-
 .../src/nodes/HardBreak.js                    |  2 +-
 .../src/nodes/Heading.js                      |  2 +-
 .../src/nodes/ListItem.js                     |  2 +-
 .../src/nodes/OrderedList.js                  |  2 +-
 .../src/nodes/TodoItem.js                     |  2 +-
 .../src/nodes/TodoList.js                     |  2 +-
 packages/tiptap/src/components/editor.js      |  2 -
 packages/tiptap/src/index.js                  |  4 +-
 packages/tiptap/src/marks/index.js            | 11 -----
 packages/tiptap/src/nodes/Paragraph.js        |  6 ---
 packages/tiptap/src/nodes/index.js            | 22 +--------
 packages/tiptap/src/utils/mark.js             | 46 +++++++++++++++++++
 packages/tiptap/src/utils/node.js             | 46 +++++++++++++++++++
 32 files changed, 420 insertions(+), 65 deletions(-)
 create mode 100644 packages/tiptap-extensions/package.json
 create mode 100644 packages/tiptap-extensions/src/index.js
 rename packages/{tiptap => tiptap-extensions}/src/marks/Bold.js (93%)
 rename packages/{tiptap => tiptap-extensions}/src/marks/Code.js (90%)
 rename packages/{tiptap => tiptap-extensions}/src/marks/Italic.js (91%)
 rename packages/{tiptap => tiptap-extensions}/src/marks/Link.js (95%)
 rename packages/{tiptap => tiptap-extensions}/src/nodes/Blockquote.js (93%)
 rename packages/{tiptap => tiptap-extensions}/src/nodes/BulletList.js (93%)
 rename packages/{tiptap => tiptap-extensions}/src/nodes/CodeBlock.js (94%)
 rename packages/{tiptap => tiptap-extensions}/src/nodes/HardBreak.js (93%)
 rename packages/{tiptap => tiptap-extensions}/src/nodes/Heading.js (96%)
 rename packages/{tiptap => tiptap-extensions}/src/nodes/ListItem.js (93%)
 rename packages/{tiptap => tiptap-extensions}/src/nodes/OrderedList.js (96%)
 rename packages/{tiptap => tiptap-extensions}/src/nodes/TodoItem.js (97%)
 rename packages/{tiptap => tiptap-extensions}/src/nodes/TodoList.js (93%)
 delete mode 100644 packages/tiptap/src/marks/index.js
 create mode 100644 packages/tiptap/src/utils/mark.js
 create mode 100644 packages/tiptap/src/utils/node.js

diff --git a/build/examples/webpack.config.js b/build/examples/webpack.config.js
index 9b889fa9c..772b5aceb 100644
--- a/build/examples/webpack.config.js
+++ b/build/examples/webpack.config.js
@@ -42,6 +42,7 @@ export default {
 			'tiptap-commands': path.resolve(rootPath, '../packages/tiptap-commands/src'),
 			'tiptap-utils': path.resolve(rootPath, '../packages/tiptap-utils/src'),
 			'tiptap-models': path.resolve(rootPath, '../packages/tiptap-models/src'),
+			'tiptap-extensions': path.resolve(rootPath, '../packages/tiptap-extensions/src'),
 		},
 		modules: [
 			srcPath,
diff --git a/examples/Components/Routes/Embeds/Iframe.js b/examples/Components/Routes/Embeds/Iframe.js
index 078d0e522..35a5d452c 100644
--- a/examples/Components/Routes/Embeds/Iframe.js
+++ b/examples/Components/Routes/Embeds/Iframe.js
@@ -1,4 +1,4 @@
-import { Node } from 'tiptap-models'
+import { Node } from 'tiptap'
 
 export default class IframeNode extends Node {
 
diff --git a/examples/Components/Routes/Embeds/index.vue b/examples/Components/Routes/Embeds/index.vue
index f67b17c0a..48c74a05e 100644
--- a/examples/Components/Routes/Embeds/index.vue
+++ b/examples/Components/Routes/Embeds/index.vue
@@ -19,6 +19,21 @@
 <script>
 import Icon from 'Components/Icon'
 import { Editor } from 'tiptap'
+import {
+	Blockquote,
+	BulletList,
+	CodeBlock,
+	HardBreak,
+	Heading,
+	ListItem,
+	OrderedList,
+	TodoItem,
+	TodoList,
+	Bold,
+	Code,
+	Italic,
+	Link,
+} from 'tiptap-extensions'
 import Iframe from './Iframe.js'
 
 export default {
@@ -28,7 +43,23 @@ export default {
 	},
 	data() {
 		return {
-			extensions: [new Iframe()],
+			extensions: [
+				new Blockquote(),
+				new BulletList(),
+				new CodeBlock(),
+				new HardBreak(),
+				new Heading(),
+				new ListItem(),
+				new OrderedList(),
+				new TodoItem(),
+				new TodoList(),
+				new Bold(),
+				new Code(),
+				new Italic(),
+				new Link(),
+				// custom extension
+				new Iframe(),
+			],
 		}
 	},
 	methods: {
diff --git a/examples/Components/Routes/HidingMenuBar/index.vue b/examples/Components/Routes/HidingMenuBar/index.vue
index 3713a5d19..0281bc83d 100644
--- a/examples/Components/Routes/HidingMenuBar/index.vue
+++ b/examples/Components/Routes/HidingMenuBar/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<editor class="editor" @update="onUpdate">
+		<editor class="editor" :extensions="extensions" @update="onUpdate">
 
 			<div class="menubar is-hidden" :class="{ 'is-focused': focused }" slot="menubar" slot-scope="{ nodes, marks, focused }">
 				<div v-if="nodes && marks">
@@ -104,12 +104,46 @@
 <script>
 import Icon from 'Components/Icon'
 import { Editor } from 'tiptap'
+import {
+	Blockquote,
+	BulletList,
+	CodeBlock,
+	HardBreak,
+	Heading,
+	ListItem,
+	OrderedList,
+	TodoItem,
+	TodoList,
+	Bold,
+	Code,
+	Italic,
+	Link,
+} from 'tiptap-extensions'
 
 export default {
 	components: {
 		Editor,
 		Icon,
 	},
+	data() {
+		return {
+			extensions: [
+				new Blockquote(),
+				new BulletList(),
+				new CodeBlock(),
+				new HardBreak(),
+				new Heading(),
+				new ListItem(),
+				new OrderedList(),
+				new TodoItem(),
+				new TodoList(),
+				new Bold(),
+				new Code(),
+				new Italic(),
+				new Link(),
+			],
+		}
+	},
 	methods: {
 		onUpdate(state) {
 			// console.log(state.doc.toJSON())
diff --git a/examples/Components/Routes/Links/index.vue b/examples/Components/Routes/Links/index.vue
index 0ba8161dd..357913bd4 100644
--- a/examples/Components/Routes/Links/index.vue
+++ b/examples/Components/Routes/Links/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<editor class="editor" @update="onUpdate">
+		<editor class="editor" :extensions="extensions" @update="onUpdate">
 			<div class="menububble" slot="menububble" slot-scope="{ marks, focus }">
 				<template v-if="marks">
 
@@ -39,6 +39,21 @@
 <script>
 import Icon from 'Components/Icon'
 import { Editor } from 'tiptap'
+import {
+	Blockquote,
+	BulletList,
+	CodeBlock,
+	HardBreak,
+	Heading,
+	ListItem,
+	OrderedList,
+	TodoItem,
+	TodoList,
+	Bold,
+	Code,
+	Italic,
+	Link,
+} from 'tiptap-extensions'
 
 export default {
 	components: {
@@ -47,6 +62,21 @@ export default {
 	},
 	data() {
 		return {
+			extensions: [
+				new Blockquote(),
+				new BulletList(),
+				new CodeBlock(),
+				new HardBreak(),
+				new Heading(),
+				new ListItem(),
+				new OrderedList(),
+				new TodoItem(),
+				new TodoList(),
+				new Bold(),
+				new Code(),
+				new Italic(),
+				new Link(),
+			],
 			linkUrl: null,
 			linkMenuIsActive: false,
 		}
diff --git a/examples/Components/Routes/MarkdownShortcuts/index.vue b/examples/Components/Routes/MarkdownShortcuts/index.vue
index da513dcf2..a2419c64b 100644
--- a/examples/Components/Routes/MarkdownShortcuts/index.vue
+++ b/examples/Components/Routes/MarkdownShortcuts/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<editor class="editor" @update="onUpdate">
+		<editor class="editor" :extensions="extensions" @update="onUpdate">
 
 			<div class="editor__content" slot="content" slot-scope="props">
 				<h2>
@@ -21,12 +21,46 @@
 <script>
 import Icon from 'Components/Icon'
 import { Editor } from 'tiptap'
+import {
+	Blockquote,
+	BulletList,
+	CodeBlock,
+	HardBreak,
+	Heading,
+	ListItem,
+	OrderedList,
+	TodoItem,
+	TodoList,
+	Bold,
+	Code,
+	Italic,
+	Link,
+} from 'tiptap-extensions'
 
 export default {
 	components: {
 		Editor,
 		Icon,
 	},
+	data() {
+		return {
+			extensions: [
+				new Blockquote(),
+				new BulletList(),
+				new CodeBlock(),
+				new HardBreak(),
+				new Heading(),
+				new ListItem(),
+				new OrderedList(),
+				new TodoItem(),
+				new TodoList(),
+				new Bold(),
+				new Code(),
+				new Italic(),
+				new Link(),
+			],
+		}
+	},
 	methods: {
 		onUpdate(state) {
 			// console.log(state.doc.toJSON())
diff --git a/examples/Components/Routes/MenuBar/index.vue b/examples/Components/Routes/MenuBar/index.vue
index ff2c8e7e3..a84819d69 100644
--- a/examples/Components/Routes/MenuBar/index.vue
+++ b/examples/Components/Routes/MenuBar/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<editor class="editor" @update="onUpdate">
+		<editor class="editor" :extensions="extensions" @update="onUpdate">
 
 			<div class="menubar" slot="menubar" slot-scope="{ nodes, marks }">
 				<div v-if="nodes && marks">
@@ -118,12 +118,46 @@
 <script>
 import Icon from 'Components/Icon'
 import { Editor } from 'tiptap'
+import {
+	Blockquote,
+	BulletList,
+	CodeBlock,
+	HardBreak,
+	Heading,
+	ListItem,
+	OrderedList,
+	TodoItem,
+	TodoList,
+	Bold,
+	Code,
+	Italic,
+	Link,
+} from 'tiptap-extensions'
 
 export default {
 	components: {
 		Editor,
 		Icon,
 	},
+	data() {
+		return {
+			extensions: [
+				new Blockquote(),
+				new BulletList(),
+				new CodeBlock(),
+				new HardBreak(),
+				new Heading(),
+				new ListItem(),
+				new OrderedList(),
+				new TodoItem(),
+				new TodoList(),
+				new Bold(),
+				new Code(),
+				new Italic(),
+				new Link(),
+			],
+		}
+	},
 	methods: {
 		onUpdate(state) {
 			// console.log(state.doc.toJSON())
diff --git a/examples/Components/Routes/MenuBubble/index.vue b/examples/Components/Routes/MenuBubble/index.vue
index d47c79926..647d8f8f8 100644
--- a/examples/Components/Routes/MenuBubble/index.vue
+++ b/examples/Components/Routes/MenuBubble/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<editor class="editor" @update="onUpdate">
+		<editor class="editor" :extensions="extensions" @update="onUpdate">
 
 			<div class="menububble" slot="menububble" slot-scope="{ marks, focus }">
 				<template v-if="marks">
@@ -48,6 +48,21 @@
 <script>
 import Icon from 'Components/Icon'
 import { Editor } from 'tiptap'
+import {
+	Blockquote,
+	BulletList,
+	CodeBlock,
+	HardBreak,
+	Heading,
+	ListItem,
+	OrderedList,
+	TodoItem,
+	TodoList,
+	Bold,
+	Code,
+	Italic,
+	Link,
+} from 'tiptap-extensions'
 
 export default {
 	components: {
@@ -56,8 +71,21 @@ export default {
 	},
 	data() {
 		return {
-			linkUrl: null,
-			linkMenuIsActive: false,
+			extensions: [
+				new Blockquote(),
+				new BulletList(),
+				new CodeBlock(),
+				new HardBreak(),
+				new Heading(),
+				new ListItem(),
+				new OrderedList(),
+				new TodoItem(),
+				new TodoList(),
+				new Bold(),
+				new Code(),
+				new Italic(),
+				new Link(),
+			],
 		}
 	},
 	methods: {
diff --git a/examples/Components/Routes/ReadOnly/index.vue b/examples/Components/Routes/ReadOnly/index.vue
index 241326d43..2a1682f66 100644
--- a/examples/Components/Routes/ReadOnly/index.vue
+++ b/examples/Components/Routes/ReadOnly/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<editor :editable="false" class="editor" @update="onUpdate">
+		<editor :editable="false" :extensions="extensions" class="editor" @update="onUpdate">
 
 			<div class="editor__content" slot="content" slot-scope="props">
 				<h2>
@@ -18,12 +18,46 @@
 <script>
 import Icon from 'Components/Icon'
 import { Editor } from 'tiptap'
+import {
+	Blockquote,
+	BulletList,
+	CodeBlock,
+	HardBreak,
+	Heading,
+	ListItem,
+	OrderedList,
+	TodoItem,
+	TodoList,
+	Bold,
+	Code,
+	Italic,
+	Link,
+} from 'tiptap-extensions'
 
 export default {
 	components: {
 		Editor,
 		Icon,
 	},
+	data() {
+		return {
+			extensions: [
+				new Blockquote(),
+				new BulletList(),
+				new CodeBlock(),
+				new HardBreak(),
+				new Heading(),
+				new ListItem(),
+				new OrderedList(),
+				new TodoItem(),
+				new TodoList(),
+				new Bold(),
+				new Code(),
+				new Italic(),
+				new Link(),
+			],
+		}
+	},
 	methods: {
 		onUpdate(state) {
 			// console.log(state.doc.toJSON())
diff --git a/examples/Components/Routes/TodoList/index.vue b/examples/Components/Routes/TodoList/index.vue
index a7900f130..8d67209cc 100644
--- a/examples/Components/Routes/TodoList/index.vue
+++ b/examples/Components/Routes/TodoList/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<editor :editable="true" class="editor" @update="onUpdate">
+		<editor :extensions="extensions" class="editor" @update="onUpdate">
 
 			<div class="menubar" slot="menubar" slot-scope="{ nodes, marks }">
 				<div v-if="nodes && marks">
@@ -67,12 +67,46 @@
 <script>
 import Icon from 'Components/Icon'
 import { Editor } from 'tiptap'
+import {
+	Blockquote,
+	BulletList,
+	CodeBlock,
+	HardBreak,
+	Heading,
+	ListItem,
+	OrderedList,
+	TodoItem,
+	TodoList,
+	Bold,
+	Code,
+	Italic,
+	Link,
+} from 'tiptap-extensions'
 
 export default {
 	components: {
 		Editor,
 		Icon,
 	},
+	data() {
+		return {
+			extensions: [
+				new Blockquote(),
+				new BulletList(),
+				new CodeBlock(),
+				new HardBreak(),
+				new Heading(),
+				new ListItem(),
+				new OrderedList(),
+				new TodoItem(),
+				new TodoList(),
+				new Bold(),
+				new Code(),
+				new Italic(),
+				new Link(),
+			],
+		}
+	},
 	methods: {
 		onUpdate(state) {
 			// console.log(state.doc.toJSON())
diff --git a/packages/tiptap-extensions/package.json b/packages/tiptap-extensions/package.json
new file mode 100644
index 000000000..cd39f77bf
--- /dev/null
+++ b/packages/tiptap-extensions/package.json
@@ -0,0 +1,26 @@
+{
+  "name": "tiptap-extensions",
+  "version": "0.1.0",
+  "description": "Extensions for tiptap",
+  "homepage": "https://tiptap.scrumpy.io",
+  "license": "MIT",
+  "main": "dist/extensions.common.js",
+  "module": "dist/extensions.esm.js",
+  "unpkg": "dist/extensions.js",
+  "jsdelivr": "dist/extensions.js",
+  "files": [
+    "src",
+    "dist"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/heyscrumpy/tiptap.git"
+  },
+  "bugs": {
+    "url": "https://github.com/heyscrumpy/tiptap/issues"
+  },
+  "dependencies": {
+    "tiptap": "^0.2.1",
+    "tiptap-commands": "^0.1.1"
+  }
+}
diff --git a/packages/tiptap-extensions/src/index.js b/packages/tiptap-extensions/src/index.js
new file mode 100644
index 000000000..daa122b20
--- /dev/null
+++ b/packages/tiptap-extensions/src/index.js
@@ -0,0 +1,14 @@
+export { default as Blockquote } from './nodes/Blockquote'
+export { default as BulletList } from './nodes/BulletList'
+export { default as CodeBlock } from './nodes/CodeBlock'
+export { default as HardBreak } from './nodes/HardBreak'
+export { default as Heading } from './nodes/Heading'
+export { default as ListItem } from './nodes/ListItem'
+export { default as OrderedList } from './nodes/OrderedList'
+export { default as TodoItem } from './nodes/TodoItem'
+export { default as TodoList } from './nodes/TodoList'
+
+export { default as Bold } from './marks/Bold'
+export { default as Code } from './marks/Code'
+export { default as Italic } from './marks/Italic'
+export { default as Link } from './marks/Link'
diff --git a/packages/tiptap/src/marks/Bold.js b/packages/tiptap-extensions/src/marks/Bold.js
similarity index 93%
rename from packages/tiptap/src/marks/Bold.js
rename to packages/tiptap-extensions/src/marks/Bold.js
index e03dc1c59..b94034d9e 100644
--- a/packages/tiptap/src/marks/Bold.js
+++ b/packages/tiptap-extensions/src/marks/Bold.js
@@ -1,4 +1,4 @@
-import { Mark } from 'tiptap-models'
+import { Mark } from 'tiptap'
 import { toggleMark } from 'tiptap-commands'
 
 export default class BoldMark extends Mark {
diff --git a/packages/tiptap/src/marks/Code.js b/packages/tiptap-extensions/src/marks/Code.js
similarity index 90%
rename from packages/tiptap/src/marks/Code.js
rename to packages/tiptap-extensions/src/marks/Code.js
index cba59f28d..1762e21d3 100644
--- a/packages/tiptap/src/marks/Code.js
+++ b/packages/tiptap-extensions/src/marks/Code.js
@@ -1,4 +1,4 @@
-import { Mark } from 'tiptap-models'
+import { Mark } from 'tiptap'
 import { toggleMark } from 'tiptap-commands'
 
 export default class CodeMark extends Mark {
diff --git a/packages/tiptap/src/marks/Italic.js b/packages/tiptap-extensions/src/marks/Italic.js
similarity index 91%
rename from packages/tiptap/src/marks/Italic.js
rename to packages/tiptap-extensions/src/marks/Italic.js
index 5511a8a83..aad09e064 100644
--- a/packages/tiptap/src/marks/Italic.js
+++ b/packages/tiptap-extensions/src/marks/Italic.js
@@ -1,4 +1,4 @@
-import { Mark } from 'tiptap-models'
+import { Mark } from 'tiptap'
 import { toggleMark } from 'tiptap-commands'
 
 export default class ItalicMark extends Mark {
diff --git a/packages/tiptap/src/marks/Link.js b/packages/tiptap-extensions/src/marks/Link.js
similarity index 95%
rename from packages/tiptap/src/marks/Link.js
rename to packages/tiptap-extensions/src/marks/Link.js
index d67abc428..20ed8be67 100644
--- a/packages/tiptap/src/marks/Link.js
+++ b/packages/tiptap-extensions/src/marks/Link.js
@@ -1,4 +1,4 @@
-import { Mark } from 'tiptap-models'
+import { Mark } from 'tiptap'
 import { updateMark, removeMark } from 'tiptap-commands'
 
 export default class LinkMark extends Mark {
diff --git a/packages/tiptap/src/nodes/Blockquote.js b/packages/tiptap-extensions/src/nodes/Blockquote.js
similarity index 93%
rename from packages/tiptap/src/nodes/Blockquote.js
rename to packages/tiptap-extensions/src/nodes/Blockquote.js
index 406b8bf9c..5778d73a7 100644
--- a/packages/tiptap/src/nodes/Blockquote.js
+++ b/packages/tiptap-extensions/src/nodes/Blockquote.js
@@ -1,4 +1,4 @@
-import { Node } from 'tiptap-models'
+import { Node } from 'tiptap'
 import { wrappingInputRule, setBlockType, wrapIn } from 'tiptap-commands'
 
 export default class BlockquoteNode extends Node {
diff --git a/packages/tiptap/src/nodes/BulletList.js b/packages/tiptap-extensions/src/nodes/BulletList.js
similarity index 93%
rename from packages/tiptap/src/nodes/BulletList.js
rename to packages/tiptap-extensions/src/nodes/BulletList.js
index 8c8532bba..ab6888f4e 100644
--- a/packages/tiptap/src/nodes/BulletList.js
+++ b/packages/tiptap-extensions/src/nodes/BulletList.js
@@ -1,4 +1,4 @@
-import { Node } from 'tiptap-models'
+import { Node } from 'tiptap'
 import { wrappingInputRule, wrapInList, toggleList } from 'tiptap-commands'
 
 export default class BulletNode extends Node {
diff --git a/packages/tiptap/src/nodes/CodeBlock.js b/packages/tiptap-extensions/src/nodes/CodeBlock.js
similarity index 94%
rename from packages/tiptap/src/nodes/CodeBlock.js
rename to packages/tiptap-extensions/src/nodes/CodeBlock.js
index 8eb5d343c..d2f151197 100644
--- a/packages/tiptap/src/nodes/CodeBlock.js
+++ b/packages/tiptap-extensions/src/nodes/CodeBlock.js
@@ -1,4 +1,4 @@
-import { Node } from 'tiptap-models'
+import { Node } from 'tiptap'
 import { toggleBlockType, setBlockType, textblockTypeInputRule } from 'tiptap-commands'
 
 export default class CodeBlockNode extends Node {
diff --git a/packages/tiptap/src/nodes/HardBreak.js b/packages/tiptap-extensions/src/nodes/HardBreak.js
similarity index 93%
rename from packages/tiptap/src/nodes/HardBreak.js
rename to packages/tiptap-extensions/src/nodes/HardBreak.js
index 688ee60e9..60cbc547a 100644
--- a/packages/tiptap/src/nodes/HardBreak.js
+++ b/packages/tiptap-extensions/src/nodes/HardBreak.js
@@ -1,4 +1,4 @@
-import { Node } from 'tiptap-models'
+import { Node } from 'tiptap'
 import { chainCommands, exitCode } from 'tiptap-commands'
 
 export default class HardBreakNode extends Node {
diff --git a/packages/tiptap/src/nodes/Heading.js b/packages/tiptap-extensions/src/nodes/Heading.js
similarity index 96%
rename from packages/tiptap/src/nodes/Heading.js
rename to packages/tiptap-extensions/src/nodes/Heading.js
index 24910ea8e..2874ebcd3 100644
--- a/packages/tiptap/src/nodes/Heading.js
+++ b/packages/tiptap-extensions/src/nodes/Heading.js
@@ -1,4 +1,4 @@
-import { Node } from 'tiptap-models'
+import { Node } from 'tiptap'
 import { setBlockType, textblockTypeInputRule, toggleBlockType } from 'tiptap-commands'
 
 export default class HeadingNode extends Node {
diff --git a/packages/tiptap/src/nodes/ListItem.js b/packages/tiptap-extensions/src/nodes/ListItem.js
similarity index 93%
rename from packages/tiptap/src/nodes/ListItem.js
rename to packages/tiptap-extensions/src/nodes/ListItem.js
index ead56c1ac..e03ad57de 100644
--- a/packages/tiptap/src/nodes/ListItem.js
+++ b/packages/tiptap-extensions/src/nodes/ListItem.js
@@ -1,4 +1,4 @@
-import { Node } from 'tiptap-models'
+import { Node } from 'tiptap'
 import { splitListItem, liftListItem, sinkListItem } from 'tiptap-commands'
 
 export default class OrderedListNode extends Node {
diff --git a/packages/tiptap/src/nodes/OrderedList.js b/packages/tiptap-extensions/src/nodes/OrderedList.js
similarity index 96%
rename from packages/tiptap/src/nodes/OrderedList.js
rename to packages/tiptap-extensions/src/nodes/OrderedList.js
index 9eacb50b1..61184c09b 100644
--- a/packages/tiptap/src/nodes/OrderedList.js
+++ b/packages/tiptap-extensions/src/nodes/OrderedList.js
@@ -1,4 +1,4 @@
-import { Node } from 'tiptap-models'
+import { Node } from 'tiptap'
 import { wrappingInputRule, wrapInList, toggleList } from 'tiptap-commands'
 
 export default class OrderedListNode extends Node {
diff --git a/packages/tiptap/src/nodes/TodoItem.js b/packages/tiptap-extensions/src/nodes/TodoItem.js
similarity index 97%
rename from packages/tiptap/src/nodes/TodoItem.js
rename to packages/tiptap-extensions/src/nodes/TodoItem.js
index af621ac17..31493ea04 100644
--- a/packages/tiptap/src/nodes/TodoItem.js
+++ b/packages/tiptap-extensions/src/nodes/TodoItem.js
@@ -1,4 +1,4 @@
-import { Node } from 'tiptap-models'
+import { Node } from 'tiptap'
 import { splitListItem, liftListItem } from 'tiptap-commands'
 
 export default class TodoItemNode extends Node {
diff --git a/packages/tiptap/src/nodes/TodoList.js b/packages/tiptap-extensions/src/nodes/TodoList.js
similarity index 93%
rename from packages/tiptap/src/nodes/TodoList.js
rename to packages/tiptap-extensions/src/nodes/TodoList.js
index fc8edbb5d..8608ec76c 100644
--- a/packages/tiptap/src/nodes/TodoList.js
+++ b/packages/tiptap-extensions/src/nodes/TodoList.js
@@ -1,4 +1,4 @@
-import { Node } from 'tiptap-models'
+import { Node } from 'tiptap'
 import { wrapInList, wrappingInputRule } from 'tiptap-commands'
 
 export default class BulletNode extends Node {
diff --git a/packages/tiptap/src/components/editor.js b/packages/tiptap/src/components/editor.js
index 9eb146f7e..681aa626e 100644
--- a/packages/tiptap/src/components/editor.js
+++ b/packages/tiptap/src/components/editor.js
@@ -16,7 +16,6 @@ import {
 	builtInKeymap,
 } from '../utils'
 import builtInNodes from '../nodes'
-import builtInMarks from '../marks'
 
 export default {
 
@@ -40,7 +39,6 @@ export default {
 	data() {
 		const plugins = new PluginManager([
 			...builtInNodes,
-			...builtInMarks,
 			...this.extensions,
 		])
 		const { nodes, marks, views } = plugins
diff --git a/packages/tiptap/src/index.js b/packages/tiptap/src/index.js
index 1306af0a5..16515fe12 100644
--- a/packages/tiptap/src/index.js
+++ b/packages/tiptap/src/index.js
@@ -1,3 +1,5 @@
 import Editor from './components/editor'
+import Node from './utils/node'
+import Mark from './utils/mark'
 
-export { Editor }
+export { Editor, Node, Mark }
diff --git a/packages/tiptap/src/marks/index.js b/packages/tiptap/src/marks/index.js
deleted file mode 100644
index b3a4a7938..000000000
--- a/packages/tiptap/src/marks/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Code from './Code'
-import Italic from './Italic'
-import Link from './Link'
-import Bold from './Bold'
-
-export default [
-	new Code(),
-	new Italic(),
-	new Link(),
-	new Bold(),
-]
diff --git a/packages/tiptap/src/nodes/Paragraph.js b/packages/tiptap/src/nodes/Paragraph.js
index a5ba67891..e748ecc9b 100644
--- a/packages/tiptap/src/nodes/Paragraph.js
+++ b/packages/tiptap/src/nodes/Paragraph.js
@@ -23,10 +23,4 @@ export default class ParagraphNode extends Node {
 		return setBlockType(type)
 	}
 
-	keys({ type }) {
-		return {
-			'Shift-Ctrl-0': setBlockType(type),
-		}
-	}
-
 }
diff --git a/packages/tiptap/src/nodes/index.js b/packages/tiptap/src/nodes/index.js
index f3e51a9a3..b4fc3ee24 100644
--- a/packages/tiptap/src/nodes/index.js
+++ b/packages/tiptap/src/nodes/index.js
@@ -1,29 +1,9 @@
-import Blockquote from './Blockquote'
-import BulletList from './BulletList'
-import CodeBlock from './CodeBlock'
 import Doc from './Doc'
-import HardBreak from './HardBreak'
-import Heading from './Heading'
-import ListItem from './ListItem'
-import OrderedList from './OrderedList'
 import Paragraph from './Paragraph'
 import Text from './Text'
-import TodoList from './TodoList'
-import TodoItem from './TodoItem'
 
 export default [
-	// essentials
 	new Doc(),
-	new Paragraph(),
 	new Text(),
-
-	new Blockquote(),
-	new CodeBlock(),
-	new Heading({ maxLevel: 3 }),
-	new HardBreak(),
-	new OrderedList(),
-	new BulletList(),
-	new ListItem(),
-	new TodoList(),
-	new TodoItem(),
+	new Paragraph(),
 ]
diff --git a/packages/tiptap/src/utils/mark.js b/packages/tiptap/src/utils/mark.js
new file mode 100644
index 000000000..a298f7e9b
--- /dev/null
+++ b/packages/tiptap/src/utils/mark.js
@@ -0,0 +1,46 @@
+export default class Mark {
+
+	constructor(options = {}) {
+		this.options = {
+			...this.defaultOptions,
+			...options,
+		}
+	}
+
+	get name() {
+		return null
+	}
+
+	get defaultOptions() {
+		return {}
+	}
+
+	get type() {
+		return 'mark'
+	}
+
+	get view() {
+		return null
+	}
+
+	get schema() {
+		return null
+	}
+
+	get plugins() {
+		return []
+	}
+
+	command() {
+		return () => {}
+	}
+
+	keys() {
+		return {}
+	}
+
+	inputRules() {
+		return []
+	}
+
+}
diff --git a/packages/tiptap/src/utils/node.js b/packages/tiptap/src/utils/node.js
new file mode 100644
index 000000000..16f02c7f2
--- /dev/null
+++ b/packages/tiptap/src/utils/node.js
@@ -0,0 +1,46 @@
+export default class Node {
+
+	constructor(options = {}) {
+		this.options = {
+			...this.defaultOptions,
+			...options,
+		}
+	}
+
+	get name() {
+		return null
+	}
+
+	get defaultOptions() {
+		return {}
+	}
+
+	get type() {
+		return 'node'
+	}
+
+	get view() {
+		return null
+	}
+
+	get schema() {
+		return null
+	}
+
+	get plugins() {
+		return []
+	}
+
+	command() {
+		return () => {}
+	}
+
+	keys() {
+		return {}
+	}
+
+	inputRules() {
+		return []
+	}
+
+}