@morningfast/platform 1.0.0 → 1.0.2

package/dist/chunks/{sub-D7y3UaHp.js → sub-LssKnIb1.js}

@@ -23,26 +23,54 @@ function m(e = {}) {
 	};
 }
 //#endregion
+//#region src/sub/composables/useSubAppContext.ts
+function h() {
+	return c(p, m());
+}
+//#endregion
+//#region src/sub/composables/useRequestClient.ts
+var g = /* @__PURE__ */ new Map();
+function _(r) {
+	let i = r ?? h(), a = i.runtime.apiBaseUrl, s = g.get(a);
+	if (s) return s;
+	let c = n({
+		baseURL: i.runtime.apiBaseUrl,
+		getToken: t,
+		onError(e) {
+			o.error(e);
+		},
+		onUnauthorized(t) {
+			e({
+				source: "sub-app",
+				reason: "unauthorized",
+				code: t.code,
+				message: t.message
+			});
+		}
+	});
+	return g.set(a, c), c;
+}
+//#endregion
 //#region src/sub/qiankun/index.ts
-var h = "morningfast-sub-app", g = "/", _ = "morningfast:theme-change";
-function v(e) {
+var v = "morningfast-sub-app", y = "/", b = "morningfast:theme-change";
+function x(e) {
 	let t = e?.basePath || "/";
 	return t.endsWith("/") ? t : `${t}/`;
 }
 //#endregion
 //#region src/sub/router/index.ts
-function y(e, t = "/") {
-	let n = r({
+function S(e, t = "/", n = {}) {
+	let a = r({
 		history: i(t),
 		routes: e
 	});
-	return n.afterEach((e) => {
+	return a.beforeEach((e, t) => (e.path !== t.path && n.requestManager?.setCurrentPage(e.path), !0)), a.afterEach((e) => {
 		document.title = String(e.meta.title ?? "Morningfast Sub App");
-	}), n;
+	}), a;
 }
 //#endregion
 //#region src/sub/theme/index.ts
-var b = {
+var C = {
 	colorPrimary: "--el-color-primary",
 	colorPrimaryLight3: "--el-color-primary-light-3",
 	colorPrimaryLight5: "--el-color-primary-light-5",
@@ -51,90 +79,62 @@ var b = {
 	colorPrimaryLight9: "--el-color-primary-light-9",
 	colorPrimaryDark2: "--el-color-primary-dark-2"
 };
-function x(e) {
+function w(e) {
 	let t = document.documentElement;
-	e && (Object.entries(b).forEach(([n, r]) => {
+	e && (Object.entries(C).forEach(([n, r]) => {
 		let i = e[n];
 		i && t.style.setProperty(r, i);
 	}), t.classList.toggle("dark", e.mode === "dark"), t.style.colorScheme = e.mode === "dark" ? "dark" : "light");
 }
 //#endregion
 //#region src/sub/app/mount.ts
-var S = null, C = null;
-function w(e) {
+var T = null, E = null;
+function D(e) {
 	f({
 		bootstrap() {},
 		mount(t) {
-			T(e.rootComponent, e.routes, t);
+			O(e.rootComponent, e.routes, t);
 		},
 		unmount() {
-			C?.(), S?.unmount(), S = null;
+			E?.(), T?.unmount(), T = null;
 		},
 		update(e) {
-			x(E(e).theme);
+			w(k(e).theme);
 		}
-	}), d.__POWERED_BY_QIANKUN__ || T(e.rootComponent, e.routes);
+	}), d.__POWERED_BY_QIANKUN__ || O(e.rootComponent, e.routes);
 }
-function T(e, t, n = {}) {
-	let r = E(n);
-	x(r.theme), D(), l();
+function O(e, t, n = {}) {
+	let r = k(n);
+	w(r.theme), A(), l();
 	let i = n.container?.querySelector("#sub-app") || document.querySelector("#sub-app");
 	if (!i) return;
-	let o = y(t, v(n));
-	S = s(e, {
+	let o = m({
 		app: n.app,
-		basePath: n.basePath,
+		basePath: x(n),
 		runtime: n.runtime,
 		theme: r.theme
-	}), S.provide(p, m({
+	}), c = _(o), d = S(t, x(n), { requestManager: c.requestManager });
+	T = s(e, {
 		app: n.app,
-		basePath: v(n),
+		basePath: n.basePath,
 		runtime: n.runtime,
 		theme: r.theme
-	})), S.use(a, { locale: u }), S.use(o), S.mount(i);
+	}), T.provide(p, o), T.use(a, { locale: u }), T.use(d), T.mount(i);
 }
-function E(e = {}) {
+function k(e = {}) {
 	return {
 		theme: e.theme,
 		...e.getRuntimeProps?.()
 	};
 }
-function D() {
-	C?.();
+function A() {
+	E?.();
 	let e = (e) => {
-		x(e.detail);
+		w(e.detail);
 	};
-	window.addEventListener(_, e), C = () => {
-		window.removeEventListener(_, e), C = null;
+	window.addEventListener(b, e), E = () => {
+		window.removeEventListener(b, e), E = null;
 	};
 }
 //#endregion
-//#region src/sub/composables/useSubAppContext.ts
-function O() {
-	return c(p, m());
-}
-//#endregion
-//#region src/sub/composables/useRequestClient.ts
-var k = /* @__PURE__ */ new Map();
-function A() {
-	let r = O(), i = r.runtime.apiBaseUrl, a = k.get(i);
-	if (a) return a;
-	let s = n({
-		baseURL: r.runtime.apiBaseUrl,
-		getToken: t,
-		onError(e) {
-			o.error(e);
-		},
-		onUnauthorized(t) {
-			e({
-				source: "sub-app",
-				reason: "unauthorized",
-				code: t.code,
-				message: t.message
-			});
-		}
-	});
-	return k.set(i, s), s;
-}
-//#endregion
-export { y as a, _ as c, p as d, x as i, v as l, O as n, g as o, w as r, h as s, A as t, m as u };
+export { v as a, _ as c, p as d, y as i, h as l, w as n, b as o, S as r, x as s, D as t, m as u };

package/dist/index.js

@@ -4,5 +4,5 @@ import { ApiError as x, RequestManager as S, createRequestClient as C, formatErr
 import { a as T, i as E, n as D, r as O, t as k } from "./chunks/auth-C3RvRgcW.js";
 import { i as A, n as j, r as M, t as N } from "./chunks/system-DZaKDrG6.js";
 import { o as P } from "./chunks/config-CJOAan9n.js";
-import { a as F, c as I, d as L, i as R, l as z, n as B, r as V, s as H, t as U, u as W } from "./chunks/sub-D7y3UaHp.js";
-export { x as ApiError, d as HOME_TAB_PATH, e as MICRO_AUTH_EXPIRED_EVENT, i as MicroAppView, S as RequestManager, H as SUB_APP_NAME, I as SUB_APP_THEME_CHANGE_EVENT, R as applySubAppTheme, s as configureMorningfastRequestClient, t as createApi, D as createMockLoginResult, O as createMockUserProfile, v as createMorningfastBaseRoutes, u as createMorningfastRouter, C as createRequestClient, g as createRoutesFromItems, W as createSubAppContext, F as createSubAppRouter, w as formatErrorMessage, j as getPersistedValue, n as getStoredUpdateCheckEnabled, y as http, _ as mountMorningfastApp, V as mountSubApp, E as normalizeLoginResult, T as normalizeUserProfile, M as removePersistedValue, b as requestManager, z as resolveSubAppBasePath, f as restartAppUpdateChecker, P as setDefaultAppConfigs, A as setPersistedValue, p as setStoredUpdateCheckEnabled, h as setupAppUpdateChecker, r as setupAuthExpiredHandler, l as stopAppUpdateChecker, L as subAppContextKey, m as useAppStore, k as useAuthStore, U as useRequestClient, o as useShortcutStore, a as useSortable, B as useSubAppContext, N as useSystemStore, c as useTabsStore };
+import { a as F, c as I, d as L, l as R, n as z, o as B, r as V, s as H, t as U, u as W } from "./chunks/sub-LssKnIb1.js";
+export { x as ApiError, d as HOME_TAB_PATH, e as MICRO_AUTH_EXPIRED_EVENT, i as MicroAppView, S as RequestManager, F as SUB_APP_NAME, B as SUB_APP_THEME_CHANGE_EVENT, z as applySubAppTheme, s as configureMorningfastRequestClient, t as createApi, D as createMockLoginResult, O as createMockUserProfile, v as createMorningfastBaseRoutes, u as createMorningfastRouter, C as createRequestClient, g as createRoutesFromItems, W as createSubAppContext, V as createSubAppRouter, w as formatErrorMessage, j as getPersistedValue, n as getStoredUpdateCheckEnabled, y as http, _ as mountMorningfastApp, U as mountSubApp, E as normalizeLoginResult, T as normalizeUserProfile, M as removePersistedValue, b as requestManager, H as resolveSubAppBasePath, f as restartAppUpdateChecker, P as setDefaultAppConfigs, A as setPersistedValue, p as setStoredUpdateCheckEnabled, h as setupAppUpdateChecker, r as setupAuthExpiredHandler, l as stopAppUpdateChecker, L as subAppContextKey, m as useAppStore, k as useAuthStore, I as useRequestClient, o as useShortcutStore, a as useSortable, R as useSubAppContext, N as useSystemStore, c as useTabsStore };

package/dist/request/index.d.ts

@@ -17,6 +17,7 @@ export interface PageResult<Row = unknown> {
     total_page: number;
 }
 export interface RequestConfig {
+    cancelOnRouteChange?: boolean;
     pageKey?: string;
     rawResponse?: boolean;
 }
@@ -25,6 +26,7 @@ export interface ManagedRequestConfig extends AxiosRequestConfig, RequestConfig
 export type RequestMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';
 export interface RequestClientOptions {
     baseURL: string;
+    cancelOnRouteChange?: boolean;
     timeout?: number;
     getToken?: () => string | undefined | null;
     getHeaders?: () => Record<string, string | undefined>;

package/dist/request.js

@@ -37,16 +37,16 @@ var t = class extends Error {
 	}
 };
 function r(r) {
-	let i = new n(), c = r.isSuccessCode ?? ((e) => e === 0), l = e.create({
+	let i = new n(), c = r.isSuccessCode ?? ((e) => e === 0), l = r.cancelOnRouteChange ?? !0, u = e.create({
 		baseURL: r.baseURL,
 		timeout: r.timeout ?? 15e3
 	});
-	l.interceptors.request.use((e) => {
+	u.interceptors.request.use((e) => {
 		let t = r.getToken?.(), n = r.getHeaders?.() ?? {};
 		return Object.entries(n).forEach(([t, n]) => {
 			n && e.headers.set(t, n);
 		}), t && e.headers.set("Authorization", `Bearer ${t}`), e;
-	}), l.interceptors.response.use((e) => {
+	}), u.interceptors.response.use((e) => {
 		let n = e.data;
 		if (e.config.rawResponse) return e.data;
 		if (n?.code !== void 0 && !c(n.code)) {
@@ -72,22 +72,23 @@ function r(r) {
 		});
 		return o(c, r), Promise.reject(new t(c.message, c));
 	});
-	function u(t) {
+	function d(t) {
 		let n = null, r = async (r) => {
-			n = t.signal ? null : new AbortController();
-			let a = n, o = a ? i.register(a, t.pageKey) : () => {};
+			let a = !!t.signal, o = t.cancelOnRouteChange ?? l;
+			n = a ? null : new AbortController();
+			let s = n, c = s ? i.register(s, o ? t.pageKey : "global") : () => {};
 			try {
 				let e = (t.method || "GET").toUpperCase(), n = {
 					...t,
 					method: e,
-					signal: t.signal || a?.signal
+					signal: t.signal || s?.signal
 				};
-				return e === "GET" || e === "DELETE" ? n.params = r : n.data = r, await l.request(n);
+				return e === "GET" || e === "DELETE" ? n.params = r : n.data = r, await u.request(n);
 			} catch (t) {
-				if ((e.isCancel(t) || t instanceof Error && t.name === "CanceledError") && a && !i.isManualCancel(a)) return null;
+				if ((e.isCancel(t) || t instanceof Error && t.name === "CanceledError") && s && !i.isManualCancel(s)) return null;
 				throw t;
 			} finally {
-				o();
+				c();
 			}
 		};
 		return r.cancel = () => {
@@ -95,8 +96,8 @@ function r(r) {
 		}, r;
 	}
 	return {
-		http: l,
-		createApi: u,
+		http: u,
+		createApi: d,
 		requestManager: i
 	};
 }

package/dist/sub/composables/useRequestClient.d.ts

@@ -1,4 +1,5 @@
-export declare function useRequestClient(): {
+import { SubAppContext } from '../context/sub-app-context';
+export declare function useRequestClient(providedContext?: SubAppContext): {
     http: import('axios').AxiosInstance;
     createApi: <Params = void, Result = void>(option: import('../../request').ManagedRequestConfig) => import('../../request').ManagedApi<Params, Result>;
     requestManager: import('../../request').RequestManager;

package/dist/sub/router/index.d.ts

@@ -1,2 +1,6 @@
 import { RouteRecordRaw } from 'vue-router';
-export declare function createSubAppRouter(routes: RouteRecordRaw[], base?: string): import('vue-router').Router;
+import { RequestManager } from '../../request';
+export interface CreateSubAppRouterOptions {
+    requestManager?: RequestManager;
+}
+export declare function createSubAppRouter(routes: RouteRecordRaw[], base?: string, options?: CreateSubAppRouterOptions): import('vue-router').Router;

package/dist/sub.js

@@ -1,3 +1,3 @@
 import { t as e } from "./chunks/route-items-DXwaEe0Y.js";
-import { a as t, c as n, d as r, i, l as a, n as o, o as s, r as c, s as l, t as u, u as d } from "./chunks/sub-D7y3UaHp.js";
-export { s as DEFAULT_SUB_APP_BASE, l as SUB_APP_NAME, n as SUB_APP_THEME_CHANGE_EVENT, i as applySubAppTheme, e as createRoutesFromItems, d as createSubAppContext, t as createSubAppRouter, c as mountSubApp, a as resolveSubAppBasePath, r as subAppContextKey, u as useRequestClient, o as useSubAppContext };
+import { a as t, c as n, d as r, i, l as a, n as o, o as s, r as c, s as l, t as u, u as d } from "./chunks/sub-LssKnIb1.js";
+export { i as DEFAULT_SUB_APP_BASE, t as SUB_APP_NAME, s as SUB_APP_THEME_CHANGE_EVENT, o as applySubAppTheme, e as createRoutesFromItems, d as createSubAppContext, c as createSubAppRouter, u as mountSubApp, l as resolveSubAppBasePath, r as subAppContextKey, n as useRequestClient, a as useSubAppContext };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morningfast/platform",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Morningfast platform runtime for main and sub applications.",
   "type": "module",
   "sideEffects": [
@@ -48,12 +48,6 @@
       "default": "./dist/assets/main/style.css"
     }
   },
-  "scripts": {
-    "build": "vite build && node scripts/merge-main-style.mjs",
-    "check": "vue-tsc --build",
-    "prepack": "pnpm build",
-    "publish:dry-run": "pnpm build && npm publish --dry-run"
-  },
   "dependencies": {
     "morningfast-plus": "^1.1.0",
     "localforage": "^1.10.0",
@@ -82,5 +76,10 @@
   },
   "engines": {
     "node": ">=22.12.0"
+  },
+  "scripts": {
+    "build": "vite build && node scripts/merge-main-style.mjs",
+    "check": "vue-tsc --build",
+    "publish:dry-run": "pnpm build && npm publish --dry-run"
   }
-}
+}