fix: improve runtime asset handling when runtime is loaded

Author: ClarkXia

CHANGELOG.md

@@ -5,6 +5,7 @@ See [https://github.com/ice-lab/icestark/releases](https://github.com/ice-lab/ic
 # 2.8.4
 
 - [fix] automatically switch to "fetch" mode when runtime is set.
+- [fix] improve runtime asset handling when runtime is loaded.
 
 # 2.8.3
 

packages/icestark/src/apps.ts

@@ -218,7 +218,7 @@ export async function loadAppModule(appConfig: AppConfig) {
       const runtimeJsList = [];
       // Filter and map runtime libraries that haven't been registered in window
       const runtimeLibs = runtime?.filter((config) => {
-        return config.version && config.library && !window[`${config.library}@${config.version}`];
+        return config.version && config.library;
       }).map((config) => {
         // Handle both string and array URL formats
         const urls = Array.isArray(config.url) ? config.url : [config.url];
@@ -250,6 +250,7 @@ export async function loadAppModule(appConfig: AppConfig) {
         return {
           content: mainJs,
           type: AssetTypeEnum.RUNTIME,
+          loaded: Boolean(config.version && config.library && window[`${config.library}@${config.version}`]),
           library: config.library,
           version: config.version,
         };

packages/icestark/src/util/handleAssets.ts

@@ -33,6 +33,7 @@ export enum AssetCommentEnum {
 
 export interface Asset {
   module?: boolean;
+  loaded?: boolean;
   type: AssetTypeEnum;
   /** Only used when type is AssetTypeEnum.RUNTIME */
   library?: string;
@@ -313,19 +314,20 @@ export function getUrlAssets(urls: string | string[]) {
 export async function fetchScripts(jsList: Asset[], fetch: Fetch = defaultFetch): Promise<string[]> {
   let jsBeforeRuntime = '';
   let jsAfterRuntime = '';
-
   jsList.forEach((asset) => {
     if (asset.type === AssetTypeEnum.RUNTIME) {
       const { library, version } = asset;
       const globalLib = `window['${library}']`;
       const backupLib = `window['__${library}__']`;
       const versionedLib = `window['${library}@${version}']`;
-      jsBeforeRuntime = `${jsBeforeRuntime}if (${globalLib}) {${backupLib} = ${globalLib};}\n`;
-      jsAfterRuntime = `${jsAfterRuntime}${versionedLib} = ${globalLib}; if (${backupLib}) {${globalLib} = ${backupLib};${backupLib} = undefined;}\n`;
+      const backupCode = `if (${globalLib}) {${backupLib} = ${globalLib};}\n`;
+      const restoreCode = `if (${backupLib}) {${globalLib} = ${backupLib};${backupLib} = undefined;}\n`;
+      jsBeforeRuntime = `${jsBeforeRuntime}${backupCode}${asset.loaded ? `${globalLib} = ${versionedLib};` : ''}`;
+      jsAfterRuntime = `${jsAfterRuntime}${asset.loaded ? '' : `${versionedLib} = ${globalLib};`}${restoreCode}`;
     }
   });
 
-  const result = await Promise.all(jsList.map(async (asset) => {
+  const result = await Promise.all(jsList.filter((asset) => !asset.loaded).map(async (asset) => {
     const { type, content } = asset;
     if (type === AssetTypeEnum.INLINE) {
       return {