Revert "Clean up eventsource initialization"

This reverts commit 48b9e15.
timneutkens · Apr 13, 2021 · 35fee0d · 35fee0d
1 parent 48b9e15
commit 35fee0d
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/packages/next/client/dev/amp-dev.js b/packages/next/client/dev/amp-dev.js
@@ -1,6 +1,6 @@
 /* globals __webpack_hash__ */
 import EventSourcePolyfill from './event-source-polyfill'
-import { addMessageListener } from './error-overlay/eventsource'
+import { getEventSourceWrapper } from './error-overlay/eventsource'
 import { setupPing } from './on-demand-entries-utils'
 import { displayContent } from './fouc'
 
@@ -68,7 +68,9 @@ async function tryApplyUpdates() {
   }
 }
 
-addMessageListener((event) => {
+getEventSourceWrapper({
+  path: `${assetPrefix}/_next/webpack-hmr`,
+}).addMessageListener((event) => {
   if (event.data === '\uD83D\uDC93') {
     return
   }

diff --git a/packages/next/client/dev/dev-build-watcher.js b/packages/next/client/dev/dev-build-watcher.js
@@ -1,4 +1,4 @@
-import { addMessageListener } from './error-overlay/eventsource'
+import { getEventSourceWrapper } from './error-overlay/eventsource'
 
 export default function initializeBuildWatcher(toggleCallback) {
   const shadowHost = document.createElement('div')
@@ -39,8 +39,8 @@ export default function initializeBuildWatcher(toggleCallback) {
   let timeoutId = null
 
   // Handle events
-
-  addMessageListener((event) => {
+  const evtSource = getEventSourceWrapper({ path: '/_next/webpack-hmr' })
+  evtSource.addMessageListener((event) => {
     // This is the heartbeat event
     if (event.data === '\uD83D\uDC93') {
       return

diff --git a/packages/next/client/dev/error-overlay/eventsource.js b/packages/next/client/dev/error-overlay/eventsource.js
@@ -57,10 +57,6 @@ function EventSourceWrapper(options) {
   }
 }
 
-export function addMessageListener(cb) {
-  eventCallbacks.push(cb)
-}
-
 export function getEventSourceWrapper(options) {
   if (!options.ondemand) {
     return {

diff --git a/packages/next/client/dev/error-overlay/hot-dev-client.js b/packages/next/client/dev/error-overlay/hot-dev-client.js
@@ -28,7 +28,7 @@
 
 import * as DevOverlay from '@next/react-dev-overlay/lib/client'
 import stripAnsi from 'next/dist/compiled/strip-ansi'
-import { addMessageListener } from './eventsource'
+import { getEventSourceWrapper } from './eventsource'
 import formatWebpackMessages from './format-webpack-messages'
 
 // This alternative WebpackDevServer combines the functionality of:
@@ -42,10 +42,10 @@ import formatWebpackMessages from './format-webpack-messages'
 
 let hadRuntimeError = false
 let customHmrEventHandler
-export default function connect() {
+export default function connect(options) {
   DevOverlay.register()
 
-  addMessageListener((event) => {
+  getEventSourceWrapper(options).addMessageListener((event) => {
     // This is the heartbeat event
     if (event.data === '\uD83D\uDC93') {
       return

diff --git a/packages/next/client/dev/on-demand-entries-utils.js b/packages/next/client/dev/on-demand-entries-utils.js
@@ -18,10 +18,8 @@ export function setupPing(assetPrefix, pathnameFn, retry) {
   // close current EventSource connection
   closePing()
 
-  evtSource = getEventSourceWrapper({
-    path: `${assetPrefix}/_next/webpack-hmr?page=${currentPage}`,
-    timeout: 5000,
-  })
+  const url = `${assetPrefix}/_next/webpack-hmr?page=${currentPage}`
+  evtSource = getEventSourceWrapper({ path: url, timeout: 5000, ondemand: 1 })
 
   evtSource.addMessageListener((event) => {
     if (event.data.indexOf('{') === -1) return

diff --git a/packages/next/client/dev/webpack-hot-middleware-client.js b/packages/next/client/dev/webpack-hot-middleware-client.js
@@ -1,7 +1,11 @@
 import connect from './error-overlay/hot-dev-client'
 
-export default () => {
-  const devClient = connect()
+export default ({ assetPrefix }) => {
+  const options = {
+    path: `${assetPrefix}/_next/webpack-hmr`,
+  }
+
+  const devClient = connect(options)
 
   devClient.subscribeToHmrEvent((obj) => {
     if (obj.action === 'reloadPage') {

diff --git a/packages/next/client/next-dev.js b/packages/next/client/next-dev.js
@@ -5,7 +5,7 @@ import initOnDemandEntries from './dev/on-demand-entries-client'
 import initWebpackHMR from './dev/webpack-hot-middleware-client'
 import initializeBuildWatcher from './dev/dev-build-watcher'
 import { displayContent } from './dev/fouc'
-import { addMessageListener } from './dev/error-overlay/eventsource'
+import { getEventSourceWrapper } from './dev/error-overlay/eventsource'
 import * as querystring from '../next-server/lib/router/utils/querystring'
 
 // Temporary workaround for the issue described here:
@@ -25,7 +25,7 @@ const {
 } = window
 
 const prefix = assetPrefix || ''
-const webpackHMR = initWebpackHMR()
+const webpackHMR = initWebpackHMR({ assetPrefix: prefix })
 
 window.next = next
 initNext({ webpackHMR })
@@ -72,7 +72,7 @@ initNext({ webpackHMR })
       }
     }
     devPagesManifestListener.unfiltered = true
-    addMessageListener(devPagesManifestListener)
+    getEventSourceWrapper({}).addMessageListener(devPagesManifestListener)
 
     if (process.env.__NEXT_BUILD_INDICATOR) {
       initializeBuildWatcher((handler) => {