fix(react-server): more support on inline server action (#90)

hi-ogawa · May 28, 2024 · 440212b · 440212b
1 parent dd873ec
commit 440212b
Show file tree

Hide file tree

Showing 12 changed files with 133 additions and 451 deletions.
diff --git a/examples/react-server/e2e/basic.test.ts b/examples/react-server/e2e/basic.test.ts
@@ -143,6 +143,19 @@ testNoJs("server action 4 @nojs", async ({ page }) => {
   await testServerAction(page, "counter4");
 });
 
+test("server action 5 @js", async ({ page }) => {
+  usePageErrorChecker(page);
+  await page.goto("/action");
+  await waitForHydration(page);
+  await testServerAction(page, "counter5");
+});
+
+testNoJs("server action 5 @nojs", async ({ page }) => {
+  usePageErrorChecker(page);
+  await page.goto("/action");
+  await testServerAction(page, "counter5");
+});
+
 async function testServerAction(page: Page, testId: string) {
   await page.getByTestId(testId).getByText("Count: 0").click();
   await page.getByTestId(testId).getByRole("button", { name: "+" }).click();

diff --git a/examples/react-server/package.json b/examples/react-server/package.json
@@ -20,6 +20,7 @@
     "react-server-dom-webpack": "19.0.0-rc-4c2e457c7c-20240522"
   },
   "devDependencies": {
+    "@hiogawa/transforms": "0.0.0-pre.8",
     "@hiogawa/vite-plugin-ssr-middleware-alpha": "workspace:*",
     "@types/estree": "^1.0.5",
     "@types/react": "18.3.1",

diff --git a/examples/react-server/src/features/server-action/__snapshots__/plugin.test.ts.snap b/examples/react-server/src/features/server-action/__snapshots__/plugin.test.ts.snap
diff --git a/examples/react-server/src/features/server-action/browser.ts b/examples/react-server/src/features/server-action/browser.ts
@@ -1,7 +1,8 @@
 import reactServerDomClient from "react-server-dom-webpack/client.browser";
 import { $__global } from "../../global";
 
-export function createServerReference(id: string) {
+export function createServerReference(id: string, name: string) {
+  id = id + "#" + name;
   return reactServerDomClient.createServerReference(id, (...args) =>
     $__global.callServer(...args),
   );

diff --git a/examples/react-server/src/features/server-action/plugin.test.ts b/examples/react-server/src/features/server-action/plugin.test.ts
diff --git a/examples/react-server/src/features/server-action/plugin.ts b/examples/react-server/src/features/server-action/plugin.ts
diff --git a/examples/react-server/src/features/server-action/server.ts b/examples/react-server/src/features/server-action/server.ts
@@ -7,6 +7,9 @@ export function registerServerReference(
   id: string,
   name: string,
 ) {
+  if (typeof action !== "function") {
+    return action;
+  }
   return ReactServer.registerServerReference(action, id, name);
 }