@moneko/core 3.30.7 → 3.32.0

package/lib/dev.d.mts

@@ -51,9 +51,5 @@ declare const _prev: ConfigType[];
 declare let prev: ConfigType;
 declare function watchConfig(filepath: string);
 declare function restart();
-interface Command {
-    command: string;
-    args: string[];
-}
 declare const isWindow: boolean;
 declare function killPort(port: number);

package/lib/vm/example.d.mts

@@ -4,10 +4,9 @@ import paths from '../commom/paths.mjs';
 import ReactiveObject from '../commom/reactive-object.mjs';
 import Rule from '../commom/rule.mjs';
 import { CONFIG } from '../config.mjs';
-import { FRAMEWORK, frameworkVersion, isDev, isLibrary } from '../process-env.mjs';
+import { isDev, isLibrary } from '../process-env.mjs';
 import { watchFiles } from './utils.mjs';
 export declare const exampleModuleName: string;
-declare const legend: boolean;
 declare function getExample();
 export declare const examples: ReactiveObject<Record<string, string>>;
 export declare function generatorExample();

package/lib/vm/example.mjs

@@ -1 +1 @@
-import{generateExample as e}from"@moneko/mdx";import o from"../commom/parse-module-meta.mjs";import t from"../commom/paths.mjs";import m from"../commom/reactive-object.mjs";import r from"../commom/rule.mjs";import{CONFIG as p}from"../config.mjs";import{FRAMEWORK as a,frameworkVersion as l,isDev as n,isLibrary as s}from"../process-env.mjs";import{watchFiles as i}from"./utils.mjs";export const exampleModuleName="@app/example";let c="react"===a&&l<18;function f(){if(!s||!1===p.htmlPluginOption)return{};let m=JSON.parse(e(t.componentsPath,`${exampleModuleName}/`,c?"6":"7")),a={};for(let e in m)Object.prototype.hasOwnProperty.call(m,e)&&Object.assign(a,{[e]:`rr(() => import('${e}'))rr`});let l={...m,[exampleModuleName]:`export default ${JSON.stringify(a).replace(r.extract_func,"$1")}`},n={};for(let e in l)if(Object.prototype.hasOwnProperty.call(l,e)){let{file:t,pkg:m,meta:r}=o(e);n[m]=r,n[t]=l[e]}return n}export const examples=new m(f());export function generatorExample(){let e=f();for(let o in e)Object.prototype.hasOwnProperty.call(e,o)&&examples.setData(o,e[o])}s&&n&&!1!==p.htmlPluginOption&&i(t.componentsPath,/(?<!\/examples\/(.+)\.md)$/,generatorExample);
+import{generateExample as e}from"@moneko/mdx";import o from"../commom/parse-module-meta.mjs";import t from"../commom/paths.mjs";import m from"../commom/reactive-object.mjs";import r from"../commom/rule.mjs";import{CONFIG as p}from"../config.mjs";import{isDev as a,isLibrary as l}from"../process-env.mjs";import{watchFiles as n}from"./utils.mjs";export const exampleModuleName="@app/example";function s(){if(!l||!1===p.htmlPluginOption)return{};let m=JSON.parse(e(t.componentsPath,`${exampleModuleName}/`,"6")),a={};for(let e in m)Object.prototype.hasOwnProperty.call(m,e)&&Object.assign(a,{[e]:`rr(() => import('${e}'))rr`});let n={...m,[exampleModuleName]:`export default ${JSON.stringify(a).replace(r.extract_func,"$1")}`},s={};for(let e in n)if(Object.prototype.hasOwnProperty.call(n,e)){let{file:t,pkg:m,meta:r}=o(e);s[m]=r,s[t]=n[e]}return s}export const examples=new m(s());export function generatorExample(){let e=s();for(let o in e)Object.prototype.hasOwnProperty.call(e,o)&&examples.setData(o,e[o])}l&&a&&!1!==p.htmlPluginOption&&n(t.componentsPath,/(?<!\/examples\/(.+)\.md)$/,generatorExample);

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

@@ -1,9 +1,10 @@
 import { CONFIG } from '../config.mjs';
-import { APPTYPE, frameworkVersion, isDev, SSR } from '../process-env.mjs';
+import { APPTYPE, frameworkVersion, isDev } from '../process-env.mjs';
 declare const legend: boolean;
 declare const ReactDomPath: string;
 declare const isHashRouter: boolean;
-declare const v7Future: Record<string, boolean | undefined>;
-declare const createRouter: string;
+declare const Router: string;
+declare const StrictMode: string;
+declare const Root: string;
 declare const renderApp: string;
 export default renderApp;

package/lib/vm/render-app.mjs

@@ -1,8 +1,11 @@
-import{CONFIG as e}from"../config.mjs";import{APPTYPE as r,frameworkVersion as t,isDev as o,SSR as a}from"../process-env.mjs";let n=t<18,i="hash"===e.routerMode,c=Object.assign({v7_relativeSplatPath:!1},"browser"===e.routerMode?{v7_fetcherPersist:!1,v7_normalizeFormMethod:!1,v7_partialHydration:a,v7_skipActionErrorRevalidation:!1}:{}),s=i?"createHashRouter":"createBrowserRouter",p=`import React, { StrictMode, type ReactElement } from 'react';
-import Fallback from '@app/fallback';
+import{CONFIG as e}from"../config.mjs";import{APPTYPE as t,frameworkVersion as r,isDev as o}from"../process-env.mjs";let n=r<18,a="hash"===e.routerMode,c=a?"HashRouter":"BrowserRouter",p=e.strict?"StrictMode":"",s=`<${p}>
+  <${c} basename={${a?"/":"basename"}} window={window}>
+    <App />
+  </${c}>
+</${p}>`,m=`import React, { StrictMode, type ReactElement } from 'react';
 import routes from '@app/routes';
 import ReactDOM from '${n?"react-dom":"react-dom/client"}';
-${n?`import { RouterProvider, ${s} } from 'react-router-dom';`:`import { ${s} } from 'react-router';import { RouterProvider } from 'react-router/dom';`}
+import { ${c}, useRoutes } from 'react-router-dom';
 
 type RenderAppProps = {
   container?: HTMLElement;
@@ -12,29 +15,16 @@ type RenderAppProps = {
 };
 
 export function App(props: RenderAppProps) {
-  return (
-    <${e.strict?"StrictMode":""}>
-      <RouterProvider
-        router={${s}(routes, {
-          basename: ${i?"/":"props.basename"},
-          window: window,
-          future: ${JSON.stringify(c)},
-        })}
-        future={{
-          /** 这使用 useTransition 而不是 useState 来更新路由器状态 */
-          v7_startTransition: ${!n},
-        }}
-        fallbackElement={Fallback && <Fallback />}
-      />
-    </${e.strict?"StrictMode":""}>
-  );
+  const router = useRoutes(routes);
+
+  return router;
 }
 
 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 };":""}
-  ${n?`ReactDOM.${o?"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;"}
+  ${"micro"===t?"window.mainApp = { ...args, container: _container as HTMLElement };":""}
+  ${n?`ReactDOM.${o?"render":"hydrate"}(${s}, _container);return () => ReactDOM.unmountComponentAtNode(_container as Element);`:`const instance = ReactDOM.createRoot(_container as HTMLElement);instance.render(${s});return instance.unmount;`}
 }
 
-export default renderApp;`;export default p;
+export default renderApp;`;export default m;

package/lib/vm/routes.d.mts

@@ -3,14 +3,13 @@ import parseModuleMeta, { type ModuleMeta } from '../commom/parse-module-meta.mj
 import { routeDir } from '../commom/paths.mjs';
 import ReactiveObject from '../commom/reactive-object.mjs';
 import { CONFIG } from '../config.mjs';
-import { FRAMEWORK, frameworkVersion, isDev, isLibrary } from '../process-env.mjs';
+import { FRAMEWORK, isDev, isLibrary } from '../process-env.mjs';
 import { watchFiles } from './utils.mjs';
 declare const routerAlia: '@pkg' | '@/pages';
 declare const moduleMeta: ModuleMeta;
 export declare const routesModuleName: string;
 export declare const routesModulePkgJson: string;
 export declare const routesModuleMeta: string;
-declare const legend: boolean;
 declare function getRouter();
 export declare const route: ReactiveObject<{
     [x: string]: string;

package/lib/vm/routes.mjs

@@ -1 +1 @@
-import{generateRouter as o}from"@moneko/mdx";import e from"../commom/parse-module-meta.mjs";import{routeDir as t}from"../commom/paths.mjs";import r from"../commom/reactive-object.mjs";import{CONFIG as m}from"../config.mjs";import{FRAMEWORK as s,frameworkVersion as u,isDev as n,isLibrary as p}from"../process-env.mjs";import{watchFiles as a}from"./utils.mjs";let i=p?"@pkg":"@/pages",l=e("@app/routes");export const routesModuleName=l.file;export const routesModulePkgJson=l.pkg;export const routesModuleMeta=l.meta;let c="react"===s&&u<18;function d(){return!1===m.htmlPluginOption?"":o(t,`${m.alias["@"]}/router/index.ts`,s,i,p,c?"6":"7")}export const route=new r({[routesModuleName]:d(),[routesModulePkgJson]:routesModuleMeta});export function generatorRouter(){route.setData(routesModuleName,d())}n&&a(t,p?/(?<!README\.mdx?)$/:/(?<!index\.tsx?)$/,generatorRouter);
+import{generateRouter as o}from"@moneko/mdx";import e from"../commom/parse-module-meta.mjs";import{routeDir as t}from"../commom/paths.mjs";import r from"../commom/reactive-object.mjs";import{CONFIG as m}from"../config.mjs";import{FRAMEWORK as s,isDev as u,isLibrary as n}from"../process-env.mjs";import{watchFiles as p}from"./utils.mjs";let a=n?"@pkg":"@/pages",i=e("@app/routes");export const routesModuleName=i.file;export const routesModulePkgJson=i.pkg;export const routesModuleMeta=i.meta;function l(){return!1===m.htmlPluginOption?"":o(t,`${m.alias["@"]}/router/index.ts`,s,a,n,"6")}export const route=new r({[routesModuleName]:l(),[routesModulePkgJson]:routesModuleMeta});export function generatorRouter(){route.setData(routesModuleName,l())}u&&p(t,n?/(?<!README\.mdx?)$/:/(?<!index\.tsx?)$/,generatorRouter);

package/package.json

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