Merge branch 'master' of https://github.com/cycleccc/wangEditor-next

cycleccc · Oct 9, 2024 · a3ef787 · a3ef787
2 parents f51a4ea + f88e4f6
commit a3ef787
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -97,7 +97,7 @@
     "rollup-plugin-visualizer": "^5.5.0",
     "tslib": "^2.3.0",
     "turbo": "2.1.3",
-    "typescript": "4.9.5",
+    "typescript": "5.6.2",
     "vitest": "^2.1.2"
   },
   "commitlint": {

diff --git a/packages/list-module/src/module/menu/BaseMenu.ts b/packages/list-module/src/module/menu/BaseMenu.ts
@@ -65,6 +65,7 @@ abstract class BaseMenu implements IButtonMenu {
       // 如果当前 active ，则转换为 p 标签
       Transforms.setNodes(editor, {
         type: 'paragraph',
+        // @ts-ignore
         ordered: undefined,
         level: undefined,
       })

diff --git a/packages/list-module/src/module/plugin.ts b/packages/list-module/src/module/plugin.ts
@@ -41,6 +41,7 @@ function withList<T extends IDomEditor>(editor: T): T {
     if (listElem.children[0].text === '') {
       Transforms.setNodes(newEditor, {
         type: 'paragraph',
+        // @ts-ignore
         ordered: undefined,
         level: undefined,
       })
@@ -90,6 +91,7 @@ function withList<T extends IDomEditor>(editor: T): T {
         // 转换为 p 元素
         Transforms.setNodes(newEditor, {
           type: 'paragraph',
+          // @ts-ignore
           ordered: undefined,
           level: undefined,
         })

diff --git a/packages/yjs/package.json b/packages/yjs/package.json
@@ -59,7 +59,7 @@
   },
   "devDependencies": {
     "slate": "^0.72.0",
-    "typescript": "^4.6.3",
+    "typescript": "^5.0.0",
     "yjs": "^13.5.29"
   }
 }
diff --git a/packages/yjs/src/applyToYjs/text/insertText.ts b/packages/yjs/src/applyToYjs/text/insertText.ts
@@ -1,5 +1,5 @@
 import { InsertTextOperation, Node, Text } from 'slate'
-import type Y from 'yjs'
+import * as Y from 'yjs'
 
 import { getYTarget } from '../../utils/location'
 import { getProperties } from '../../utils/slate'

diff --git a/packages/yjs/src/applyToYjs/text/removeText.ts b/packages/yjs/src/applyToYjs/text/removeText.ts
@@ -1,5 +1,5 @@
 import { Node, RemoveTextOperation } from 'slate'
-import type Y from 'yjs'
+import * as Y from 'yjs'
 
 import { getYTarget } from '../../utils/location'
 

diff --git a/packages/yjs/src/module/custom-types.ts b/packages/yjs/src/module/custom-types.ts
@@ -1,7 +1,7 @@
 import type {
   Descendant, Editor, Element, Node,
 } from 'slate'
-import type Y from 'yjs'
+import * as Y from 'yjs'
 
 export type DeltaAttributes = {
   retain: number

diff --git a/yarn.lock b/yarn.lock
@@ -3629,7 +3629,7 @@ __metadata:
     rollup-plugin-visualizer: "npm:^5.5.0"
     tslib: "npm:^2.3.0"
     turbo: "npm:2.1.3"
-    typescript: "npm:4.9.5"
+    typescript: "npm:5.6.2"
     vitest: "npm:^2.1.2"
   languageName: unknown
   linkType: soft
@@ -3657,7 +3657,7 @@ __metadata:
   resolution: "@wangeditor-next/yjs@workspace:packages/yjs"
   dependencies:
     slate: "npm:^0.72.0"
-    typescript: "npm:^4.6.3"
+    typescript: "npm:^5.0.0"
     y-protocols: "npm:^1.0.5"
     yjs: "npm:^13.5.29"
   peerDependencies:
@@ -12524,23 +12524,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:4.9.5, typescript@npm:^4.6.3":
-  version: 4.9.5
-  resolution: "typescript@npm:4.9.5"
+"typescript@npm:5.6.2, typescript@npm:^5.0.0":
+  version: 5.6.2
+  resolution: "typescript@npm:5.6.2"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/5f6cad2e728a8a063521328e612d7876e12f0d8a8390d3b3aaa452a6a65e24e9ac8ea22beb72a924fd96ea0a49ea63bb4e251fb922b12eedfb7f7a26475e5c56
+  checksum: 10c0/3ed8297a8c7c56b7fec282532503d1ac795239d06e7c4966b42d4330c6cf433a170b53bcf93a130a7f14ccc5235de5560df4f1045eb7f3550b46ebed16d3c5e5
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@npm%3A4.9.5#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^4.6.3#optional!builtin<compat/typescript>":
-  version: 4.9.5
-  resolution: "typescript@patch:typescript@npm%3A4.9.5#optional!builtin<compat/typescript>::version=4.9.5&hash=289587"
+"typescript@patch:typescript@npm%3A5.6.2#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.0.0#optional!builtin<compat/typescript>":
+  version: 5.6.2
+  resolution: "typescript@patch:typescript@npm%3A5.6.2#optional!builtin<compat/typescript>::version=5.6.2&hash=8c6c40"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/e3333f887c6829dfe0ab6c1dbe0dd1e3e2aeb56c66460cb85c5440c566f900c833d370ca34eb47558c0c69e78ced4bfe09b8f4f98b6de7afed9b84b8d1dd06a1
+  checksum: 10c0/94eb47e130d3edd964b76da85975601dcb3604b0c848a36f63ac448d0104e93819d94c8bdf6b07c00120f2ce9c05256b8b6092d23cf5cf1c6fa911159e4d572f
   languageName: node
   linkType: hard