Merge branch 'main' into release-next

remix-run · Aug 28, 2023 · c06984d · c06984d
2 parents c265a42 + 4b494b9
commit c06984d
Show file tree

Hide file tree

Showing 47 changed files with 343 additions and 322 deletions.
diff --git a/contributors.yml b/contributors.yml
@@ -5,6 +5,7 @@
 - AchThomas
 - adamdotjs
 - adil62
+- adrienharnay
 - afzalsayed96
 - Ajayff4
 - akamfoad
@@ -132,6 +133,7 @@
 - lopezac
 - lordofthecactus
 - LordThi
+- louis-young
 - loun4
 - lounsbrough
 - lpaube
@@ -178,7 +180,9 @@
 - petersendidit
 - promet99
 - pyitphyoaung
+- refusado
 - rimian
+- robbtraister
 - RobHannay
 - rtmann
 - rubeonline
@@ -195,10 +199,12 @@
 - shivamsinghchahar
 - SimenB
 - SkayuX
+- smithki
 - souzasmatheus
 - srmagura
 - stasundr
 - stmtk1
+- swalker326
 - tanayv
 - theostavrides
 - thisiskartik
@@ -230,7 +236,3 @@
 - yionr
 - yuleicul
 - zheng-chuang
-- swalker326
-- smithki
-- louis-young
-- robbtraister
diff --git a/docs/hooks/use-navigate.md b/docs/hooks/use-navigate.md
@@ -54,7 +54,7 @@ The `navigate` function has two signatures:
 
 ## `options.replace`
 
-Specifying `replace: true` will cause the navigation will replace the current entry in the history stack instead of adding a new one.
+Specifying `replace: true` will cause the navigation to replace the current entry in the history stack instead of adding a new one.
 
 ## `options.state`
 

diff --git a/docs/route/lazy.md b/docs/route/lazy.md
@@ -22,7 +22,7 @@ let routes = createRoutesFromElements(
 );
 ```
 
-Then in your lazy route modules, export the properties you want defined for the route:
+Then in your lazy route modules, export the properties you want defined for the route (`loader`, `Component`, `ErrorBoundary`):
 
 ```jsx
 export async function loader({ request }) {
@@ -59,6 +59,10 @@ export function ErrorBoundary() {
 ErrorBoundary.displayName = "SampleErrorBoundary";
 ```
 
+<docs-info>
+Note that there's no `default` export in this lazy-loaded file.  That's because `default` is not a valid key on a route object.  These files generally should only export keys you would define on a route object, such as `loader`, `action`, `Component`, `ErrorBoundary`, etc.  All exports will be spread directly on the route object unless you manually return an object from `lazy`.
+</docs-info>
+
 ## Statically Defined Properties
 
 Any properties defined statically on the route cannot be overwritten by the `lazy` function, and you'll receive a console warning if you attempt to overwrite them.

diff --git a/examples/auth-router-provider/package-lock.json b/examples/auth-router-provider/package-lock.json
diff --git a/examples/auth-router-provider/package.json b/examples/auth-router-provider/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router-dom": "^6.14.1"
+    "react-router-dom": "^6.15.0"
   },
   "devDependencies": {
     "@rollup/plugin-replace": "^5.0.2",

diff --git a/examples/auth/package-lock.json b/examples/auth/package-lock.json
diff --git a/examples/auth/package.json b/examples/auth/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router-dom": "^6.8.0"
+    "react-router-dom": "^6.15.0"
   },
   "devDependencies": {
     "@rollup/plugin-replace": "^5.0.2",

diff --git a/examples/basic-data-router/package-lock.json b/examples/basic-data-router/package-lock.json
diff --git a/examples/basic-data-router/package.json b/examples/basic-data-router/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-router-dom": "^6.10.0"
+    "react-router-dom": "^6.15.0"
   },
   "devDependencies": {
     "@rollup/plugin-replace": "5.0.2",

diff --git a/examples/basic/package-lock.json b/examples/basic/package-lock.json
diff --git a/examples/basic/package.json b/examples/basic/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router-dom": "^6.8.0"
+    "react-router-dom": "^6.15.0"
   },
   "devDependencies": {
     "@rollup/plugin-replace": "^5.0.2",