Skip to content

Commit 8f46add

Browse files
birkskyumbirkskyum
authored
Merge branch 'main' into fix-route-matching
2 parents 4a850d1 + d0e33fa commit 8f46add

File tree

130 files changed

+2576
-2628
lines changed

Some content is hidden

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

130 files changed

+2576
-2628
lines changed

‎e2e/react-router/basic-file-based/tests/non-nested-paths.spec.ts‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { expect, test } from '@playwright/test'
2-
import { useExperimentalNonNestedRoutes } from './utils/useExperimentalNonNestedRoutes'
32

43
const testCases: Array<{
54
name: string
@@ -185,13 +184,7 @@ test.describe('Non-nested paths', () => {
185184
await expect(pathRouteHeading).not.toBeVisible()
186185
await expect(barHeading).toBeVisible()
187186
const bar2ParamValue = await barParams.innerText()
188-
if (useExperimentalNonNestedRoutes || testPathDesc !== 'named') {
189-
expect(JSON.parse(bar2ParamValue)).toEqual(paramValue2)
190-
} else {
191-
// this is a bug with named path params and non-nested paths
192-
// that is resolved in the new experimental flag
193-
expect(JSON.parse(bar2ParamValue)).toEqual(paramValue)
194-
}
187+
expect(JSON.parse(bar2ParamValue)).toEqual(paramValue2)
195188
})
196189
})
197190
},
@@ -350,17 +343,8 @@ test.describe('Deeply nested non-nested paths', () => {
350343
await expect(bazBarFooRouteHeading).not.toBeVisible()
351344
await expect(bazBarFooQuxHeading).toBeVisible()
352345
await expect(bazBarFooQuxParams).toBeVisible()
353-
354-
if (useExperimentalNonNestedRoutes) {
355-
expect(await bazBarFooQuxParams.innerText()).toBe(
356-
JSON.stringify({ baz: 'baz-bar-qux', foo: 'foo' }),
357-
)
358-
} else {
359-
// this is a bug with named path params and non-nested paths
360-
// that is resolved in the new experimental flag
361-
expect(await bazBarFooQuxParams.innerText()).toBe(
362-
JSON.stringify({ baz: 'baz-bar', foo: 'foo' }),
363-
)
364-
}
346+
expect(await bazBarFooQuxParams.innerText()).toBe(
347+
JSON.stringify({ baz: 'baz-bar-qux', foo: 'foo' }),
348+
)
365349
})
366350
})

‎e2e/react-router/basic-file-based/tests/params.spec.ts‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { expect, test } from '@playwright/test'
2-
import { useExperimentalNonNestedRoutes } from './utils/useExperimentalNonNestedRoutes'
32
import type { Page } from '@playwright/test'
43

54
test.beforeEach(async ({ page }) => {
@@ -100,22 +99,12 @@ test.describe('params operations + non-nested routes', () => {
10099
const foo2ParamsValue = page.getByTestId('foo-params-value')
101100
const foo2ParamsText = await foo2ParamsValue.innerText()
102101
const foo2ParamsObj = JSON.parse(foo2ParamsText)
103-
if (useExperimentalNonNestedRoutes) {
104-
expect(foo2ParamsObj).toEqual({ foo: 'foo2' })
105-
} else {
106-
// this is a bug that is resolved in the new experimental flag
107-
expect(foo2ParamsObj).toEqual({ foo: 'foo' })
108-
}
102+
expect(foo2ParamsObj).toEqual({ foo: 'foo2' })
109103

110104
const params2Value = page.getByTestId('foo-bar-params-value')
111105
const params2Text = await params2Value.innerText()
112106
const params2Obj = JSON.parse(params2Text)
113-
if (useExperimentalNonNestedRoutes) {
114-
expect(params2Obj).toEqual({ foo: 'foo2', bar: 'bar2' })
115-
} else {
116-
// this is a bug that is resolved in the new experimental flag
117-
expect(params2Obj).toEqual({ foo: 'foo', bar: 'bar2' })
118-
}
107+
expect(params2Obj).toEqual({ foo: 'foo2', bar: 'bar2' })
119108
})
120109
})
121110

‎e2e/react-start/basic/tests/navigation.spec.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ test.use({
99
})
1010
test('Navigating to post', async ({ page }) => {
1111
await page.goto('/')
12+
await page.waitForURL('/')
1213

1314
await page.getByRole('link', { name: 'Posts' }).click()
1415
await page.getByRole('link', { name: 'sunt aut facere repe' }).click()

‎e2e/solid-router/basic-file-based/tests/non-nested-paths.spec.ts‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { expect, test } from '@playwright/test'
2-
import { useExperimentalNonNestedRoutes } from './utils/useExperimentalNonNestedRoutes'
32

43
const testCases: Array<{
54
name: string
@@ -185,13 +184,7 @@ test.describe('Non-nested paths', () => {
185184
await expect(pathRouteHeading).not.toBeVisible()
186185
await expect(barHeading).toBeVisible()
187186
const bar2ParamValue = await barParams.innerText()
188-
if (useExperimentalNonNestedRoutes || testPathDesc !== 'named') {
189-
expect(JSON.parse(bar2ParamValue)).toEqual(paramValue2)
190-
} else {
191-
// this is a bug with named path params and non-nested paths
192-
// that is resolved in the new experimental flag
193-
expect(JSON.parse(bar2ParamValue)).toEqual(paramValue)
194-
}
187+
expect(JSON.parse(bar2ParamValue)).toEqual(paramValue2)
195188
})
196189
})
197190
},
@@ -350,17 +343,8 @@ test.describe('Deeply nested non-nested paths', () => {
350343
await expect(bazBarFooRouteHeading).not.toBeVisible()
351344
await expect(bazBarFooQuxHeading).toBeVisible()
352345
await expect(bazBarFooQuxParams).toBeVisible()
353-
354-
if (useExperimentalNonNestedRoutes) {
355-
expect(await bazBarFooQuxParams.innerText()).toBe(
356-
JSON.stringify({ baz: 'baz-bar-qux', foo: 'foo' }),
357-
)
358-
} else {
359-
// this is a bug with named path params and non-nested paths
360-
// that is resolved in the new experimental flag
361-
expect(await bazBarFooQuxParams.innerText()).toBe(
362-
JSON.stringify({ baz: 'baz-bar', foo: 'foo' }),
363-
)
364-
}
346+
expect(await bazBarFooQuxParams.innerText()).toBe(
347+
JSON.stringify({ baz: 'baz-bar-qux', foo: 'foo' }),
348+
)
365349
})
366350
})

‎e2e/solid-router/basic-file-based/tests/params.spec.ts‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { expect, test } from '@playwright/test'
2-
import { useExperimentalNonNestedRoutes } from './utils/useExperimentalNonNestedRoutes'
32
import type { Page } from '@playwright/test'
43

54
test.beforeEach(async ({ page }) => {
@@ -100,22 +99,12 @@ test.describe('params operations + non-nested routes', () => {
10099
const foo2ParamsValue = page.getByTestId('foo-params-value')
101100
const foo2ParamsText = await foo2ParamsValue.innerText()
102101
const foo2ParamsObj = JSON.parse(foo2ParamsText)
103-
if (useExperimentalNonNestedRoutes) {
104-
expect(foo2ParamsObj).toEqual({ foo: 'foo2' })
105-
} else {
106-
// this is a bug that is resolved in the new experimental flag
107-
expect(foo2ParamsObj).toEqual({ foo: 'foo' })
108-
}
102+
expect(foo2ParamsObj).toEqual({ foo: 'foo2' })
109103

110104
const params2Value = page.getByTestId('foo-bar-params-value')
111105
const params2Text = await params2Value.innerText()
112106
const params2Obj = JSON.parse(params2Text)
113-
if (useExperimentalNonNestedRoutes) {
114-
expect(params2Obj).toEqual({ foo: 'foo2', bar: 'bar2' })
115-
} else {
116-
// this is a bug that is resolved in the new experimental flag
117-
expect(params2Obj).toEqual({ foo: 'foo', bar: 'bar2' })
118-
}
107+
expect(params2Obj).toEqual({ foo: 'foo2', bar: 'bar2' })
119108
})
120109
})
121110

‎examples/react/authenticated-routes-firebase/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
},
1111
"dependencies": {
1212
"@tailwindcss/postcss": "^4.1.15",
13-
"@tanstack/react-router": "^1.135.0",
14-
"@tanstack/react-router-devtools": "^1.135.0",
15-
"@tanstack/router-plugin": "^1.135.0",
13+
"@tanstack/react-router": "^1.135.2",
14+
"@tanstack/react-router-devtools": "^1.135.2",
15+
"@tanstack/router-plugin": "^1.135.2",
1616
"firebase": "^11.4.0",
1717
"postcss": "^8.5.1",
1818
"react": "^19.0.0",

‎examples/react/authenticated-routes/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
},
1111
"dependencies": {
1212
"@tailwindcss/postcss": "^4.1.15",
13-
"@tanstack/react-router": "^1.135.0",
14-
"@tanstack/react-router-devtools": "^1.135.0",
15-
"@tanstack/router-plugin": "^1.135.0",
13+
"@tanstack/react-router": "^1.135.2",
14+
"@tanstack/react-router-devtools": "^1.135.2",
15+
"@tanstack/router-plugin": "^1.135.2",
1616
"postcss": "^8.5.1",
1717
"react": "^19.0.0",
1818
"react-dom": "^19.0.0",

‎examples/react/basic-default-search-params/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"dependencies": {
1212
"@tailwindcss/postcss": "^4.1.15",
1313
"@tanstack/react-query": "^5.90.0",
14-
"@tanstack/react-router": "^1.135.0",
15-
"@tanstack/react-router-devtools": "^1.135.0",
14+
"@tanstack/react-router": "^1.135.2",
15+
"@tanstack/react-router-devtools": "^1.135.2",
1616
"postcss": "^8.5.1",
1717
"react": "^19.0.0",
1818
"react-dom": "^19.0.0",

‎examples/react/basic-devtools-panel/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"dependencies": {
1212
"@tailwindcss/postcss": "^4.1.15",
1313
"@tanstack/react-query-devtools": "^5.67.2",
14-
"@tanstack/react-router": "^1.135.0",
15-
"@tanstack/react-router-devtools": "^1.135.0",
14+
"@tanstack/react-router": "^1.135.2",
15+
"@tanstack/react-router-devtools": "^1.135.2",
1616
"postcss": "^8.5.1",
1717
"react": "^19.0.0",
1818
"react-dom": "^19.0.0",

‎examples/react/basic-file-based/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
},
1111
"dependencies": {
1212
"@tailwindcss/postcss": "^4.1.15",
13-
"@tanstack/react-router": "^1.135.0",
14-
"@tanstack/react-router-devtools": "^1.135.0",
15-
"@tanstack/router-plugin": "^1.135.0",
13+
"@tanstack/react-router": "^1.135.2",
14+
"@tanstack/react-router-devtools": "^1.135.2",
15+
"@tanstack/router-plugin": "^1.135.2",
1616
"postcss": "^8.5.1",
1717
"react": "^19.0.0",
1818
"react-dom": "^19.0.0",

0 commit comments

Comments
 (0)