Skip to content

Commit

Permalink
full reload support
Browse files Browse the repository at this point in the history
  • Loading branch information
pooya parsa committed Apr 23, 2019
1 parent 4de6261 commit 686425e
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 4 deletions.
19 changes: 17 additions & 2 deletions packages/cli/src/commands/dev.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import consola from 'consola'
import chalk from 'chalk'
import opener from 'opener'
import workstation from 'workstation'
import { common, server, worker } from '../options'
import { eventsMapping, formatPath } from '../utils'
import { showBanner } from '../utils/banner'
Expand Down Expand Up @@ -104,8 +105,22 @@ export default {
async worker(cmd) {
const config = await cmd.getNuxtConfig({ dev: true })

await startNuxtWorker('server', config)
await startNuxtWorker('builder', config)
let serverWorkers = []
let builderWorkers = []

const start = async () => {
const oldWorkers = [...serverWorkers, ...builderWorkers]
serverWorkers = await startNuxtWorker('server', config)
builderWorkers = await startNuxtWorker('builder', config)
await Promise.all(oldWorkers.map(w => w.stop()))
}

workstation.on('message:hook:watch:restart', (payload) => {
this.logChanged(payload)
start()
})

await start()

await startWorkerServer(config)
}
Expand Down
3 changes: 2 additions & 1 deletion packages/workers/bin/builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ class BuilderWorker extends NuxtWorker {
if (this.options.dev) {
// Publish builder hooks
this.publishHook('build:resources')
this.publishHook('bundler:progress', states => JSON.stringify(states))
this.publishHook('bundler:progress', states => states)
this.publishHook('watch:restart', payload => payload)

// Register MFS service
const mfsService = await createHTTPService({
Expand Down
2 changes: 1 addition & 1 deletion packages/workers/bin/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class ServerWorker extends NuxtWorker {
endpoint: 'http://localhost:3000/_mfs' // TODO: Generate me!
})
this.subscribeHook('build:resources', () => [httpfs])
this.subscribeHook('bundler:progress', states => [JSON.parse(states)])
this.subscribeHook('bundler:progress', states => [states])
}
}
}
Expand Down

0 comments on commit 686425e

Please sign in to comment.