Fix experimental optimizeCss for SSR (#22513)

This ensures `distDir` is set under `renderOpts` in `next-server` so that it is present when experimental `optimizeCss` is enabled. x-ref: #16539
vercel · Feb 25, 2021 · 6d068ae · 6d068ae
1 parent c81eadc
commit 6d068ae
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/packages/next/next-server/server/next-server.ts b/packages/next/next-server/server/next-server.ts
@@ -161,6 +161,7 @@ export default class Server {
     locales?: string[]
     defaultLocale?: string
     domainLocales?: DomainLocales
+    distDir: string
   }
   private compression?: Middleware
   private onErrorMiddleware?: ({ err }: { err: Error }) => Promise<void>
@@ -218,6 +219,7 @@ export default class Server {
       optimizeImages: this.nextConfig.experimental.optimizeImages,
       optimizeCss: this.nextConfig.experimental.optimizeCss,
       domainLocales: this.nextConfig.i18n?.domains,
+      distDir: this.distDir,
     }
 
     // Only the `publicRuntimeConfig` key is exposed to the client side

diff --git a/test/integration/critical-css/pages/index.js b/test/integration/critical-css/pages/index.js
@@ -8,4 +8,10 @@ export default function Home() {
   )
 }
 
-Home.getInitialProps = () => ({})
+export const getServerSideProps = () => {
+  return {
+    props: {
+      hello: 'world',
+    },
+  }
+}
diff --git a/test/integration/critical-css/test/index.test.js b/test/integration/critical-css/test/index.test.js
@@ -19,15 +19,15 @@ let app
 
 function runTests() {
   it('should inline critical CSS', async () => {
-    const html = await renderViaHTTP(appPort, '/index')
+    const html = await renderViaHTTP(appPort, '/')
     expect(html).toMatch(
       /<link rel="stylesheet" href="\/_next\/static\/css\/.*\.css" .*>/
     )
     expect(html).toMatch(/body{font-family:SF Pro Text/)
   })
 
   it('should not inline non-critical css', async () => {
-    const html = await renderViaHTTP(appPort, '/index')
+    const html = await renderViaHTTP(appPort, '/')
     expect(html).not.toMatch(/.extra-style/)
   })
 }