fix(core): prevent exponential build

Author: gregberge

packages/smooth-core/package.json

@@ -29,8 +29,8 @@
     "smooth": "./bin/smooth"
   },
   "peerDependencies": {
-    "react": ">=16.3.0",
-    "react-dom": ">=16.3.0"
+    "react": ">=16.8.0",
+    "react-dom": ">=16.8.0"
   },
   "dependencies": {
     "@babel/core": "^7.3.3",
@@ -66,7 +66,6 @@
     "graphql-tag": "^2.10.1",
     "graphql-tools": "^4.0.4",
     "humanize-string": "^1.0.2",
-    "log-update": "^2.3.0",
     "merge-deep": "^3.0.2",
     "pluralize": "^7.0.0",
     "progress-estimator": "^0.2.2",

packages/smooth-core/src/build/index.js

@@ -20,14 +20,15 @@ export async function buildSchema({ config }) {
   const { schemaDefinition, schema } = await buildSchemaDefinition({ config })
   await applyAsyncHook(config, 'onBuild', { schemaDefinition })
   const fragmentTypes = await getFragmentTypes({ schema })
-  cache.writeCacheFile('fragmentTypes.json', JSON.stringify(fragmentTypes))
+  await cache.writeCacheFile(
+    'fragmentTypes.json',
+    JSON.stringify(fragmentTypes),
+  )
   return { schema, fragmentTypes }
 }
 
 export function watchSchema({ logger, ...options }) {
-  const watcher = new Watcher(async () =>
-    logger(buildSchema(options), 'Schemas'),
-  )
+  const watcher = new Watcher(async () => logger(buildSchema(options)))
   watchFs(options.config.srcPath, () => watcher.tick())
   return watcher
 }
@@ -45,7 +46,7 @@ export async function buildWebpack({ config }) {
   })
 }
 
-export function watchWebpack({ logger, config }) {
+export function watchWebpack({ config, logger }) {
   const resolver = {
     done: result => {
       if (resolver.resolve) {
@@ -54,23 +55,26 @@ export function watchWebpack({ logger, config }) {
       }
     },
     task: async () => {
-      resolver.done()
+      if (resolver.resolve) return
       resolver.promise = new Promise(resolve => {
         resolver.resolve = resolve
       })
-      return logger(resolver.promise, 'Webpack')
+      return logger(resolver.promise)
     },
   }
 
   const watcher = new Watcher(resolver.task)
+  watcher.tick()
 
   const middleware = webpackMiddleware({ config }, compiler => {
     compiler.hooks.done.tap('smooth', (compiler, stats) => {
       resolver.done(stats)
     })
-    compiler.hooks.invalid.tap('smooth', () => watcher.tick())
-    compiler.hooks.run.tap('smooth', () => watcher.tick())
-    compiler.hooks.watchRun.tap('smooth', () => watcher.tick())
+    compiler.hooks.invalid.tap('smooth', (filename, changeTime) => {
+      if (!filename.match(/\/\.smooth\//)) {
+        watcher.tick()
+      }
+    })
   })
 
   watcher.middleware = middleware

packages/smooth-core/src/build/webpackMiddleware.js

@@ -1,3 +1,5 @@
+const ignored = ['.git', /\/\.smooth\//, 'node_modules']
+
 export default function webpackMiddleware({ config }, onCreateCompiler) {
   const webpackDevMiddleware = require('webpack-dev-middleware')
   const webpackHotMiddleware = require('webpack-hot-middleware')
@@ -9,8 +11,9 @@ export default function webpackMiddleware({ config }, onCreateCompiler) {
   const devMiddlewareInstance = webpackDevMiddleware(
     compiler,
     config.webpackDevMiddleware({
-      logLevel: 'error',
       publicPath: '/web/static/',
+      logLevel: 'error',
+      watchOptions: { ignored, aggregateTimeout: 300 },
       writeToDisk(filePath) {
         return /node\/static/.test(filePath) || /loadable-stats/.test(filePath)
       },

packages/smooth-core/src/cli/index.js

@@ -1,7 +1,6 @@
 /* eslint-disable no-console */
 import path from 'path'
 import program from 'commander'
-import logUpdate from 'log-update'
 import createLogger from 'progress-estimator'
 import { getConfig } from '../config'
 import { start } from '../server'
@@ -13,50 +12,30 @@ import {
   buildWebpack,
 } from '../build'
 
-let stdout = `Smooth CMS 👨‍🚀
- 
-
-
-
-`
-function createCustomLogFunction(line) {
-  function logFunction(str) {
-    const lines = stdout.split('\n')
-    lines[line] = str
-    stdout = lines.join('\n')
-    logUpdate(stdout)
-  }
-
-  logFunction.clear = logUpdate.clear
-  logFunction.done = () => {}
-  return logFunction
-}
-
-function createCustomLogger(line) {
-  return createLogger({ logFunction: createCustomLogFunction(line) })
-}
+const logger = createLogger()
 
 function watch({ config }) {
+  let webpackWatcher
+
   const schemaWatcher = watchSchema({
     config,
-    logger: createCustomLogger(2),
+    logger: promise => logger(promise, 'Build schemas'),
   })
 
-  const logServer = createCustomLogFunction(5)
-
-  let count = 0
-  function done() {
-    count += 1
-    if (count === 2) {
-      logServer('Project ready 🚀')
-    }
-  }
-
   schemaWatcher.on('done', ({ schema, fragmentTypes }) => {
-    const webpackWatcher = watchWebpack({
-      config,
-      logger: createCustomLogger(3),
-    })
+    if (!webpackWatcher) {
+      webpackWatcher = watchWebpack({
+        config,
+        logger: promise => logger(promise, 'Build webpack'),
+      })
+
+      webpackWatcher.once('done', () => {
+        console.log('🚀 Ready on http://localhost:3000')
+      })
+
+      // eslint-disable-next-line no-console
+      webpackWatcher.on('error', console.error)
+    }
 
     start({
       dev: true,
@@ -65,13 +44,8 @@ function watch({ config }) {
       config,
       webpackMiddleware: webpackWatcher.middleware,
     })
-
-    webpackWatcher.on('done', done)
-    // eslint-disable-next-line no-console
-    webpackWatcher.on('error', console.error)
   })
 
-  schemaWatcher.on('done', done)
   // eslint-disable-next-line no-console
   schemaWatcher.on('error', console.error)
 }
@@ -84,8 +58,8 @@ function clearConsole() {
 
 async function devCommand() {
   clearConsole()
+  console.log('> smooth.js 👨‍🚀')
   const config = await getConfig({ dev: true })
-  logUpdate.done()
   watch({ config })
 }
 

yarn.lock

@@ -5547,9 +5547,9 @@ https-proxy-agent@^2.2.1:
     debug "^3.1.0"
 
 humanize-duration@^3.15.3:
-  version "3.16.0"
-  resolved "https://registry.yarnpkg.com/humanize-duration/-/humanize-duration-3.16.0.tgz#c7ec3b898305f007c63893f891870b2b5a2e0a7d"
-  integrity sha512-LDnNSe8EkJjhRsijWgUK12UK7ivbCww2R3LW9quKdBDoQjeAewqnGHch5AJTCOny1cPLhnXTzvniXVP3B9O6Ew==
+  version "3.17.0"
+  resolved "https://registry.yarnpkg.com/humanize-duration/-/humanize-duration-3.17.0.tgz#a2cec75f9329ce68f8797b23d31d1f988992d11b"
+  integrity sha512-9em7CXFa0my1DF3aIQg0sTRyAX2znEOMHolUvu9nSTUjS+bRD32y0MH+Hnm3Xu0cSWrxpYb2isXSfH9pF2LP8g==
 
 humanize-ms@^1.2.1:
   version "1.2.1"