Unverified Commit 2ddfd844 authored by Prateek Bhatnagar's avatar Prateek Bhatnagar Committed by GitHub

Improvements - Font optimizations (#16031)

Co-authored-by: 's avatarTim Neutkens <tim@timneutkens.nl>
Co-authored-by: 's avatarJoe Haddad <joe.haddad@zeit.co>
parent bd703543
...@@ -929,7 +929,7 @@ export default async function getBaseWebpackConfig( ...@@ -929,7 +929,7 @@ export default async function getBaseWebpackConfig(
config.experimental.reactMode config.experimental.reactMode
), ),
'process.env.__NEXT_OPTIMIZE_FONTS': JSON.stringify( 'process.env.__NEXT_OPTIMIZE_FONTS': JSON.stringify(
config.experimental.optimizeFonts config.experimental.optimizeFonts && !dev
), ),
'process.env.__NEXT_OPTIMIZE_IMAGES': JSON.stringify( 'process.env.__NEXT_OPTIMIZE_IMAGES': JSON.stringify(
config.experimental.optimizeImages config.experimental.optimizeImages
......
// eslint-disable-next-line import/no-extraneous-dependencies import webpack, { compilation as CompilationType, Compiler } from 'webpack'
import { NodePath } from 'ast-types/lib/node-path'
import { compilation as CompilationType, Compiler } from 'webpack'
import { namedTypes } from 'ast-types' import { namedTypes } from 'ast-types'
import { RawSource } from 'webpack-sources' import { RawSource } from 'webpack-sources'
import { import {
...@@ -9,10 +7,17 @@ import { ...@@ -9,10 +7,17 @@ import {
} from '../../../next-server/server/font-utils' } from '../../../next-server/server/font-utils'
// @ts-ignore // @ts-ignore
import BasicEvaluatedExpression from 'webpack/lib/BasicEvaluatedExpression' import BasicEvaluatedExpression from 'webpack/lib/BasicEvaluatedExpression'
import { process as minify } from 'cssnano-simple'
import { OPTIMIZED_FONT_PROVIDERS } from '../../../next-server/lib/constants' import { OPTIMIZED_FONT_PROVIDERS } from '../../../next-server/lib/constants'
interface VisitorMap { const isWebpack5 = parseInt(webpack.version!) === 5
[key: string]: (path: NodePath) => void
async function minifyCss(css: string): Promise<string> {
return new Promise((resolve) => {
minify(css, { map: false }).then((res) => {
resolve(res.css)
})
})
} }
export class FontStylesheetGatheringPlugin { export class FontStylesheetGatheringPlugin {
...@@ -132,19 +137,41 @@ export class FontStylesheetGatheringPlugin { ...@@ -132,19 +137,41 @@ export class FontStylesheetGatheringPlugin {
this.manifestContent = [] this.manifestContent = []
for (let promiseIndex in fontDefinitionPromises) { for (let promiseIndex in fontDefinitionPromises) {
const css = await fontDefinitionPromises[promiseIndex]
const content = await minifyCss(css)
this.manifestContent.push({ this.manifestContent.push({
url: this.gatheredStylesheets[promiseIndex], url: this.gatheredStylesheets[promiseIndex],
content: await fontDefinitionPromises[promiseIndex], content,
}) })
} }
if (!isWebpack5) {
compilation.assets['font-manifest.json'] = new RawSource( compilation.assets['font-manifest.json'] = new RawSource(
JSON.stringify(this.manifestContent, null, ' ') JSON.stringify(this.manifestContent, null, ' ')
) )
}
modulesFinished() modulesFinished()
} }
) )
cb() cb()
}) })
if (isWebpack5) {
compiler.hooks.make.tap(this.constructor.name, (compilation) => {
// @ts-ignore TODO: Remove ignore when webpack 5 is stable
compilation.hooks.processAssets.tap(
{
name: this.constructor.name,
// @ts-ignore TODO: Remove ignore when webpack 5 is stable
stage: webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
},
(assets: any) => {
assets['font-manifest.json'] = new RawSource(
JSON.stringify(this.manifestContent, null, ' ')
)
}
)
})
}
} }
} }
......
...@@ -145,10 +145,7 @@ class FontOptimizerMiddleware implements PostProcessMiddleware { ...@@ -145,10 +145,7 @@ class FontOptimizerMiddleware implements PostProcessMiddleware {
const fontContent = options.getFontDefinition(url) const fontContent = options.getFontDefinition(url)
result = result.replace( result = result.replace(
'</head>', '</head>',
`<style data-href="${url}">${fontContent.replace( `<style data-href="${url}">${fontContent}</style></head>`
/(\n)/g,
''
)}</style></head>`
) )
} }
return result return result
......
...@@ -169,8 +169,9 @@ export default class Server { ...@@ -169,8 +169,9 @@ export default class Server {
customServer: customServer === true ? true : undefined, customServer: customServer === true ? true : undefined,
ampOptimizerConfig: this.nextConfig.experimental.amp?.optimizer, ampOptimizerConfig: this.nextConfig.experimental.amp?.optimizer,
basePath: this.nextConfig.basePath, basePath: this.nextConfig.basePath,
optimizeFonts: this.nextConfig.experimental.optimizeFonts, optimizeFonts: this.nextConfig.experimental.optimizeFonts && !dev,
fontManifest: this.nextConfig.experimental.optimizeFonts fontManifest:
this.nextConfig.experimental.optimizeFonts && !dev
? requireFontManifest(this.distDir, this._isLikeServerless) ? requireFontManifest(this.distDir, this._isLikeServerless)
: null, : null,
optimizeImages: this.nextConfig.experimental.optimizeImages, optimizeImages: this.nextConfig.experimental.optimizeImages,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment