Merge branch 'release-next' into dev

remix-run · Jun 30, 2023 · 7abaf9f · 7abaf9f
2 parents 12af64b + 708f7db
commit 7abaf9f
Show file tree

Hide file tree

Showing 80 changed files with 435 additions and 178 deletions.
diff --git a/contributors.yml b/contributors.yml
@@ -417,6 +417,7 @@
 - plastic041
 - plondon
 - pmbanugo
+- pratikdevdas
 - princerajroy
 - prvnbist
 - ptitFicus
@@ -429,6 +430,7 @@
 - reggie3
 - reichhartd
 - remix-run-bot
+- richardhunghhw
 - riencoertjens
 - rkulinski
 - rlfarman
@@ -552,3 +554,4 @@
 - amir-ziaei
 - mrkhosravian
 - tanerijun
+- ally1002
diff --git a/docs/file-conventions/entry.server.md b/docs/file-conventions/entry.server.md
@@ -39,10 +39,10 @@ export function handleError(
 
 ### Streaming Rendering Errors
 
-When you are streaming your HTML responses via [`renderToPipeableStream`][rendertopipeablestream] or [`renderToReadableStream`][rendertoreadablestream], your own `handleError` implementation will only handle errors encountered uring the initial shell render. If you encounter a rendering error during subsequent streamed rendering you will need handle these errors manually since the Remix server has already sent the Response by that point.
+When you are streaming your HTML responses via [`renderToPipeableStream`][rendertopipeablestream] or [`renderToReadableStream`][rendertoreadablestream], your own `handleError` implementation will only handle errors encountered during the initial shell render. If you encounter a rendering error during subsequent streamed rendering you will need handle these errors manually since the Remix server has already sent the Response by that point.
 
 - For `renderToPipeableStream`, you can handle these errors in the `onError` callback function. You will need to toggle a boolean when the in `onShellReady` so you know if the error was a shell rendering error (and can be ignored) or an async rendering error (and must be handled).
-  - For an exmaple, please see the default [`entry.server.tsx`][node-streaming-entry-server] for Node.
+  - For an example, please see the default [`entry.server.tsx`][node-streaming-entry-server] for Node.
 - For `renderToReadableStream`, you can handle these errors in the `onError` callback function
   - For an example, please see the default [`entry.server.tsx`][cloudflare-streaming-entry-server] for Cloudflare
 

diff --git a/docs/guides/routing.md b/docs/guides/routing.md
@@ -203,7 +203,7 @@ You may notice an `?index` query parameter showing up on your URLs from time to
     ├── root.tsx
     └── routes
         ├── sales.invoices._index.tsx   <-- /sales/invoices?index
-        ├── sales.invoices.invoices.tsx <-- /sales/invoices
+        └── sales.invoices.tsx <-- /sales/invoices
 ```
 
 This is handled automatically for you when you submit from a `<Form>` contained within either the layout route or the index route. But if you are submitting forms to different routes, or using `fetcher.submit`/`fetcher.load` you may need to be aware of this URL pattern, so you can target the correct route.

diff --git a/docs/other-api/dev-v2.md b/docs/other-api/dev-v2.md
@@ -328,6 +328,16 @@ server.listen(port, () => {
 });
 ```
 
+Now that the app server is set up, you should be able to build and run your app in production mode with TLS.
+To get the dev server to interop with TLS, you'll need to specify the TLS cert and key you created:
+
+```sh
+remix dev --tls-key=key.pem --tls-cert=cert.pem -c 'node ./server.js'
+```
+
+Alternatively, you can specify the TLS key and cert via the `v2_dev.tlsCert` and `v2_dev.tlsKey` config options.
+Now your app server and dev server are TLS ready!
+
 ### Troubleshooting
 
 #### HMR: hot updates losing app state

diff --git a/docs/route/error-boundary-v2.md b/docs/route/error-boundary-v2.md
@@ -64,4 +64,4 @@ export function ErrorBoundary() {
 [error-boundaries]: https://reactjs.org/docs/error-boundaries.html
 [rr-error-boundary]: https://reactrouter.com/en/main/route/error-element
 [use-route-error]: ../hooks/use-route-error
-[is-route-error-response]: ../utils/is-route-error-response.md
+[is-route-error-response]: ../utils/is-route-error-response
diff --git a/docs/tutorials/jokes.md b/docs/tutorials/jokes.md
@@ -7740,7 +7740,7 @@ Phew! And there we have it. If you made it through this whole thing then I'm rea
 [the-http-api]: https://developer.mozilla.org/en-US/docs/Web/HTTP
 [the-basic-example]: https://codesandbox.io/s/github/remix-run/examples/tree/main/basic
 [express]: https://expressjs.com
-[hydrate]: https://reactjs.org/docs/react-dom.html#hydrate
+[hydrate]: https://react.dev/reference/react-dom/client/hydrateRoot
 [http-localhost-3000]: http://localhost:3000
 [bare-bones-hello-world-app]: /jokes-tutorial/img/bare-bones.png
 [remix-config-js]: ../file-conventions/remix-config

diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `create-remix`
 
+## 1.18.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/dev@1.18.1`
+
 ## 1.18.0
 
 ### Patch Changes

diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-remix",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "Create a new Remix app",
   "homepage": "https://remix.run",
   "bugs": {
@@ -17,7 +17,7 @@
     "create-remix": "dist/cli.js"
   },
   "dependencies": {
-    "@remix-run/dev": "1.18.0"
+    "@remix-run/dev": "1.18.1"
   },
   "engines": {
     "node": ">=14.0.0"

diff --git a/packages/remix-architect/CHANGELOG.md b/packages/remix-architect/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/architect`
 
+## 1.18.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@1.18.1`
+
 ## 1.18.0
 
 ### Patch Changes

diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/architect",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "Architect server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
@@ -15,7 +15,7 @@
   "typings": "dist/index.d.ts",
   "dependencies": {
     "@architect/functions": "^5.2.0",
-    "@remix-run/node": "1.18.0",
+    "@remix-run/node": "1.18.1",
     "@types/aws-lambda": "^8.10.82"
   },
   "devDependencies": {

diff --git a/packages/remix-cloudflare-pages/CHANGELOG.md b/packages/remix-cloudflare-pages/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-pages`
 
+## 1.18.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@1.18.1`
+
 ## 1.18.0
 
 ### Patch Changes

diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-pages",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "Cloudflare Pages request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
@@ -15,7 +15,7 @@
   "typings": "dist/index.d.ts",
   "module": "dist/esm/index.js",
   "dependencies": {
-    "@remix-run/cloudflare": "1.18.0"
+    "@remix-run/cloudflare": "1.18.1"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^3.4.0",

diff --git a/packages/remix-cloudflare-workers/CHANGELOG.md b/packages/remix-cloudflare-workers/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-workers`
 
+## 1.18.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@1.18.1`
+
 ## 1.18.0
 
 ### Patch Changes

diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-workers",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "Cloudflare worker request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
@@ -16,7 +16,7 @@
   "module": "dist/esm/index.js",
   "dependencies": {
     "@cloudflare/kv-asset-handler": "^0.1.3",
-    "@remix-run/cloudflare": "1.18.0"
+    "@remix-run/cloudflare": "1.18.1"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^3.4.0"

diff --git a/packages/remix-cloudflare/CHANGELOG.md b/packages/remix-cloudflare/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare`
 
+## 1.18.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@1.18.1`
+
 ## 1.18.0
 
 ### Patch Changes

diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "Cloudflare platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
@@ -15,7 +15,7 @@
   "typings": "dist/index.d.ts",
   "dependencies": {
     "@cloudflare/kv-asset-handler": "^0.1.3",
-    "@remix-run/server-runtime": "1.18.0"
+    "@remix-run/server-runtime": "1.18.1"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^3.4.0"

diff --git a/packages/remix-css-bundle/CHANGELOG.md b/packages/remix-css-bundle/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @remix-run/css-bundle
 
+## 1.18.1
+
 ## 1.18.0
 
 ## 1.17.1

diff --git a/packages/remix-css-bundle/package.json b/packages/remix-css-bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/css-bundle",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "CSS bundle href when using CSS bundling features in Remix",
   "homepage": "https://remix.run",
   "bugs": {

diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/deno`
 
+## 1.18.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@1.18.1`
+
 ## 1.18.0
 
 ### Patch Changes

diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/deno",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "Deno platform abstractions for Remix",
   "homepage": "https://remix.run",
   "main": "./index.ts",
@@ -15,7 +15,7 @@
   "license": "MIT",
   "sideEffects": false,
   "dependencies": {
-    "@remix-run/server-runtime": "1.18.0",
+    "@remix-run/server-runtime": "1.18.1",
     "mime": "^3.0.0"
   },
   "engines": {

diff --git a/packages/remix-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/dev`
 
+## 1.18.1
+
+### Patch Changes
+
+- Ignore missing `react-dom/client` for React 17 ([#6725](https://github.com/remix-run/remix/pull/6725))
+- Updated dependencies:
+  - `@remix-run/server-runtime@1.18.1`
+
 ## 1.18.0
 
 ### Minor Changes

diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/dev",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "Dev tools and CLI for Remix",
   "homepage": "https://remix.run",
   "bugs": {
@@ -28,7 +28,7 @@
     "@babel/traverse": "^7.21.5",
     "@babel/types": "^7.21.5",
     "@npmcli/package-json": "^2.0.0",
-    "@remix-run/server-runtime": "1.18.0",
+    "@remix-run/server-runtime": "1.18.1",
     "@vanilla-extract/integration": "^6.2.0",
     "arg": "^5.0.1",
     "cacache": "^15.0.5",
@@ -74,7 +74,7 @@
     "xdm": "^2.0.0"
   },
   "devDependencies": {
-    "@remix-run/serve": "1.18.0",
+    "@remix-run/serve": "1.18.1",
     "@types/cacache": "^15.0.0",
     "@types/gunzip-maybe": "^1.4.0",
     "@types/inquirer": "^8.2.0",
@@ -94,7 +94,7 @@
     "type-fest": "^2.16.0"
   },
   "peerDependencies": {
-    "@remix-run/serve": "^1.18.0"
+    "@remix-run/serve": "^1.18.1"
   },
   "peerDependenciesMeta": {
     "@remix-run/serve": {

diff --git a/packages/remix-eslint-config/CHANGELOG.md b/packages/remix-eslint-config/CHANGELOG.md
@@ -1,10 +1,12 @@
 # `@remix-run/eslint-config`
 
-## 1.18.0
+## 1.18.1
 
-### Minor Changes
+No significant changes to this package were made in this release. [See the releases page on GitHub](https://github.com/remix-run/remix/releases/tag/remix%401.18.1) for an overview of all changes in v1.18.1.
+
+## 1.18.0
 
-- Update `@remix-run/eslint-config` to inherit rules from `@typescript-eslint/recommended` ([#6614](https://github.com/remix-run/remix/pull/6614))
+No significant changes to this package were made in this release. [See the releases page on GitHub](https://github.com/remix-run/remix/releases/tag/remix%401.18.0) for an overview of all changes in v1.18.0.
 
 ## 1.17.1
 

diff --git a/packages/remix-eslint-config/package.json b/packages/remix-eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/eslint-config",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "ESLint configuration for Remix projects",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"

diff --git a/packages/remix-express/CHANGELOG.md b/packages/remix-express/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/express`
 
+## 1.18.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@1.18.1`
+
 ## 1.18.0
 
 ### Patch Changes

diff --git a/packages/remix-express/package.json b/packages/remix-express/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/express",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "Express server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
@@ -14,7 +14,7 @@
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "dependencies": {
-    "@remix-run/node": "1.18.0"
+    "@remix-run/node": "1.18.1"
   },
   "devDependencies": {
     "@types/express": "^4.17.9",

diff --git a/packages/remix-netlify/CHANGELOG.md b/packages/remix-netlify/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/netlify`
 
+## 1.18.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@1.18.1`
+
 ## 1.18.0
 
 ### Patch Changes