Skip to content

Commit d9516ec

Browse files
committed
Merge branch 'main' of https://github.com/remix-run/remix
Closes #54.
2 parents 4712b0e + c525f10 commit d9516ec

File tree

721 files changed

+20156
-30013
lines changed

Some content is hidden

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

721 files changed

+20156
-30013
lines changed

.changeset/config.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@
1515
"@remix-run/dev",
1616
"@remix-run/eslint-config",
1717
"@remix-run/express",
18-
"@remix-run/netlify",
1918
"@remix-run/node",
2019
"@remix-run/react",
2120
"@remix-run/serve",
2221
"@remix-run/server-runtime",
23-
"@remix-run/testing",
24-
"@remix-run/vercel"
22+
"@remix-run/testing"
2523
]
2624
],
2725
"linked": [],

.eslintrc.js

-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ module.exports = {
5252
"newlines-between": "always",
5353
},
5454
],
55-
56-
"react/jsx-no-leaked-render": [WARN, { validStrategies: ["ternary"] }],
5755
},
5856
},
5957
],

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ tsconfig.tsbuildinfo
1313
/fixtures/test
1414
/fixtures/my-remix-app
1515
/fixtures/deno-app
16-
/playwright-report
16+
/integration/playwright-report
1717
/test-results
1818
/uploads
1919

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16
1+
18

babel.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module.exports = {
44
"@babel/preset-env",
55
{
66
targets: {
7-
node: "14",
7+
node: "18",
88
},
99
},
1010
],

contributors.yml

+9
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
- bogas04
6666
- BogdanDevBst
6767
- bolchowka
68+
- brookslybrand
6869
- brophdawg11
6970
- bruno-oliveira
7071
- bsharrow
@@ -183,6 +184,8 @@
183184
- guatedude2
184185
- guerra08
185186
- gunners6518
187+
- gustavoguichard
188+
- gustavopch
186189
- gyx1000
187190
- hadizz
188191
- hardingmatt
@@ -219,6 +222,7 @@
219222
- jacargentina
220223
- jacob-ebey
221224
- JacobParis
225+
- jacobwgillespie
222226
- jack-r-warren
223227
- jakeginnivan
224228
- jakewtaylor
@@ -229,6 +233,7 @@
229233
- jaydiablo
230234
- jca41
231235
- jdeniau
236+
- jeeyoungk
232237
- JeffBeltran
233238
- jenseng
234239
- jeremyjfleming
@@ -534,6 +539,7 @@
534539
- vorcigernix
535540
- wangbinyq
536541
- weavdale
542+
- wilcoschoneveld
537543
- willhack
538544
- willin
539545
- wizardlyhel
@@ -566,9 +572,12 @@
566572
- amir-ziaei
567573
- mrkhosravian
568574
- tanerijun
575+
- naveed-fida
569576
- toufiqnuur
570577
- ally1002
571578
- defjosiah
572579
- AlemTuzlak
573580
- ledniy
581+
- robbtraister
582+
- TrySound
574583
- rogepi

docs/api/conventions.md

-256
This file was deleted.

docs/api/index.md

-4
This file was deleted.

0 commit comments

Comments
 (0)