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

Fix missing cleanup process in flight plugin globals #43297

Merged
merged 8 commits into from Nov 29, 2022
Merged

Fix missing cleanup process in flight plugin globals #43297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ac4503b
add clean up process to manifest globals
shuding Nov 23, 2022
b5c2239
fix
shuding Nov 23, 2022
3941ff6
Merge branch 'canary' into shu/491a
shuding Nov 25, 2022
caf849a
fix race condition
shuding Nov 25, 2022
0d2569f
Merge branch 'canary' into shu/491a
shuding Nov 25, 2022
0284e72
fix tests
shuding Nov 28, 2022
8b5cb29
Merge branch 'canary' into shu/491a
kodiakhq[bot] Nov 28, 2022
4e8a9a0
remove clean up for now
shuding Nov 29, 2022
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
33 changes: 25 additions & 8 deletions packages/next/build/webpack/plugins/flight-client-entry-plugin.ts
View file
Open in desktop
Expand Up @@ -3,6 +3,8 @@ import type {
ClientComponentImports,
NextFlightClientEntryLoaderOptions,
} from '../loaders/next-flight-client-entry-loader'
import type { FlightCSSManifest } from './flight-manifest-plugin'

import { webpack } from 'next/dist/compiled/webpack/webpack'
import { stringify } from 'querystring'
import path from 'path'
Expand All @@ -19,7 +21,6 @@ import {
EDGE_RUNTIME_WEBPACK,
FLIGHT_SERVER_CSS_MANIFEST,
} from '../../../shared/lib/constants'
import { FlightCSSManifest } from './flight-manifest-plugin'
import { ASYNC_CLIENT_MODULES } from './flight-manifest-plugin'
import { isClientComponentModule, regexCSS } from '../loaders/utils'
import { traverseModules } from '../utils'
Expand All @@ -37,8 +38,8 @@ export const injectedClientEntries = new Map()
export const serverModuleIds = new Map<string, string | number>()
export const edgeServerModuleIds = new Map<string, string | number>()

// TODO-APP: move CSS manifest generation to the flight manifest plugin.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No longer valid.

const flightCSSManifest: FlightCSSManifest = {}
let serverCSSManifest: FlightCSSManifest = {}
let edgeServerCSSManifest: FlightCSSManifest = {}

export class FlightClientEntryPlugin {
dev: boolean
Expand Down Expand Up @@ -112,7 +113,7 @@ export class FlightClientEntryPlugin {
}

traverseModules(compilation, (mod, _chunk, _chunkGroup, modId) => {
recordModule(modId + '', mod)
recordModule(String(modId), mod)
})
})
}
Expand Down Expand Up @@ -234,6 +235,15 @@ export class FlightClientEntryPlugin {
// by the certain chunk.
compilation.hooks.afterOptimizeModules.tap(PLUGIN_NAME, () => {
const cssImportsForChunk: Record<string, string[]> = {}
if (this.isEdgeServer) {
edgeServerCSSManifest = {}
} else {
serverCSSManifest = {}
}

let cssManifest = this.isEdgeServer
? edgeServerCSSManifest
: serverCSSManifest

function collectModule(entryName: string, mod: any) {
const resource = mod.resource
Expand Down Expand Up @@ -272,10 +282,10 @@ export class FlightClientEntryPlugin {
}

const entryCSSInfo: Record<string, string[]> =
flightCSSManifest.__entry_css__ || {}
cssManifest.__entry_css__ || {}
entryCSSInfo[entryName] = cssImportsForChunk[entryName]

Object.assign(flightCSSManifest, {
Object.assign(cssManifest, {
__entry_css__: entryCSSInfo,
})
})
Expand Down Expand Up @@ -320,7 +330,7 @@ export class FlightClientEntryPlugin {
clientEntryDependencyMap,
})

Object.assign(flightCSSManifest, cssImports)
Object.assign(cssManifest, cssImports)
}
})
})
Expand All @@ -333,7 +343,14 @@ export class FlightClientEntryPlugin {
stage: webpack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_HASH,
},
(assets: webpack.Compilation['assets']) => {
const manifest = JSON.stringify(flightCSSManifest)
const manifest = JSON.stringify({
...serverCSSManifest,
...edgeServerCSSManifest,
__entry_css__: {
...serverCSSManifest.__entry_css__,
...edgeServerCSSManifest.__entry_css__,
},
})
assets[FLIGHT_SERVER_CSS_MANIFEST + '.json'] = new sources.RawSource(
manifest
) as unknown as webpack.sources.RawSource
Expand Down
89 changes: 43 additions & 46 deletions test/e2e/app-dir/index.test.ts
View file
Open in desktop
Expand Up @@ -382,6 +382,49 @@ describe('app dir', () => {
}
}
)
;(isDev ? describe : describe.skip)('HMR', () => {
it('should HMR correctly for client component', async () => {
const filePath = 'app/client-component-route/page.js'
const origContent = await next.readFile(filePath)

try {
const browser = await webdriver(next.url, '/client-component-route')

const ssrInitial = await renderViaHTTP(
next.url,
'/client-component-route'
)

expect(ssrInitial).toContain('hello from app/client-component-route')

expect(await browser.elementByCss('p').text()).toContain(
'hello from app/client-component-route'
)

await next.patchFile(
filePath,
origContent.replace('hello from', 'swapped from')
)

await check(() => browser.elementByCss('p').text(), /swapped from/)

const ssrUpdated = await renderViaHTTP(
next.url,
'/client-component-route'
)
expect(ssrUpdated).toContain('swapped from')

await next.patchFile(filePath, origContent)

await check(() => browser.elementByCss('p').text(), /hello from/)
expect(
await renderViaHTTP(next.url, '/client-component-route')
).toContain('hello from')
} finally {
await next.patchFile(filePath, origContent)
}
})
})

it('should handle hash in initial url', async () => {
const browser = await webdriver(next.url, '/dashboard#abc')
Expand Down Expand Up @@ -1332,52 +1375,6 @@ describe('app dir', () => {
})
})
})

if (isDev) {
it('should HMR correctly for client component', async () => {
const filePath = 'app/client-component-route/page.js'
const origContent = await next.readFile(filePath)

try {
const browser = await webdriver(next.url, '/client-component-route')

const ssrInitial = await renderViaHTTP(
next.url,
'/client-component-route'
)

expect(ssrInitial).toContain(
'hello from app/client-component-route'
)

expect(await browser.elementByCss('p').text()).toContain(
'hello from app/client-component-route'
)

await next.patchFile(
filePath,
origContent.replace('hello from', 'swapped from')
)

await check(() => browser.elementByCss('p').text(), /swapped from/)

const ssrUpdated = await renderViaHTTP(
next.url,
'/client-component-route'
)
expect(ssrUpdated).toContain('swapped from')

await next.patchFile(filePath, origContent)

await check(() => browser.elementByCss('p').text(), /hello from/)
expect(
await renderViaHTTP(next.url, '/client-component-route')
).toContain('hello from')
} finally {
await next.patchFile(filePath, origContent)
}
})
}
})

describe('css support', () => {
Expand Down