fixing tests

vercel · Aug 4, 2020 · 539f346 · 539f346
1 parent faae463
commit 539f346
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/packages/next/build/webpack/loaders/next-serverless-loader.ts b/packages/next/build/webpack/loaders/next-serverless-loader.ts
@@ -440,7 +440,7 @@ const nextServerlessLoader: loader.Loader = function () {
            * __webpack_require__.__NEXT_FONT_MANIFEST__ is added by
            * font-stylesheet-gathering-plugin
            */
-          renderOpts.fontManifest = renderOpts.fontManifest = __webpack_require__.__NEXT_FONT_MANIFEST__;
+          renderOpts.fontManifest = __webpack_require__.__NEXT_FONT_MANIFEST__;
           process.env['__NEXT_OPTIMIZE_FONT'+'S'] = true
         }
         let result = await renderToHTML(req, res, "${page}", Object.assign({}, getStaticProps ? { ...(parsedUrl.query.amp ? { amp: '1' } : {}) } : parsedUrl.query, nowParams ? nowParams : params, _params, isFallback ? { __nextFallback: 'true' } : {}), renderOpts)

diff --git a/packages/next/build/webpack/plugins/font-stylesheet-gathering-plugin.ts b/packages/next/build/webpack/plugins/font-stylesheet-gathering-plugin.ts
@@ -103,17 +103,26 @@ export class FontStylesheetGatheringPlugin {
       this.parserHandler
     )
     compiler.hooks.make.tapAsync(this.constructor.name, (compilation, cb) => {
-      const mainTemplate = compilation.mainTemplate
-      mainTemplate.hooks.requireExtensions.tap(
-        this.constructor.name,
-        (source: string) => {
-          return `${source}
-      // Font manifest declaration
-      ${mainTemplate.requireFn}.__NEXT_FONT_MANIFEST__ = ${JSON.stringify(
-            this.manifestContent
-          )};`
-        }
-      )
+      // @ts-ignore
+      if (compilation.options.output.path.endsWith('serverless')) {
+        /**
+         * Inline font manifest for serverless case only.
+         * For target: server drive the manifest through physical file and less of webpack magic.
+         */
+        const mainTemplate = compilation.mainTemplate
+        mainTemplate.hooks.requireExtensions.tap(
+          this.constructor.name,
+          (source: string) => {
+            return `${source}
+                // Font manifest declaration
+                ${
+                  mainTemplate.requireFn
+                }.__NEXT_FONT_MANIFEST__ = ${JSON.stringify(
+              this.manifestContent
+            )};`
+          }
+        )
+      }
       compilation.hooks.finishModules.tapAsync(
         this.constructor.name,
         async (_: any, modulesFinished: Function) => {

diff --git a/test/integration/font-optimization/test/index.test.js b/test/integration/font-optimization/test/index.test.js
@@ -82,6 +82,10 @@ describe('Font optimization for SSR apps', () => {
       `module.exports = { experimental: {optimizeFonts: true} }`,
       'utf8'
     )
+
+    if (fs.pathExistsSync(join(appDir, '.next'))) {
+      await fs.remove(join(appDir, '.next'))
+    }
     await nextBuild(appDir)
     appPort = await findPort()
     app = await nextStart(appDir, appPort)