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.

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

Fix CSS not being bundled in app dir #45787

Merged
merged 33 commits into from
Mar 17, 2023
Merged
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
ff6e824
fix css not bundled
shuding Feb 10, 2023
0fb12db
Merge branch 'canary' into shu/7yrw
shuding Feb 16, 2023
7531460
update test
shuding Feb 17, 2023
8891f78
Merge branch 'canary' into shu/7yrw
shuding Feb 17, 2023
3ac673a
Merge branch 'canary' into shu/7yrw
kodiakhq[bot] Feb 17, 2023
30ebeb6
Merge branch 'canary' into shu/7yrw
shuding Feb 17, 2023
a35c336
Merge branch 'canary' into shu/7yrw
shuding Feb 17, 2023
5fcb1ac
Merge branch 'canary' into shu/7yrw
shuding Feb 17, 2023
9bbdf5f
Merge branch 'canary' into shu/7yrw
kodiakhq[bot] Feb 18, 2023
7a00f42
Merge branch 'canary' into shu/7yrw
ijjk Feb 18, 2023
4776a6c
Merge branch 'canary' into shu/7yrw
kodiakhq[bot] Feb 18, 2023
9c278c1
Merge branch 'canary' into shu/7yrw
kodiakhq[bot] Feb 18, 2023
75dc81e
Merge branch 'canary' into shu/7yrw
kodiakhq[bot] Feb 18, 2023
02d46b4
Merge branch 'canary' into shu/7yrw
kodiakhq[bot] Feb 18, 2023
f05baec
Merge branch 'canary' into shu/7yrw
kodiakhq[bot] Feb 18, 2023
c7e9ab6
Merge branch 'canary' into shu/7yrw
kodiakhq[bot] Feb 18, 2023
7af6e69
adjust timeout
shuding Feb 20, 2023
d75a90a
Merge branch 'canary' into shu/7yrw
shuding Feb 20, 2023
0425001
merge canary
shuding Feb 27, 2023
84612d4
udpate test
shuding Feb 27, 2023
1a7e7d7
add pre-render
shuding Feb 27, 2023
3b3e3fc
update test
ijjk Feb 27, 2023
18c3d5e
use check
ijjk Feb 28, 2023
fe19619
Merge branch 'canary' into shu/7yrw
ijjk Feb 28, 2023
e1ac3a3
update check usage
ijjk Feb 28, 2023
50d90f6
Merge branch 'canary' into shu/7yrw
shuding Mar 4, 2023
48ffc52
Merge branch 'canary' into shu/7yrw
shuding Mar 5, 2023
6798b2c
add debug code
shuding Mar 6, 2023
bfb8c37
attach error
shuding Mar 6, 2023
ed9dd66
Merge branch 'canary' into shu/7yrw
shuding Mar 10, 2023
1f7f43c
Merge branch 'canary' into shu/7yrw
shuding Mar 16, 2023
236ec11
Merge branch 'canary' into shu/7yrw
shuding Mar 17, 2023
8536910
prefetch target page
shuding Mar 17, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions test/e2e/app-dir/app/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -317,16 +317,16 @@ createNextDescribe(
try {
// Click the link.
await browser.elementById('link-to-rewritten-path').click()
await browser.waitForElementByCss('#from-dashboard')
await browser.waitForElementByCss('#from-dashboard', 5000)
shuding marked this conversation as resolved.
Show resolved Hide resolved

// Check to see that we were rewritten and not redirected.
// TODO-APP: rewrite url is broken
// expect(await browser.url()).toBe(`${next.url}/rewritten-to-dashboard`)

// Check to see that the page we navigated to is in fact the dashboard.
expect(await browser.elementByCss('#from-dashboard').text()).toBe(
'hello from app/dashboard'
)
expect(
await browser.elementByCss('#from-dashboard', 5000).text()
).toBe('hello from app/dashboard')
} finally {
await browser.close()
}
Expand Down Expand Up @@ -589,15 +589,15 @@ createNextDescribe(
try {
// Click the link.
await browser.elementById('pages-link').click()
expect(await browser.waitForElementByCss('#pages-text').text()).toBe(
'hello from pages/dynamic-pages-route-app-overlap/[slug]'
)
expect(
await browser.waitForElementByCss('#pages-text', 5000).text()
).toBe('hello from pages/dynamic-pages-route-app-overlap/[slug]')

// When refreshing the browser, the app page should be rendered
await browser.refresh()
expect(await browser.waitForElementByCss('#app-text').text()).toBe(
'hello from app/dynamic-pages-route-app-overlap/app-dir/page'
)
expect(
await browser.waitForElementByCss('#app-text', 5000).text()
).toBe('hello from app/dynamic-pages-route-app-overlap/app-dir/page')
} finally {
await browser.close()
}
Expand Down