Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/late-melons-raise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"solid-js": patch
---

Update `SuspenseList` to handle hydration context
5 changes: 5 additions & 0 deletions .changeset/sad-heads-smell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"solid-js": patch
---

Add unit tests for `resolveSSRNode` and `createResource` functions
23 changes: 15 additions & 8 deletions packages/solid/src/server/rendering.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import {
Owner,
Accessor,
castError,
catchError,
cleanNode,
createContext,
createMemo,
useContext,
createOwner,
Owner,
runWithOwner,
catchError,
Accessor,
Setter,
Signal,
castError,
cleanNode,
createOwner
useContext
} from "./reactive.js";
import type { JSX } from "../jsx.js";

Expand Down Expand Up @@ -623,7 +623,14 @@ export function SuspenseList(props: {
revealOrder: "forwards" | "backwards" | "together";
tail?: "collapsed" | "hidden";
}) {
// TODO: support tail options
// TODO: support revealOrder and tail options
if (sharedConfig.context && !sharedConfig.context.noHydrate) {
const c = sharedConfig.context;
setHydrateContext(nextHydrateContext());
const result = props.children;
setHydrateContext(c);
return result;
}
return props.children;
}

Expand Down
52 changes: 52 additions & 0 deletions packages/solid/test/rendering.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import { describe, expect, test } from "vitest";
import { createResource } from "../src/index.js";
import { resolveSSRNode } from "dom-expressions/src/server.js";

describe("resolveSSRNode", () => {
test("should resolve a string node", () => {
expect(resolveSSRNode("Hello World")).toBe("Hello World");
});

test("should resolve a null or boolean node", () => {
expect(resolveSSRNode(null)).toBe("");
expect(resolveSSRNode(false)).toBe("");
});

test("should resolve an array of nodes", () => {
const nodes = ["<div>", "<span>", "</span>", "</div>"];
expect(resolveSSRNode(nodes)).toBe("<div><!--!$--><span><!--!$--></span><!--!$--></div>");
});

test("should resolve an object with 't' property", () => {
const node = { t: "<div>Text</div>" };
expect(resolveSSRNode(node)).toBe("<div>Text</div>");
});

test("should resolve a function node", () => {
const fn = () => "dynamic content";
expect(resolveSSRNode(fn)).toBe("dynamic content");
});
});

describe("createResource", () => {
test("should return initial value immediately if provided", () => {
const [data] = createResource(() => Promise.resolve("test"), { initialValue: "loading" });
expect(data()).toBe("loading");
});

test("should handle a promise and update the value", async () => {
const [data, { refetch }] = createResource(
() => new Promise(resolve => setTimeout(() => resolve("Success!"), 10))
);

// Initially, data should be undefined, and loading should be true
expect(data()).toBeUndefined();
expect(data.loading).toBe(true);

await new Promise(r => setTimeout(r, 20)); // Wait for the promise to resolve

// After resolution, data should have the new value, and loading should be false
expect(data()).toBe("Success!");
expect(data.loading).toBe(false);
});
});
Loading