+ cypress routeParams/suspense tests

packages/lib/cypress/e2e/csr/context.cy.js

@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
 
-describe("two-way-binding", () => {
+describe("context", () => {
   beforeEach(() => {
     const port = Cypress.env("port")
     cy.visit(`http://localhost:${port}/context`)

packages/lib/cypress/e2e/csr/route-params.cy.js

@@ -0,0 +1,12 @@
+/// <reference types="cypress" />
+
+describe("route-params", () => {
+  beforeEach(() => {
+    const port = Cypress.env("port")
+    cy.visit(`http://localhost:${port}/nested-routing/test123`)
+  })
+
+  it("should display the route parameter value, 'test123'", () => {
+    cy.get("main h1").should("have.text", "test123")
+  })
+})

packages/lib/cypress/e2e/csr/signals.cy.js

@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
 
-describe("two-way-binding", () => {
+describe("signals", () => {
   beforeEach(() => {
     const port = Cypress.env("port")
     cy.visit(`http://localhost:${port}`)

packages/lib/cypress/e2e/csr/suspense.cy.js

@@ -0,0 +1,15 @@
+/// <reference types="cypress" />
+
+describe("suspense", () => {
+  beforeEach(() => {
+    const port = Cypress.env("port")
+    cy.visit(`http://localhost:${port}/suspense`)
+  })
+
+  it("when the component renders, it should initially display a loading indicator", () => {
+    cy.get("main p").should("exist").should("have.text", "loading...")
+  })
+  it("when the component has loaded, it should display a list", () => {
+    cy.get("main ul").should("exist")
+  })
+})

packages/lib/src/router/router.ts

@@ -1,3 +1,4 @@
+import { useRequestData } from "../ssr"
 import { matchPath } from "."
 import { Signal, Component } from ".."
 import { Cinnabun } from "../cinnabun"
@@ -84,9 +85,7 @@ export const Router = (
         const c = self.children[i] as RouteComponent
         const matchRes = (self as RouterComponent).matchRoute(
           c,
-          Cinnabun.isClient
-            ? val
-            : self.cbInstance!.getServerRequestData<string>("path")!
+          useRequestData<string>(self, "path", val)!
         )
         if (matchRes.routeMatch) {
           c.props.render = !!matchRes.routeMatch