@moneko/react 1.6.6 → 1.6.8

package/env.d.ts

@@ -99,7 +99,8 @@ declare module '@app/info' {
   export default app;
 }
 declare module '@app/routes' {
-  export interface RouteConfig {
+  import type { NonIndexRouteObject } from 'react-router-dom';
+  export interface RouteConfig extends Omit<NonIndexRouteObject, 'element' | 'children'> {
     /** 菜单id */
     key?: string;
     value?: string;

package/lib/entry.js

@@ -1 +1 @@
-import{jsx as e}from"react/jsx-runtime";import{StrictMode as r,useRef as t}from"react";import o from"@app/info";import a from"@app/fallback";import n from"@app/routes";import{createRoot as i}from"react-dom/client";import{RouterProvider as m,createBrowserRouter as p,createHashRouter as c}from"react-router-dom";"development"===process.env.NODE_ENV&&process.env.injectRemoteReactRefresh&&await import("./inject-react-refresh.js");let s="hash"===o.routerMode,l=s?c:p;export function App(i){let p=t(Object.assign({v7_startTransition:!0,v7_relativeSplatPath:!0},"browser"===o.routerMode?{v7_fetcherPersist:!0,v7_normalizeFormMethod:!0,v7_partialHydration:!0,v7_skipActionErrorRevalidation:!0}:{}));return /*#__PURE__*/e(r,{children:/*#__PURE__*/e(m,{router:l(n,{basename:s?"/":i.basename,window:window,future:p.current}),fallbackElement:a&&/*#__PURE__*/e(a,{})})})}export default function(r={}){let{container:t,basename:a=o.base,language:n,...m}=r,p=t?.querySelector("#root")||document.getElementById("root"),c=i(p);return"micro"===o.type&&(window.mainApp={...m,container:p}),c.render(/*#__PURE__*/e(App,{basename:a,language:n})),c.unmount}
+import{jsx as e}from"react/jsx-runtime";import{StrictMode as r,useRef as t}from"react";import o from"@app/info";import a from"@app/fallback";import n from"@app/routes";import{createRoot as i}from"react-dom/client";import{RouterProvider as m,createBrowserRouter as p,createHashRouter as c}from"react-router-dom";"development"===process.env.NODE_ENV&&process.env.injectRemoteReactRefresh&&await import("./inject-react-refresh.js");let s="hash"===o.routerMode,u=s?c:p;export function App(i){let p=t(Object.assign({v7_startTransition:!0,v7_relativeSplatPath:!0},"browser"===o.routerMode?{v7_fetcherPersist:!0,v7_normalizeFormMethod:!0,v7_partialHydration:!0,v7_skipActionErrorRevalidation:!0}:{}));return /*#__PURE__*/e(r,{children:/*#__PURE__*/e(m,{router:u(n,{basename:s?"/":i.basename,window:window,future:p.current}),future:p.current,fallbackElement:a&&/*#__PURE__*/e(a,{})})})}export default function(r={}){let{container:t,basename:a=o.base,language:n,...m}=r,p=t?.querySelector("#root")||document.getElementById("root"),c=i(p);return"micro"===o.type&&(window.mainApp={...m,container:p}),c.render(/*#__PURE__*/e(App,{basename:a,language:n})),c.unmount}

package/lib/index.d.ts

@@ -1,7 +1,12 @@
 import * as React from 'react';
 export * from 'react-router-dom';
-export { default as LinkWithMenuId } from './link.js';
-export { default as useNavigateWithMenuId } from './use-navgate.js';
+export { default as useNavigate } from './use-navgate.js';
+export { default as Link } from './link.js';
+export { 
+/** 原版 useNavigate */
+useNavigate as useNavigateReactRouter, 
+/** 原版 Link */
+Link as LinkReactRouter, } from 'react-router-dom';
 export { default as renderApp, App } from './entry.js';
 export { default as ErrorBoundary, type ErrorBoundaryProps, type ErrorBoundaryState, } from './error-boundary.js';
 export type RenderAppProps = {

package/lib/index.js

@@ -1 +1 @@
-import*as r from"react";export*from"react-router-dom";export{default as LinkWithMenuId}from"./link.js";export{default as useNavigateWithMenuId}from"./use-navgate.js";export{default as renderApp,App}from"./entry.js";export{default as ErrorBoundary}from"./error-boundary.js";export default r;
+import*as r from"react";export*from"react-router-dom";export{default as useNavigate}from"./use-navgate.js";export{default as Link}from"./link.js";export{useNavigate as useNavigateReactRouter,Link as LinkReactRouter}from"react-router-dom";export{default as renderApp,App}from"./entry.js";export{default as ErrorBoundary}from"./error-boundary.js";export default r;

package/lib/use-navgate.js

@@ -1 +1 @@
-import{useNavigate as e,useSearchParams as r}from"react-router-dom";export default(t=>{let a=Array.from(new Set(["menuId","dynamicTitle",...t||[]])).filter(Boolean),o=e(),[l]=r();return(e,r)=>{if(-1===e){o(-1);return}let t={},n=e.split("?"),i=new URLSearchParams(n[1]||"");for(let[e,r]of l)a.includes(e)&&(t[e]=r);for(let[e,r]of i)a.includes(e)&&(t[e]=r);let f=new URLSearchParams(t).toString();o(f?`${n[0]}?${f}`:n[0],r)}});
+import{useNavigate as e,useSearchParams as r}from"react-router-dom";export default(t=>{let a=Array.from(new Set(["menuId","dynamicTitle",...t||[]])).filter(Boolean),l=e(),[o]=r();return(e,r)=>{if(-1===e){l(-1);return}let t={},n=e.split("?"),f=new URLSearchParams(n[1]||"");for(let[e,r]of o)a.includes(e)&&(t[e]=r);for(let[e,r]of f)a.includes(e)&&(t[e]=r);let i=new URLSearchParams(t).toString();l(i?`${n[0]}?${i}`:n[0],{flushSync:!0,...r})}});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moneko/react",
-  "version": "1.6.6",
+  "version": "1.6.8",
   "description": "react",
   "main": "lib/index.js",
   "scripts": {