🏁 fix clearInterval compatible bug in ie10 and ie11 (#1490)

Co-authored-by: Kuitos <[email protected]>
umijs · Jun 16, 2021 · 6de0ac9 · 6de0ac9
1 parent 7ae60e3
commit 6de0ac9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/src/loader.ts b/src/loader.ts
@@ -320,12 +320,13 @@ export async function loadApp<T extends ObjectType>(
     unmountSandbox = sandboxContainer.unmount;
   }
 
-  const { beforeUnmount = [], afterUnmount = [], afterMount = [], beforeMount = [], beforeLoad = [] } = mergeWith(
-    {},
-    getAddOns(global, assetPublicPath),
-    lifeCycles,
-    (v1, v2) => concat(v1 ?? [], v2 ?? []),
-  );
+  const {
+    beforeUnmount = [],
+    afterUnmount = [],
+    afterMount = [],
+    beforeMount = [],
+    beforeLoad = [],
+  } = mergeWith({}, getAddOns(global, assetPublicPath), lifeCycles, (v1, v2) => concat(v1 ?? [], v2 ?? []));
 
   await execHooksChain(toArray(beforeLoad), app, global);
 
@@ -338,11 +339,8 @@ export async function loadApp<T extends ObjectType>(
     sandboxContainer?.instance?.latestSetProp,
   );
 
-  const {
-    onGlobalStateChange,
-    setGlobalState,
-    offGlobalStateChange,
-  }: Record<string, CallableFunction> = getMicroAppStateActions(appInstanceId);
+  const { onGlobalStateChange, setGlobalState, offGlobalStateChange }: Record<string, CallableFunction> =
+    getMicroAppStateActions(appInstanceId);
 
   // FIXME temporary way
   const syncAppWrapperElement2Sandbox = (element: HTMLElement | null) => (initialAppWrapperElement = element);

diff --git a/src/sandbox/patchers/interval.ts b/src/sandbox/patchers/interval.ts
@@ -14,7 +14,7 @@ export default function patch(global: Window) {
 
   global.clearInterval = (intervalId: number) => {
     intervals = intervals.filter((id) => id !== intervalId);
-    return rawWindowClearInterval(intervalId);
+    return rawWindowClearInterval.call(window, intervalId as any);
   };
 
   global.setInterval = (handler: CallableFunction, timeout?: number, ...args: any[]) => {

diff --git a/src/sandbox/snapshotSandbox.ts b/src/sandbox/snapshotSandbox.ts
@@ -8,7 +8,8 @@ import { SandBoxType } from '../interfaces';
 function iter(obj: typeof window, callbackFn: (prop: any) => void) {
   // eslint-disable-next-line guard-for-in, no-restricted-syntax
   for (const prop in obj) {
-    if (obj.hasOwnProperty(prop)) {
+    // patch for clearInterval for compatible reason, see #1490
+    if (obj.hasOwnProperty(prop) || prop === 'clearInterval') {
       callbackFn(prop);
     }
   }