@moneko/core 3.30.0-beta.1 → 3.30.0-beta.2

package/lib/vm/render-app.d.mts

@@ -1,5 +1,6 @@
 import { CONFIG } from '../config.mjs';
 import { APPTYPE, frameworkVersion, isDev, SSR } from '../process-env.mjs';
+declare const legend: boolean;
 declare const ReactDomPath: string;
 declare const isHashRouter: boolean;
 declare const v7Future: Record<string, boolean | undefined>;

package/lib/vm/render-app.mjs

@@ -1,8 +1,9 @@
-import{CONFIG as e}from"../config.mjs";import{APPTYPE as r,frameworkVersion as t,isDev as a,SSR as n}from"../process-env.mjs";let o="hash"===e.routerMode,s=Object.assign({v7_relativeSplatPath:!1},"browser"===e.routerMode?{v7_fetcherPersist:!1,v7_normalizeFormMethod:!1,v7_partialHydration:n,v7_skipActionErrorRevalidation:!1}:{}),c=o?"createHashRouter":"createBrowserRouter",i=`import React, { StrictMode, useRef, type ReactElement } from 'react';
+import{CONFIG as e}from"../config.mjs";import{APPTYPE as r,frameworkVersion as t,isDev as a,SSR as o}from"../process-env.mjs";let n=t<18,s="hash"===e.routerMode,c=Object.assign({v7_relativeSplatPath:!1},"browser"===e.routerMode?{v7_fetcherPersist:!1,v7_normalizeFormMethod:!1,v7_partialHydration:o,v7_skipActionErrorRevalidation:!1}:{}),i=s?"createHashRouter":"createBrowserRouter",p=`import React, { StrictMode, useRef, type ReactElement } from 'react';
 import Fallback from '@app/fallback';
 import routes from '@app/routes';
-import ReactDOM from '${t<18?"react-dom":"react-dom/client"}';
-import { RouterProvider, ${c} } from 'react-router-dom';
+import ReactDOM from '${n?"react-dom":"react-dom/client"}';
+import { ${i} } from 'react-router';
+import { RouterProvider } from 'react-router${n?"-dom":"/dom"}';
 
 type RenderAppProps = {
   container?: HTMLElement;
@@ -12,12 +13,12 @@ type RenderAppProps = {
 };
 
 export function App(props: RenderAppProps) {
-  const v7Future = useRef(${JSON.stringify(s)});
+  const v7Future = useRef(${JSON.stringify(c)});
   return (
     <StrictMode>
       <RouterProvider
-        router={${c}(routes, {
-          basename: ${o?"/":"props.basename"},
+        router={${i}(routes, {
+          basename: ${s?"/":"props.basename"},
           window: window,
           future: v7Future.current,
         })}
@@ -35,7 +36,7 @@ function renderApp(props: RenderAppProps = {}) {
   const { container, basename = "${e.basename}", language, ...args } = props;
   const _container = container?.querySelector('#root') || document.getElementById('root');
   ${"micro"===r?"window.mainApp = { ...args, container: _container as HTMLElement };":""}
-  ${t<18?`ReactDOM.${a?"render":"hydrate"}(<App basename={basename} language={language} />, _container);return () => ReactDOM.unmountComponentAtNode(_container as Element);`:"const instance = ReactDOM.createRoot(_container as HTMLElement);instance.render(<App basename={basename} language={language} />);return instance.unmount;"}
+  ${n?`ReactDOM.${a?"render":"hydrate"}(<App basename={basename} language={language} />, _container);return () => ReactDOM.unmountComponentAtNode(_container as Element);`:"const instance = ReactDOM.createRoot(_container as HTMLElement);instance.render(<App basename={basename} language={language} />);return instance.unmount;"}
 }
 
-export default renderApp;`;export default i;
+export default renderApp;`;export default p;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moneko/core",
-  "version": "3.30.0-beta.1",
+  "version": "3.30.0-beta.2",
   "description": "core",
   "main": "lib/index.mjs",
   "type": "module",

package/typings/global.d.ts

@@ -335,9 +335,8 @@ export declare type ConfigType = {
    *     // 导出 react 和 react-dom
    *     'react',
    *     'react-dom',
-   *     // 导出 react-router 和 react-router-dom
+   *     // 导出 react-router
    *     'react-router',
-   *     'react-router-dom',
    *     // 导出 Button 组件
    *     './Button': './src/components/Button'
    *   }
@@ -351,7 +350,7 @@ export declare type ConfigType = {
    *       name: 'demo_mf_name',
    *       host: 'http://localhost:3001/remoteEntry.js',
    *       // 引用远程模块的依赖
-   *       library: ['react', 'react-dom', 'react-router', 'react-router-dom'],
+   *       library: ['react', 'react-dom', 'react-router'],
    *     }
    *   ]
    * }