feat(core): make content configurable

BREAKING CHANGE: "Blocks" & "BlockFragment" are now exported under "smooth-code/content"

Author: gregberge

packages/smooth-core/blocks.js

@@ -0,0 +1 @@
+module.exports = require('./lib/content')

packages/smooth-core/content.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import loadable from '@loadable/component'
-import Status from './router/Status'
+import { Status } from '../router'
 
 const ErrorPage = loadable(() => import('__smooth_error'))
 

packages/smooth-core/src/blocks.js

@@ -1,7 +1,7 @@
-import React from 'react'
+import React, { useRef } from 'react'
 import loadable from '@loadable/component'
 import App from '__smooth_app'
-import Content from './Content'
+import Content from '__smooth_content'
 import PageContext from './PageContext'
 
 function getFileName(filePath) {
@@ -54,15 +54,36 @@ export function getPages() {
     .sort(sortPages)
 }
 
-export default function Page({ page, lang, ...props }) {
+export default function Page({
+  page,
+  lang,
+  indexUrl,
+  history,
+  match,
+  location,
+}) {
+  const Component = useRef()
   return (
     <page.LoadableComponent>
-      {exp => {
-        const Component = page.isContent ? Content : exp.default
-        const appProps = { lang, page, exp, ...props }
+      {pageModule => {
+        if (!Component.current) {
+          Component.current = page.isContent
+            ? function ContentWrapper() {
+                return <Content Component={pageModule.default} />
+              }
+            : pageModule.default
+        }
+
+        const pageContext = {
+          lang,
+          page: { ...page, module: pageModule, indexUrl },
+          history,
+          match,
+          location,
+        }
         return (
-          <PageContext.Provider value={{ lang, page }}>
-            <App {...appProps} Component={Component} />
+          <PageContext.Provider value={pageContext}>
+            <App {...pageContext} Component={Component.current} />
           </PageContext.Provider>
         )
       }}

packages/smooth-core/src/client/Content.js

@@ -19,12 +19,14 @@ export default function Routes() {
             <Route
               key={index}
               path={`${url}${page.routePath}`}
-              render={routeProps => (
+              render={({ history, match, location }) => (
                 <Page
                   lang={lang}
                   indexUrl={`${url}${page.indexPath}`}
                   page={page}
-                  {...routeProps}
+                  history={history}
+                  match={match}
+                  location={location}
                 />
               )}
             />

packages/smooth-core/src/client/ErrorBoundary.js

@@ -0,0 +1 @@
+export { default } from '../content'

packages/smooth-core/src/client/Page.js

@@ -71,6 +71,7 @@ function getTargetConfig(target, { config, dev }) {
           __smooth_app: getScriptPath(config, '_app.js'),
           __smooth_document: getScriptPath(config, '_document.js'),
           __smooth_error: getScriptPath(config, '_error.js'),
+          __smooth_content: getScriptPath(config, '_content.js'),
           __smooth_blocks: config.blocksPath,
           __smooth_pages: config.pagesPath,
         },