fix timing issue with deferStream

solidjs · Dec 1, 2023 · e09a3cc · e09a3cc
1 parent 4600682
commit e09a3cc
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 26 deletions.
diff --git a/.changeset/rotten-foxes-cough.md b/.changeset/rotten-foxes-cough.md
@@ -0,0 +1,5 @@
+---
+"solid-js": patch
+---
+
+fix timing issue with deferStream
diff --git a/package.json b/package.json
@@ -37,18 +37,18 @@
     "babel-plugin-jsx-dom-expressions": "^0.37.9",
     "coveralls": "^3.1.1",
     "csstype": "^3.1.0",
-    "dom-expressions": "0.37.9",
-    "hyper-dom-expressions": "0.37.9",
+    "dom-expressions": "0.37.10",
+    "hyper-dom-expressions": "0.37.10",
     "jsdom": "^21.1.1",
-    "lit-dom-expressions": "0.37.9",
+    "lit-dom-expressions": "0.37.10",
     "ncp": "^2.0.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.8",
     "rimraf": "^3.0.2",
     "rollup": "^3.7.5",
     "rollup-plugin-cleanup": "^3.2.1",
     "rollup-plugin-copy": "^3.4.0",
-    "seroval": "^0.14.1",
+    "seroval": "^0.15.1",
     "simple-git-hooks": "^2.8.1",
     "symlink-dir": "^5.0.1",
     "tsconfig-replace-paths": "^0.0.11",

diff --git a/packages/solid/package.json b/packages/solid/package.json
@@ -236,6 +236,6 @@
   ],
   "dependencies": {
     "csstype": "^3.1.0",
-    "seroval": "^0.14.1"
+    "seroval": "^0.15.1"
   }
 }
diff --git a/packages/solid/src/server/rendering.ts b/packages/solid/src/server/rendering.ts
@@ -535,7 +535,7 @@ type HydrationContext = {
   id: string;
   count: number;
   serialize: (id: string, v: Promise<any> | any, deferStream?: boolean) => void;
-  push: (v: any) => string;
+  nextRoot: (v: any) => string;
   replace: (id: string, replacement: () => any) => void;
   block: (p: Promise<any>) => void;
   resources: Record<string, any>;

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml