Simplify build output for SSG pages

Combine the line for page HTML and page JSON into a single line per page
and move output for SSG pages with fallback to section for SSR pages.

This way, we can eliminate the nesting from SSG pages (we no longer have
subsection 1, 2, and 3). This will allow us to more easily implement the
maxLogLines option for limiting output for each section to a specific
number of lines.

Author: FinnWoelm

lib/setupSsgPages.js

@@ -11,77 +11,42 @@ const getNetlifyFunctionName                  = require('./getNetlifyFunctionNam
 // Identify all pages that require server-side rendering and create a separate
 // Netlify Function for every page.
 const setupSsgPages = () => {
-  logTitle("🔥 Setting up SSG pages")
+  // Folder for page JSON data
+  const nextDataFolder = join(NETLIFY_PUBLISH_PATH, "_next", "data/")
+
+  logTitle("🔥 Copying pre-rendered SSG pages to", NETLIFY_PUBLISH_PATH,
+           "and JSON data to", nextDataFolder)
 
   // Get SSG pages
   const ssgPages = allNextJsPages.filter(page => page.isSsg())
 
-  // Copy pre-rendered SSG pages to Netlify publish folder
-  logItem("1. Copying pre-rendered SSG pages to", NETLIFY_PUBLISH_PATH)
+  ssgPages.forEach(({ route, htmlFile, jsonFile, dataRoute }) => {
+    logItem(route)
 
-  ssgPages.forEach(({ htmlFile }) => {
-    const filePath = join("pages", htmlFile)
-    logItem("  ", filePath)
+    // Copy pre-rendered HTML page
+    const htmlPath = join("pages", htmlFile)
 
     copySync(
-      join(NEXT_DIST_DIR,         "serverless",     filePath),
+      join(NEXT_DIST_DIR,         "serverless",     htmlPath),
       join(NETLIFY_PUBLISH_PATH,  htmlFile),
       {
         overwrite: false,
         errorOnExist: true
       }
     )
-  })
 
-  // Copy SSG page data to _next/data/ folder
-  const nextDataFolder = join(NETLIFY_PUBLISH_PATH, "_next", "data/")
-  logItem("2. Copying SSG page data to", nextDataFolder)
-
-  ssgPages.forEach(({ jsonFile, dataRoute }) => {
-    const dataPath = join("pages", jsonFile)
-    logItem("  ", dataPath)
+    // Copy page's JSON data
+    const jsonPath = join("pages", jsonFile)
 
     copySync(
-      join(NEXT_DIST_DIR,         "serverless", dataPath),
+      join(NEXT_DIST_DIR,         "serverless", jsonPath),
       join(NETLIFY_PUBLISH_PATH,  dataRoute),
       {
         overwrite: false,
         errorOnExist: true
       }
     )
   })
-
-  // Set up Netlify Functions to handle fallbacks for SSG pages
-  const ssgFallbackPages = allNextJsPages.filter(page => page.isSsgFallback())
-  logItem("3. Setting up Netlify Functions for SSG pages with fallback: true")
-
-  ssgFallbackPages.forEach(({ filePath }) => {
-    logItem("  ", filePath)
-
-    // Set function name based on file path
-    const functionName      = getNetlifyFunctionName(filePath)
-    const functionDirectory = join(NETLIFY_FUNCTIONS_PATH, functionName)
-
-    // Copy function template
-    copySync(
-      FUNCTION_TEMPLATE_PATH,
-      join(functionDirectory, `${functionName}.js`),
-      {
-        overwrite: false,
-        errorOnExist: true
-      }
-    )
-
-    // Copy page
-    copySync(
-      join(NEXT_DIST_DIR, "serverless", filePath),
-      join(functionDirectory, "nextJsPage.js"),
-      {
-        overwrite: false,
-        errorOnExist: true
-      }
-    )
-  })
 }
 
 module.exports = setupSsgPages

lib/setupSsrPages.js

@@ -10,10 +10,14 @@ const getNetlifyFunctionName                            = require('./getNetlifyF
 // Identify all pages that require server-side rendering and create a separate
 // Netlify Function for every page.
 const setupSsrPages = () => {
-  logTitle("💫 Setting up SSR pages as Netlify Functions in", NETLIFY_FUNCTIONS_PATH)
+  logTitle("💫 Setting up SSR pages and SSG pages with fallback",
+           "as Netlify Functions in", NETLIFY_FUNCTIONS_PATH)
 
-  // Get SSR pages
-  const ssrPages = allNextJsPages.filter(page => page.isSsr())
+  // Get SSR pages and SSG fallback pages (which also need to be rendered
+  // server-side)
+  const ssrPages = allNextJsPages.filter(page =>
+    page.isSsr() || page.isSsgFallback()
+  )
 
   // Create Netlify Function for every page
   ssrPages.forEach(({ filePath }) => {

next-on-netlify.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+const { logTitle } = require('./lib/logger')
 const prepareFolders  = require('./lib/prepareFolders')
 const copyPublicFiles = require('./lib/copyPublicFiles')
 const copyNextAssets  = require('./lib/copyNextAssets')
@@ -22,4 +23,4 @@ setupHtmlPages()
 
 setupRedirects()
 
-console.log("\x1b[1m✅ Success! All done!\x1b[22m")
+logTitle("✅ Success! All done!")

tests/defaults.test.js

@@ -66,7 +66,8 @@ describe('Next', () => {
     expect(BUILD_OUTPUT).toMatch("Next on Netlify")
     expect(BUILD_OUTPUT).toMatch("Copying public/ folder to out_publish/")
     expect(BUILD_OUTPUT).toMatch("Copying static NextJS assets to out_publish/")
-    expect(BUILD_OUTPUT).toMatch("Setting up SSR pages as Netlify Functions in out_functions/")
+    expect(BUILD_OUTPUT).toMatch("Setting up SSR pages and SSG pages with fallback as Netlify Functions in out_functions/")
+    expect(BUILD_OUTPUT).toMatch("Copying pre-rendered SSG pages to out_publish/ and JSON data to out_publish/_next/data/")
     expect(BUILD_OUTPUT).toMatch("Writing pre-rendered HTML pages to out_publish/")
     expect(BUILD_OUTPUT).toMatch("Setting up redirects")
     expect(BUILD_OUTPUT).toMatch("Success! All done!")