Skip to content

Commit

Permalink
Inline static data buffer instead of using fs read (#49323)
Browse files Browse the repository at this point in the history
  • Loading branch information
huozhi committed May 8, 2023
1 parent 44e9f0b commit 96c7acf
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type webpack from 'webpack'
import fs from 'fs'
import path from 'path'
import { METADATA_RESOURCE_QUERY } from './metadata/discover'
import { imageExtMimeTypeMap } from '../../../lib/mime-type'
Expand Down Expand Up @@ -36,27 +37,29 @@ function getContentType(resourcePath: string) {
}

// Strip metadata resource query string from `import.meta.url` to make sure the fs.readFileSync get the right path.
function getStaticRouteCode(resourcePath: string, fileBaseName: string) {
async function getStaticRouteCode(resourcePath: string, fileBaseName: string) {
const cache =
fileBaseName === 'favicon'
? 'public, max-age=0, must-revalidate'
: process.env.NODE_ENV !== 'production'
? cacheHeader.none
: cacheHeader.longCache
return `\
import fs from 'fs'
import { fileURLToPath } from 'url'
const code = `\
import { NextResponse } from 'next/server'
const contentType = ${JSON.stringify(getContentType(resourcePath))}
const resourceUrl = new URL(import.meta.url)
const filePath = fileURLToPath(resourceUrl).replace(${JSON.stringify(
METADATA_RESOURCE_QUERY
)}, '')
const buffer = Buffer.from(${JSON.stringify(
(
await fs.promises.readFile(
resourcePath.replace(METADATA_RESOURCE_QUERY, ''),
{
encoding: 'utf-8',
}
)
).toString()
)})
let buffer
export function GET() {
if (!buffer) { buffer = fs.readFileSync(filePath) }
return new NextResponse(buffer, {
headers: {
'Content-Type': contentType,
Expand All @@ -67,6 +70,7 @@ export function GET() {
export const dynamic = 'force-static'
`
return code
}

function getDynamicTextRouteCode(resourcePath: string) {
Expand Down Expand Up @@ -201,7 +205,7 @@ ${staticGenerationCode}
// When it's static route, it could be favicon.ico, sitemap.xml, robots.txt etc.
// TODO-METADATA: improve the cache control strategy
const nextMetadataRouterLoader: webpack.LoaderDefinitionFunction<MetadataRouteLoaderOptions> =
function () {
async function () {
const { resourcePath } = this
const { pageExtensions, page } = this.getOptions()

Expand All @@ -218,7 +222,7 @@ const nextMetadataRouterLoader: webpack.LoaderDefinitionFunction<MetadataRouteLo
code = getDynamicImageRouteCode(resourcePath)
}
} else {
code = getStaticRouteCode(resourcePath, fileBaseName)
code = await getStaticRouteCode(resourcePath, fileBaseName)
}

return code
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function page() {
return 'icon in dynamic routes'
}
10 changes: 9 additions & 1 deletion test/e2e/app-dir/metadata/metadata.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ createNextDescribe(
'app dir - metadata',
{
files: __dirname,
skipDeployment: false,
},
({ next, isNextDev, isNextStart }) => {
const getTitle = (browser: BrowserInterface) =>
Expand Down Expand Up @@ -603,6 +602,15 @@ createNextDescribe(
// No apple icon if it's not provided
const $appleIcon = $('head > link[rel="apple-touch-icon"]')
expect($appleIcon.length).toBe(0)

const $dynamic = await next.render$('/icons/static/dynamic-routes/123')
const $dynamicIcon = $dynamic('head > link[rel="icon"]')
const dynamicIconHref = $dynamicIcon.attr('href')
expect(dynamicIconHref).toMatch(
/\/icons\/static\/dynamic-routes\/123\/icon\.png\?b76e8f0282c93c8e/
)
const dynamicIconRes = await next.fetch(dynamicIconHref)
expect(dynamicIconRes.status).toBe(200)
})

if (isNextDev) {
Expand Down

0 comments on commit 96c7acf

Please sign in to comment.