Skip to content

Commit

Permalink
Merge branch 'beta' of https://github.com/TanStack/router into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
tannerlinsley committed Nov 18, 2022
2 parents 5ee825f + 0b52887 commit 18e246f
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion examples/react/basic-ssr-lite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"debug": "node --inspect-brk server"
},
"dependencies": {
"@tanstack/react-router": "0.0.1-beta.16",
"@tanstack/react-router": "0.0.1-beta.18",
"@tanstack/react-router-devtools": "0.0.1-beta.13",
"axios": "^1.1.3",
"react": "^18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/react/basic-ssr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"debug": "node --inspect-brk server"
},
"dependencies": {
"@tanstack/react-router": "0.0.1-beta.16",
"@tanstack/react-router": "0.0.1-beta.18",
"@tanstack/react-router-devtools": "0.0.1-beta.13",
"axios": "^1.1.3",
"react": "^18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/react/basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"start": "vite"
},
"dependencies": {
"@tanstack/react-router": "0.0.1-beta.16",
"@tanstack/react-router": "0.0.1-beta.18",
"@tanstack/react-router-devtools": "0.0.1-beta.13",
"@vitejs/plugin-react": "^1.1.3",
"axios": "^1.1.3",
Expand Down
2 changes: 1 addition & 1 deletion examples/react/kitchen-sink-codesplit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"start": "vite"
},
"dependencies": {
"@tanstack/react-router": "0.0.1-beta.16",
"@tanstack/react-router": "0.0.1-beta.18",
"@tanstack/react-router-devtools": "0.0.1-beta.13",
"@vitejs/plugin-react": "^1.1.3",
"axios": "^1.1.3",
Expand Down
2 changes: 1 addition & 1 deletion examples/react/kitchen-sink-routegen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"start": "vite"
},
"dependencies": {
"@tanstack/react-router": "0.0.1-beta.16",
"@tanstack/react-router": "0.0.1-beta.18",
"@tanstack/react-router-devtools": "0.0.1-beta.13",
"@vitejs/plugin-react": "^1.1.3",
"axios": "^1.1.3",
Expand Down
2 changes: 1 addition & 1 deletion examples/react/kitchen-sink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"start": "vite"
},
"dependencies": {
"@tanstack/react-router": "0.0.1-beta.16",
"@tanstack/react-router": "0.0.1-beta.18",
"@tanstack/react-router-devtools": "0.0.1-beta.13",
"@vitejs/plugin-react": "^1.1.3",
"axios": "^1.1.3",
Expand Down
2 changes: 1 addition & 1 deletion examples/react/with-react-query/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dependencies": {
"@tanstack/react-query": "^4.14.1",
"@tanstack/react-query-devtools": "^4.14.1",
"@tanstack/react-router": "0.0.1-beta.16",
"@tanstack/react-router": "0.0.1-beta.18",
"@tanstack/react-router-devtools": "0.0.1-beta.13",
"@vitejs/plugin-react": "^1.1.3",
"axios": "^1.1.3",
Expand Down
2 changes: 1 addition & 1 deletion examples/react/with-trpc-react-query/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"@tanstack/react-query": "^4.14.1",
"@tanstack/react-query-devtools": "^4.14.1",
"@tanstack/react-router": "0.0.1-beta.16",
"@tanstack/react-router": "0.0.1-beta.18",
"@tanstack/react-router-devtools": "0.0.1-beta.13",
"@trpc/client": "^10.0.0-rc.6",
"@trpc/react-query": "^10.0.0-rc.6",
Expand Down
2 changes: 1 addition & 1 deletion examples/react/with-trpc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"@tanstack/react-query": "^4.14.1",
"@tanstack/react-query-devtools": "^4.14.1",
"@tanstack/react-router": "0.0.1-beta.16",
"@tanstack/react-router": "0.0.1-beta.18",
"@tanstack/react-router-devtools": "0.0.1-beta.13",
"@trpc/client": "^10.0.0-rc.6",
"@trpc/react-query": "^10.0.0-rc.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-router-devtools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
],
"sideEffects": false,
"peerDependencies": {
"@tanstack/react-router": "0.0.1-beta.16",
"@tanstack/react-router": "0.0.1-beta.18",
"react": ">=16",
"react-dom": ">=16"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/react-router-rank-routes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@
"peerDependencies": {
"react": ">=16",
"react-dom": ">=16",
"@tanstack/react-router": "0.0.1-beta.16"
"@tanstack/react-router": "0.0.1-beta.18"
}
}
2 changes: 1 addition & 1 deletion packages/react-router/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tanstack/react-router",
"author": "Tanner Linsley",
"version": "0.0.1-beta.16",
"version": "0.0.1-beta.18",
"license": "MIT",
"repository": "tanstack/router",
"homepage": "https://tanstack.com/router/",
Expand Down
10 changes: 5 additions & 5 deletions packages/react-router/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -440,15 +440,15 @@ export function createReactRouter<

invariant(
runtimeMatch.routeId == match?.routeId,
`useMatch('${
`useMatch("${
match?.routeId as string
}') is being called in a component that is meant to render the '${
}") is being called in a component that is meant to render the '${
runtimeMatch.routeId
}' route. Did you mean to 'useMatch(${
}' route. Did you mean to 'useMatch("${
match?.routeId as string
}, { strict: false })' or 'useRoute(${
}", { strict: false })' or 'useRoute("${
match?.routeId as string
})' instead?`,
}")' instead?`,
)
}

Expand Down

0 comments on commit 18e246f

Please sign in to comment.