From 760d70afa450edce2548ad2b414a2290140cf593 Mon Sep 17 00:00:00 2001
From: Nick the Sick <nicholas.perez@tiptap.dev>
Date: Mon, 27 Jan 2025 15:16:33 +0100
Subject: [PATCH] feat: move the character-count extension into
 `@tiptap/extensions`

---
 .changeset/chilly-lemons-remember.md          | 19 ++++++++++++++++++-
 .../CollaborationSplitPane/React/Editor.jsx   |  2 +-
 .../Demos/SingleRoomCollab/React/index.jsx    |  2 +-
 .../CollaborativeEditing/React/index.jsx      |  2 +-
 .../CollaborativeEditing/Vue/index.vue        |  2 +-
 demos/src/Examples/Community/React/index.jsx  |  2 +-
 demos/src/Examples/Community/Vue/index.vue    |  2 +-
 .../Extensions/CharacterCount/React/index.jsx |  2 +-
 .../Extensions/CharacterCount/Vue/index.vue   |  2 +-
 .../extension-character-count/package.json    |  6 ++----
 .../extension-character-count/src/index.ts    |  4 ++--
 packages/extensions/package.json              |  8 ++++++++
 .../src/character-count}/character-count.ts   |  0
 .../extensions/src/character-count/index.ts   |  1 +
 packages/extensions/src/index.ts              |  1 +
 pnpm-lock.yaml                                |  7 ++-----
 16 files changed, 42 insertions(+), 20 deletions(-)
 rename packages/{extension-character-count/src => extensions/src/character-count}/character-count.ts (100%)
 create mode 100644 packages/extensions/src/character-count/index.ts

diff --git a/.changeset/chilly-lemons-remember.md b/.changeset/chilly-lemons-remember.md
index 2515541742..7b89d4740b 100644
--- a/.changeset/chilly-lemons-remember.md
+++ b/.changeset/chilly-lemons-remember.md
@@ -2,7 +2,24 @@
 '@tiptap/extensions': major
 ---
 
-Adds the new `@tiptap/extensions` package which packages multiple utility extensions like `History`, `Placeholder`, `DropCursor`, `GapCursor`, `TrailingNode`, `Focus`, and `Selection`.
+Adds the new `@tiptap/extensions` package which packages multiple utility extensions like `History`, `Placeholder`, `CharacterCount`, `DropCursor`, `GapCursor`, `TrailingNode`, `Focus`, and `Selection`.
+
+## CharacterCount
+
+This extension adds a cursor that indicates where a new node will be inserted when dragging and dropping.
+
+Migrate from `@tiptap/extension-character-count` to `@tiptap/extensions`:
+
+```diff
+- import CharacterCount from '@tiptap/extension-character-count'
++ import { CharacterCount } from '@tiptap/extensions'
+```
+
+Usage:
+
+```ts
+import { CharacterCount, CharacterCountOptions } from '@tiptap/extensions'
+```
 
 ## DropCursor
 
diff --git a/demos/src/Demos/CollaborationSplitPane/React/Editor.jsx b/demos/src/Demos/CollaborationSplitPane/React/Editor.jsx
index ce1a906e9c..15959b2172 100644
--- a/demos/src/Demos/CollaborationSplitPane/React/Editor.jsx
+++ b/demos/src/Demos/CollaborationSplitPane/React/Editor.jsx
@@ -1,8 +1,8 @@
-import CharacterCount from '@tiptap/extension-character-count'
 import Collaboration from '@tiptap/extension-collaboration'
 import CollaborationCursor from '@tiptap/extension-collaboration-cursor'
 import Highlight from '@tiptap/extension-highlight'
 import { TaskItem, TaskList } from '@tiptap/extension-list'
+import { CharacterCount } from '@tiptap/extensions'
 import { EditorContent, useEditor } from '@tiptap/react'
 import StarterKit from '@tiptap/starter-kit'
 import React, { useCallback, useEffect, useState } from 'react'
diff --git a/demos/src/Demos/SingleRoomCollab/React/index.jsx b/demos/src/Demos/SingleRoomCollab/React/index.jsx
index d86614a16b..7497017a6e 100644
--- a/demos/src/Demos/SingleRoomCollab/React/index.jsx
+++ b/demos/src/Demos/SingleRoomCollab/React/index.jsx
@@ -1,9 +1,9 @@
 import './styles.scss'
 
 import { TiptapCollabProvider } from '@hocuspocus/provider'
-import CharacterCount from '@tiptap/extension-character-count'
 import Collaboration from '@tiptap/extension-collaboration'
 import CollaborationCursor from '@tiptap/extension-collaboration-cursor'
+import { CharacterCount } from '@tiptap/extensions'
 import { EditorContent, useEditor } from '@tiptap/react'
 import StarterKit from '@tiptap/starter-kit'
 import React, { useCallback, useEffect, useState } from 'react'
diff --git a/demos/src/Examples/CollaborativeEditing/React/index.jsx b/demos/src/Examples/CollaborativeEditing/React/index.jsx
index 9198ecc706..f09dd119e0 100644
--- a/demos/src/Examples/CollaborativeEditing/React/index.jsx
+++ b/demos/src/Examples/CollaborativeEditing/React/index.jsx
@@ -1,11 +1,11 @@
 import './styles.scss'
 
 import { TiptapCollabProvider } from '@hocuspocus/provider'
-import CharacterCount from '@tiptap/extension-character-count'
 import Collaboration from '@tiptap/extension-collaboration'
 import CollaborationCursor from '@tiptap/extension-collaboration-cursor'
 import Highlight from '@tiptap/extension-highlight'
 import { TaskItem, TaskList } from '@tiptap/extension-list'
+import { CharacterCount } from '@tiptap/extensions'
 import { EditorContent, useEditor } from '@tiptap/react'
 import StarterKit from '@tiptap/starter-kit'
 import React, { useCallback, useEffect, useState } from 'react'
diff --git a/demos/src/Examples/CollaborativeEditing/Vue/index.vue b/demos/src/Examples/CollaborativeEditing/Vue/index.vue
index ffd8e387a9..f5c3ab4bc8 100644
--- a/demos/src/Examples/CollaborativeEditing/Vue/index.vue
+++ b/demos/src/Examples/CollaborativeEditing/Vue/index.vue
@@ -23,11 +23,11 @@
 
 <script>
 import { TiptapCollabProvider } from '@hocuspocus/provider'
-import CharacterCount from '@tiptap/extension-character-count'
 import Collaboration from '@tiptap/extension-collaboration'
 import CollaborationCursor from '@tiptap/extension-collaboration-cursor'
 import Highlight from '@tiptap/extension-highlight'
 import { TaskItem, TaskList } from '@tiptap/extension-list'
+import { CharacterCount } from '@tiptap/extensions'
 import StarterKit from '@tiptap/starter-kit'
 import { Editor, EditorContent } from '@tiptap/vue-3'
 import * as Y from 'yjs'
diff --git a/demos/src/Examples/Community/React/index.jsx b/demos/src/Examples/Community/React/index.jsx
index ad249ce6f3..c16cc11a89 100644
--- a/demos/src/Examples/Community/React/index.jsx
+++ b/demos/src/Examples/Community/React/index.jsx
@@ -1,10 +1,10 @@
 import './styles.scss'
 
-import CharacterCount from '@tiptap/extension-character-count'
 import Document from '@tiptap/extension-document'
 import Mention from '@tiptap/extension-mention'
 import Paragraph from '@tiptap/extension-paragraph'
 import Text from '@tiptap/extension-text'
+import { CharacterCount } from '@tiptap/extensions'
 import { EditorContent, useEditor, useEditorState } from '@tiptap/react'
 import React from 'react'
 
diff --git a/demos/src/Examples/Community/Vue/index.vue b/demos/src/Examples/Community/Vue/index.vue
index 74571a065a..75f6c08b40 100644
--- a/demos/src/Examples/Community/Vue/index.vue
+++ b/demos/src/Examples/Community/Vue/index.vue
@@ -28,11 +28,11 @@
 </template>
 
 <script>
-import CharacterCount from '@tiptap/extension-character-count'
 import Document from '@tiptap/extension-document'
 import Mention from '@tiptap/extension-mention'
 import Paragraph from '@tiptap/extension-paragraph'
 import Text from '@tiptap/extension-text'
+import { CharacterCount } from '@tiptap/extensions'
 import { Editor, EditorContent } from '@tiptap/vue-3'
 
 import suggestion from './suggestion.js'
diff --git a/demos/src/Extensions/CharacterCount/React/index.jsx b/demos/src/Extensions/CharacterCount/React/index.jsx
index feb2576cc1..f2d96d70e2 100644
--- a/demos/src/Extensions/CharacterCount/React/index.jsx
+++ b/demos/src/Extensions/CharacterCount/React/index.jsx
@@ -1,9 +1,9 @@
 import './styles.scss'
 
-import CharacterCount from '@tiptap/extension-character-count'
 import Document from '@tiptap/extension-document'
 import Paragraph from '@tiptap/extension-paragraph'
 import Text from '@tiptap/extension-text'
+import { CharacterCount } from '@tiptap/extensions'
 import { EditorContent, useEditor } from '@tiptap/react'
 import React from 'react'
 
diff --git a/demos/src/Extensions/CharacterCount/Vue/index.vue b/demos/src/Extensions/CharacterCount/Vue/index.vue
index 27e93b8ade..527168fbe7 100644
--- a/demos/src/Extensions/CharacterCount/Vue/index.vue
+++ b/demos/src/Extensions/CharacterCount/Vue/index.vue
@@ -31,10 +31,10 @@
 </template>
 
 <script>
-import CharacterCount from '@tiptap/extension-character-count'
 import Document from '@tiptap/extension-document'
 import Paragraph from '@tiptap/extension-paragraph'
 import Text from '@tiptap/extension-text'
+import { CharacterCount } from '@tiptap/extensions'
 import { Editor, EditorContent } from '@tiptap/vue-3'
 
 export default {
diff --git a/packages/extension-character-count/package.json b/packages/extension-character-count/package.json
index 39d97d7468..536b75dfd8 100644
--- a/packages/extension-character-count/package.json
+++ b/packages/extension-character-count/package.json
@@ -31,12 +31,10 @@
     "dist"
   ],
   "devDependencies": {
-    "@tiptap/core": "^3.0.0-next.4",
-    "@tiptap/pm": "^3.0.0-next.4"
+    "@tiptap/extensions": "^3.0.0-next.4"
   },
   "peerDependencies": {
-    "@tiptap/core": "^3.0.0-next.1",
-    "@tiptap/pm": "^3.0.0-next.1"
+    "@tiptap/extensions": "^3.0.0-next.3"
   },
   "repository": {
     "type": "git",
diff --git a/packages/extension-character-count/src/index.ts b/packages/extension-character-count/src/index.ts
index 02623dffb0..664b113ef7 100644
--- a/packages/extension-character-count/src/index.ts
+++ b/packages/extension-character-count/src/index.ts
@@ -1,5 +1,5 @@
-import { CharacterCount } from './character-count.js'
+import { CharacterCount } from '@tiptap/extensions'
 
-export * from './character-count.js'
+export { CharacterCount, CharacterCountOptions } from '@tiptap/extensions'
 
 export default CharacterCount
diff --git a/packages/extensions/package.json b/packages/extensions/package.json
index 9323f752a8..661cd068c8 100644
--- a/packages/extensions/package.json
+++ b/packages/extensions/package.json
@@ -22,6 +22,14 @@
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
     },
+    "./character-count": {
+      "types": {
+        "import": "./dist/character-count/index.d.ts",
+        "require": "./dist/character-count/index.d.cts"
+      },
+      "import": "./dist/character-count/index.js",
+      "require": "./dist/character-count/index.cjs"
+    },
     "./drop-cursor": {
       "types": {
         "import": "./dist/drop-cursor/index.d.ts",
diff --git a/packages/extension-character-count/src/character-count.ts b/packages/extensions/src/character-count/character-count.ts
similarity index 100%
rename from packages/extension-character-count/src/character-count.ts
rename to packages/extensions/src/character-count/character-count.ts
diff --git a/packages/extensions/src/character-count/index.ts b/packages/extensions/src/character-count/index.ts
new file mode 100644
index 0000000000..016071a91b
--- /dev/null
+++ b/packages/extensions/src/character-count/index.ts
@@ -0,0 +1 @@
+export * from './character-count.js'
diff --git a/packages/extensions/src/index.ts b/packages/extensions/src/index.ts
index 206b56fad5..f3bb0c4349 100644
--- a/packages/extensions/src/index.ts
+++ b/packages/extensions/src/index.ts
@@ -1,3 +1,4 @@
+export * from './character-count/index.js'
 export * from './drop-cursor/index.js'
 export * from './focus/index.js'
 export * from './gap-cursor/index.js'
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fde4dd7b14..484d5e1e25 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -337,12 +337,9 @@ importers:
 
   packages/extension-character-count:
     devDependencies:
-      '@tiptap/core':
-        specifier: ^3.0.0-next.4
-        version: link:../core
-      '@tiptap/pm':
+      '@tiptap/extensions':
         specifier: ^3.0.0-next.4
-        version: link:../pm
+        version: link:../extensions
 
   packages/extension-code:
     devDependencies: