Commit 0c7089f8 authored by Arunoda Susiripala's avatar Arunoda Susiripala Committed by GitHub

Remove mitt and use an internal EventEmitter (#2477)

This fixes one of the crucial bug in Next.js
The issue happens when you try to load a page when it's
prefetching.
With mitt, it only fires the first registered event.
parent f44d597c
import { createElement } from 'react' import { createElement } from 'react'
import ReactDOM from 'react-dom' import ReactDOM from 'react-dom'
import mitt from 'mitt'
import HeadManager from './head-manager' import HeadManager from './head-manager'
import { createRouter } from '../lib/router' import { createRouter } from '../lib/router'
import EventEmitter from '../lib/EventEmitter'
import App from '../lib/app' import App from '../lib/app'
import { loadGetInitialProps, getURL } from '../lib/utils' import { loadGetInitialProps, getURL } from '../lib/utils'
import ErrorDebugComponent from '../lib/error-debug' import ErrorDebugComponent from '../lib/error-debug'
...@@ -77,7 +77,7 @@ export default async () => { ...@@ -77,7 +77,7 @@ export default async () => {
err err
}) })
const emitter = mitt() const emitter = new EventEmitter()
router.subscribe(({ Component, props, hash, err }) => { router.subscribe(({ Component, props, hash, err }) => {
render({ Component, props, err, hash, emitter }) render({ Component, props, err, hash, emitter })
......
export default class EventEmitter {
listeners = {}
on (event, cb) {
if (!this.listeners[event]) {
this.listeners[event] = new Set()
}
this.listeners[event].add(cb)
}
emit (event, ...data) {
if (!this.listeners[event]) return
this.listeners[event].forEach(cb => cb(...data))
}
off (event, cb) {
if (!this.listeners[event]) return
this.listeners[event].delete(cb)
}
}
/* global window, document, __NEXT_DATA__ */ /* global window, document, __NEXT_DATA__ */
import mitt from 'mitt' import EventEmitter from './EventEmitter'
const webpackModule = module const webpackModule = module
...@@ -10,10 +10,10 @@ export default class PageLoader { ...@@ -10,10 +10,10 @@ export default class PageLoader {
this.pageCache = {} this.pageCache = {}
this.pageLoadedHandlers = {} this.pageLoadedHandlers = {}
this.pageRegisterEvents = mitt() this.pageRegisterEvents = new EventEmitter()
this.loadingRoutes = {} this.loadingRoutes = {}
this.chunkRegisterEvents = mitt() this.chunkRegisterEvents = new EventEmitter()
this.loadedChunks = {} this.loadedChunks = {}
} }
......
/* global __NEXT_DATA__ */ /* global __NEXT_DATA__ */
import { parse, format } from 'url' import { parse, format } from 'url'
import mitt from 'mitt' import EventEmitter from '../EventEmitter'
import shallowEquals from '../shallow-equals' import shallowEquals from '../shallow-equals'
import PQueue from '../p-queue' import PQueue from '../p-queue'
import { loadGetInitialProps, getURL } from '../utils' import { loadGetInitialProps, getURL } from '../utils'
...@@ -22,7 +22,7 @@ export default class Router { ...@@ -22,7 +22,7 @@ export default class Router {
} }
// Handling Router Events // Handling Router Events
this.events = mitt() this.events = new EventEmitter()
this.pageLoader = pageLoader this.pageLoader = pageLoader
this.prefetchQueue = new PQueue({ concurrency: 2 }) this.prefetchQueue = new PQueue({ concurrency: 2 })
......
...@@ -77,7 +77,6 @@ ...@@ -77,7 +77,6 @@
"loader-utils": "1.1.0", "loader-utils": "1.1.0",
"md5-file": "3.1.1", "md5-file": "3.1.1",
"minimist": "1.2.0", "minimist": "1.2.0",
"mitt": "1.1.2",
"mkdirp-then": "1.2.0", "mkdirp-then": "1.2.0",
"mv": "2.1.1", "mv": "2.1.1",
"mz": "2.6.0", "mz": "2.6.0",
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment