@blueking/bk-weweb 0.0.35-beta.7 → 0.0.35-beta.9

package/dist/index.esm.js

@@ -1538,7 +1538,7 @@ var Script = class {
   scoped;
   url;
   constructor({ async, code, defer, fromHtml, initial, isModule, url }) {
-    this.code = code;
+    this.code = code?.replace(STRICT_MODE_REGEX, "");
     this.async = async;
     this.defer = defer;
     this.isModule = isModule;
@@ -1574,11 +1574,15 @@ var Script = class {
       }
       if (app instanceof MicroInstanceModel) {
         const globalWindow = app.scopeJs ? app.sandBox?.proxyWindow || window : window;
-        const exportProp = getGlobalProp(globalWindow);
+        const isIifeVar = !!this.code.replace(/\/\*[\s\S]*?\*\//g, "").match(/^\s*var\s/);
+        const exportProp = getGlobalProp(globalWindow, isIifeVar);
         if (exportProp) {
           this.exportInstance = globalWindow[exportProp];
           if (!app.scopeJs) {
-            delete globalWindow[exportProp];
+            const descriptor = Object.getOwnPropertyDescriptor(globalWindow, exportProp);
+            if (descriptor?.configurable) {
+              delete globalWindow[exportProp];
+            }
           }
         }
       }
@@ -1593,7 +1597,7 @@ var Script = class {
       const isScopedLocation = app instanceof MicroAppModel && app.scopeLocation;
       app.registerRunningApp();
       new Function("window", "location", "history", scopedCode)(
-        app.sandBox.proxyWindow,
+        app.sandBox.proxyWindow || window,
         isScopedLocation ? app.iframe.contentWindow.location : window.location,
         isScopedLocation ? app.iframe.contentWindow.history : window.history
       );
@@ -2785,7 +2789,7 @@ async function loadApp(props) {
     instance = new MicroAppModel(props);
     appCache.setApp(instance);
   } else {
-    instance.data = props.data || {};
+    instance.data = props.data || instance.data || {};
   }
   await instance.start();
   return instance;
@@ -2809,6 +2813,7 @@ function loadInstance(props) {
       }, STATUS_CHECK_INTERVAL);
       return;
     }
+    instance.data = props.data || instance.data || {};
     resolve(instance);
   });
 }