fix: cache resources are returned by macro tasks (#603)

Author: imtaotao

packages/loader/src/index.ts

@@ -6,11 +6,11 @@ import {
 } from '@garfish/hooks';
 import {
   error,
+  macroTask,
   __LOADER_FLAG__,
   isJsType,
   isCssType,
   isHtmlType,
-  parseContentType,
 } from '@garfish/utils';
 import { StyleManager } from './managers/style';
 import { ModuleManager } from './managers/module';
@@ -166,7 +166,7 @@ export class Loader {
     // 当最后一个子应用被卸载时，其它子应用也将一起被卸载
 
     if (res && Object.keys(res).includes(scope)) {
-      return res[scope]
+      return res[scope];
     }
 
     let appCacheContainer = cacheStore[scope];
@@ -177,7 +177,7 @@ export class Loader {
     }
 
     if (appCacheContainer.has(url)) {
-      return Promise.resolve(copyResult(appCacheContainer.get(url)));
+      return macroTask(copyResult(appCacheContainer.get(url)));
     } else {
       // If other containers have cache
       for (const key in cacheStore) {
@@ -187,7 +187,7 @@ export class Loader {
             const result = container.get(url);
             cachedDataSet.add(result);
             appCacheContainer.set(url, result, result.fileType);
-            return Promise.resolve(copyResult(result));
+            return macroTask(copyResult(result));
           }
         }
       }
@@ -268,7 +268,9 @@ export class Loader {
         // loadingList[url][scope] = null
       });
 
-    loadingList[url] ? loadingList[url][scope] = loadRes : loadingList[url] = { [scope]: loadRes };
+    loadingList[url]
+      ? (loadingList[url][scope] = loadRes)
+      : (loadingList[url] = { [scope]: loadRes });
     return loadRes;
   }
 }

packages/utils/src/utils.ts

@@ -1,4 +1,4 @@
-export const noop = () => { };
+export const noop = () => {};
 
 export const objectToString = Object.prototype.toString;
 
@@ -113,11 +113,11 @@ export function error(error: string | Error) {
 export function validURL(str) {
   const pattern = new RegExp(
     '^(https?:\\/\\/)?' + // protocol
-    '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // domain name
-    '((\\d{1,3}\\.){3}\\d{1,3}))' + // OR ip (v4) address
-    '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // port and path
-    '(\\?[;&a-z\\d%_.~+=-]*)?' + // query string
-    '(\\#[-a-z\\d_]*)?$',
+      '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // domain name
+      '((\\d{1,3}\\.){3}\\d{1,3}))' + // OR ip (v4) address
+      '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // port and path
+      '(\\?[;&a-z\\d%_.~+=-]*)?' + // query string
+      '(\\#[-a-z\\d_]*)?$',
     'i',
   ); // fragment locator
   return !!pattern.test(str);
@@ -164,7 +164,10 @@ export function evalWithEnv(
   }
 }
 
-export function safeWrapper(callback: (...args: Array<any>) => any, disableWarn?: boolean) {
+export function safeWrapper(
+  callback: (...args: Array<any>) => any,
+  disableWarn?: boolean,
+) {
   try {
     callback();
   } catch (e) {
@@ -407,9 +410,10 @@ export function setDocCurrentScript(
     el.textContent = code;
   }
 
-  originScript && originScript.getAttributeNames().forEach((attribute) => {
-    el.setAttribute(attribute, originScript.getAttribute(attribute) || '');
-  });
+  originScript &&
+    originScript.getAttributeNames().forEach((attribute) => {
+      el.setAttribute(attribute, originScript.getAttribute(attribute) || '');
+    });
 
   if (async) {
     el.setAttribute('async', 'true');
@@ -583,3 +587,9 @@ export function getSourceURL(url: string | URL | Request): string {
   if (url instanceof Request) return url.url;
   return url.startsWith('/') ? `${location.origin}${url}` : url;
 }
+
+export function macroTask<T extends any>(value: T) {
+  return new Promise<T>((resolve) => {
+    setTimeout(() => resolve(value));
+  });
+}