Skip to content

Commit

Permalink
Merge branch 'dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
nickprinsloo authored Nov 1, 2023
2 parents 0b04740 + 33c64cb commit f66f1c2
Show file tree
Hide file tree
Showing 93 changed files with 1,334 additions and 586 deletions.
7 changes: 0 additions & 7 deletions .changeset/big-tigers-burn.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/create-remix-default-remix-version.md

This file was deleted.

9 changes: 0 additions & 9 deletions .changeset/empty-default-export.md

This file was deleted.

11 changes: 0 additions & 11 deletions .changeset/fetcher-persist.md

This file was deleted.

8 changes: 0 additions & 8 deletions .changeset/fix-express-proxy.md

This file was deleted.

18 changes: 0 additions & 18 deletions .changeset/perfect-rockets-approve.md

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/deduplicate-yarn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
token: ${{ secrets.FORMAT_PAT }}

- name: ⎔ Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: "yarn"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/deployments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
uses: actions/checkout@v4

- name: ⎔ Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: npm
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
uses: actions/checkout@v4

- name: ⎔ Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: npm
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
uses: actions/checkout@v4

- name: ⎔ Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: npm
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
uses: actions/checkout@v4

- name: ⎔ Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: npm
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
uses: actions/checkout@v4

- name: ⎔ Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: npm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
token: ${{ secrets.FORMAT_PAT }}

- name: ⎔ Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: "yarn"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/checkout@v4

- name: ⎔ Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: "yarn"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
fetch-depth: 0

- name: ⎔ Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: "yarn"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-experimental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
fetch-depth: 0

- name: ⎔ Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: "yarn"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
fetch-depth: 0

- name: ⎔ Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: "yarn"
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
uses: actions/checkout@v4

- name: ⎔ Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
cache: "npm"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shared-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: actions/checkout@v4

- name: ⎔ Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: "yarn"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shared-test-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
uses: actions/checkout@v4

- name: ⎔ Setup node ${{ matrix.node }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
cache: "yarn"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shared-test-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
uses: actions/checkout@v4

- name: ⎔ Setup node ${{ matrix.node }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
cache: "yarn"
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/stacks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
name: "grunge"
steps:
- name: ⎔ Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18

Expand All @@ -37,7 +37,7 @@ jobs:
npx -y create-remix@${{ inputs.version }} ${{ matrix.stack.name }} --template ${{ matrix.stack.repo }} --no-install --no-git-init
- name: ⎔ Setup dependency caching
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
cache: npm
cache-dependency-path: ${{ matrix.stack.name }}/package.json
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
run: unzip ${{ matrix.stack.name }}.zip

- name: ⎔ Setup node and dependency caching
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
cache: npm
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
run: unzip ${{ matrix.stack.name }}.zip

- name: ⎔ Setup node and dependency caching
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
cache: npm
Expand Down Expand Up @@ -170,7 +170,7 @@ jobs:
run: unzip ${{ matrix.stack.name }}.zip

- name: ⎔ Setup node and dependency caching
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
cache: npm
Expand Down Expand Up @@ -213,7 +213,7 @@ jobs:
run: unzip ${{ matrix.stack.name }}.zip

- name: ⎔ Setup node and dependency caching
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
cache: npm
Expand Down
6 changes: 6 additions & 0 deletions contributors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@
- kimdontdoit
- KingSora
- kishanhitk
- kiyadotdev
- klauspaiva
- knowler
- konradkalemba
Expand Down Expand Up @@ -489,6 +490,7 @@
- sergiocarneiro
- sergiodxa
- shairez
- shamsup
- shashankboosi
- shininglovestar
- shubhaguha
Expand All @@ -511,6 +513,7 @@
- stephenwade
- SufianBabri
- supachaidev
- syeef
- Synvox
- tagraves
- takagimeow
Expand Down Expand Up @@ -547,6 +550,7 @@
- viveleroi
- vkrol
- vlindhol
- vm
- vmosyaykin
- vorcigernix
- wangbinyq
Expand Down Expand Up @@ -595,3 +599,5 @@
- TrySound
- rogepi
- fredericoo
- SeanGroff
- jmarbutt
16 changes: 12 additions & 4 deletions docs/components/form.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,21 @@ The encoding type to use for the form submission.

Defaults to `application/x-www-form-urlencoded`, use `multipart/form-data` for file uploads.

## `navigate`
### `navigate`

You can tell the form to skip the navigation and use a [fetcher][use_fetcher] internally by specifying `<Form navigate={false}>`. This is essentially a shorthand for `useFetcher()` + `<fetcher.Form>` where you don't care about the resulting data and only want to kick off a submission and access the pending state via [`useFetchers()`][use_fetchers].

## `fetcherKey`
```tsx
<Form method="post" navigate={false} />
```

### `fetcherKey`

When using a non-navigating `Form`, you may also optionally specify your own fetcher key to use via `<Form navigate={false} fetcherKey="my-key">`.
When using a non-navigating `Form`, you may also optionally specify your own fetcher `key` to use.

```tsx
<Form method="post" navigate={false} fetcherKey="my-key" />
```

### `preventScrollReset`

Expand Down Expand Up @@ -81,7 +89,7 @@ If true, it will submit the form with the browser instead of client side routing

This is recommended over [`<form>`][form_element]. When the `action` prop is omitted, `<Form>` and `<form>` will sometimes call different actions depending on what the current URL is since `<form>` uses the current URL as the default, but `<Form>` uses the URL for the route the form is rendered in.

## `unstable_viewTransition`
### `unstable_viewTransition`

The `unstable_viewTransition` prop enables a [View Transition][view-transitions] for this navigation by wrapping the final state update in `document.startViewTransition()`. If you need to apply specific styles for this view transition, you will also need to leverage the [`unstable_useViewTransitionState()`][use-view-transition-state].

Expand Down
2 changes: 1 addition & 1 deletion docs/discussion/form-vs-fetcher.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ These actions are generally more subtle and don't require a context switch for t

- **Updating a Single Field**: Maybe a user wants to change the name of an item in a list or update a specific property of a record. This action is minor and doesn't necessitate a new page or URL.

- **Deleting a Record from a List**: In a list view, if a user deletes an item, they likely expect to remain on the list view, with that item simply disappearing.
- **Deleting a Record from a List**: In a list view, if a user deletes an item, they likely expect to remain on the list view, with that item no longer in the list.

- **Creating a Record in a List View**: When adding a new item to a list, it often makes sense for the user to remain in that context, seeing their new item added to the list without a full page transition.

Expand Down
Loading

0 comments on commit f66f1c2

Please sign in to comment.