Merge pull request #40 from zephraph/support-next-ssg

Add support for exporting ssg hooks

__tests__/fixtures/extend-frontmatter-async/layouts/docs-page.jsx

@@ -0,0 +1,20 @@
+import { frontMatter as introData } from '../pages/docs/intro.mdx'
+import { frontMatter as advancedData } from '../pages/docs/advanced.mdx'
+
+export default frontMatter => {
+  return function docsPageLayout({ children }) {
+    return (
+      <>
+        <p>LAYOUT TEMPLATE</p>
+        <h1>{frontMatter.title}</h1>
+        <p>
+          All frontMatter: {JSON.stringify(frontMatter)}
+        </p>
+        <p>
+          Other docs: {introData.title}, {advancedData.title}
+        </p>
+        {children}
+      </>
+    )
+  }
+}

__tests__/fixtures/extend-frontmatter-async/pages/docs/advanced.mdx

@@ -0,0 +1,5 @@
+---
+title: 'Advanced Docs'
+---
+
+This is some **advanced** docs content!

__tests__/fixtures/extend-frontmatter-async/pages/docs/intro.mdx

@@ -0,0 +1,6 @@
+---
+layout: 'docs-page'
+title: 'Intro Docs'
+---
+
+Here's some _introductory_ docs content

__tests__/fixtures/extend-frontmatter-async/pages/index.jsx

@@ -0,0 +1,14 @@
+import { frontMatter as introData } from './docs/intro.mdx'
+import { frontMatter as advancedData } from './docs/advanced.mdx'
+
+export default () => {
+  return (
+    <>
+      <p>Hello world</p>
+      <ul>
+        <li>{introData.title}</li>
+        <li>{advancedData.title}</li>
+      </ul>
+    </>
+  )
+}

__tests__/fixtures/layout-exports-ssg/layouts/docs-page.jsx

@@ -0,0 +1,17 @@
+import { frontMatter as other} from '../pages/docs/intro.mdx'
+
+export async function getStaticProps() {
+  return {props: {}}
+}
+
+export default (frontMatter) => {
+  return function docsPageLayout({ children }) {
+    return (
+      <>
+        <p>LAYOUT TEMPLATE</p>
+        <h1>{frontMatter.title}</h1>
+        {children}
+      </>
+    )
+  }
+}

__tests__/fixtures/layout-exports-ssg/next.config.js

@@ -0,0 +1,3 @@
+const withMdxEnhanced = require('../../..')
+
+module.exports = withMdxEnhanced()()

__tests__/fixtures/layout-exports-ssg/pages/docs/intro.mdx

@@ -0,0 +1,6 @@
+---
+layout: 'docs-page'
+title: 'Intro Docs'
+---
+
+Hello world

__tests__/integration.js

@@ -4,6 +4,7 @@ const rmfr = require('rmfr')
 const nextBuild = require('next/dist/build').default
 const nextExport = require('next/dist/export').default
 const glob = require('glob')
+const execa = require("execa")
 
 // increase timeout since these are integration tests
 jest.setTimeout(200000)
@@ -38,6 +39,12 @@ test('options.layoutPath and options.defaultLayout', async () => {
   )
 })
 
+test('exports ssg functions from layout', async () => {
+  const layoutSSGExportFixture = path.join(__dirname, 'fixtures/layout-exports-ssg')
+  const outPath = await compileNextjs(layoutSSGExportFixture)
+  return expectContentMatch(outPath, 'docs/intro.html', /Hello world/)
+})
+
 describe('options.extendFrontMatter', () => {
   it('should work with a sync process fn', async () => {
     const extendFmFixture = path.join(__dirname, 'fixtures/extend-frontmatter')
@@ -47,8 +54,8 @@ describe('options.extendFrontMatter', () => {
   })
 
   it('should work with an async process fn', async () => {
-    const extendFmFixture = path.join(__dirname, 'fixtures/extend-frontmatter')
-    const outPath = await compileNextjs(extendFmFixture, 'next.config.async.js')
+    const extendFmFixture = path.join(__dirname, 'fixtures/extend-frontmatter-async')
+    const outPath = await compileNextjs(extendFmFixture)
     expectContentMatch(outPath, 'index.html', /Hello world/)
     expectContentMatch(outPath, 'docs/intro.html', /ortni\/scod/)
   })
@@ -100,17 +107,11 @@ afterAll(() => {
 
 // Test Utilities
 
-function compileNextjs(projectPath, configPath = 'next.config.js') {
-  const config = require(path.join(projectPath, configPath))
+async function compileNextjs(projectPath) {
   const outPath = path.join(projectPath, 'out')
-  return nextBuild(projectPath, config)
-    .then(() => {
-      return nextExport(projectPath, {
-        outdir: outPath,
-        silent: true
-      })
-    })
-    .then(() => outPath)
+  await execa("next", ["build", projectPath], { preferLocal: true, cwd: projectPath })
+  await execa("next", ["export", projectPath], { preferLocal: true, cwd: projectPath })
+  return outPath
 }
 
 function expectContentMatch(outPath, filePath, matcher) {

loader.js

@@ -126,6 +126,7 @@ async function processLayout(options, frontMatter, content, resourcePath, scans)
   // Import the layout, export the layout-wrapped content, pass front matter into layout
   return `import layout from '${normalizeToUnixPath(layoutPath)}'
 
+export * from '${normalizeToUnixPath(layoutPath)}'
 export default layout(${stringifyObject(mergedFrontMatter)})
 
 ${content}