Merge branch 'main' into route-generator/dont-remove-trailing-slash-for-root

Author: cxa

docs/router/framework/react/api/router.md

@@ -32,6 +32,7 @@ title: Router API
   - [`<Link>`](../router/linkComponent.md)
   - [`<MatchRoute>`](../router/matchRouteComponent.md)
   - [`<Navigate>`](../router/navigateComponent.md)
+  - [`<NotFoundComponent>`](../router/notFoundComponentComponent.md)
   - [`<Outlet>`](../router/outletComponent.md)
 - Hooks
   - [`useAwaited`](../router/useAwaitedHook.md)

docs/router/framework/react/api/router/notFoundComponentComponent.md

@@ -0,0 +1,36 @@
+---
+id: notFoundComponentComponent
+title: NotFoundComponent component
+---
+
+The `NotFoundComponent` component is a component that renders when a not-found error occurs in a route.
+
+## NotFoundComponent props
+
+The `NotFoundComponent` component accepts the following props:
+
+### `props.data` prop
+
+- Type: `unknown`
+- Optional
+- Custom data that is passed to the `notFoundComponent` when the not-found error is handled
+- This data comes from the `data` property of the `NotFoundError` object
+
+### `props.isNotFound` prop
+
+- Type: `boolean`
+- Required
+- A boolean value indicating whether the current state is a not-found error state
+- This value is always `true`
+
+### `props.routeId` prop
+
+- Type: `RouteIds<RegisteredRouter['routeTree']>`
+- Required
+- The ID of the route that is attempting to handle the not-found error
+- Must be one of the valid route IDs from the router's route tree
+
+## NotFoundComponent returns
+
+- Returns appropriate UI for not-found error situations
+- Typically includes a "page not found" message along with links to go home or navigate to previous pages

e2e/react-router/basepath-file-based/package.json

@@ -6,7 +6,7 @@
     "dev": "vite --port 3000",
     "dev:e2e": "vite",
     "build": "vite build && tsc --noEmit",
-    "serve": "vite preview",
+    "preview": "vite preview",
     "start": "vite",
     "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
   },

e2e/react-router/basepath-file-based/playwright.config.ts

@@ -26,7 +26,7 @@ export default defineConfig({
   },
 
   webServer: {
-    command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm serve --port ${PORT}`,
+    command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`,
     url: baseURL,
     reuseExistingServer: !process.env.CI,
     stdout: 'pipe',

e2e/react-router/basic-file-based-code-splitting/package.json

@@ -6,7 +6,7 @@
     "dev": "vite --port 3000",
     "dev:e2e": "vite",
     "build": "vite build && tsc --noEmit",
-    "serve": "vite preview",
+    "preview": "vite preview",
     "start": "vite",
     "test:e2e:verbose-routes:true": "rm -rf port*.txt; VERBOSE_FILE_ROUTES=1 playwright test --project=chromium",
     "test:e2e:verbose-routes:false": "rm -rf port*.txt; VERBOSE_FILE_ROUTES=0 playwright test --project=chromium",

e2e/react-router/basic-file-based-code-splitting/playwright.config.ts

@@ -26,7 +26,7 @@ export default defineConfig({
   },
 
   webServer: {
-    command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && pnpm serve --port ${PORT}`,
+    command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && pnpm preview --port ${PORT}`,
     url: baseURL,
     reuseExistingServer: !process.env.CI,
     stdout: 'pipe',

e2e/react-router/basic-file-based/package.json

@@ -8,8 +8,8 @@
     "dev:e2e": "vite",
     "build": "vite build && tsc --noEmit",
     "build:nonnested": "MODE=nonnested VITE_MODE=nonnested vite build && tsc --noEmit",
-    "serve": "vite preview",
-    "serve:nonnested": "MODE=nonnested VITE_MODE=nonnested vite preview",
+    "preview": "vite preview",
+    "preview:nonnested": "MODE=nonnested VITE_MODE=nonnested vite preview",
     "start": "vite",
     "start:nonnested": "MODE=nonnested VITE_MODE=nonnested vite",
     "test:e2e": "pnpm run test:e2e:nonnested && pnpm run test:e2e:default",

e2e/react-router/basic-file-based/playwright.config.ts

@@ -9,8 +9,8 @@ import { useExperimentalNonNestedRoutes } from './tests/utils/useExperimentalNon
 const PORT = await getTestServerPort(packageJson.name)
 const EXTERNAL_PORT = await getDummyServerPort(packageJson.name)
 const baseURL = `http://localhost:${PORT}`
-const experimentalNonNestedPathsModeCommand = `pnpm build:nonnested && pnpm serve:nonnested --port ${PORT}`
-const defaultCommand = `pnpm build && pnpm serve --port ${PORT}`
+const experimentalNonNestedPathsModeCommand = `pnpm build:nonnested && pnpm preview:nonnested --port ${PORT}`
+const defaultCommand = `pnpm build && pnpm preview --port ${PORT}`
 const command = useExperimentalNonNestedRoutes
   ? experimentalNonNestedPathsModeCommand
   : defaultCommand

e2e/react-router/basic-react-query-file-based/package.json

@@ -6,7 +6,7 @@
     "dev": "vite --port 3000",
     "dev:e2e": "vite",
     "build": "vite build && tsc --noEmit",
-    "serve": "vite preview",
+    "preview": "vite preview",
     "start": "vite",
     "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
   },

e2e/react-router/basic-react-query-file-based/playwright.config.ts

@@ -25,7 +25,7 @@ export default defineConfig({
   },
 
   webServer: {
-    command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && pnpm serve --port ${PORT}`,
+    command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && pnpm preview --port ${PORT}`,
     url: baseURL,
     reuseExistingServer: !process.env.CI,
     stdout: 'pipe',