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 required files matching in rsc #34137

Merged
merged 3 commits into from Feb 9, 2022
Merged

Fix required files matching in rsc #34137

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fea8c9
Fix required files matching in rsc
huozhi Feb 9, 2022
16eb36a
Merge branch 'canary' into fix/match-required-files
kodiakhq[bot] Feb 9, 2022
de20ab4
Merge branch 'canary' into fix/match-required-files
kodiakhq[bot] Feb 9, 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
5 changes: 2 additions & 3 deletions packages/next/build/index.ts
View file
Open in desktop
Expand Up @@ -572,9 +572,8 @@ export default async function build(
hasServerComponents
? path.join(
SERVER_DIRECTORY,
MIDDLEWARE_FLIGHT_MANIFEST + runtime === 'edge'
? '.js'
: '.json'
MIDDLEWARE_FLIGHT_MANIFEST +
(runtime === 'edge' ? '.js' : '.json')
)
: null,
REACT_LOADABLE_MANIFEST,
Expand Down
31 changes: 24 additions & 7 deletions test/integration/react-streaming-and-server-components/test/index.test.js
View file
Open in desktop
Expand Up @@ -148,16 +148,25 @@ describe('Edge runtime - prod', () => {

it('should generate middleware SSR manifests for edge runtime', async () => {
const distServerDir = join(distDir, 'server')
const hasFile = (filename) => fs.existsSync(join(distServerDir, filename))

const files = [
'middleware-build-manifest.js',
'middleware-flight-manifest.js',
'middleware-ssr-runtime.js',
'middleware-manifest.json',
]

const requiredServerFiles = (
await fs.readJSON(join(distDir, 'required-server-files.json'))
).files

files.forEach((file) => {
expect(hasFile(file)).toBe(true)
const filepath = join(distServerDir, file)
expect(fs.existsSync(filepath)).toBe(true)
})

requiredServerFiles.forEach((file) => {
const requiredFilePath = join(appDir, file)
expect(fs.existsSync(requiredFilePath)).toBe(true)
})
})

Expand Down Expand Up @@ -250,17 +259,25 @@ const nodejsRuntimeBasicSuite = {
if (env === 'prod') {
it('should generate middleware SSR manifests for Node.js', async () => {
const distServerDir = join(distDir, 'server')
const hasFile = (filename) =>
fs.existsSync(join(distServerDir, filename))

const requiredServerFiles = (
await fs.readJSON(join(distDir, 'required-server-files.json'))
).files

const files = [
'middleware-build-manifest.js',
'middleware-flight-manifest.json',
'middleware-manifest.json',
]

files.forEach((file) => {
if (!hasFile(file)) console.log(file)
expect(hasFile(file)).toBe(true)
const filepath = join(distServerDir, file)
expect(fs.existsSync(filepath)).toBe(true)
})

requiredServerFiles.forEach((file) => {
const requiredFilePath = join(appDir, file)
expect(fs.existsSync(requiredFilePath)).toBe(true)
})
})
}
Expand Down