Upgrade to Lexical 0.12.4 & Svelte 4

umaranis · Nov 23, 2023 · 66a0451 · 66a0451
1 parent 13030ce
commit 66a0451
Show file tree

Hide file tree

Showing 6 changed files with 2,935 additions and 1,585 deletions.
diff --git a/demos/sveltekit/package.json b/demos/sveltekit/package.json
@@ -9,18 +9,18 @@
     "lint": "eslint ."
   },
   "devDependencies": {
-    "@sveltejs/adapter-auto": "^2.0.1",
-    "@sveltejs/kit": "^1.15.8",
-    "eslint": "^8.39.0",
-    "eslint-plugin-svelte3": "^4.0.0",
-    "svelte": "^3.58.0",
-    "svelte-check": "^3.2.0",
-    "typescript": "^5.0.4",
-    "vite": "^4.3.1"
+    "@sveltejs/adapter-auto": "^2.1.1",
+    "@sveltejs/kit": "^1.27.6",
+    "eslint": "^8.54.0",
+    "eslint-plugin-svelte": "^2.35.1",
+    "svelte": "^4.2.7",
+    "svelte-check": "^3.6.1",
+    "typescript": "^5.3.2",
+    "vite": "^4.5.0"
   },
   "type": "module",
   "dependencies": {
-    "svelte-lexical": "0.3.4",
-    "svelte-preprocess": "^5.0.3"
+    "svelte-lexical": "workspace:*",
+    "svelte-preprocess": "^5.1.1"
   }
 }
diff --git a/packages/svelte-lexical/package.json b/packages/svelte-lexical/package.json
@@ -21,33 +21,33 @@
     "svelte-check": "svelte-check"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.5",
-    "@babel/preset-env": "^7.22.5",
-    "@rollup/plugin-commonjs": "^25.0.1",
-    "@rollup/plugin-node-resolve": "^15.1.0",
-    "@rollup/plugin-typescript": "^11.1.1",
-    "@testing-library/jest-dom": "^5.16.5",
-    "@testing-library/svelte": "^3.2.2",
-    "@tsconfig/svelte": "^4.0.1",
-    "@types/lodash-es": "^4.17.7",
-    "@typescript-eslint/eslint-plugin": "^5.59.9",
-    "@typescript-eslint/parser": "^5.59.9",
-    "babel-jest": "^29.5.0",
-    "eslint": "^8.42.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-svelte3": "^4.0.0",
-    "jest": "^29.5.0",
-    "jest-environment-jsdom": "^29.5.0",
-    "prettier-plugin-organize-attributes": "^0.0.5",
-    "prettier-plugin-svelte": "^2.10.1",
-    "rollup": "^3.25.0",
-    "rollup-plugin-css-only": "^4.3.0",
-    "rollup-plugin-svelte": "^7.1.5",
-    "svelte-check": "^3.4.3",
-    "svelte-jester": "^2.3.2",
-    "svelte-preprocess": "^5.0.4",
-    "typescript": "^5.1.3"
+    "@babel/core": "^7.23.3",
+    "@babel/preset-env": "^7.23.3",
+    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-typescript": "^11.1.5",
+    "@testing-library/jest-dom": "^6.1.4",
+    "@testing-library/svelte": "^4.0.5",
+    "@tsconfig/svelte": "^5.0.2",
+    "@types/lodash-es": "^4.17.12",
+    "@typescript-eslint/eslint-plugin": "^6.12.0",
+    "@typescript-eslint/parser": "^6.12.0",
+    "babel-jest": "^29.7.0",
+    "eslint": "^8.54.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-svelte": "^2.35.1",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "prettier-plugin-organize-attributes": "^1.0.0",
+    "prettier-plugin-svelte": "^3.1.2",
+    "rollup": "^4.5.1",
+    "rollup-plugin-css-only": "^4.5.2",
+    "rollup-plugin-svelte": "^7.1.6",
+    "svelte-check": "^3.6.1",
+    "svelte-jester": "^3.0.0",
+    "svelte-preprocess": "^5.1.1",
+    "typescript": "^5.3.2"
   },
   "keywords": [
     "lexical",
@@ -61,28 +61,28 @@
     "dist"
   ],
   "dependencies": {
-    "@lexical/clipboard": "0.11.1",
-    "@lexical/code": "0.11.1",
-    "@lexical/file": "0.11.1",
-    "@lexical/hashtag": "0.11.1",
-    "@lexical/history": "0.11.1",
-    "@lexical/link": "0.11.1",
-    "@lexical/list": "0.11.1",
-    "@lexical/mark": "0.11.1",
-    "@lexical/overflow": "0.11.1",
-    "@lexical/plain-text": "0.11.1",
-    "@lexical/rich-text": "0.11.1",
-    "@lexical/selection": "0.11.1",
-    "@lexical/table": "0.11.1",
-    "@lexical/text": "0.11.1",
-    "@lexical/utils": "0.11.1",
-    "@lexical/yjs": "0.11.1",
-    "lexical": "0.11.1",
+    "@lexical/clipboard": "0.12.4",
+    "@lexical/code": "0.12.4",
+    "@lexical/file": "0.12.4",
+    "@lexical/hashtag": "0.12.4",
+    "@lexical/history": "0.12.4",
+    "@lexical/link": "0.12.4",
+    "@lexical/list": "0.12.4",
+    "@lexical/mark": "0.12.4",
+    "@lexical/overflow": "0.12.4",
+    "@lexical/plain-text": "0.12.4",
+    "@lexical/rich-text": "0.12.4",
+    "@lexical/selection": "0.12.4",
+    "@lexical/table": "0.12.4",
+    "@lexical/text": "0.12.4",
+    "@lexical/utils": "0.12.4",
+    "@lexical/yjs": "0.12.4",
+    "lexical": "0.12.4",
     "lodash-es": "^4.17.21",
-    "prettier": "^2.8.8",
-    "svelte": "^3.59.1",
+    "prettier": "^3.1.0",
+    "svelte": "^4.2.7",
     "y-websocket": "1.5.0",
-    "yjs": "13.6.2"
+    "yjs": "13.6.10"
   },
   "jest": {
     "transform": {

diff --git a/packages/svelte-lexical/src/core/Decorator.svelte b/packages/svelte-lexical/src/core/Decorator.svelte
@@ -45,7 +45,7 @@
       // 1- set `props` on existing svelte components
       // 2- create new components and put them in cache
       editor.registerDecoratorListener<{
-        componentClass: typeof SvelteComponent;
+        componentClass: typeof SvelteComponent<any>;
         props: object;
       }>((decorators) => {
         dirtyComponents.forEach((nodeKey) => {

diff --git a/packages/svelte-lexical/src/core/composerContext.ts b/packages/svelte-lexical/src/core/composerContext.ts
@@ -32,7 +32,7 @@ export function setHistoryStateContext(historyState: HistoryState) {
 }
 
 export type SvelteComponentTypeRef = {
-  componentType: typeof SvelteComponent;
+  componentType: typeof SvelteComponent<any>;
   props?: Record<string, object | string | boolean>;
 };
 

diff --git a/packages/svelte-lexical/src/core/plugins/Image/ImageNode.ts b/packages/svelte-lexical/src/core/plugins/Image/ImageNode.ts
@@ -59,7 +59,7 @@ export type SerializedImageNode = Spread<
 >;
 
 type DecoratorImageType = {
-  componentClass: typeof SvelteComponent;
+  componentClass: typeof SvelteComponent<any>;
   props: ComponentProps<ImageComponent>;
 };