Merge pull request #68 from Patternslib/upd

update tiptap + dependencies.
Patternslib · Aug 19, 2024 · c59ad0b · c59ad0b
2 parents 70939c3 + 0ebc3fb
commit c59ad0b
Show file tree

Hide file tree

Showing 4 changed files with 2,625 additions and 4,125 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,10 +11,10 @@ jobs:
     name: test
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
       with:
-        node-version: '18'
+        node-version: '20'
         cache: 'yarn'
     - run: |
         make install

diff --git a/package.json b/package.json
@@ -5,39 +5,39 @@
     "license": "MIT",
     "main": "./src/tiptap.js",
     "dependencies": {
-        "@tiptap/core": "2.1.12",
-        "@tiptap/extension-blockquote": "^2.1.12",
-        "@tiptap/extension-bold": "^2.1.12",
-        "@tiptap/extension-bullet-list": "^2.1.12",
-        "@tiptap/extension-code": "^2.1.12",
-        "@tiptap/extension-code-block": "^2.1.12",
-        "@tiptap/extension-document": "^2.1.12",
-        "@tiptap/extension-dropcursor": "^2.1.12",
-        "@tiptap/extension-gapcursor": "^2.1.12",
-        "@tiptap/extension-hard-break": "^2.1.12",
-        "@tiptap/extension-heading": "^2.1.12",
-        "@tiptap/extension-history": "^2.1.12",
-        "@tiptap/extension-horizontal-rule": "^2.1.12",
-        "@tiptap/extension-image": "^2.1.12",
-        "@tiptap/extension-italic": "^2.1.12",
-        "@tiptap/extension-link": "^2.1.12",
-        "@tiptap/extension-list-item": "^2.1.12",
-        "@tiptap/extension-mention": "^2.1.12",
-        "@tiptap/extension-ordered-list": "^2.1.12",
-        "@tiptap/extension-paragraph": "^2.1.12",
-        "@tiptap/extension-placeholder": "^2.1.12",
-        "@tiptap/extension-strike": "^2.1.12",
-        "@tiptap/extension-table": "^2.1.12",
-        "@tiptap/extension-table-cell": "^2.1.12",
-        "@tiptap/extension-table-header": "^2.1.12",
-        "@tiptap/extension-table-row": "^2.1.12",
-        "@tiptap/extension-text": "^2.1.12",
-        "@tiptap/pm": "^2.1.12",
-        "@tiptap/suggestion": "^2.1.12"
+        "@tiptap/core": "2.6.4",
+        "@tiptap/extension-blockquote": "^2.6.4",
+        "@tiptap/extension-bold": "^2.6.4",
+        "@tiptap/extension-bullet-list": "^2.6.4",
+        "@tiptap/extension-code": "^2.6.4",
+        "@tiptap/extension-code-block": "^2.6.4",
+        "@tiptap/extension-document": "^2.6.4",
+        "@tiptap/extension-dropcursor": "^2.6.4",
+        "@tiptap/extension-gapcursor": "^2.6.4",
+        "@tiptap/extension-hard-break": "^2.6.4",
+        "@tiptap/extension-heading": "^2.6.4",
+        "@tiptap/extension-history": "^2.6.4",
+        "@tiptap/extension-horizontal-rule": "^2.6.4",
+        "@tiptap/extension-image": "^2.6.4",
+        "@tiptap/extension-italic": "^2.6.4",
+        "@tiptap/extension-link": "^2.6.4",
+        "@tiptap/extension-list-item": "^2.6.4",
+        "@tiptap/extension-mention": "^2.6.4",
+        "@tiptap/extension-ordered-list": "^2.6.4",
+        "@tiptap/extension-paragraph": "^2.6.4",
+        "@tiptap/extension-placeholder": "^2.6.4",
+        "@tiptap/extension-strike": "^2.6.4",
+        "@tiptap/extension-table": "^2.6.4",
+        "@tiptap/extension-table-cell": "^2.6.4",
+        "@tiptap/extension-table-header": "^2.6.4",
+        "@tiptap/extension-table-row": "^2.6.4",
+        "@tiptap/extension-text": "^2.6.4",
+        "@tiptap/pm": "^2.6.4",
+        "@tiptap/suggestion": "^2.6.4"
     },
     "devDependencies": {
-        "@patternslib/dev": "^3.5.3",
-        "@patternslib/patternslib": "^9.9.5"
+        "@patternslib/dev": "^3.6.1",
+        "@patternslib/patternslib": "^9.9.14"
     },
     "scripts": {
         "start": "NODE_ENV=development webpack serve --config webpack.config.js",

diff --git a/src/tiptap.test.js b/src/tiptap.test.js
@@ -93,16 +93,16 @@ describe("pat-tiptap", () => {
               ">
           </textarea>
 
-        <template id="modal-link">
-          <form id="link-panel">
-            <input name="tiptap-href"/>
-            <input name="tiptap-text"/>
-            <button
-                type="submit"
-                name="tiptap-confirm"
-                class="close-panel">submit</button>
-          </form>
-        </template>
+          <template id="modal-link">
+            <form id="link-panel">
+              <input name="tiptap-href"/>
+              <input name="tiptap-text"/>
+              <button
+                  type="submit"
+                  name="tiptap-confirm"
+                  class="close-panel">submit</button>
+            </form>
+          </template>
         `;
 
         const pattern1 = new Pattern(document.querySelectorAll(".pat-tiptap")[0]);
@@ -114,8 +114,8 @@ describe("pat-tiptap", () => {
         const button_1 = document.querySelector("#tiptap-external-toolbar-1 .button-link"); // prettier-ignore
         const button_2 = document.querySelector("#tiptap-external-toolbar-2 .button-link"); // prettier-ignore
 
-        new PatternModal(button_1);
-        new PatternModal(button_2);
+        await events.await_pattern_init(new PatternModal(button_1));
+        await events.await_pattern_init(new PatternModal(button_2));
 
         containers[0].querySelector("[contenteditable]").focus(); // Set focus to bypass toolbar check
         button_1.click();
@@ -190,7 +190,7 @@ describe("pat-tiptap", () => {
         const containers = document.querySelectorAll(".tiptap-container");
         const button_link = document.querySelector("#tiptap-external-toolbar .button-link"); // prettier-ignore
 
-        new PatternModal(button_link);
+        await events.await_pattern_init(new PatternModal(button_link));
 
         containers[0].querySelector("[contenteditable]").focus(); // Set focus to bypass toolbar check
         await utils.timeout(1);
@@ -413,7 +413,7 @@ describe("pat-tiptap", () => {
             await events.await_pattern_init(pattern);
 
             button_link = document.querySelector("#tiptap-external-toolbar .button-link"); // prettier-ignore
-            new PatternModal(button_link);
+            await events.await_pattern_init(new PatternModal(button_link));
 
             document.querySelector(".tiptap-container [contenteditable]").focus(); // Set focus to bypass toolbar check
 
@@ -525,7 +525,7 @@ describe("pat-tiptap", () => {
         await events.await_pattern_init(pattern);
 
         const button_image = document.querySelector("#tiptap-external-toolbar .button-image"); // prettier-ignore
-        new PatternModal(button_image);
+        await events.await_pattern_init(new PatternModal(button_image));
 
         document.querySelector(".tiptap-container [contenteditable]").focus(); // Set focus to bypass toolbar check
 
@@ -580,7 +580,7 @@ describe("pat-tiptap", () => {
         await events.await_pattern_init(pattern);
 
         const button_image = document.querySelector("#tiptap-external-toolbar .button-image"); // prettier-ignore
-        new PatternModal(button_image);
+        await events.await_pattern_init(new PatternModal(button_image));
 
         document.querySelector(".tiptap-container [contenteditable]").focus(); // Set focus to bypass toolbar check
 
@@ -628,7 +628,7 @@ describe("pat-tiptap", () => {
         await events.await_pattern_init(pattern);
 
         const button_image = document.querySelector("#tiptap-external-toolbar .button-image"); // prettier-ignore
-        new PatternModal(button_image);
+        await events.await_pattern_init(new PatternModal(button_image));
 
         document.querySelector(".tiptap-container [contenteditable]").focus(); // Set focus to bypass toolbar check
 
@@ -713,7 +713,7 @@ describe("pat-tiptap", () => {
         await events.await_pattern_init(pattern);
 
         const button_embed = document.querySelector("#tiptap-external-toolbar .button-embed"); // prettier-ignore
-        new PatternModal(button_embed);
+        await events.await_pattern_init(new PatternModal(button_embed));
 
         document.querySelector(".tiptap-container [contenteditable]").focus(); // Set focus to bypass toolbar check
 
@@ -764,7 +764,7 @@ describe("pat-tiptap", () => {
         await events.await_pattern_init(pattern);
 
         const button_embed = document.querySelector("#tiptap-external-toolbar .button-embed"); // prettier-ignore
-        new PatternModal(button_embed);
+        await events.await_pattern_init(new PatternModal(button_embed));
 
         document.querySelector(".tiptap-container [contenteditable]").focus(); // Set focus to bypass toolbar check
 
@@ -812,7 +812,7 @@ describe("pat-tiptap", () => {
         await events.await_pattern_init(pattern);
 
         const button_embed = document.querySelector("#tiptap-external-toolbar .button-embed"); // prettier-ignore
-        new PatternModal(button_embed);
+        await events.await_pattern_init(new PatternModal(button_embed));
 
         document.querySelector(".tiptap-container [contenteditable]").focus(); // Set focus to bypass toolbar check
 
@@ -863,7 +863,7 @@ describe("pat-tiptap", () => {
         await events.await_pattern_init(pattern);
 
         const button_embed = document.querySelector("#tiptap-external-toolbar .button-embed"); // prettier-ignore
-        new PatternModal(button_embed);
+        await events.await_pattern_init(new PatternModal(button_embed));
 
         document.querySelector(".tiptap-container [contenteditable]").focus(); // Set focus to bypass toolbar check