Merge pull request #148 from ice-lab/release/1.5.6

release/1.5.6

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ice/stark",
-  "version": "1.5.5",
+  "version": "1.5.6",
   "description": "Icestark is a JavaScript library for multiple projects, Ice workbench solution.",
   "scripts": {
     "build": "rm -rf lib && tsc",

packages/icestark-module/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ice/stark-module",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "toolkit for load standard micro-module",
   "main": "lib/index.js",
   "scripts": {

packages/icestark-module/src/global.ts

@@ -4,6 +4,7 @@
 let firstGlobalProp;
 let secondGlobalProp;
 let lastGlobalProp;
+let noteGlobalKeys = [];
 const isIE11 = typeof navigator !== 'undefined' && navigator.userAgent.indexOf('Trident') !== -1;
 
 function shouldSkipProperty(p, globalWindow) {
@@ -27,15 +28,26 @@ export function getGlobalProp (globalWindow) {
     cnt++;
     lastProp = p;
   }
-  if (lastProp !== lastGlobalProp)
+  if (lastProp !== lastGlobalProp) {
     return lastProp;
+  } else {
+    // polyfill for UC browser which lastprops will alway be window
+    // eslint-disable-next-line no-restricted-syntax
+    for (const p in globalWindow) {
+      if (!noteGlobalKeys.includes(p)) {
+        lastProp = p;
+      }
+    }
+    return lastProp;
+  }
 }
 
 export function noteGlobalProps (globalWindow) {
   // alternatively Object.keys(global).pop()
   // but this may be faster (pending benchmarks)
   firstGlobalProp = undefined;
   secondGlobalProp = undefined;
+  noteGlobalKeys = Object.keys(globalWindow);
   // eslint-disable-next-line no-restricted-syntax
   for (const p in globalWindow) {
     // do not check frames cause it could be removed during import

src/AppRouter.tsx

@@ -12,7 +12,8 @@ import {
   isInCapturedEventListeners,
   addCapturedEventListeners,
   removeCapturedEventListeners,
-  setHistoryState,
+  createPopStateEvent,
+  setHistoryEvent,
 } from './util/capturedListeners';
 
 type RouteType = 'pushState' | 'replaceState';
@@ -155,12 +156,12 @@ export default class AppRouter extends React.Component<AppRouterProps, AppRouter
   hijackHistory = (): void => {
     window.history.pushState = (state: any, title: string, url?: string, ...rest) => {
       originalPush.apply(window.history, [state, title, url, ...rest]);
-      this.handleStateChange(state, url, 'pushState');
+      this.handleStateChange(createPopStateEvent(state, 'pushState'), url, 'pushState');
     };
 
     window.history.replaceState = (state: any, title: string, url?: string, ...rest) => {
       originalReplace.apply(window.history, [state, title, url, ...rest]);
-      this.handleStateChange(state, url, 'replaceState');
+      this.handleStateChange(createPopStateEvent(state, 'replaceState'), url, 'replaceState');
     };
 
     window.addEventListener('popstate', this.handlePopState, false);
@@ -214,14 +215,13 @@ export default class AppRouter extends React.Component<AppRouterProps, AppRouter
   /**
    * Trigger statechange: pushState | replaceState
    */
-  handleStateChange = (state: any, url: string, routeType?: RouteType): void => {
+  handleStateChange = (evt: PopStateEvent, url: string, routeType?: RouteType): void => {
     // if AppRouter is unmounted, cancel all operations
     if (this.unmounted) return;
-
     // setHistoryState before setState
     // setState is only async batched when it is called inside a React event handler, otherwise it is sync
     // make sure history state had beed recorded before render
-    setHistoryState(state);
+    setHistoryEvent(evt);
     this.setState({ url });
 
     this.handleRouteChange(url, routeType);
@@ -235,8 +235,7 @@ export default class AppRouter extends React.Component<AppRouterProps, AppRouter
     if (this.unmounted) return;
 
     const url = location.href;
-
-    setHistoryState(event.state);
+    setHistoryEvent(event);
     this.setState({ url });
 
     this.handleRouteChange(url, 'popstate');

src/util/capturedListeners.ts

@@ -14,7 +14,7 @@ const capturedEventListeners = {
   [CapturedEventNameEnum.HASHCHANGE]: [],
 };
 
-let historyState = null;
+let historyEvent = null;
 
 export function find(list, element) {
   if (!Array.isArray(list)) {
@@ -24,36 +24,40 @@ export function find(list, element) {
   return list.filter(item => item === element).length > 0;
 }
 
-export function createPopStateEvent(state) {
+// inspired by https://github.com/single-spa/single-spa/blob/master/src/navigation/navigation-events.js#L107
+export function createPopStateEvent(state, originalMethodName) {
   // We need a popstate event even though the browser doesn't do one by default when you call replaceState, so that
   // all the applications can reroute.
+  let evt;
   try {
-    return new PopStateEvent('popstate', { state });
+    evt =  new PopStateEvent('popstate', { state });
   } catch (err) {
     // IE 11 compatibility
     // https://docs.microsoft.com/en-us/openspecs/ie_standards/ms-html5e/bd560f47-b349-4d2c-baa8-f1560fb489dd
-    const evt: any = document.createEvent('PopStateEvent');
+    evt = document.createEvent('PopStateEvent');
     evt.initPopStateEvent('popstate', false, false, state);
-    return evt;
   }
+  evt.icestark = true;
+  evt.icestarkTrigger = originalMethodName;
+  return evt;
 }
 
 export function callCapturedEventListeners() {
-  if (historyState) {
+  if (historyEvent) {
     Object.keys(capturedEventListeners).forEach(eventName => {
       const capturedListeners = capturedEventListeners[eventName];
       if (capturedListeners.length) {
         capturedListeners.forEach(listener => {
-          listener.call(this, createPopStateEvent(historyState));
+          listener.call(this, historyEvent);
         });
       }
     });
-    historyState = null;
+    historyEvent = null;
   }
 }
 
-export function setHistoryState(state) {
-  historyState = state;
+export function setHistoryEvent(evt: PopStateEvent) {
+  historyEvent = evt;
 }
 
 export function isInCapturedEventListeners(eventName, fn) {

src/util/handleAssets.ts

@@ -74,7 +74,7 @@ export function appendCSS(
     element.addEventListener(
       'error',
       () => {
-        error(`css asset loaded error: ${asset}`);
+        error(`css asset loaded error: ${content || asset}`);
         return resolve();
       },
       false,
@@ -113,7 +113,7 @@ export function appendExternalScript(
 
     element.addEventListener(
       'error',
-      () => reject(new Error(`js asset loaded error: ${asset}`)),
+      () => reject(new Error(`js asset loaded error: ${content || asset}`)),
       false,
     );
     element.addEventListener('load', () => resolve(), false);
@@ -417,4 +417,4 @@ export function cacheAssets(cacheKey: string): void {
       assetsNode.setAttribute('cache', cacheKey);
     }
   });
-}
+}

tests/capturedListeners.spec.tsx

@@ -7,7 +7,8 @@ import {
   removeCapturedEventListeners,
   isInCapturedEventListeners,
   callCapturedEventListeners,
-  setHistoryState,
+  setHistoryEvent,
+  createPopStateEvent,
   resetCapturedEventListeners,
 } from '../src/util/capturedListeners';
 
@@ -38,7 +39,7 @@ describe('capturedListeners', () => {
     expect(isInCapturedEventListeners(CapturedEventNameEnum.POPSTATE, popStateMockFn)).toBe(true);
 
     // call
-    setHistoryState({});
+    setHistoryEvent(createPopStateEvent({}, 'popstate'));
     callCapturedEventListeners();
 
     expect(popStateMockFn).toBeCalledTimes(1);
@@ -52,7 +53,7 @@ describe('capturedListeners', () => {
     );
 
     // call
-    setHistoryState({});
+    setHistoryEvent(createPopStateEvent({}, 'popstate'));
     callCapturedEventListeners();
 
     expect(popStateMockFn).toBeCalledTimes(2);
@@ -62,7 +63,7 @@ describe('capturedListeners', () => {
     resetCapturedEventListeners();
 
     // call
-    setHistoryState({});
+    setHistoryEvent(createPopStateEvent({}, 'popstate'));
     callCapturedEventListeners();
 
     expect(popStateMockFn).toBeCalledTimes(2);