feat(docz-core): watch gatsby config files

core/docz-core/src/bundler/machine/index.ts

@@ -33,7 +33,7 @@ const machine = Machine<ServerMachineCtx>({
   states: {
     watch: {
       invoke: {
-        src: 'watchConfig',
+        src: 'watchConfigFiles',
       },
     },
     server: {

core/docz-core/src/bundler/machine/services/createResources.ts → core/docz-core/src/bundler/machine/services/create-resources.ts

@@ -1,7 +1,7 @@
 import * as path from 'path'
 import * as fs from 'fs-extra'
 import { finds } from 'load-cfg'
-import { getOr, fromPairs } from 'lodash/fp'
+import { omit, getOr, fromPairs } from 'lodash/fp'
 import latestVersion from 'latest-version'
 import findUp from 'find-up'
 import sh from 'shelljs'
@@ -107,47 +107,48 @@ export const writeNotFound = async () => {
   await outputFileFromTemplate('404.tpl.js', outputPath, {})
 }
 
-const writeConfigFile = async ({ args, isDoczRepo }: ServerMachineCtx) => {
+const writeGatsbyConfig = async ({ args, isDoczRepo }: ServerMachineCtx) => {
   const outputPath = path.join(paths.docz, 'gatsby-config.js')
-
+  const config = omit(['plugins'], args)
+  const newConfig = JSON.stringify({ ...config, root: paths.docz })
   await outputFileFromTemplate('gatsby-config.tpl.js', outputPath, {
     isDoczRepo,
-    config: JSON.stringify({ ...args, root: paths.docz }),
+    config: newConfig,
   })
 }
 
-const writeGatsbyNode = async (ctx: ServerMachineCtx) => {
-  const outputPath = path.join(paths.docz, 'gatsby-node.js')
-  await outputFileFromTemplate('gatsby-node.tpl.js', outputPath, {
-    keys: Object.keys(ctx.args.gatsbyNode),
-  })
+const copyGatsbyConfigFile = async (from: string, to: string) => {
+  const filepath = path.join(paths.root, from)
+  const dest = path.join(paths.docz, to)
+  if (fs.pathExistsSync(filepath)) {
+    await fs.copy(filepath, dest)
+  }
 }
 
-const writeGatsbySSR = async (ctx: ServerMachineCtx) => {
-  const outputPath = path.join(paths.docz, 'gatsby-ssr.js')
-  await outputFileFromTemplate('gatsby-ssr.tpl.js', outputPath, {
-    keys: Object.keys(ctx.args.gatsbySSR),
-  })
-}
+const writeGatsbyConfigCustom = async () =>
+  copyGatsbyConfigFile('gatsby-config.js', 'gatsby-config.custom.js')
 
-const writeGatsbyBrowser = async (ctx: ServerMachineCtx) => {
-  const outputPath = path.join(paths.docz, 'gatsby-browser.js')
-  await outputFileFromTemplate('gatsby-browser.tpl.js', outputPath, {
-    keys: Object.keys(ctx.args.gatsbyBrowser),
-  })
-}
+const writeGatsbyNode = async () =>
+  copyGatsbyConfigFile('gatsby-node.js', 'gatsby-node.js')
+
+const writeGatsbySSR = async () =>
+  copyGatsbyConfigFile('gatsby-ssr.js', 'gatsby-ssr.js')
+
+const writeGatsbyBrowser = async () =>
+  copyGatsbyConfigFile('gatsby-browser.js', 'gatsby-browser.js')
 
 export const createResources = async (ctx: ServerMachineCtx) => {
   try {
     copyPkgJSON()
     await copyDoczRc()
     await copyAndModifyPkgJson(ctx)
     await writeEslintRc(ctx)
-    await writeConfigFile(ctx)
     await writeNotFound()
-    await writeGatsbyBrowser(ctx)
-    await writeGatsbyNode(ctx)
-    await writeGatsbySSR(ctx)
+    await writeGatsbyConfig(ctx)
+    await writeGatsbyConfigCustom()
+    await writeGatsbyNode()
+    await writeGatsbyBrowser()
+    await writeGatsbySSR()
   } catch (err) {
     console.log(err)
   }

core/docz-core/src/bundler/machine/services/index.ts

@@ -1,5 +1,5 @@
-export { createResources } from './createResources'
-export { ensureDirs } from './ensureDirs'
-export { execDevCommand } from './execDevCommand'
-export { installDeps } from './installDeps'
-export { watchConfig } from './watchConfig'
+export { createResources } from './create-resources'
+export { ensureDirs } from './ensure-dirs'
+export { execDevCommand } from './exec-dev-command'
+export { installDeps } from './install-deps'
+export { watchConfigFiles } from './watch-config-files'

core/docz-core/src/bundler/machine/services/watch-config-files.ts

@@ -0,0 +1,48 @@
+import * as path from 'path'
+import { finds } from 'load-cfg'
+import sh from 'shelljs'
+
+import { Config } from '../../../config/argv'
+import * as paths from '../../../config/paths'
+import { createWatcher } from '../../../states/config'
+import { ServerMachineCtx as Context } from '../context'
+
+const createWatch = (args: Config) => (
+  glob: any,
+  src: string,
+  custom?: boolean
+) => {
+  const watcher = createWatcher(glob, args)
+  const srcPath = path.join(paths.root, src)
+  const destPath = path.join(
+    paths.docz,
+    custom ? src.replace('.js', '.custom.js') : src
+  )
+
+  const copyFile = () => sh.cp(srcPath, destPath)
+  const deleteFile = () => sh.rm(destPath)
+
+  watcher
+    .on('add', copyFile)
+    .on('change', copyFile)
+    .on('unlink', deleteFile)
+
+  return () => watcher.close()
+}
+
+export const watchConfigFiles = ({ args }: Context) => () => {
+  const watch = createWatch(args)
+  const doczrc = watch(args.config || finds('docz'), 'doczrc.js')
+  const gatsbyBrowser = watch(paths.gatsbyBrowser, 'gatsby-browser.js')
+  const gatsbyNode = watch(paths.gatsbyNode, 'gatsby-node.js')
+  const gatsbySSR = watch(paths.gatsbySSR, 'gatsby-ssr.js')
+  const gatsbyConfig = watch(paths.gatsbyConfig, 'gatsby-config.js', true)
+
+  return () => {
+    doczrc()
+    gatsbyConfig()
+    gatsbyBrowser()
+    gatsbyNode()
+    gatsbySSR()
+  }
+}

core/docz-core/src/config/paths.ts

@@ -40,6 +40,10 @@ export interface Paths {
   appNodeModules: string
   appPackageJson: string
   appYarnLock: string
+  gatsbyConfig: string
+  gatsbyBrowser: string
+  gatsbyNode: string
+  gatsbySSR: string
   ownNodeModules: string
 
   checkIsDoczProject: (config: any) => boolean
@@ -69,6 +73,10 @@ export const appNodeModules = resolveApp('node_modules')
 export const appPackageJson = resolveApp('package.json')
 export const appYarnLock = resolveOwn('yarn.lock')
 export const ownNodeModules = resolveOwn('node_modules')
+export const gatsbyConfig = resolveApp('gatsby-config.js')
+export const gatsbyBrowser = resolveApp('gatsby-browser.js')
+export const gatsbyNode = resolveApp('gatsby-node.js')
+export const gatsbySSR = resolveApp('gatsby-ssr.js')
 
 export const getDist = (dest: string) => path.join(root, dest)
 export const distPublic = (dest: string) => path.join(dest, 'public/')

core/docz-core/src/states/config.ts

@@ -48,8 +48,7 @@ const update = async (params: Params, initial: Payload, { config }: Config) => {
 
 export const WATCH_IGNORE = /(((^|[\/\\])\.((?!docz)(.+)))|(node_modules))/
 
-export const configWatcher = (config: Config) => {
-  const glob = config.config || finds('docz')
+export const createWatcher = (glob: any, config: Config) => {
   const ignored = config.watchIgnore || WATCH_IGNORE
   const watcher = chokidar.watch(glob, {
     ignored,
@@ -62,8 +61,9 @@ export const configWatcher = (config: Config) => {
 }
 
 export const state = (config: Config, dev?: boolean): State => {
+  const glob = config.config || finds('docz')
   const initial = getInitialConfig(config)
-  const watcher = configWatcher(config)
+  const watcher = createWatcher(glob, config)
 
   return {
     id: 'config',