Unverified Commit 8f21c283 authored by Janicklas Ralph's avatar Janicklas Ralph Committed by GitHub

Experimental feature changes (#21646)

Adding test for experimental-serverless-trace + fix for the same
parent 08846cf8
...@@ -1013,7 +1013,7 @@ export default async function getBaseWebpackConfig( ...@@ -1013,7 +1013,7 @@ export default async function getBaseWebpackConfig(
config.experimental.optimizeImages config.experimental.optimizeImages
), ),
'process.env.__NEXT_OPTIMIZE_CSS': JSON.stringify( 'process.env.__NEXT_OPTIMIZE_CSS': JSON.stringify(
!!config.experimental.optimizeCss && !dev config.experimental.optimizeCss && !dev
), ),
'process.env.__NEXT_SCROLL_RESTORATION': JSON.stringify( 'process.env.__NEXT_SCROLL_RESTORATION': JSON.stringify(
config.experimental.scrollRestoration config.experimental.scrollRestoration
...@@ -1202,6 +1202,7 @@ export default async function getBaseWebpackConfig( ...@@ -1202,6 +1202,7 @@ export default async function getBaseWebpackConfig(
reactMode: config.experimental.reactMode, reactMode: config.experimental.reactMode,
optimizeFonts: config.experimental.optimizeFonts, optimizeFonts: config.experimental.optimizeFonts,
optimizeImages: config.experimental.optimizeImages, optimizeImages: config.experimental.optimizeImages,
optimizeCss: config.experimental.optimizeCss,
scrollRestoration: config.experimental.scrollRestoration, scrollRestoration: config.experimental.scrollRestoration,
basePath: config.basePath, basePath: config.basePath,
pageEnv: config.experimental.pageEnv, pageEnv: config.experimental.pageEnv,
......
...@@ -1575,6 +1575,8 @@ export default class Server { ...@@ -1575,6 +1575,8 @@ export default class Server {
locale, locale,
locales, locales,
defaultLocale, defaultLocale,
optimizeCss: this.renderOpts.optimizeCss,
distDir: this.distDir,
fontManifest: this.renderOpts.fontManifest, fontManifest: this.renderOpts.fontManifest,
domainLocales: this.renderOpts.domainLocales, domainLocales: this.renderOpts.domainLocales,
} }
......
...@@ -7,3 +7,5 @@ export default function Home() { ...@@ -7,3 +7,5 @@ export default function Home() {
</div> </div>
) )
} }
Home.getInitialProps = () => ({})
...@@ -65,3 +65,21 @@ describe('CSS optimization for serverless apps', () => { ...@@ -65,3 +65,21 @@ describe('CSS optimization for serverless apps', () => {
afterAll(() => killApp(app)) afterAll(() => killApp(app))
runTests() runTests()
}) })
describe('Font optimization for emulated serverless apps', () => {
beforeAll(async () => {
await fs.writeFile(
nextConfig,
`module.exports = { target: 'experimental-serverless-trace', experimental: {optimizeCss: true} }`,
'utf8'
)
await nextBuild(appDir)
appPort = await findPort()
app = await nextStart(appDir, appPort)
})
afterAll(async () => {
await killApp(app)
await fs.remove(nextConfig)
})
runTests()
})
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