Skip to content
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
80eb6c8
chore: federation
ScriptedAlchemy Feb 28, 2025
17f6736
fix: tests
ScriptedAlchemy Feb 28, 2025
35c5e24
chore: add federation
ScriptedAlchemy Mar 1, 2025
f164bfa
chore: add federation
ScriptedAlchemy Mar 10, 2025
24937f0
chore: add federation
ScriptedAlchemy Mar 11, 2025
851f076
chore: update rstack
ScriptedAlchemy Mar 18, 2025
53bcbd9
chore: update rstack
ScriptedAlchemy Mar 18, 2025
a529bc4
chore: update rstack
ScriptedAlchemy Mar 18, 2025
3bdd69e
chore: fix ssr in rr7.3
ScriptedAlchemy Mar 19, 2025
24535bc
chore: fix ssr in rr7.3
ScriptedAlchemy Mar 20, 2025
76738ea
chore: fix ssr in rr7.3
ScriptedAlchemy Mar 20, 2025
003411d
chore: fix ssr in rr7.3
ScriptedAlchemy Mar 21, 2025
7351e1e
chore: fix ssr in rr7.3
ScriptedAlchemy Mar 21, 2025
78027d8
chore: fix ssr in rr7.3
ScriptedAlchemy Mar 21, 2025
fccd2b4
chore: fix ssr in rr7.3
ScriptedAlchemy Mar 21, 2025
f0b66e8
Fix: Remove unused imports in manifest.ts to resolve TypeScript linte…
ScriptedAlchemy Mar 21, 2025
3cbed5d
chore: fix federation imports
ScriptedAlchemy Mar 23, 2025
a317ea0
Merge branch 'main' into federation
ScriptedAlchemy Mar 23, 2025
a7462ae
chore: upgrade react router
ScriptedAlchemy Mar 23, 2025
3730eb9
Merge branch 'main' into federation
ScriptedAlchemy Mar 23, 2025
c03da62
chore: stage over updates from mf branch
ScriptedAlchemy Mar 23, 2025
2420e5f
chore: add prettier
ScriptedAlchemy Mar 23, 2025
601cbcb
chore: add prettier
ScriptedAlchemy Mar 23, 2025
13d4940
chore: add prettier
ScriptedAlchemy Mar 23, 2025
140205c
fix: improve async handler logic in server-utils
ScriptedAlchemy Mar 23, 2025
b1dfc40
chore: add E2E testing workflow
ScriptedAlchemy Mar 23, 2025
fb6acf0
fix: update federation option to use dynamic configuration
ScriptedAlchemy Mar 23, 2025
a94980b
Merge branch 'main' into federation
ScriptedAlchemy Mar 24, 2025
b4f11c1
Merge branch 'main' into federation
ScriptedAlchemy Mar 24, 2025
efc2f8d
workaround e2e flakes, consume all mf modules
ScriptedAlchemy Mar 24, 2025
a43e2c5
workaround e2e flakes, consume all mf modules
ScriptedAlchemy Mar 24, 2025
bd8d074
fix custom server example
ScriptedAlchemy Mar 24, 2025
17626f3
update docs and examples
ScriptedAlchemy Mar 24, 2025
c2390a4
add tests
ScriptedAlchemy Mar 24, 2025
5c301c1
add tests
ScriptedAlchemy Mar 24, 2025
8165647
add tests
ScriptedAlchemy Mar 24, 2025
f9aed36
Update package.json repository URL, enhance e2e script, and rename Gi…
ScriptedAlchemy Mar 24, 2025
711d1a7
Update e2e script in package.json to remove redundant port kill comma…
ScriptedAlchemy Mar 24, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"version": "1.0.1",
"private": true,
"devDependencies": {
"@rsbuild/core": "1.1.0",
"@rslib/core": "0.1.3",
"@rsbuild/core": "1.2.19",
"@rslib/core": "0.5.4",
"@types/node": "^22.10.1",
"typescript": "^5.7.2"
}
Expand Down
15 changes: 12 additions & 3 deletions config/rslib.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const nodeMinifyConfig: Minify = {
// preserve variable name and disable minify for easier debugging
mangle: false,
minify: false,
compress: false,
compress: true,
},
},
};
Expand All @@ -27,8 +27,8 @@ export const pluginCleanTscCache: RsbuildPlugin = {
setup(api) {
api.onBeforeBuild(() => {
const tsbuildinfo = path.join(
api.context.rootPath,
'tsconfig.tsbuildinfo',
api.context.rootPath,
'tsconfig.tsbuildinfo',
);
if (fs.existsSync(tsbuildinfo)) {
fs.rmSync(tsbuildinfo);
Expand All @@ -40,12 +40,21 @@ export const pluginCleanTscCache: RsbuildPlugin = {
export const esmConfig: LibConfig = {
format: 'esm',
syntax: 'es2021',
shims: {
esm: {
__dirname: true
}
},
dts: {
build: true,
},
plugins: [pluginCleanTscCache],
output: {
minify: nodeMinifyConfig,
externals: {
'@babel/traverse': 'commonjs @babel/traverse',
'@babel/generator': 'commonjs @babel/generator',
}
},
};

Expand Down
14 changes: 7 additions & 7 deletions examples/cloudflare/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@
"typecheck": "tsc -b"
},
"dependencies": {
"@react-router/node": "^7.1.3",
"@react-router/serve": "^7.1.3",
"@react-router/node": "^7.3.0",
"@react-router/serve": "^7.3.0",
"isbot": "^5.1.17",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-router": "^7.1.3"
"react-router": "7.3.0"
},
"devDependencies": {
"@cloudflare/workers-types": "^4.20241112.0",
"@react-router/cloudflare": "^7.1.3",
"@react-router/dev": "^7.1.3",
"@rsbuild/core": "^1.2.3",
"@rsbuild/plugin-react": "^1.1.0",
"@react-router/cloudflare": "^7.3.0",
"@react-router/dev": "^7.3.0",
"@rsbuild/core": "^1.2.19",
"@rsbuild/plugin-react": "^1.1.1",
"@rsbuild/plugin-react-router": "workspace:*",
"@tailwindcss/postcss": "^4.0.0",
"@types/node": "^20",
Expand Down
12 changes: 6 additions & 6 deletions examples/custom-node-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
"author": "",
"license": "ISC",
"dependencies": {
"@react-router/express": "^7.0.2",
"@react-router/node": "^7.0.2",
"@react-router/express": "^7.3.0",
"@react-router/node": "^7.3.0",
"express": "^4.21.2",
"isbot": "^5.1.22",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-router": "^7.0.2"
"react-router": "7.3.0"
},
"devDependencies": {
"@react-router/dev": "^7.0.2",
"@rsbuild/core": "^1.2.3",
"@rsbuild/plugin-react": "^1.1.0",
"@react-router/dev": "^7.3.0",
"@rsbuild/core": "^1.2.19",
"@rsbuild/plugin-react": "^1.1.1",
"@rsbuild/plugin-react-router": "workspace:*",
"@rsdoctor/rspack-plugin": "^0.4.13",
"@types/express": "^5.0.0",
Expand Down
1 change: 1 addition & 0 deletions examples/default-template/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
# React Router
/.react-router/
/build/
test-results
16 changes: 8 additions & 8 deletions examples/default-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@
"typecheck": "react-router typegen && tsc"
},
"dependencies": {
"@react-router/express": "^7.1.3",
"@react-router/node": "^7.1.3",
"@react-router/serve": "^7.1.3",
"@react-router/express": "^7.3.0",
"@react-router/node": "^7.3.0",
"@react-router/serve": "^7.3.0",
"isbot": "^5.1.17",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-router": "^7.1.3"
"react-router": "7.3.0"
},
"devDependencies": {
"@react-router/dev": "^7.1.3",
"@rsbuild/core": "^1.2.3",
"@rsbuild/plugin-react": "^1.1.0",
"@react-router/dev": "^7.3.0",
"@rsbuild/core": "^1.2.19",
"@rsbuild/plugin-react": "^1.1.1",
"@rsbuild/plugin-react-router": "workspace:*",
"@tailwindcss/postcss": "^4.0.0",
"@types/node": "^20",
"@types/react": "^19.0.1",
"@types/react-dom": "^19.0.1",
"react-router-devtools": "^1.1.0",
"react-router-devtools": "^1.1.6",
"tailwindcss": "^4.0.0",
"typescript": "^5.7.2",
"vite": "^5.4.11",
Expand Down
12 changes: 5 additions & 7 deletions examples/epic-stack/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions examples/epic-stack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@
"/server-build"
],
"dependencies": {
"@rsbuild/core": "1.2.3",
"@rsbuild/plugin-react": "1.1.0",
"@rsbuild/plugin-react-router": "workspace:*",
"@conform-to/react": "1.2.2",
"@conform-to/zod": "1.2.2",
"@epic-web/cachified": "5.2.0",
Expand All @@ -65,10 +62,13 @@
"@radix-ui/react-toast": "1.2.5",
"@radix-ui/react-tooltip": "1.1.7",
"@react-email/components": "0.0.32",
"@react-router/express": "7.1.5",
"@react-router/node": "7.1.5",
"@react-router/remix-routes-option-adapter": "7.1.5",
"@react-router/express": "7.3.0",
"@react-router/node": "^7.3.0",
"@react-router/remix-routes-option-adapter": "7.3.0",
"@remix-run/server-runtime": "2.15.3",
"@rsbuild/core": "1.2.19",
"@rsbuild/plugin-react": "1.1.1",
"@rsbuild/plugin-react-router": "workspace:*",
"@sentry/node": "8.54.0",
"@sentry/profiling-node": "8.54.0",
"@sentry/react": "8.54.0",
Expand Down Expand Up @@ -101,7 +101,7 @@
"qrcode": "1.5.4",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-router": "7.1.5",
"react-router": "7.3.0",
"remix-auth": "3.7.0",
"remix-auth-github": "1.7.0",
"remix-utils": "8.1.0",
Expand All @@ -120,7 +120,7 @@
"@epic-web/config": "1.16.5",
"@faker-js/faker": "9.4.0",
"@playwright/test": "1.50.1",
"@react-router/dev": "7.1.5",
"@react-router/dev": "^7.3.0",
"@sentry/vite-plugin": "3.1.2",
"@sly-cli/sly": "1.14.0",
"@testing-library/dom": "10.4.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<!-- Summary: Put your summary here -->

## Test Plan

<!-- What steps need to be taken to verify this works as expected? -->

## Checklist

- [ ] Tests updated
- [ ] Docs updated

## Screenshots

<!-- If what you're changing is within the app, please show before/after.
You can provide a video as well if that makes more sense -->
Loading