terribleplan/next.js
1
0
Fork 0
mirror of https://github.com/terribleplan/next.js.git synced 2024-01-19 02:48:18 +00:00
Code Issues Releases Wiki Activity

Additional config options for hot reloader web socket connection (#6083)

Browse source 
* Additional config options for hot reloader web socket connection

* Apply suggestions from code review

Accepting suggested code changes

Co-Authored-By: jaslakson <jason.aslakson@americastestkitchen.com>

* updated README with websocket proxy options

* Fix test / cleanup port setting

* Always set proxy_path
This commit is contained in:
Jason Aslakson 2019-01-19 07:39:09 -05:00 committed by Tim Neutkens
parent b8c9a1b574
commit 00003193df
4 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/next-server/server/config.js
View file

@ -18,7 +18,9 @@ const defaultConfig = {
onDemandEntries: { onDemandEntries: {
maxInactiveAge: 60 * 1000, maxInactiveAge: 60 * 1000,
pagesBufferLength: 2, pagesBufferLength: 2,
websocketPort: 0 websocketPort: 0,
websocketProxyPath: '/',
websocketProxyPort: null
} }
} }

4
packages/next/README.md
View file

@ -1297,6 +1297,10 @@ module.exports = {
pagesBufferLength: 2, pagesBufferLength: 2,
// optionally configure a port for the onDemandEntries WebSocket, not needed by default // optionally configure a port for the onDemandEntries WebSocket, not needed by default
websocketPort: 3001, websocketPort: 3001,
// optionally configure a proxy path for the onDemandEntries WebSocket, not need by default
websocketProxyPath: '/hmr',
// optionally configure a proxy port for the onDemandEntries WebSocket, not need by default
websocketProxyPort: 7002,
}, },
} }
``` ```

5
packages/next/client/on-demand-entries-client.js
View file

@ -3,7 +3,8 @@
import Router from 'next/router' import Router from 'next/router'
import fetch from 'unfetch' import fetch from 'unfetch'
const { hostname } = location const { hostname, protocol } = location
const wsProtocol = protocol.includes('https') ? 'wss' : 'ws'
const retryTime = 5000 const retryTime = 5000
let ws = null let ws = null
let lastHref = null let lastHref = null
@ -19,7 +20,7 @@ export default async ({ assetPrefix }) => {
} }
return new Promise(resolve => { return new Promise(resolve => {
ws = new WebSocket(`ws://${hostname}:${process.env.NEXT_WS_PORT}`) ws = new WebSocket(`${wsProtocol}://${hostname}:${process.env.NEXT_WS_PORT}${process.env.NEXT_WS_PROXY_PATH}`)
ws.onopen = () => resolve() ws.onopen = () => resolve()
ws.onclose = () => { ws.onclose = () => {
setTimeout(async () => { setTimeout(async () => {

15
packages/next/server/hot-reloader.js
View file

@ -164,10 +164,13 @@ export default class HotReloader {
return del(join(this.dir, this.config.distDir), { force: true }) return del(join(this.dir, this.config.distDir), { force: true })
} }
addWsPort (configs) { addWsConfig (configs) {
configs[0].plugins.push(new webpack.DefinePlugin({ const { websocketProxyPath, websocketProxyPort } = this.config.onDemandEntries
'process.env.NEXT_WS_PORT': this.wsPort const opts = {
})) 'process.env.NEXT_WS_PORT': websocketProxyPort || this.wsPort,
'process.env.NEXT_WS_PROXY_PATH': JSON.stringify(websocketProxyPath)
}
configs[0].plugins.push(new webpack.DefinePlugin(opts))
} }
async getWebpackConfig () { async getWebpackConfig () {
@ -200,7 +203,7 @@ export default class HotReloader {
}) })
const configs = await this.getWebpackConfig() const configs = await this.getWebpackConfig()
this.addWsPort(configs) this.addWsConfig(configs)
const multiCompiler = webpack(configs) const multiCompiler = webpack(configs)
@ -229,7 +232,7 @@ export default class HotReloader {
await this.clean() await this.clean()
const configs = await this.getWebpackConfig() const configs = await this.getWebpackConfig()
this.addWsPort(configs) this.addWsConfig(configs)
const compiler = webpack(configs) const compiler = webpack(configs)