fix: 修复async脚本导致脚本执行顺序错乱问题 (#173)

close #173
Tencent · Sep 23, 2022 · 60a3e0c · 60a3e0c
1 parent adf5a72
commit 60a3e0c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/docs/api/preloadApp.md b/docs/api/preloadApp.md
@@ -177,6 +177,8 @@ interface ScriptObjectLoader {
   src?: string;
   /** 脚本是否为module模块 */
   module?: boolean;
+  /** 脚本是否为async执行 */
+  async?: boolean;
   /** 脚本是否设置crossorigin */
   crossorigin?: boolean;
   /** 脚本crossorigin的类型 */

diff --git a/docs/api/startApp.md b/docs/api/startApp.md
@@ -206,6 +206,8 @@ interface ScriptObjectLoader {
   src?: string;
   /** 脚本是否为module模块 */
   module?: boolean;
+  /** 脚本是否为async执行 */
+  async?: boolean;
   /** 脚本是否设置crossorigin */
   crossorigin?: boolean;
   /** 脚本crossorigin的类型 */

diff --git a/packages/wujie-core/src/iframe.ts b/packages/wujie-core/src/iframe.ts
@@ -650,7 +650,7 @@ export function syncIframeUrlToWindow(iframeWindow: Window): void {
  * @param iframeWindow
  */
 export function insertScriptToIframe(scriptResult: ScriptObject | ScriptObjectLoader, iframeWindow: Window) {
-  const { src, module, content, crossorigin, crossoriginType, callback } = scriptResult as ScriptObjectLoader;
+  const { src, module, content, crossorigin, crossoriginType, async, callback } = scriptResult as ScriptObjectLoader;
   const scriptElement = iframeWindow.document.createElement("script");
   const nextScriptElement = iframeWindow.document.createElement("script");
   const { replace, plugins, proxyLocation } = iframeWindow.__WUJIE;
@@ -686,14 +686,15 @@ export function insertScriptToIframe(scriptResult: ScriptObject | ScriptObjectLo
 
   if (/^<!DOCTYPE html/i.test(code)) {
     error(WUJIE_TIPS_SCRIPT_ERROR_REQUESTED, scriptResult);
-    return container.appendChild(nextScriptElement);
+    return !async && container.appendChild(nextScriptElement);
   }
   container.appendChild(scriptElement);
 
   // 调用回调
   callback?.(iframeWindow);
 
-  container.appendChild(nextScriptElement);
+  // async脚本不在执行队列，无需next操作
+  !async && container.appendChild(nextScriptElement);
 }
 
 /**

diff --git a/packages/wujie-core/src/index.ts b/packages/wujie-core/src/index.ts
@@ -16,6 +16,8 @@ export interface ScriptObjectLoader {
   src?: string;
   /** 脚本是否为module模块 */
   module?: boolean;
+  /** 脚本是否为async执行 */
+  async?: boolean;
   /** 脚本是否设置crossorigin */
   crossorigin?: boolean;
   /** 脚本crossorigin的类型 */