@xingtukeji/micro 1.1.16 → 1.1.17

package/dist/index.js

@@ -12,20 +12,20 @@ var R = (e, t, n) => t in e ? T(e, t, { enumerable: !0, configurable: !0, writab
   return e;
 }, y = (e, t) => A(e, x(t));
 var p = (e, t, n) => (R(e, typeof t != "symbol" ? t + "" : t, n), n);
-var h = (e, t, n) => new Promise((r, o) => {
+var h = (e, t, n) => new Promise((o, r) => {
   var a = (l) => {
     try {
       i(n.next(l));
     } catch (_) {
-      o(_);
+      r(_);
     }
   }, c = (l) => {
     try {
       i(n.throw(l));
     } catch (_) {
-      o(_);
+      r(_);
     }
-  }, i = (l) => l.done ? r(l.value) : Promise.resolve(l.value).then(a, c);
+  }, i = (l) => l.done ? o(l.value) : Promise.resolve(l.value).then(a, c);
   i((n = n.apply(e, t)).next());
 });
 import { ref as C, defineComponent as k, watch as H, onMounted as j, onUnmounted as N, openBlock as V, createElementBlock as B, mergeProps as F } from "vue";
@@ -48,16 +48,16 @@ const s = {
   // 微应用在 url 参数中的前缀
   MICRO_VERSION: "__XT_MICRO_VERSION"
   // 微应用版本
-}, u = "1.1.16";
+}, u = "1.1.17";
 function f(e, t = window.location.href) {
   e = e.replace(/[\[\]]/g, "\\$&");
-  var n = new RegExp("[?&]" + e + "(=([^&#]*)|&|#|$)"), r = n.exec(t);
-  return r ? r[2] ? decodeURIComponent(r[2].replace(/\+/g, " ")).trim() : "" : null;
+  var n = new RegExp("[?&]" + e + "(=([^&#]*)|&|#|$)"), o = n.exec(t);
+  return o ? o[2] ? decodeURIComponent(o[2].replace(/\+/g, " ")).trim() : "" : null;
 }
 function S(e, t, n) {
   try {
     return e && (n && e.startsWith("#") ? e : new URL(e, t).href);
-  } catch (r) {
+  } catch (o) {
     return e;
   }
 }
@@ -67,20 +67,20 @@ function D(e) {
 }
 function K(e) {
   const t = e.search || "";
-  return [...new URLSearchParams(t).entries()].reduce((n, r) => (n[r[0]] = r[1], n), {});
+  return [...new URLSearchParams(t).entries()].reduce((n, o) => (n[o[0]] = o[1], n), {});
 }
 function Y(e, t) {
   let n = null;
-  return function(...r) {
-    const o = this;
+  return function(...o) {
+    const r = this;
     n && clearTimeout(n), n = setTimeout(() => {
-      e.apply(o, r);
+      e.apply(r, o);
     }, t);
   };
 }
 function U(e, t, n) {
-  const [r, o] = e.split("#"), a = new URL(r), c = a.searchParams;
-  return t = s.URL_PARAM_PREFIX + t, c.has(t) ? c.set(t, n) : c.append(t, n), o && (a.hash = o), a.search = c.toString(), a.toString();
+  const [o, r] = e.split("#"), a = new URL(o), c = a.searchParams;
+  return t = s.URL_PARAM_PREFIX + t, c.has(t) ? c.set(t, n) : c.append(t, n), r && (a.hash = r), a.search = c.toString(), a.toString();
 }
 const P = (e) => h(void 0, null, function* () {
   return new Promise((t) => {
@@ -118,7 +118,7 @@ const I = (e) => `${s.DOM_ID_PREFIX}${e}`, b = (e, t = !1) => {
   function n(i) {
     return i !== null && typeof i == "object" && !Array.isArray(i);
   }
-  const r = typeof e.params == "function" ? e.params() : n(e.params) ? e.params : {}, o = typeof e.token == "function" ? e.token() : n(e.token) ? e.token : "", a = new URL(
+  const o = typeof e.params == "function" ? e.params() : n(e.params) ? e.params : {}, r = typeof e.token == "function" ? e.token() : n(e.token) ? e.token : "", a = new URL(
     e.url.indexOf("http") > -1 ? e.url : window.location.origin + e.url
   ), c = f(s.URL_PARAM_PREFIX + e.name);
   if (!t && c) {
@@ -130,9 +130,9 @@ const I = (e) => `${s.DOM_ID_PREFIX}${e}`, b = (e, t = !1) => {
       }), a.hash = l.hash;
     }
   }
-  if (a.searchParams.set(s.IS_MICRO, !0 + ""), a.searchParams.set(s.MICRO_NAME, e.name), o && a.searchParams.set(s.MICRO_TOKEN, o), r)
-    for (let i of Object.keys(r))
-      a.searchParams.set(i, r[i]);
+  if (a.searchParams.set(s.IS_MICRO, !0 + ""), a.searchParams.set(s.MICRO_NAME, e.name), r && a.searchParams.set(s.MICRO_TOKEN, r), o)
+    for (let i of Object.keys(o))
+      a.searchParams.set(i, o[i]);
   return w(e.name), a.href;
 }, W = () => {
   const e = document.createElement("div");
@@ -145,19 +145,19 @@ const I = (e) => `${s.DOM_ID_PREFIX}${e}`, b = (e, t = !1) => {
   const t = document.createElement("iframe");
   t.id = I(e.app.name);
   const n = b(e.app);
-  t.src = n, t.style.width = "100%", t.style.height = "100%", t.style.border = "none", t.style.margin = "0", t.style.padding = "0", t.style.backgroundColor = "transparent", t.style["color-scheme"] = "unset", t.style.visibility = "hidden", t.addEventListener("load", (o) => (t.style.visibility = "visible", e.onLoad.call(e, o))), t.addEventListener(
+  t.src = n, t.style.width = "100%", t.style.height = "100%", t.style.border = "none", t.style.margin = "0", t.style.padding = "0", t.style.backgroundColor = "transparent", t.style["color-scheme"] = "unset", t.style.visibility = "hidden", t.addEventListener("load", (r) => (t.style.visibility = "visible", e.onLoad.call(e, r))), t.addEventListener(
     "error",
-    (o) => e.onError.call(e, o)
+    (r) => e.onError.call(e, r)
   ), t.addEventListener(
     "unload",
-    (o) => e.onUnload.call(e, o)
+    (r) => e.onUnload.call(e, r)
   );
-  const r = new MutationObserver((o) => {
-    console.log("监听 body 中子节点的变化2", e.panel), o.forEach((a) => {
-      Array.from(a.removedNodes).includes(t) && (e.onUnload(new Event("unload")), r.disconnect());
+  const o = new MutationObserver((r) => {
+    console.log("监听 body 中子节点的变化2", e.panel), r.forEach((a) => {
+      Array.from(a.removedNodes).includes(t) && (e.onUnload(new Event("unload")), o.disconnect());
     });
   });
-  return r.observe(e.panel.parentNode, {
+  return o.observe(e.panel.parentNode, {
     childList: !0,
     subtree: !1
   }), t;
@@ -172,15 +172,15 @@ class G {
     return this.app = t, this.dom = void 0, this.panel = void 0, t.preload && this.preload(), this;
   }
   mount(t, n = !1) {
-    let r;
-    if (t ? (typeof t == "string" ? r = document.querySelector(t) : r = t, r.innerHTML = "") : r = document.body, r) {
-      this.panel = r;
-      let o = document.getElementById(I(this.app.name));
-      o || (o = z(this), this.dom = o), n ? o.style.display = "none" : o.style.removeProperty("display");
+    let o;
+    if (t ? (typeof t == "string" ? o = document.querySelector(t) : o = t, o.innerHTML = "") : o = document.body, o) {
+      this.panel = o;
+      let r = document.getElementById(I(this.app.name));
+      r || (r = z(this), this.dom = r), n ? r.style.display = "none" : r.style.removeProperty("display");
       const a = W();
       this.loadingTimer = setTimeout(() => {
-        this.loading = a, r.appendChild(a);
-      }, 1e3), r.appendChild(o);
+        this.loading = a, o.appendChild(a);
+      }, 1e3), o.appendChild(r);
     } else
       throw new Error("el not found");
   }
@@ -210,8 +210,8 @@ class G {
   reload(t = !1) {
     let n = this.dom.src;
     t && (n = b(this.app, !0), console.log("go home", n)), console.log("reload app", this.app, n);
-    const r = new URL(n);
-    r.searchParams.set("__t", Date.now().toString()), this.dom.style.visibility = "hidden", this.dom.src = r.toString();
+    const o = new URL(n);
+    o.searchParams.set("__t", Date.now().toString()), this.dom.style.visibility = "hidden", this.dom.src = o.toString();
   }
   changeOptions(t) {
     console.log("changeOptions", this.app, t), this.app = d(d({}, this.app), t);
@@ -255,12 +255,12 @@ const Q = (e) => {
       );
       for (let a of t)
         n.searchParams.delete(a);
-      const r = w(e.data.data.name), o = U(
-        r.href,
+      const o = w(e.data.data.name), r = U(
+        o,
         e.data.data.name,
         n.href
       );
-      window.history.replaceState(null, "", o);
+      window.history.replaceState(null, "", r);
     } else if (e.data.cmd === "$xt/micro/info") {
       console.debug("parent 「$xt/micro/info」 receive message", e.data);
       const t = g(e.data.data);
@@ -293,13 +293,13 @@ const Q = (e) => {
   });
 }, ce = (...t) => h(void 0, [...t], function* (e = {}) {
   window[s.MICRO_TYPE] = "child";
-  const n = f(s.IS_MICRO), r = f(s.MICRO_NAME);
-  if (console.debug("child microInit", n, r), n && (window[s.IS_MICRO] = n === "true"), r && P(r).then((o) => {
+  const n = f(s.IS_MICRO), o = f(s.MICRO_NAME);
+  if (console.debug("child microInit", n, o), n && (window[s.IS_MICRO] = n === "true"), o && P(o).then((r) => {
     window[s.MICRO_APP] = d({
       microVersion: u
-    }, o);
+    }, r);
   }), window[s.IS_MICRO]) {
-    let o = function(c) {
+    let r = function(c) {
       var i = document.styleSheets[0];
       if (!i) {
         var l = document.createElement("style");
@@ -308,11 +308,11 @@ const Q = (e) => {
       i.insertRule(c, i.cssRules.length);
     };
     window[s.IS_MICRO] && e.hideHeaderCssSelector && (Array.isArray(e.hideHeaderCssSelector) ? e.hideHeaderCssSelector.forEach((c) => {
-      o(`${c} { display: none !important; }`);
-    }) : o(
+      r(`${c} { display: none !important; }`);
+    }) : r(
       `${e.hideHeaderCssSelector} { display: none !important; }`
-    )), yield Z(r, window), window.addEventListener("message", (c) => h(void 0, null, function* () {
-      c.data.cmd === `$xt/micro/${r}` && M(r);
+    )), yield Z(o, window), window.addEventListener("message", (c) => h(void 0, null, function* () {
+      c.data.cmd === `$xt/micro/${o}` && M(o);
     }));
     const a = f(s.MICRO_TOKEN);
     e.authHandler && a && (yield e.authHandler(a));
@@ -320,21 +320,21 @@ const Q = (e) => {
     console.warn("当前环境非微应用环境");
 });
 function Z(e, t) {
-  const n = t.history, r = n.pushState, o = n.replaceState;
+  const n = t.history, o = n.pushState, r = n.replaceState;
   n.pushState = function(a, c, i) {
     const l = y(d(d({}, n.state || {}), a), {
       // 添加新数据
       _patchedByParent: !0
       // 可选：标记这是被父窗口修改的状态
     });
-    r.call(n, l, c, i), M(e);
+    o.call(n, l, c, i), M(e);
   }, n.replaceState = function(a, c, i) {
     const l = y(d(d({}, n.state || {}), a), {
       // 添加新数据
       _patchedByParent: !0
       // 可选：标记这是被父窗口修改的状态
     });
-    o.call(n, l, c, i), M(e);
+    r.call(n, l, c, i), M(e);
   };
 }
 function M(e) {
@@ -344,16 +344,16 @@ function M(e) {
         microVersion: u
       }, a);
     }));
-    const { name: t, sync: n, mainLocation: r } = window[s.MICRO_APP], o = window.location.pathname + window.location.search + window.location.hash;
+    const { name: t, sync: n, mainLocation: o } = window[s.MICRO_APP], r = window.location.pathname + window.location.search + window.location.hash;
     window.parent.postMessage(
       {
         cmd: "$xt/micro/sync",
         data: {
           name: t,
-          url: window.encodeURIComponent(o)
+          url: window.encodeURIComponent(r)
         }
       },
-      r.origin
+      o.origin
     );
   });
 }
@@ -371,9 +371,9 @@ const ee = {
   return n ? m[e.name] = d(d({}, n), t) : m[e.name] = y(d({}, t), {
     instance: new G(e)
   }), m[e.name];
-}, g = (e) => m[e], te = (e, t) => m[e.name] = d(d({}, e), t), ne = (e, t) => new Promise((n, r) => {
-  let o = g(e);
-  o ? (t && (o.instance.changeOptions(t), o = te(o, t)), o.preload ? o.instance.preloadRender(o.el) : o.instance.mount(o.el), n(o)) : r("app not found, please setup app first");
+}, g = (e) => m[e], te = (e, t) => m[e.name] = d(d({}, e), t), ne = (e, t) => new Promise((n, o) => {
+  let r = g(e);
+  r ? (t && (r.instance.changeOptions(t), r = te(r, t)), r.preload ? r.instance.preloadRender(r.el) : r.instance.mount(r.el), n(r)) : o("app not found, please setup app first");
 }), oe = (e) => {
   let t = g(e);
   t && t.instance.unmount();
@@ -385,37 +385,35 @@ const ee = {
   const t = window.location.href.split("#");
   console.log("url", t);
   const n = new URL(t[0]);
-  return console.log("mainURL", n), n.searchParams.delete(s.URL_PARAM_PREFIX + e), window.history.replaceState(
-    {},
-    "",
-    t.length > 1 ? n.href + "#" + t[1] : n.href
-  ), n;
+  console.log("mainURL", n), n.searchParams.delete(s.URL_PARAM_PREFIX + e);
+  const o = t.length > 1 ? n.href + "#" + t[1] : n.href;
+  return window.history.replaceState({}, "", o), o;
 }, re = /* @__PURE__ */ k({
   __name: "XTMicroView",
   props: {
     appId: String
   },
   setup(e) {
-    const t = e, n = C(), r = () => {
+    const t = e, n = C(), o = () => {
       t.appId && ne(t.appId, {
         el: n.value,
-        onUnload(o, a) {
+        onUnload(r, a) {
           console.log("on unload", a.app.name), w(a.app.name);
         }
-      }).then((o) => {
+      }).then((r) => {
         console.debug("app mounted", t.appId);
       });
     };
-    return H(() => t.appId, (o, a) => {
-      o !== a && a && oe(a), r();
+    return H(() => t.appId, (r, a) => {
+      r !== a && a && oe(a), o();
     }), j(() => {
-      r();
+      o();
     }), N(() => {
       console.debug("「micro」", "app unmount", t.appId), w(t.appId);
-    }), (o, a) => (V(), B("div", F({
+    }), (r, a) => (V(), B("div", F({
       ref_key: "refPanel",
       ref: n
-    }, o.$attrs, { class: "xt-micro" }), null, 16));
+    }, r.$attrs, { class: "xt-micro" }), null, 16));
   }
 });
 window[s.MICRO_VERSION] = u;

package/dist/types/api.d.ts

@@ -19,5 +19,5 @@ export declare const startApp: (name: string, options?: Partial<AppOption>) => P
  */
 export declare const stopApp: (name: string) => void;
 export declare const reloadApp: (name: string, isGoHome?: boolean) => void;
-export declare const clearParentUrl: (appName: string) => URL;
+export declare const clearParentUrl: (appName: string) => string;
 export { microInit };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xingtukeji/micro",
-  "version": "1.1.16",
+  "version": "1.1.17",
   "private": false,
   "description": "",
   "main": "dist/index.js",