Skip to content

Commit 838c79a

Browse files
authored
Merge branch 'dev' into kentcdodds-patch-2
2 parents 5d461de + 6563a94 commit 838c79a

File tree

403 files changed

+15901
-9706
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

403 files changed

+15901
-9706
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@remix-run/react": patch
3+
---
4+
5+
better opt out of loader revalidation on UI only changes

.changeset/css-bundle-monorepo-fix.md

-6
This file was deleted.

.changeset/css-side-effect-import-extensions.md

-5
This file was deleted.

.changeset/deprecate-fetcher-type-submission.md

-5
This file was deleted.

.changeset/entry-client-no-ric.md

-6
This file was deleted.

.changeset/eslint-no-display-name.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"remix": patch
3+
"@remix-run/eslint-config": patch
4+
---
5+
6+
don't require display name in root module

.changeset/export-use-match.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@remix-run/react": patch
3+
---
4+
5+
Add `useMatch` re-export from `react-router-dom`

.changeset/good-laws-marry.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@remix-run/dev": patch
3+
---
4+
5+
wait until app server is killed before starting a new app server

.changeset/light-bikes-exercise.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"remix": patch
3+
"@remix-run/dev": patch
4+
---
5+
6+
normalize file paths before testing if a changed file is a route entry

.changeset/meta-v2-enhancements.md

-6
This file was deleted.

.changeset/ninety-flies-allow.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@remix-run/dev": patch
3+
---
4+
5+
- Fix public asset serving for non-Remix assets in the new dev server
6+
- Add `--public-directory` / `unstable_dev.publicDirectory` option for configuring local directory for serving non-Remix assets like fonts
7+
- Fix `svg` serving for new dev server

.changeset/no-log-on-aborted-request.md

-5
This file was deleted.

.changeset/poor-nails-warn.md

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
"@remix-run/dev": patch
3+
---
4+
5+
fix race where app server responds with updated manifest version _before_ dev server is listening for it
6+
7+
dev server now listens for updated versions _before_ writing the server changes, guaranteeing that it is listening
8+
before the app server gets a chance to send its 'ready' message

.changeset/three-cheetahs-lick.md

-7
This file was deleted.

.changeset/tsconfig-no-modify.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"remix": patch
3+
"@remix-run/dev": patch
4+
---
5+
6+
stop modifying a user's tsconfig when running using `getConfig` (`remix dev`, `remix routes`, `remix build`, etc)

.changeset/twenty-toys-laugh.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@remix-run/dev": patch
3+
---
4+
5+
cancel previous build when rebuild is kicked off to prevent rebuilds from hanging

.changeset/vanilla-extract-cache.md

-5
This file was deleted.

.eslintrc.js

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ module.exports = {
1818
"no-undef": OFF,
1919
"no-unused-expressions": OFF,
2020
"no-unused-vars": OFF,
21+
"@typescript-eslint/no-redeclare": OFF,
2122
},
2223
},
2324
{

.github/workflows/deployments.yml

+4-21
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,16 @@ on:
2828
TEST_VERCEL_USER_ID:
2929
required: true
3030

31+
concurrency:
32+
group: ${{ github.workflow }}-${{ github.ref }}
33+
cancel-in-progress: true
34+
3135
jobs:
3236
arc_deploy:
3337
name: Architect Deploy
3438
if: github.repository == 'remix-run/remix'
3539
runs-on: ubuntu-latest
3640
steps:
37-
- name: 🛑 Cancel Previous Runs
38-
uses: styfle/cancel-workflow-action@0.11.0
39-
4041
- name: ⬇️ Checkout repo
4142
uses: actions/checkout@v3
4243

@@ -71,9 +72,6 @@ jobs:
7172
if: github.repository == 'remix-run/remix'
7273
runs-on: ubuntu-latest
7374
steps:
74-
- name: 🛑 Cancel Previous Runs
75-
uses: styfle/cancel-workflow-action@0.11.0
76-
7775
- name: ⬇️ Checkout repo
7876
uses: actions/checkout@v3
7977

@@ -109,9 +107,6 @@ jobs:
109107
if: github.repository == 'remix-run/remix'
110108
runs-on: ubuntu-latest
111109
steps:
112-
- name: 🛑 Cancel Previous Runs
113-
uses: styfle/cancel-workflow-action@0.11.0
114-
115110
- name: ⬇️ Checkout repo
116111
uses: actions/checkout@v3
117112

@@ -148,9 +143,6 @@ jobs:
148143
if: github.repository == 'remix-run/remix'
149144
runs-on: ubuntu-latest
150145
steps:
151-
- name: 🛑 Cancel Previous Runs
152-
uses: styfle/cancel-workflow-action@0.11.0
153-
154146
- name: ⬇️ Checkout repo
155147
uses: actions/checkout@v3
156148

@@ -190,9 +182,6 @@ jobs:
190182
if: github.repository == 'remix-run/remix'
191183
runs-on: ubuntu-latest
192184
steps:
193-
- name: 🛑 Cancel Previous Runs
194-
uses: styfle/cancel-workflow-action@0.11.0
195-
196185
- name: ⬇️ Checkout repo
197186
uses: actions/checkout@v3
198187

@@ -228,9 +217,6 @@ jobs:
228217
if: github.repository == 'remix-run/remix'
229218
runs-on: ubuntu-latest
230219
steps:
231-
- name: 🛑 Cancel Previous Runs
232-
uses: styfle/cancel-workflow-action@0.11.0
233-
234220
- name: ⬇️ Checkout repo
235221
uses: actions/checkout@v3
236222

@@ -263,9 +249,6 @@ jobs:
263249
if: github.repository == 'remix-run/remix'
264250
runs-on: ubuntu-latest
265251
steps:
266-
- name: 🛑 Cancel Previous Runs
267-
uses: styfle/cancel-workflow-action@0.11.0
268-
269252
- name: ⬇️ Checkout repo
270253
uses: actions/checkout@v3
271254

.github/workflows/format.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@ on:
66
- main
77
- dev
88

9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
913
jobs:
1014
format:
1115
if: github.repository == 'remix-run/remix'
1216
runs-on: ubuntu-latest
1317

1418
steps:
15-
- name: 🛑 Cancel Previous Runs
16-
uses: styfle/cancel-workflow-action@0.11.0
17-
1819
- name: ⬇️ Checkout repo
1920
uses: actions/checkout@v3
2021
with:

.github/workflows/lint.yml

+9-7
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ on:
77
- dev
88
pull_request:
99

10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
1014
jobs:
1115
lint:
1216
name: ⬣ Lint
1317
runs-on: ubuntu-latest
1418
steps:
15-
- name: 🛑 Cancel Previous Runs
16-
uses: styfle/cancel-workflow-action@0.11.0
17-
1819
- name: ⬇️ Checkout repo
1920
uses: actions/checkout@v3
2021

@@ -24,14 +25,15 @@ jobs:
2425
node-version-file: ".nvmrc"
2526
cache: "yarn"
2627

27-
- name: 📥 Install deps
28-
run: yarn --frozen-lockfile
29-
30-
- name: Disable Eslint GitHub Actions Annotations
28+
- name: Disable GitHub Actions Annotations
3129
run: |
30+
echo "::remove-matcher owner=tsc::"
3231
echo "::remove-matcher owner=eslint-compact::"
3332
echo "::remove-matcher owner=eslint-stylish::"
3433
34+
- name: 📥 Install deps
35+
run: yarn --frozen-lockfile
36+
3537
- name: 🔬 Lint
3638
run: yarn lint
3739

.github/workflows/merged-pr.yml

-24
This file was deleted.

.github/workflows/nightly.yml

+4-7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on:
55
schedule:
66
- cron: "0 7 * * *" # every day at 12AM PST
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
812
env:
913
CI: true
1014

@@ -22,9 +26,6 @@ jobs:
2226
# allows this to be used in the `comment` job below - will be undefined if there's no release necessary
2327
NEXT_VERSION: ${{ steps.version.outputs.NEXT_VERSION }}
2428
steps:
25-
- name: 🛑 Cancel Previous Runs
26-
uses: styfle/cancel-workflow-action@0.11.0
27-
2829
- name: ⬇️ Checkout repo
2930
uses: actions/checkout@v3
3031
with:
@@ -95,10 +96,6 @@ jobs:
9596
name: 📝 Comment on related issues and pull requests
9697
if: github.repository == 'remix-run/remix' && needs.nightly.outputs.NEXT_VERSION
9798
uses: ./.github/workflows/release-comments.yml
98-
with:
99-
ref: "refs/tags/v${{ needs.nightly.outputs.NEXT_VERSION }}"
100-
package_version_to_follow: "remix"
101-
release_branch: "dev"
10299

103100
deployments:
104101
needs: [nightly]

.github/workflows/no-response.yml

+19-12
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,27 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: 🥺 Handle Ghosting
18-
uses: actions/stale@v7
18+
uses: actions/stale@v8
1919
with:
20-
days-before-close: 10
2120
close-issue-message: >
22-
This issue has been automatically closed because we haven't received a
23-
response from the original author 🙈. This automation helps keep the issue
24-
tracker clean from issues that are unactionable. Please reach out if you
25-
have more information for us! 🙂
21+
This issue has been automatically closed because we didn't hear
22+
anything from the original author after the previous notice.
2623
close-pr-message: >
27-
This PR has been automatically closed because we haven't received a
28-
response from the original author 🙈. This automation helps keep the issue
29-
tracker clean from PRs that are unactionable. Please reach out if you
30-
have more information for us! 🙂
31-
# don't automatically mark issues/PRs as stale
32-
days-before-stale: -1
24+
This PR has been automatically closed because we didn't hear
25+
anything from the original author after the previous notice.
3326
stale-issue-label: needs-response
27+
stale-issue-message: >
28+
This issue has been automatically marked stale because we haven't
29+
received a response from the original author in a while 🙈. This
30+
automation helps keep the issue tracker clean from issues that are
31+
not actionable. Please reach out if you have more information for us
32+
or you think this issue shouldn't be closed! 🙂 If you don't do so
33+
within 7 days, this issue will be automatically closed.
3434
stale-pr-label: needs-response
35+
stale-pr-message: >
36+
This PR has been automatically marked stale because we haven't
37+
received a response from the original author in a while 🙈. This
38+
automation helps keep the issue tracker clean from issues that are
39+
not actionable. Please reach out if you have more information for us
40+
or you think this issue shouldn't be closed! 🙂 If you don't do so
41+
within 7 days, this PR will be automatically closed.

0 commit comments

Comments
 (0)