feat: add onCreateServer & onCreateApolloServerConfig

Also refactor plugin hooks

Author: gregberge

packages/smooth/README.md

@@ -10,7 +10,6 @@
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
-
 - [How to use](#how-to-use)
   - [Setup](#setup)
   - [Structure](#structure)
@@ -896,6 +895,8 @@ The `modules` option on `"preset-env"` should be kept to `false` otherwise webpa
 
 ### smooth-node.js
 
+- onCreateServer
+- onCreateApolloServerConfig
 - onRenderBody
 - onCreateBabelConfig
 - getContents

packages/smooth/src/build/index.js

@@ -1,6 +1,6 @@
 import path from 'path'
 import webpack from 'webpack'
-import { applyAsyncHook } from '../plugin'
+import { onBuild } from '../plugin/nodeHooks'
 import {
   createSchemaDefinition,
   makeExecutableSchema,
@@ -40,7 +40,7 @@ export async function buildSchemaDefinition({ config }) {
 export async function buildSchema({ config }) {
   const cache = createCache({ config })
   const { schemaDefinition, schema } = await buildSchemaDefinition({ config })
-  await applyAsyncHook(config, 'onBuild', { schemaDefinition })
+  await onBuild(config)({ schemaDefinition })
   const fragmentTypes = await getFragmentTypes({ schema })
   await cache.writeCacheFile(
     'fragmentTypes.json',

packages/smooth/src/config/webpack.js

@@ -3,7 +3,7 @@ import fs from 'fs'
 import webpack from 'webpack'
 import nodeExternals from 'webpack-node-externals'
 import LoadablePlugin from '@loadable/webpack-plugin'
-import { applyHook } from '../plugin/node'
+import { onCreateBabelConfig } from '../plugin/nodeHooks'
 import SmoothCacheHotReloader from '../webpack/plugins/smooth-cache-hot-reloader'
 
 function fileExistsSync(filepath) {
@@ -46,36 +46,10 @@ function getDirectory(config, dirPath, defaultPath) {
     : path.join(config.cachePath, defaultPath)
 }
 
-function getBabelOptions({ config, isServer }) {
-  let mixOpts = { plugins: [], presets: [] }
-
-  const actions = {
-    setBabelOptions(opts) {
-      mixOpts = { ...mixOpts, ...opts }
-    },
-    setBabelPlugin({ name, options = {} }) {
-      mixOpts = {
-        ...mixOpts,
-        plugins: [...mixOpts.plugins, [name, options]],
-      }
-    },
-    setBabelPreset({ name, options = {} }) {
-      mixOpts = {
-        ...mixOpts,
-        presets: [...mixOpts.presets, [name, options]],
-      }
-    },
-  }
-
-  applyHook(config, 'onCreateBabelConfig', { isServer, actions })
-
-  return mixOpts
-}
-
 function getTargetConfig(target, { config, dev }) {
   const mainEntry = path.join(__dirname, '../client', `main-${target}.js`)
   const isServer = target === 'node'
-  const babelOptions = getBabelOptions({ config, isServer })
+  const babelOptions = onCreateBabelConfig(config)({ isServer })
   const defaultLoaders = {
     babel: {
       loader: 'smooth-babel-loader',

packages/smooth/src/content/Query.js

@@ -4,7 +4,7 @@ import gql from 'graphql-tag'
 import { Redirect, useRouter } from '../router'
 import { usePageContext } from '../page/PageContext'
 import { HTTPError } from '../router/HTTPError'
-import { applyHook } from '../plugin/browser'
+import { onSelectContentFields } from '../plugin/browserHooks'
 import { Query as BaseQuery } from '../query/Query'
 import {
   getFragmentDefinition,
@@ -23,11 +23,7 @@ function getQuery(page) {
   const type = getDefinitionType(fragmentDefinition)
   const queryField = getQueryField(type)
   const fragmentName = getDefinitionName(fragmentDefinition)
-  const fields = applyHook(
-    'onSelectContentFields',
-    { fields: [`...${fragmentName}`] },
-    'fields',
-  )
+  const fields = onSelectContentFields({ fragmentName })
 
   const query = gql`
     query Content(

packages/smooth/src/page/Page.js

@@ -2,7 +2,7 @@ import React, { useRef } from 'react'
 import loadable from '@loadable/component'
 import App from '__smooth_app'
 import Content from '__smooth_content'
-import { applyHook } from '../plugin/browser'
+import { wrapContentElement } from '../plugin/browserHooks'
 import { PageContextProvider } from './PageContext'
 import { usePause } from '../router/HiddenRouter'
 
@@ -87,7 +87,7 @@ function enrichPageRef(
       const ContentComponent = props => {
         const Component = pageRef.current.module.default
         const element = <Component {...props} />
-        return applyHook('wrapContentElement', { element, props }, 'element')
+        return wrapContentElement({ element, props })
       }
       const PageComponent = () => <Content Component={ContentComponent} />
       pageRef.current.ContentComponent = ContentComponent

packages/smooth/src/plugin/browserHooks/index.js

@@ -0,0 +1,3 @@
+export * from './onRouteUpdate'
+export * from './onSelectContentFields'
+export * from './wrapContentElement'

packages/smooth/src/plugin/browserHooks/onRouteUpdate.js

@@ -0,0 +1,3 @@
+import { applyHook } from '../browser'
+
+export const onRouteUpdate = options => applyHook('onRouteUpdate', options)

packages/smooth/src/plugin/browserHooks/onSelectContentFields.js

@@ -0,0 +1,8 @@
+import { applyHook } from '../browser'
+
+export const onSelectContentFields = ({ fragmentName }) =>
+  applyHook(
+    'onSelectContentFields',
+    { fields: [`...${fragmentName}`] },
+    'fields',
+  )

packages/smooth/src/plugin/browserHooks/wrapContentElement.js

@@ -0,0 +1,4 @@
+import { applyHook } from '../browser'
+
+export const wrapContentElement = ({ element, props }) =>
+  applyHook('wrapContentElement', { element, props }, 'element')

packages/smooth/src/plugin/nodeHooks/index.js

@@ -0,0 +1,6 @@
+export * from './onBuild'
+export * from './onCreateApolloServerConfig'
+export * from './onCreateServer'
+export * from './onCreateBabelConfig'
+export * from './onRenderBody'
+export * from './wrapRootElement'