fix: history listener subscription execute multiple times (#2230)

* fix: history listener subscription execute multiple times

* chore: father -> father-build

Author: sorrycc

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "scripts": {
-    "build": "father build",
+    "build": "father-build",
     "doc:dev": "./website/node_modules/.bin/vuepress dev ./docs",
     "doc:deploy": "rm -rf ./website/yarn.lock && cd ./website && npm run deploy && cd -",
     "changelog": "lerna-changelog",
@@ -33,7 +33,7 @@
     "react-dom": "^16.8.4",
     "react-testing-library": "^6.0.0",
     "shelljs": "^0.8.1",
-    "father": "^2.6.6",
+    "father-build": "^1.14.0",
     "umi-test": "^1.5.2"
   },
   "lint-staged": {

packages/dva/package.json

@@ -34,7 +34,7 @@
     "@types/isomorphic-fetch": "^0.0.35",
     "@types/react-redux": "^7.1.0",
     "@types/react-router-dom": "^4.3.1",
-    "connected-react-router": "^6.3.2",
+    "connected-react-router": "6.3.2",
     "dva-core": "2.0.0",
     "global": "^4.3.2",
     "history": "^4.7.2",

packages/dva/src/index.js

@@ -30,7 +30,6 @@ export default function(opts = {}) {
     },
     setupApp(app) {
       app._history = patchHistory(history);
-      // app._history = patchHistory(history);
     },
   };
 
@@ -106,8 +105,23 @@ function render(container, store, app, router) {
 function patchHistory(history) {
   const oldListen = history.listen;
   history.listen = callback => {
+    // Let ConnectedRouter to sync history to store first
+    // connected-react-router's version is locked since the check function may be broken
+    // ref: https://github.com/umijs/umi/issues/2693
+    const isConnectedRouterHandler =
+      callback.name === 'handleLocationChange' &&
+      callback.toString().indexOf('onLocationChanged') > -1;
     callback(history.location, history.action);
-    return oldListen.call(history, callback);
+    return oldListen.call(history, (...args) => {
+      if (isConnectedRouterHandler) {
+        callback(...args);
+      } else {
+        // Delay all listeners besides ConnectedRouter
+        setTimeout(() => {
+          callback(...args);
+        });
+      }
+    });
   };
   return history;
 }

packages/dva/test/index.e2e.js

@@ -15,6 +15,8 @@ const { Link, Switch, Route, Router } = router;
 
 afterEach(cleanup);
 
+const delay = timeout => new Promise(resolve => setTimeout(resolve, timeout));
+
 test('normal', () => {
   const app = dva();
   app.model({
@@ -154,7 +156,9 @@ test('navigate', async () => {
   const { getByTestId, getByText } = render(React.createElement(app.start()));
   expect(getByTestId('title').innerHTML).toEqual('You are on Home');
   fireEvent.click(getByText('Users'));
+  await delay(100);
   expect(getByTestId('title').innerHTML).toEqual('You are on Users');
   fireEvent.click(getByText('RouterRedux to Home'));
+  await delay(100);
   expect(getByTestId('title').innerHTML).toEqual('You are on Home');
 });