Skip to content

[pull] canary from vercel:canary #54

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.

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

Merged
merged 4 commits into from
Apr 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2025-04-10"
channel = "nightly-2025-02-12"
components = ["rustfmt", "clippy", "rust-analyzer"]
profile = "minimal"
10 changes: 6 additions & 4 deletions test/e2e/app-dir/navigation/navigation.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,7 @@ describe('app dir - navigation', () => {
.elementByCss("[href='/metadata-await-promise/nested']")
.click()

await waitFor(resolveMetadataDuration)
await waitFor(resolveMetadataDuration + 500)

expect(await browser.elementById('page-content').text()).toBe('Content')
expect(await browser.elementByCss('title').text()).toBe('Async Title')
Expand All @@ -912,9 +912,11 @@ describe('app dir - navigation', () => {
.click()

if (!isNextDev) {
expect(await browser.elementByCss('title').text()).toBe('Async Title')

await waitFor(resolveMetadataDuration + 500)
expect(
await browser
.waitForElementByCss('title', resolveMetadataDuration + 500)
.text()
).toBe('Async Title')
}

expect(await browser.elementById('page-content').text()).toBe('Content')
Expand Down
4 changes: 2 additions & 2 deletions test/lib/browsers/playwright.ts
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ export class Playwright extends BrowserInterface {
}

elementByCss(selector: string) {
return this.waitForElementByCss(selector)
return this.waitForElementByCss(selector, 5_000)
}

elementById(sel) {
Expand Down Expand Up @@ -427,7 +427,7 @@ export class Playwright extends BrowserInterface {
)
}

waitForElementByCss(selector, timeout?: number) {
waitForElementByCss(selector, timeout = 10_000) {
return this.chain(() => {
return page
.waitForSelector(selector, { timeout, state: 'attached' })
Expand Down
108 changes: 93 additions & 15 deletions test/rspack-build-tests-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -1447,6 +1447,19 @@
"flakey": [],
"runtimeError": false
},
"test/e2e/app-dir/back-forward-cache/back-forward-cache.test.ts": {
"passed": [
"back/forward cache React state is preserved when navigating back to a page with different search params than before ",
"back/forward cache React state is preserved when navigating back/forward with links",
"back/forward cache React state is preserved when navigating with back/forward buttons",
"back/forward cache bfcache only preserves up to N entries",
"back/forward cache navigate back and forth repeatedly between the same pages without evicting"
],
"failed": [],
"pending": [],
"flakey": [],
"runtimeError": false
},
"test/e2e/app-dir/binary/rsc-binary.test.ts": {
"passed": [
"RSC binary serialization should correctly encode/decode binaries and hydrate"
Expand Down Expand Up @@ -1596,7 +1609,6 @@
"css-order loose should load correct styles navigating third -> first-client",
"css-order loose should load correct styles navigating third -> second",
"css-order loose should load correct styles navigating third -> second-client",
"css-order loose should load correct styles on big-interleaved-b",
"css-order loose should load correct styles on first",
"css-order loose should load correct styles on first-client",
"css-order loose should load correct styles on interleaved-a",
Expand Down Expand Up @@ -1661,11 +1673,8 @@
"css-order strict should load correct styles navigating third -> first-client",
"css-order strict should load correct styles navigating third -> second",
"css-order strict should load correct styles navigating third -> second-client",
"css-order strict should load correct styles on big-interleaved-b",
"css-order strict should load correct styles on first",
"css-order strict should load correct styles on first-client",
"css-order strict should load correct styles on global-first",
"css-order strict should load correct styles on global-second",
"css-order strict should load correct styles on interleaved-a",
"css-order strict should load correct styles on interleaved-b",
"css-order strict should load correct styles on pages-first",
Expand All @@ -1677,10 +1686,6 @@
"css-order strict should load correct styles on pages-reversed-b",
"css-order strict should load correct styles on pages-second",
"css-order strict should load correct styles on pages-third",
"css-order strict should load correct styles on partial-reversed-a",
"css-order strict should load correct styles on partial-reversed-b",
"css-order strict should load correct styles on reversed-a",
"css-order strict should load correct styles on reversed-b",
"css-order strict should load correct styles on second",
"css-order strict should load correct styles on second-client",
"css-order strict should load correct styles on third",
Expand All @@ -1701,6 +1706,7 @@
],
"failed": [
"css-order loose should load correct styles on big-interleaved-a",
"css-order loose should load correct styles on big-interleaved-b",
"css-order strict should load correct styles navigating back again first -> first-client -> first -> first-client",
"css-order strict should load correct styles navigating back again first -> second -> first -> second",
"css-order strict should load correct styles navigating back again first -> second-client -> first -> second-client",
Expand All @@ -1723,6 +1729,13 @@
"css-order strict should load correct styles navigating back again third -> second -> third -> second",
"css-order strict should load correct styles navigating back again third -> second-client -> third -> second-client",
"css-order strict should load correct styles on big-interleaved-a",
"css-order strict should load correct styles on big-interleaved-b",
"css-order strict should load correct styles on global-first",
"css-order strict should load correct styles on global-second",
"css-order strict should load correct styles on partial-reversed-a",
"css-order strict should load correct styles on partial-reversed-b",
"css-order strict should load correct styles on reversed-a",
"css-order strict should load correct styles on reversed-b",
"css-order true should load correct styles navigating back again first -> first-client -> first -> first-client",
"css-order true should load correct styles navigating back again first -> second -> first -> second",
"css-order true should load correct styles navigating back again first -> second-client -> first -> second-client",
Expand Down Expand Up @@ -3655,6 +3668,16 @@
"flakey": [],
"runtimeError": false
},
"test/e2e/app-dir/not-found-with-pages-i18n/not-found-with-pages.test.ts": {
"passed": [
"not-found-with-pages should prefer the app router 404 over the pages router 404 when both are present",
"not-found-with-pages should write all locales to the pages manifest"
],
"failed": [],
"pending": [],
"flakey": [],
"runtimeError": false
},
"test/e2e/app-dir/not-found/basic/index.test.ts": {
"passed": [
"app dir - not-found - basic should include not found client reference manifest in the file trace",
Expand Down Expand Up @@ -4341,6 +4364,15 @@
"flakey": [],
"runtimeError": false
},
"test/e2e/app-dir/ppr-middleware-rewrite-force-dynamic-ssg-dynamic-params/ppr-middleware-rewrite-force-dynamic-ssg-dynamic-params.test.ts": {
"passed": [
"ppr-middleware-rewrite-force-dynamic-generate-static-params should have correct dynamic params"
],
"failed": [],
"pending": [],
"flakey": [],
"runtimeError": false
},
"test/e2e/app-dir/ppr-missing-root-params/ppr-missing-root-params.test.ts": {
"passed": [
"ppr-missing-root-params (multiple) should result in a build error",
Expand Down Expand Up @@ -4619,6 +4651,15 @@
"flakey": [],
"runtimeError": false
},
"test/e2e/app-dir/rewrite-with-search-params/rewrite-with-search-params.test.ts": {
"passed": [
"rewrite-with-search-params should not contain params in search params after rewrite"
],
"failed": [],
"pending": [],
"flakey": [],
"runtimeError": false
},
"test/e2e/app-dir/rewrites-redirects/rewrites-redirects.test.ts": {
"passed": [
"redirects and rewrites navigation using button should redirect from middleware correctly",
Expand Down Expand Up @@ -4713,6 +4754,15 @@
"flakey": [],
"runtimeError": false
},
"test/e2e/app-dir/rsc-basic/rsc-basic-react-experimental.test.ts": {
"passed": [
"react@experimental should opt into the react@experimental when enabling $flag"
],
"failed": [],
"pending": [],
"flakey": [],
"runtimeError": false
},
"test/e2e/app-dir/rsc-basic/rsc-basic.test.ts": {
"passed": [
"app dir - rsc basics client references with TLA (edge) should support TLA in lazy client reference",
Expand All @@ -4721,8 +4771,6 @@
"app dir - rsc basics client references with TLA (node) should support TLA in sync client reference imports",
"app dir - rsc basics next internal shared context should not error if just load next/navigation module in pages/api",
"app dir - rsc basics next internal shared context should not error if just load next/router module in app page",
"app dir - rsc basics react@experimental should opt into the react@experimental when enabling ppr",
"app dir - rsc basics react@experimental should opt into the react@experimental when enabling taint",
"app dir - rsc basics should be able to call legacy react-dom/server APIs in client components",
"app dir - rsc basics should be able to navigate between rsc routes",
"app dir - rsc basics should correctly render component returning null",
Expand Down Expand Up @@ -4763,6 +4811,16 @@
"flakey": [],
"runtimeError": false
},
"test/e2e/app-dir/rsc-query-routing/rsc-query-routing.test.ts": {
"passed": [
"rsc-query-routing should contain rsc query in rsc request when redirect the page",
"rsc-query-routing should contain rsc query in rsc request when rewrite the page"
],
"failed": [],
"pending": [],
"flakey": [],
"runtimeError": false
},
"test/e2e/app-dir/rsc-webpack-loader/rsc-webpack-loader.test.ts": {
"passed": [
"app dir - rsc webpack loader should support webpack loader rules"
Expand Down Expand Up @@ -5878,6 +5936,7 @@
},
"test/e2e/app-dir/worker/worker.test.ts": {
"passed": [
"app dir - workers should not bundle web workers with string specifiers",
"app dir - workers should support module web workers with dynamic imports",
"app dir - workers should support web workers with dynamic imports"
],
Expand Down Expand Up @@ -8105,6 +8164,13 @@
"flakey": [],
"runtimeError": false
},
"test/e2e/swc-plugins/index.test.ts": {
"passed": ["swcPlugins supports swcPlugins basic case"],
"failed": [],
"pending": ["swcPlugins invalid plugin name shows a redbox in dev"],
"flakey": [],
"runtimeError": false
},
"test/e2e/swc-warnings/index.test.ts": {
"passed": [
"can force swc should not have warning",
Expand Down Expand Up @@ -8238,6 +8304,16 @@
"flakey": [],
"runtimeError": false
},
"test/e2e/turbopack-turbo-config-compatibility/index.test.ts": {
"passed": [],
"failed": [],
"pending": [
"turbopack-turbo-config-compatibility including both turbopack and deprecated experimental turbo config prefers turbopack config over deprecated experimental turbo config",
"turbopack-turbo-config-compatibility only including deprecated experimental turbo config still uses the deprecated experimental turbo config"
],
"flakey": [],
"runtimeError": false
},
"test/e2e/type-module-interop/index.test.ts": {
"passed": [
"Type module interop should render client-side",
Expand Down Expand Up @@ -9859,6 +9935,7 @@
"CSS Modules Composes Ordering useLightnincsss(true) production mode should have correct color on index page (on nav from other)",
"CSS Modules Composes Ordering useLightnincsss(true) production mode should not change color on hover",
"Data URLs production mode should compile successfully",
"Data URLs production mode should have emitted expected files",
"Ordering with Global CSS and Modules (dev) useLightnincsss(false) should have the correct color (css ordering)",
"Ordering with Global CSS and Modules (dev) useLightnincsss(false) should have the correct color (css ordering) during hot reloads",
"Ordering with Global CSS and Modules (dev) useLightnincsss(false) should not execute scripts in any order",
Expand All @@ -9872,7 +9949,6 @@
"should handle unresolved files gracefully production mode should build correctly"
],
"failed": [
"Data URLs production mode should have emitted expected files",
"should handle unresolved files gracefully production mode should have correct file references in CSS output"
],
"pending": [
Expand Down Expand Up @@ -14748,9 +14824,10 @@
"flakey": [],
"runtimeError": false
},
"test/integration/invalid-href/test/index.test.js": {
"test/integration/invalid-href/test/index.test.ts": {
"passed": [
"Invalid hrefs production mode does not show error in production when https://google.com is used as href on Link",
"Invalid hrefs production mode does not show error in production when exotic protocols are used in href in Link",
"Invalid hrefs production mode does not show error in production when https:// is used in href on Link",
"Invalid hrefs production mode does not show error in production when mailto: is used as href on Link",
"Invalid hrefs production mode does not show error when internal href is used with external as",
"Invalid hrefs production mode doesn't fail on invalid url",
Expand All @@ -14760,7 +14837,8 @@
],
"failed": [],
"pending": [
"Invalid hrefs development mode does not show error when https://google.com is used as href on Link",
"Invalid hrefs development mode does not show error when exotic protocols are used in href in Link",
"Invalid hrefs development mode does not show error when https:// is used as href in Link",
"Invalid hrefs development mode does not show error when mailto: is used as href on Link",
"Invalid hrefs development mode does not throw error when dynamic route mismatch is used on Link and params are manually provided",
"Invalid hrefs development mode doesn't fail on invalid url",
Expand Down Expand Up @@ -15094,7 +15172,7 @@
"flakey": [],
"runtimeError": false
},
"test/integration/module-id-strategies/test/index.test.js": {
"test/integration/module-ids/test/index.test.js": {
"passed": [],
"failed": [],
"pending": [
Expand Down
Loading
Loading