@blueking/bk-weweb 0.0.27-beta.1 → 0.0.28-beta.2

package/dist/index.d.mts

@@ -178,13 +178,11 @@ declare class EntrySource {
     getStyle(urlOrCode: string): Style | undefined;
     importEntery(app: BaseModel): Promise<void>;
     importHtmlEntry(app: MicroAppModel): Promise<void>;
-    importInstanceEntry(app: BaseModel): Promise<void>;
+    importInstanceEntry(): Promise<void>;
     setScript(url: string, script: IScriptOption | Script): void;
     setStyle(url: string, style: Style): void;
 }
 
-declare function fetchSource(url: string, options?: {}, app?: BaseModel): Promise<string>;
-
 interface IBaseModelProps {
     [WewebCustomAttrs.mode]?: WewebMode;
     [WewebCustomAttrs.url]: string;
@@ -235,7 +233,6 @@ interface BaseModel {
     start(): Promise<void>;
     unmount(needDestroy?: boolean): void;
     url: string;
-    fetchSource?: typeof fetchSource;
 }
 declare enum WewebMode {
     APP = "app",
@@ -314,10 +311,7 @@ declare class MicroInstanceModel implements BaseModel {
     showSourceCode: boolean;
     source?: EntrySource;
     url: string;
-    fetchSource?: typeof fetchSource;
-    constructor(props: IJsModelProps & {
-        fetchSource?: typeof fetchSource;
-    });
+    constructor(props: IJsModelProps);
     activated<T>(container: HTMLElement | ShadowRoot, callback?: (instance: BaseModel, exportInstance?: T) => void): void;
     deactivated(): void;
     mount<T>(container?: HTMLElement | ShadowRoot, callback?: (instance: MicroInstanceModel, exportInstance: T) => void): void;

package/dist/index.esm.js

@@ -7,12 +7,75 @@ function setCurrentRunningApp(appInstance) {
   currentRunningApp = appInstance;
 }
 var windowNativeFuncMap = /* @__PURE__ */ new Map();
+var globalContextCode = `const { ${[
+  "Array",
+  "ArrayBuffer",
+  "Boolean",
+  "constructor",
+  "DataView",
+  "Date",
+  "decodeURI",
+  "decodeURIComponent",
+  "encodeURI",
+  "encodeURIComponent",
+  "Error",
+  "escape",
+  "eval",
+  "EvalError",
+  "Float32Array",
+  "Float64Array",
+  "Function",
+  "hasOwnProperty",
+  "Infinity",
+  "Int16Array",
+  "Int32Array",
+  "Int8Array",
+  "isFinite",
+  "isNaN",
+  "isPrototypeOf",
+  "JSON",
+  "Map",
+  "Math",
+  "NaN",
+  "Number",
+  "Object",
+  "parseFloat",
+  "parseInt",
+  "Promise",
+  "propertyIsEnumerable",
+  "Proxy",
+  "RangeError",
+  "ReferenceError",
+  "Reflect",
+  "RegExp",
+  "Set",
+  "String",
+  "Symbol",
+  "SyntaxError",
+  "toLocaleString",
+  "toString",
+  "TypeError",
+  "Uint16Array",
+  "Uint32Array",
+  "Uint8Array",
+  "Uint8ClampedArray",
+  "undefined",
+  "unescape",
+  "URIError",
+  "valueOf",
+  "WeakMap",
+  "WeakSet"
+].join(",")} }= this;`;
+var getGlobalContextCode = () => {
+  return globalContextCode;
+};
 var collectNativeWindowFunc = () => {
-  Object.getOwnPropertyNames(window).forEach((key) => {
+  const keyList = Object.getOwnPropertyNames(window);
+  for (const key of keyList) {
     if (!windowNativeFuncMap.has(key) && key.match(/^[A-Z]/) && typeof window[key] === "function" && window[key].toString().includes("[native code]")) {
       windowNativeFuncMap.set(key, true);
     }
-  });
+  }
 };
 collectNativeWindowFunc();
 
@@ -415,7 +478,7 @@ var SandBox = class {
         return true;
       },
       get: (target, key) => {
-        if (windowNativeFuncMap.has(key) || key === Symbol.unscopables) return rawWindow[key];
+        if (key === Symbol.unscopables || windowNativeFuncMap.has(key)) return rawWindow[key];
         if (DEV_MICRO_APP_WINDOE_KEY_MAP[key]) return this.fakeWindow[key];
         if (WINDOW_ALIAS_LIST.includes(key)) return this.proxyWindow;
         if (key === "document") {
@@ -497,9 +560,7 @@ var SandBox = class {
         return true;
       }
     });
-    if (app.showSourceCode) {
-      rawWindow[this.windowSymbolKey] = this.proxyWindow;
-    }
+    rawWindow[this.windowSymbolKey] = this.proxyWindow;
   }
   active = false;
   inRawWindowKeySet = /* @__PURE__ */ new Set();
@@ -705,10 +766,7 @@ function setMarkElement(element, app, keepAlive) {
 }
 
 // src/utils/fetch.ts
-function fetchSource(url, options = {}, app) {
-  if (typeof app?.fetchSource === "function") {
-    return app.fetchSource(url, options);
-  }
+function fetchSource(url, options = {}) {
   if (src_default.fetchSource) {
     return src_default.fetchSource(url, options);
   }
@@ -805,7 +863,7 @@ var Style = class {
       code = style?.code || "";
     }
     if (!code) {
-      code = await fetchSource(this.url, {}, app).catch(() => "");
+      code = await fetchSource(this.url).catch(() => "");
     }
     this.code = code;
     return code;
@@ -986,7 +1044,6 @@ var MicroInstanceModel = class {
   // 入口资源
   url;
   // url
-  fetchSource;
   constructor(props) {
     this.name = props.id !== props.url ? props.id : random(5);
     this.appCacheKey = props.id || this.name;
@@ -1001,7 +1058,6 @@ var MicroInstanceModel = class {
     if (this.scopeJs) {
       this.sandBox = new SandBox(this);
     }
-    this.fetchSource = props.fetchSource;
   }
   activated(container, callback) {
     this.isPreLoad = false;
@@ -1185,11 +1241,12 @@ var Script = class {
       code = appCache.getCacheScript(this.url)?.code || "";
     }
     if (!code) {
-      code = await fetchSource(this.url, {}, app).catch((e) => {
+      code = await fetchSource(this.url).catch((e) => {
         console.error(`fetch script ${this.url} error`, e);
         return "";
       });
     }
+    code = code.replace(/^"use\sstrict";$/gim, "");
     this.code = code;
     return code;
   }
@@ -1206,17 +1263,21 @@ var Script = class {
         }`;
       }
       if (app.showSourceCode) {
-        return `;(function(window, self){
+        return `;(function(window, self, globalThis){
           with(window){
-            ;${this.code}
+            ${getGlobalContextCode()}
+
+            ${this.code}
 
           }
         }).call(window.${app.sandBox.windowSymbolKey},
-           window.${app.sandBox.windowSymbolKey});`;
+           window.${app.sandBox.windowSymbolKey}, window.${app.sandBox.windowSymbolKey}, window.${app.sandBox.windowSymbolKey});`;
       }
       return `
           with(window) {
-              try {
+            try {
+              ${getGlobalContextCode()}
+
                 ${this.code}
               }
               catch(e) {
@@ -1229,7 +1290,7 @@ var Script = class {
   }
 };
 function shouldSkipProperty(global, p) {
-  return !global.hasOwnProperty(p) || !isNaN(p) && p < global.length || typeof navigator !== "undefined" && navigator.userAgent.indexOf("Trident") !== -1 && global[p] && typeof window !== "undefined" && global[p].parent === window;
+  return !global.hasOwnProperty(p) || !Number.isNaN(p) && p < global.length || typeof navigator !== "undefined" && navigator.userAgent.indexOf("Trident") !== -1 && global[p] && typeof window !== "undefined" && global[p].parent === window;
 }
 function getGlobalProp(global, useFirstGlobalProp) {
   let cnt = 0;
@@ -1266,13 +1327,13 @@ async function execAppScripts(app) {
   await Promise.all(commomList.map((script) => script.excuteCode(app)));
   const deferScriptList = [];
   const asyncScriptList = [];
-  appScriptList.forEach((script) => {
+  for (const script of appScriptList) {
     if (script.defer || script.async) {
       if (!script.code && script.defer) {
         deferScriptList.push(script.excuteCode(app));
       } else asyncScriptList.push(script.excuteCode(app));
     }
-  });
+  }
   await Promise.all([...asyncScriptList, ...deferScriptList]).catch((e) => {
     console.error(e);
   });
@@ -1697,12 +1758,12 @@ var EntrySource = class {
       }
     }
     if (app instanceof MicroAppModel) await this.importHtmlEntry(app);
-    else if (app instanceof MicroInstanceModel) await this.importInstanceEntry(app);
+    else if (app instanceof MicroInstanceModel) await this.importInstanceEntry();
   }
   async importHtmlEntry(app) {
     let htmlStr = appCache.getCacheHtml(this.url);
     if (!htmlStr) {
-      htmlStr = await fetchSource(addUrlProtocol(this.url), { cache: "no-cache" }, app);
+      htmlStr = await fetchSource(addUrlProtocol(this.url), { cache: "no-cache" });
       if (!htmlStr) {
         console.error("load app entry error, pleace check");
         return Promise.reject();
@@ -1716,10 +1777,10 @@ var EntrySource = class {
     await excuteAppStyles(app, wrapElement);
     this.html = wrapElement;
   }
-  async importInstanceEntry(app) {
+  async importInstanceEntry() {
     let jsStr = appCache.getCacheScript(this.url)?.code;
     if (!jsStr) {
-      jsStr = await fetchSource(this.url, { cache: "no-cache" }, app);
+      jsStr = await fetchSource(this.url, { cache: "no-cache" });
     }
     if (!jsStr) {
       console.error("load app entry error, pleace check");