Skip to content

fix: add progressive server actions OOTB #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 18, 2025
Merged

fix: add progressive server actions OOTB #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.DS_Store
.parcel-cache
node_modules
dist/
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"private": true,
"scripts": {
"build": "yarn workspace parcel-resolver-react-router-experimental run build && yarn workspace parcel-resolver-react-router-typegen-experimental run build"
"build": "yarn workspace parcel-resolver-react-router-experimental run build && yarn workspace parcel-resolver-react-router-typegen-experimental run build",
"watch": "yarn workspace parcel-resolver-react-router-experimental run build --watch & yarn workspace parcel-resolver-react-router-typegen-experimental run build --watch"
},
"devDependencies": {
"@types/node": "^22.14.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/resolver/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
"oxc-transform": "^0.64.0"
},
"devDependencies": {
"@react-router/dev": "0.0.0-experimental-0fd8a0272",
"@react-router/dev": "0.0.0-experimental-573acd4d4",
"@types/express": "^5.0.1",
"@types/react": "^19.1.2",
"@types/react-dom": "^19.1.2",
"react": "^19.1.0",
"react-dom": "^19.1.0",
"react-router": "0.0.0-experimental-0fd8a0272",
"react-router": "0.0.0-experimental-573acd4d4",
"react-server-dom-parcel": "^19.1.0",
"tsup": "^8.4.0"
},
Expand Down
8 changes: 8 additions & 0 deletions packages/resolver/src/entry.rsc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
"use server-entry";

import {
decodeAction,
decodeReply,
loadServerAction,
renderToReadableStream,
// @ts-expect-error
} from "react-server-dom-parcel/server.edge";
import {
type DecodeCallServerFunction,
type DecodeFormActionFunction,
matchServerRequest,
} from "react-router/server";

Expand All @@ -21,13 +23,19 @@ const decodeCallServer: DecodeCallServerFunction = async (actionId, reply) => {
return action.bind(null, ...args);
};

const decodeFormAction: DecodeFormActionFunction = async (formData) => {
return await decodeAction(formData);
};

export async function callServer(request: Request) {
const match = await matchServerRequest({
decodeCallServer,
decodeFormAction,
request,
routes,
});

console.log(match.payload);
return new Response(renderToReadableStream(match.payload), {
status: match.statusCode,
headers: match.headers,
Expand Down
7 changes: 2 additions & 5 deletions packages/resolver/src/resolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,7 @@ declare module "virtual:react-router/routes" {
),
]);

const configPath = path.resolve(
options.projectRoot,
"react-router.config.ts"
);
const configPath = path.resolve(process.cwd(), "react-router.config.ts");

config.invalidateOnFileChange(configPath);
config.invalidateOnFileCreate({
Expand All @@ -99,7 +96,7 @@ declare module "virtual:react-router/routes" {
});

const appDirectory = path.resolve(
options.projectRoot,
process.cwd(),
rrConfig.appDirectory || "app"
);
const routesPath = path.join(appDirectory, "routes.ts");
Expand Down
4 changes: 2 additions & 2 deletions packages/typegen/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"execa": "^9.5.2"
},
"devDependencies": {
"@react-router/dev": "0.0.0-experimental-0fd8a0272",
"react-router": "0.0.0-experimental-0fd8a0272",
"@react-router/dev": "0.0.0-experimental-573acd4d4",
"react-router": "0.0.0-experimental-573acd4d4",
"tsup": "^8.4.0"
},
"engines": {
Expand Down
26 changes: 13 additions & 13 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1498,10 +1498,10 @@
resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==

"@react-router/[email protected]0fd8a0272":
version "0.0.0-experimental-0fd8a0272"
resolved "https://registry.yarnpkg.com/@react-router/dev/-/dev-0.0.0-experimental-0fd8a0272.tgz#2f34d21efeb69a8e6903f70324acde8c233f23fe"
integrity sha512-wACkcRelYC8ZGMv98EM6HBpaOMt7mslQQMatqPkIAKJm7hl2K9jmq4MucxVuOMKfcP5ks7tFImHfDhyBtHzgwQ==
"@react-router/[email protected]573acd4d4":
version "0.0.0-experimental-573acd4d4"
resolved "https://registry.yarnpkg.com/@react-router/dev/-/dev-0.0.0-experimental-573acd4d4.tgz#e3e5b4af4c2af67646477aeb3ef0cdd7702c8e77"
integrity sha512-KUMUDQI9piLSWN6t9QkNmNihVAuuTDRZs+rwHFyZUlALff+529Dag0EvU8Zlgnlqj4KSK4hj2GufXoVsFvotNg==
dependencies:
"@babel/core" "^7.21.8"
"@babel/generator" "^7.21.5"
Expand All @@ -1512,7 +1512,7 @@
"@babel/traverse" "^7.23.2"
"@babel/types" "^7.22.5"
"@npmcli/package-json" "^4.0.1"
"@react-router/node" "0.0.0-experimental-0fd8a0272"
"@react-router/node" "0.0.0-experimental-573acd4d4"
arg "^5.0.1"
babel-dead-code-elimination "^1.0.6"
chokidar "^4.0.0"
Expand All @@ -1531,10 +1531,10 @@
valibot "^0.41.0"
vite-node "3.0.0-beta.2"

"@react-router/[email protected]0fd8a0272":
version "0.0.0-experimental-0fd8a0272"
resolved "https://registry.yarnpkg.com/@react-router/node/-/node-0.0.0-experimental-0fd8a0272.tgz#6cca9c0897d6df38da8756da267108a510b7366c"
integrity sha512-7fYScf4OMh8wv9ip2gdpStd4txSMF1CbS30pFrOWt72rYCX6KCADBFYcR9cBnJMU4omYwNoibOrRWpF3Tfas2A==
"@react-router/[email protected]573acd4d4":
version "0.0.0-experimental-573acd4d4"
resolved "https://registry.yarnpkg.com/@react-router/node/-/node-0.0.0-experimental-573acd4d4.tgz#bfa18dc085a800a0d87d0eda1c7d5af4364db840"
integrity sha512-L+qANXcW8ftPqkx5AJi1I3CAHdlT8FxZQt8K+mN7s4EjmsAJ47AEczrFmgYgaKdNUg7iAHZa/qY6IZC3zBH4TQ==
dependencies:
"@mjackson/node-fetch-server" "^0.2.0"
source-map-support "^0.5.21"
Expand Down Expand Up @@ -3669,10 +3669,10 @@ react-refresh@^0.14.0:
resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.2.tgz#3833da01ce32da470f1f936b9d477da5c7028bf9"
integrity sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==

[email protected]0fd8a0272:
version "0.0.0-experimental-0fd8a0272"
resolved "https://registry.yarnpkg.com/react-router/-/react-router-0.0.0-experimental-0fd8a0272.tgz#e4efa1a0c90c47aa70a165de994fb2cf9df706d0"
integrity sha512-l8n8GC4BcKoY1oTbovpA0DK6NtoSKJhMVDCURH3dHo/5AUtrYIzo8msbmdfV6l0/PWyGkuGVy+06G25EPEIjTg==
[email protected]573acd4d4:
version "0.0.0-experimental-573acd4d4"
resolved "https://registry.yarnpkg.com/react-router/-/react-router-0.0.0-experimental-573acd4d4.tgz#01b5afae8dfb6b935bfed29c43c9e03551c84166"
integrity sha512-kL2LwyD+t7Do/wNB74Abjcr4A0aFW0dtotzHkFFDswcmfOKdEqyDgZAJ1HRWYW8OIQAejHfQlzPrH9f5XHyGpg==
dependencies:
"@types/cookie" "^0.6.0"
cookie "^1.0.1"
Expand Down