Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat!: align types with React Router #7319

Merged
merged 10 commits into from
Sep 6, 2023
Merged

feat!: align types with React Router #7319

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
77a8b65
Align types with React Router
brophdawg11 Aug 31, 2023
02f48a1
Fix lint issue
brophdawg11 Aug 31, 2023
a389baf
Update Remix types to use unknown instead of any
brophdawg11 Sep 5, 2023
0d781a9
Merge branch 'release-next' into brophdawg11/align-rr-types
brophdawg11 Sep 5, 2023
7ba1b38
Apply suggestions from code review
brophdawg11 Sep 5, 2023
5532a3d
Update exports
brophdawg11 Sep 5, 2023
f62989d
Switch fetcher to use AppData in generic
brophdawg11 Sep 5, 2023
339f2c5
Revert back to 20.5.1 for node CI runs
brophdawg11 Sep 6, 2023
35b6e1c
Switch `UIMatch` from `interface` to `type`
brophdawg11 Sep 6, 2023
41a1647
Bump RR prerelease
brophdawg11 Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Bump RR prerelease
  • Loading branch information
@brophdawg11
brophdawg11 committed Sep 6, 2023
commit 41a16470e4f734c10d7bc820abb238750c426b04
4 changes: 2 additions & 2 deletions packages/remix-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"typings": "dist/index.d.ts",
"module": "dist/esm/index.js",
"dependencies": {
"@remix-run/router": "1.9.0-pre.1",
"@remix-run/router": "1.9.0-pre.2",
"@remix-run/server-runtime": "2.0.0-pre.7",
"react-router-dom": "6.16.0-pre.1"
"react-router-dom": "6.16.0-pre.2"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.17.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/remix-server-runtime/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"typings": "dist/index.d.ts",
"module": "dist/esm/index.js",
"dependencies": {
"@remix-run/router": "1.9.0-pre.1",
"@remix-run/router": "1.9.0-pre.2",
"@types/cookie": "^0.4.1",
"@web3-storage/multipart-parser": "^1.0.0",
"cookie": "^0.4.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/remix-testing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"dependencies": {
"@remix-run/node": "2.0.0-pre.7",
"@remix-run/react": "2.0.0-pre.7",
"@remix-run/router": "1.9.0-pre.1",
"react-router-dom": "6.16.0-pre.1"
"@remix-run/router": "1.9.0-pre.2",
"react-router-dom": "6.16.0-pre.2"
},
"devDependencies": {
"@types/node": "^18.17.1",
Expand Down
30 changes: 15 additions & 15 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2132,10 +2132,10 @@
"@changesets/types" "^5.0.0"
dotenv "^8.1.0"

"@remix-run/router@1.9.0-pre.1":
version "1.9.0-pre.1"
resolved "https://registry.npmjs.org/@remix-run/router/-/router-1.9.0-pre.1.tgz#f9d2d60bf0a65d9a29cd78eac90aa556fb40b00b"
integrity sha512-uRNAn+/4nyvoRIXjych6RweUgFua3fXmUa1lTRxReVaRkux33R9aCqfgapQP5RgduAq4K06JRaNLnKBYmRW/0A==
"@remix-run/router@1.9.0-pre.2":
version "1.9.0-pre.2"
resolved "https://registry.npmjs.org/@remix-run/router/-/router-1.9.0-pre.2.tgz#60f8d78a6a63734f212a35330a72d256598928ca"
integrity sha512-SsG5WVdITYKH5VJnsI1yDyNlQjV3TxF9Aeq7ZhrYprCD0x5QqaqvTEbdpuEHybzDbvpU1Ev9eO99RTHoxeHV2w==

"@remix-run/web-blob@^3.1.0-pre.0":
version "3.1.0-pre.0"
Expand Down Expand Up @@ -10128,20 +10128,20 @@ react-refresh@^0.14.0:
resolved "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz"
integrity sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==

react-router-dom@6.16.0-pre.1:
version "6.16.0-pre.1"
resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.16.0-pre.1.tgz#0c7e5e8a3192603b12c754ba47be2c8301ca43c7"
integrity sha512-W6rrNTPaKM/4QTBYE+PElGiHaYo0Kxr+69rbUg6Hs5HzCQYfhH02tree5ZP8pLRGmMAc1KfK31RiBkYwSpXRkw==
react-router-dom@6.16.0-pre.2:
version "6.16.0-pre.2"
resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.16.0-pre.2.tgz#331f8a820d984303f65990a2ab9da06f781d1b7e"
integrity sha512-ZaYhnNQPeCYOGb9bcVxT3lbSLehZY36xK+j+xnQRw0GeaF+KBi14Hn2HwmhbmwYCbv15d1jHtvE676rFGrQlDg==
dependencies:
"@remix-run/router" "1.9.0-pre.1"
react-router "6.16.0-pre.1"
"@remix-run/router" "1.9.0-pre.2"
react-router "6.16.0-pre.2"

react-router@6.16.0-pre.1:
version "6.16.0-pre.1"
resolved "https://registry.npmjs.org/react-router/-/react-router-6.16.0-pre.1.tgz#3af6fe265a6d1fecf9321a4c2f60986a5f5137c0"
integrity sha512-kFDaSkiedeNhaq6OgDwilUzppxzeIFmmbv2WQ1YqxD6yk74n20KXGIYGdiipiMr8Qr/5cZ/j9ISj720zeFQinQ==
react-router@6.16.0-pre.2:
version "6.16.0-pre.2"
resolved "https://registry.npmjs.org/react-router/-/react-router-6.16.0-pre.2.tgz#2a306b77033c2d3110ecb37f5e4446e28916dcf6"
integrity sha512-6DVgJNxnBLGOD0SOiv11sPDaZErfrAhAuFUOzTy5OPdMpmagvsTidji6aadUZAnXDjQNYQS053BIaLC7pn5+bg==
dependencies:
"@remix-run/router" "1.9.0-pre.1"
"@remix-run/router" "1.9.0-pre.2"

react@^18.2.0:
version "18.2.0"
Expand Down