@xingtukeji/micro 1.1.10 → 1.1.12

package/README.md

@@ -48,3 +48,8 @@ microInit({
 ```javascript
 http://192.168.100.127:8000/console/?__XT_MICRO_microtest2=http://localhost:5173/?test=123#/page2#/micro/microtest2
 ```
+
+```javascript
+window.__XT_MICRO_VERSION; //获取微前端框架版本
+window.__XT_MICRO_APP; //获取微应用信息，包括主应用的 location 信息
+```

package/dist/index.js

@@ -1,41 +1,43 @@
 (function(){"use strict";try{if(typeof document!="undefined"){var e=document.createElement("style");e.appendChild(document.createTextNode('.xt-micro{width:100%;height:100%;overflow:hidden;background-color:transparent}.xt-micro:before{content:"加载中";position:absolute;inset:0;display:flex;justify-content:center;align-items:center;z-index:-1}.micro-iframe{width:100%;height:100%;border:none;margin:0;padding:0}.micro-iframe:after{content:"加载中";position:absolute;inset:0;display:flex;justify-content:center;align-items:center;background:#fff}')),document.head.appendChild(e)}}catch(t){console.error("vite-plugin-css-injected-by-js",t)}})();
-var L = Object.defineProperty, v = Object.defineProperties;
-var b = Object.getOwnPropertyDescriptors;
+var v = Object.defineProperty, L = Object.defineProperties;
+var T = Object.getOwnPropertyDescriptors;
 var M = Object.getOwnPropertySymbols;
-var T = Object.prototype.hasOwnProperty, x = Object.prototype.propertyIsEnumerable;
-var _ = (e, t, n) => t in e ? L(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n, l = (e, t) => {
+var b = Object.prototype.hasOwnProperty, x = Object.prototype.propertyIsEnumerable;
+var y = (e, t, n) => t in e ? v(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n, l = (e, t) => {
   for (var n in t || (t = {}))
-    T.call(t, n) && _(e, n, t[n]);
+    b.call(t, n) && y(e, n, t[n]);
   if (M)
     for (var n of M(t))
-      x.call(t, n) && _(e, n, t[n]);
+      x.call(t, n) && y(e, n, t[n]);
   return e;
-}, f = (e, t) => v(e, b(t));
-var m = (e, t, n) => (_(e, typeof t != "symbol" ? t + "" : t, n), n);
-var R = (e, t, n) => new Promise((r, o) => {
+}, f = (e, t) => L(e, T(t));
+var m = (e, t, n) => (y(e, typeof t != "symbol" ? t + "" : t, n), n);
+var g = (e, t, n) => new Promise((r, o) => {
   var a = (d) => {
     try {
-      i(n.next(d));
+      s(n.next(d));
     } catch (h) {
       o(h);
     }
-  }, s = (d) => {
+  }, c = (d) => {
     try {
-      i(n.throw(d));
+      s(n.throw(d));
     } catch (h) {
       o(h);
     }
-  }, i = (d) => d.done ? r(d.value) : Promise.resolve(d.value).then(a, s);
-  i((n = n.apply(e, t)).next());
+  }, s = (d) => d.done ? r(d.value) : Promise.resolve(d.value).then(a, c);
+  s((n = n.apply(e, t)).next());
 });
-import { ref as P, defineComponent as $, watch as X, onMounted as k, onUnmounted as H, openBlock as N, createElementBlock as B, mergeProps as j } from "vue";
-const c = {
+import { ref as P, defineComponent as $, watch as X, onMounted as k, onUnmounted as H, openBlock as N, createElementBlock as j, mergeProps as B } from "vue";
+const i = {
   KEY: "$xtm",
   // 父应用注入子应用实例的key
   IS_MICRO: "__XT_MICRO",
   // 是否在微应用中
   MICRO_NAME: "__XT_MICRO_NAME",
   // 微应用名称
+  MICRO_TYPE: "__XT_MICRO_TYPE",
+  // 微应用类型 'parent' | 'child'
   MICRO_TOKEN: "__XT_MICRO_TOKEN",
   // 微应用token
   MICRO_APP: "__XT_MICRO_APP",
@@ -46,8 +48,8 @@ const c = {
   // 微应用在 url 参数中的前缀
   MICRO_VERSION: "__XT_MICRO_VERSION"
   // 微应用版本
-}, p = "1.1.10";
-function u(e, t = window.location.href) {
+}, u = "1.1.11";
+function p(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;
@@ -77,16 +79,16 @@ function K(e, t) {
   };
 }
 function C(e, t, n) {
-  const [r, o] = e.split("#"), a = new URL(r), s = a.searchParams;
-  return t = c.URL_PARAM_PREFIX + t, s.has(t) ? s.set(t, n) : s.append(t, n), o && (a.hash = o), a.search = s.toString(), a.toString();
+  const [r, o] = e.split("#"), a = new URL(r), c = a.searchParams;
+  return t = i.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 S = (e) => R(void 0, null, function* () {
+const S = (e) => g(void 0, null, function* () {
   return new Promise((t) => {
     window.addEventListener("message", (n) => {
-      n.data.cmd === "$xt/micro/info" && (n.data.data.mainMicroVersion !== p && console.warn(
-        `子应用版本与主应用版本不一致，${e}子应用版本：${p}，主应用版本：${n.data.data.mainMicroVersion}`
+      console.debug("child ipcSyncAppInfo receive message", n.data), n.data.cmd === "$xt/micro/info" && (n.data.data.mainMicroVersion !== u && console.warn(
+        `子应用版本与主应用版本不一致，${e}子应用版本：${u}，主应用版本：${n.data.data.mainMicroVersion}`
       ), t(n.data.data));
-    }), window.parent.postMessage(
+    }), console.debug("child ipcSyncAppInfo send message", e), window.parent.postMessage(
       {
         cmd: "$xt/micro/info",
         data: e
@@ -101,10 +103,10 @@ const S = (e) => R(void 0, null, function* () {
   debounce: K,
   getAbsolutePath: E,
   getAnchorElementQueryMap: F,
-  getQueryParameter: u,
+  getQueryParameter: p,
   ipcSyncAppInfo: S
 }, Symbol.toStringTag, { value: "Module" })), O = P(!1);
-Object.defineProperty(window, c.IS_MICRO, {
+Object.defineProperty(window, i.IS_MICRO, {
   get: function() {
     return O.value;
   },
@@ -112,39 +114,39 @@ Object.defineProperty(window, c.IS_MICRO, {
     O.value = e;
   }
 });
-const g = (e) => `${c.DOM_ID_PREFIX}${e}`, D = (e) => {
-  function t(i) {
-    return i !== null && typeof i == "object" && !Array.isArray(i);
+const I = (e) => `${i.DOM_ID_PREFIX}${e}`, D = (e) => {
+  function t(s) {
+    return s !== null && typeof s == "object" && !Array.isArray(s);
   }
   const n = typeof e.params == "function" ? e.params() : t(e.params) ? e.params : {}, r = typeof e.token == "function" ? e.token() : t(e.token) ? e.token : "", o = new URL(
     e.url.indexOf("http") > -1 ? e.url : window.location.origin + e.url
-  ), a = u(c.URL_PARAM_PREFIX + e.name);
+  ), a = p(i.URL_PARAM_PREFIX + e.name);
   if (a) {
-    const i = E(a, e.url, !0);
-    if (i) {
-      const d = new URL(i);
-      d.searchParams.forEach((U, A) => {
-        o.searchParams.set(A, U);
+    const s = E(a, e.url, !0);
+    if (s) {
+      const d = new URL(s);
+      d.searchParams.forEach((A, U) => {
+        o.searchParams.set(U, A);
       }), o.hash = d.hash;
     }
   }
-  if (o.searchParams.set(c.IS_MICRO, !0 + ""), o.searchParams.set(c.MICRO_NAME, e.name), r && o.searchParams.set(c.MICRO_TOKEN, r), n)
-    for (let i of Object.keys(n))
-      o.searchParams.set(i, n[i]);
-  const s = new URL(window.location.href);
-  return s.searchParams.delete(e.name), window.history.replaceState({}, "", s.href), o.href;
-}, W = () => {
+  if (o.searchParams.set(i.IS_MICRO, !0 + ""), o.searchParams.set(i.MICRO_NAME, e.name), r && o.searchParams.set(i.MICRO_TOKEN, r), n)
+    for (let s of Object.keys(n))
+      o.searchParams.set(s, n[s]);
+  const c = new URL(window.location.href);
+  return c.searchParams.delete(e.name), window.history.replaceState({}, "", c.href), o.href;
+}, Y = () => {
   const e = document.createElement("div");
   return e.innerHTML = "应用加载中...", e.style.textAlign = "center", e.style.lineHeight = "100px", e.style.fontSize = "20px", e.style.color = "#999", e.style.position = "absolute", e.style.top = "0", e.style.left = "0", e.style.right = "0", e.style.bottom = "0", e.style.zIndex = "999", e.style.background = "transparent", e.style["mix-blend-mode"] = "difference", e;
-}, q = (e) => {
+}, W = (e) => {
   e.style.opacity = "0", setTimeout(() => {
     e.remove();
   }, 500);
-}, z = (e) => {
+}, q = (e) => {
   const t = document.createElement("iframe");
-  t.id = g(e.app.name);
+  t.id = I(e.app.name);
   const n = D(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"] = "none", 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", (o) => (t.style.visibility = "visible", e.onLoad.call(e, o))), t.addEventListener(
     "error",
     (o) => e.onError.call(e, o)
   ), t.addEventListener(
@@ -158,7 +160,7 @@ const g = (e) => `${c.DOM_ID_PREFIX}${e}`, D = (e) => {
   });
   return r.observe(e.panel, { childList: !0 }), t;
 };
-class G {
+class z {
   constructor(t) {
     m(this, "app");
     m(this, "dom");
@@ -171,9 +173,9 @@ class G {
     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(g(this.app.name));
-      o || (o = z(this), this.dom = o), n ? o.style.display = "none" : o.style.removeProperty("display");
-      const a = W();
+      let o = document.getElementById(I(this.app.name));
+      o || (o = q(this), this.dom = o), n ? o.style.display = "none" : o.style.removeProperty("display");
+      const a = Y();
       this.loadingTimer = setTimeout(() => {
         this.loading = a, r.appendChild(a);
       }, 1e3), r.appendChild(o);
@@ -182,7 +184,7 @@ class G {
   }
   unmount() {
     var n;
-    const t = document.getElementById(g(this.app.name));
+    const t = document.getElementById(I(this.app.name));
     if (t)
       this.app.preload ? (t.style.display = "none", document.body.appendChild(t)) : (n = this.panel) == null || n.removeChild(t);
     else
@@ -210,7 +212,7 @@ class G {
     this.app = l(l({}, this.app), t);
   }
   onLoad(t) {
-    console.debug("app onLoad", this.app.name), this.loadingTimer && clearTimeout(this.loadingTimer), this.loading && q(this.loading), Q(this), this.app.onLoad && this.app.onLoad(t, this);
+    console.debug("app onLoad", this.app.name), this.loadingTimer && clearTimeout(this.loadingTimer), this.loading && W(this.loading), G(this), this.app.onLoad && this.app.onLoad(t, this);
   }
   onUnload(t) {
     console.debug("app onUnload", this.app.name), this.app.onUnload && this.app.onUnload(t, this);
@@ -219,7 +221,7 @@ class G {
     console.error("app onError", this.app.name), this.app.onError && this.app.onError(t, this);
   }
 }
-const Q = (e) => {
+const G = (e) => {
   var t, n;
   (n = (t = e.dom) == null ? void 0 : t.contentWindow) == null || n.postMessage(
     {
@@ -234,13 +236,13 @@ const Q = (e) => {
     },
     "*"
   );
-}, Y = () => {
-  window.addEventListener("message", (e) => {
+}, Q = () => {
+  window[i.MICRO_TYPE] = "parent", window.addEventListener("message", (e) => {
     if (e.data.cmd === "$xt/micro/sync") {
       const t = [
-        c.IS_MICRO,
-        c.MICRO_NAME,
-        c.MICRO_TOKEN
+        i.IS_MICRO,
+        i.MICRO_NAME,
+        i.MICRO_TOKEN
       ], n = new URL(
         window.decodeURIComponent(e.data.data.url),
         e.origin
@@ -248,8 +250,8 @@ const Q = (e) => {
       for (let a of t)
         n.searchParams.delete(a);
       const r = new URL(window.location.href);
-      r.searchParams.forEach((a, s) => {
-        s.startsWith(c.URL_PARAM_PREFIX) && r.searchParams.delete(s);
+      r.searchParams.forEach((a, c) => {
+        c.startsWith(i.URL_PARAM_PREFIX) && r.searchParams.delete(c);
       });
       const o = C(
         r.href,
@@ -258,13 +260,24 @@ const Q = (e) => {
       );
       window.history.replaceState(null, "", o);
     } else if (e.data.cmd === "$xt/micro/info") {
-      const t = y(e.data.data);
+      console.debug("parent 「$xt/micro/info」 receive message", e.data);
+      const t = _(e.data.data);
       e.source.postMessage(
         {
           cmd: "$xt/micro/info",
           data: {
-            mainBaseURL: window.location.origin,
-            mainMicroVersion: p,
+            mainLocation: {
+              origin: window.location.origin,
+              href: window.location.href,
+              pathname: window.location.pathname,
+              search: window.location.search,
+              hash: window.location.hash,
+              host: window.location.host,
+              hostname: window.location.hostname,
+              port: window.location.port,
+              protocol: window.location.protocol
+            },
+            mainMicroVersion: u,
             name: t.name,
             url: t.url,
             params: t.params,
@@ -276,53 +289,56 @@ const Q = (e) => {
       );
     }
   });
-}, ie = (...t) => R(void 0, [...t], function* (e = {}) {
-  const n = u(c.IS_MICRO), r = u(c.MICRO_NAME);
-  n && (window[c.IS_MICRO] = !0), r && S(r).then((s) => {
-    window[c.MICRO_APP] = l({
-      microVersion: p
-    }, s);
-  });
-  function o(s) {
-    var i = document.styleSheets[0];
-    if (!i) {
-      var d = document.createElement("style");
-      document.head.appendChild(d), i = d.sheet;
-    }
-    i.insertRule(s, i.cssRules.length);
-  }
-  window[c.IS_MICRO] && e.hideHeaderCssSelector && (Array.isArray(e.hideHeaderCssSelector) ? e.hideHeaderCssSelector.forEach((s) => {
-    o(`${s} { display: none !important; }`);
-  }) : o(
-    `${e.hideHeaderCssSelector} { display: none !important; }`
-  )), window.addEventListener("message", (s) => {
-    s.data.cmd === `$xt/micro/${r}` && I();
-  }), J(window);
-  const a = u(c.MICRO_TOKEN);
-  e.authHandler && a && (yield e.authHandler(a));
+}, ie = (...t) => g(void 0, [...t], function* (e = {}) {
+  window[i.MICRO_TYPE] = "child";
+  const n = p(i.IS_MICRO), r = p(i.MICRO_NAME);
+  if (console.debug("child microInit", n, r), n && (window[i.IS_MICRO] = n === "true"), r && S(r).then((o) => {
+    window[i.MICRO_APP] = l({
+      microVersion: u
+    }, o);
+  }), window[i.IS_MICRO]) {
+    let o = function(c) {
+      var s = document.styleSheets[0];
+      if (!s) {
+        var d = document.createElement("style");
+        document.head.appendChild(d), s = d.sheet;
+      }
+      s.insertRule(c, s.cssRules.length);
+    };
+    window[i.IS_MICRO] && e.hideHeaderCssSelector && (Array.isArray(e.hideHeaderCssSelector) ? e.hideHeaderCssSelector.forEach((c) => {
+      o(`${c} { display: none !important; }`);
+    }) : o(
+      `${e.hideHeaderCssSelector} { display: none !important; }`
+    )), window.addEventListener("message", (c) => {
+      c.data.cmd === `$xt/micro/${r}` && R();
+    }), J(window);
+    const a = p(i.MICRO_TOKEN);
+    e.authHandler && a && (yield e.authHandler(a));
+  } else
+    console.warn("当前环境非微应用环境");
 });
 function J(e) {
   const t = e.history, n = t.pushState, r = t.replaceState;
-  t.pushState = function(o, a, s) {
-    const i = f(l(l({}, t.state || {}), o), {
+  t.pushState = function(o, a, c) {
+    const s = f(l(l({}, t.state || {}), o), {
       // 添加新数据
       _patchedByParent: !0
       // 可选：标记这是被父窗口修改的状态
     });
-    n.call(t, i, a, s), I();
-  }, t.replaceState = function(o, a, s) {
-    const i = f(l(l({}, t.state || {}), o), {
+    n.call(t, s, a, c), R();
+  }, t.replaceState = function(o, a, c) {
+    const s = f(l(l({}, t.state || {}), o), {
       // 添加新数据
       _patchedByParent: !0
       // 可选：标记这是被父窗口修改的状态
     });
-    r.call(t, i, a, s), I();
+    r.call(t, s, a, c), R();
   };
 }
-function I() {
-  if (!window[c.MICRO_APP])
+function R() {
+  if (!window[i.MICRO_APP])
     return;
-  const { name: e, sync: t, mainBaseURL: n } = window[c.MICRO_APP], r = window.location.pathname + window.location.search + window.location.hash;
+  const { name: e, sync: t, mainBaseURL: n } = window[i.MICRO_APP], r = window.location.pathname + window.location.search + window.location.hash;
   window.parent.postMessage(
     {
       cmd: "$xt/micro/sync",
@@ -346,16 +362,16 @@ const Z = {
   }
   const t = Object.assign({}, Z, e);
   return w[e.name] = f(l({}, t), {
-    instance: new G(e)
+    instance: new z(e)
   }), w[e.name];
-}, y = (e) => w[e], ee = (e, t) => w[e.name] = l(l({}, e), t), te = (e, t) => new Promise((n, r) => {
-  let o = y(e);
+}, _ = (e) => w[e], ee = (e, t) => w[e.name] = l(l({}, e), t), te = (e, t) => new Promise((n, r) => {
+  let o = _(e);
   o ? (t && (o.instance.changeOptions(t), o = ee(o, t)), o.preload ? o.instance.preloadRender(o.el) : o.instance.mount(o.el), n(o)) : r("app not found");
 }), ne = (e) => {
-  let t = y(e);
+  let t = _(e);
   t && t.instance.unmount();
 }, de = (e) => {
-  let t = y(e);
+  let t = _(e);
   t && t.instance.reload();
 }, oe = /* @__PURE__ */ $({
   __name: "XTMicroView",
@@ -376,22 +392,22 @@ const Z = {
       r();
     }), H(() => {
       console.debug("app unmount", t.appId);
-    }), (o, a) => (N(), B("div", j({
+    }), (o, a) => (N(), j("div", B({
       ref_key: "refPanel",
       ref: n
     }, o.$attrs, { class: "xt-micro" }), null, 16));
   }
 });
-window[c.MICRO_VERSION] = p;
+window[i.MICRO_VERSION] = u;
 const le = {
   install: (e, t = {}) => {
-    e.component("xt-micro-view", oe), Y();
+    e.component("xt-micro-view", oe), Q();
   }
 };
 export {
   oe as XTMicroView,
   le as default,
-  y as getApp,
+  _ as getApp,
   ie as microInit,
   de as reloadApp,
   ce as setupApp,

package/package.json

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