@xfe-repo/web-router 1.0.2 → 1.0.5

package/dist/index.d.mts

@@ -1,16 +1,21 @@
 import { History } from 'history';
 import { LoadableComponent, loadableReady } from '@loadable/component';
 import { ParsedQuery } from 'query-string';
+import React, { ReactElement, ComponentType } from 'react';
 import { RegisterComponentStatic } from '@xfe-repo/web-register';
 export * from 'react-router-dom';
-import React, { ReactElement, ComponentType } from 'react';
 
 type PageComponent = LoadableComponent<any> & RegisterComponentStatic;
 type RouteConfig = {
     path: string;
     Component: PageComponent;
 };
-declare const getRoutes: (pagesIndexPath: string[], getPageComponents: (path: string) => Promise<any>) => RouteConfig[];
+type GetRoutesConfig = {
+    pagesIndexPath: string[];
+    getPageComponents: (path: string) => Promise<any>;
+    fallback?: ReactElement;
+};
+declare const getRoutes: (config: GetRoutesConfig) => RouteConfig[];
 
 type RouterProps = {
     navigator: NavigatorType;
@@ -50,4 +55,4 @@ declare function createNavigator(options: CreateNavigatorOptions): NavigatorType
 declare const getClientNavigator: () => NavigatorType;
 declare const routerReady: typeof loadableReady;
 
-export { type CreateNavigatorOptions, Link, type NavigatorStack, type NavigatorType, type PageComponent, type RouteConfig, Router, createNavigator, getClientNavigator, getRoutes, routerReady };
+export { type CreateNavigatorOptions, type GetRoutesConfig, Link, type NavigatorStack, type NavigatorType, type PageComponent, type RouteConfig, Router, createNavigator, getClientNavigator, getRoutes, routerReady };

package/dist/index.d.ts

@@ -1,16 +1,21 @@
 import { History } from 'history';
 import { LoadableComponent, loadableReady } from '@loadable/component';
 import { ParsedQuery } from 'query-string';
+import React, { ReactElement, ComponentType } from 'react';
 import { RegisterComponentStatic } from '@xfe-repo/web-register';
 export * from 'react-router-dom';
-import React, { ReactElement, ComponentType } from 'react';
 
 type PageComponent = LoadableComponent<any> & RegisterComponentStatic;
 type RouteConfig = {
     path: string;
     Component: PageComponent;
 };
-declare const getRoutes: (pagesIndexPath: string[], getPageComponents: (path: string) => Promise<any>) => RouteConfig[];
+type GetRoutesConfig = {
+    pagesIndexPath: string[];
+    getPageComponents: (path: string) => Promise<any>;
+    fallback?: ReactElement;
+};
+declare const getRoutes: (config: GetRoutesConfig) => RouteConfig[];
 
 type RouterProps = {
     navigator: NavigatorType;
@@ -50,4 +55,4 @@ declare function createNavigator(options: CreateNavigatorOptions): NavigatorType
 declare const getClientNavigator: () => NavigatorType;
 declare const routerReady: typeof loadableReady;
 
-export { type CreateNavigatorOptions, Link, type NavigatorStack, type NavigatorType, type PageComponent, type RouteConfig, Router, createNavigator, getClientNavigator, getRoutes, routerReady };
+export { type CreateNavigatorOptions, type GetRoutesConfig, Link, type NavigatorStack, type NavigatorType, type PageComponent, type RouteConfig, Router, createNavigator, getClientNavigator, getRoutes, routerReady };

package/dist/index.js

@@ -287,10 +287,9 @@ var import_react_router_dom3 = require("react-router-dom");
 var import_query_string = __toESM(require("query-string"));
 __reExport(src_exports, require("react-router-dom"), module.exports);
 // src/routes.ts
-var import_react = require("react");
 var import_component = __toESM(require("@loadable/component"));
-var import_web_components = require("@xfe-repo/web-components");
-var getRoutes = function(pagesIndexPath, getPageComponents) {
+var getRoutes = function(config) {
+    var pagesIndexPath = config.pagesIndexPath, getPageComponents = config.getPageComponents, fallback = config.fallback;
     var routes = [];
     pagesIndexPath.forEach(function(pageIndexPath) {
         if (pageIndexPath.startsWith("./")) return;
@@ -299,31 +298,29 @@ var getRoutes = function(pagesIndexPath, getPageComponents) {
         var pageComponent = (0, import_component.default)(function() {
             return getPageComponents(pageRelativePath);
         }, {
-            fallback: (0, import_react.createElement)(import_web_components.Loading, {
-                loading: true
-            })
+            fallback: fallback
         });
         var routerPath = "/".concat(pageRelativePath);
         if (routerPath === "/home" || routerPath === "/index") routerPath = "/";
-        var config = {
+        var config2 = {
             path: routerPath,
             Component: pageComponent
         };
-        routes.push(config);
+        routes.push(config2);
     });
     return routes;
 };
 // src/Router.tsx
-var import_react2 = require("react");
+var import_react = require("react");
 var import_react_router_dom = require("react-router-dom");
 var import_jsx_runtime = require("react/jsx-runtime");
-var Router = (0, import_react2.memo)(function(props) {
+var Router = (0, import_react.memo)(function(props) {
     var navigator = props.navigator, routes = props.routes, _props_basename = props.basename, basename = _props_basename === void 0 ? "/" : _props_basename, children = props.children, NotFoundPageComponent = props.NotFoundPageComponent;
-    var _ref = _sliced_to_array((0, import_react2.useState)({
+    var _ref = _sliced_to_array((0, import_react.useState)({
         action: navigator.action,
         location: navigator.location
     }), 2), navigatorState = _ref[0], setNavigatorState = _ref[1];
-    (0, import_react2.useEffect)(function() {
+    (0, import_react.useEffect)(function() {
         return navigator.listen(setNavigatorState);
     }, [
         navigator
@@ -355,12 +352,12 @@ var Router = (0, import_react2.memo)(function(props) {
     });
 });
 // src/Link.tsx
-var import_react3 = require("react");
+var import_react2 = require("react");
 var import_react_router_dom2 = require("react-router-dom");
 var import_jsx_runtime2 = require("react/jsx-runtime");
 var Link = function(props) {
     var to = props.to, children = props.children, reLaunch = props.reLaunch, preload = props.preload, replace = props.replace, className = props.className;
-    var _navigator2 = (0, import_react3.useMemo)(function() {
+    var _navigator2 = (0, import_react2.useMemo)(function() {
         return getClientNavigator();
     }, []);
     if (/http(s)?:\/{2}/.test(to)) {

package/dist/index.mjs

@@ -6,27 +6,24 @@ import queryString from "query-string";
 export * from "react-router-dom";
 
 // src/routes.ts
-import { createElement } from "react";
 import loadable from "@loadable/component";
-import { Loading } from "@xfe-repo/web-components";
-var getRoutes = (pagesIndexPath, getPageComponents) => {
+var getRoutes = (config) => {
+  const { pagesIndexPath, getPageComponents, fallback } = config;
   const routes = [];
   pagesIndexPath.forEach((pageIndexPath) => {
     if (pageIndexPath.startsWith("./"))
       return;
     const regExpResult = pageIndexPath.match(/(?<=pages\/).*(?=\/index.(?:tsx|js))/);
     const pageRelativePath = regExpResult ? regExpResult[0].toLowerCase() : "";
-    const pageComponent = loadable(() => getPageComponents(pageRelativePath), {
-      fallback: createElement(Loading, { loading: true })
-    });
+    const pageComponent = loadable(() => getPageComponents(pageRelativePath), { fallback });
     let routerPath = `/${pageRelativePath}`;
     if (routerPath === "/home" || routerPath === "/index")
       routerPath = "/";
-    const config = {
+    const config2 = {
       path: routerPath,
       Component: pageComponent
     };
-    routes.push(config);
+    routes.push(config2);
   });
   return routes;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfe-repo/web-router",
-  "version": "1.0.2",
+  "version": "1.0.5",
   "sideEffects": false,
   "exports": {
     ".": {
@@ -25,8 +25,7 @@
     "@loadable/component": "^5.15.3",
     "history": "^5.3.0",
     "query-string": "^7.1.3",
-    "react-router-dom": "^6.11.1",
-    "@xfe-repo/web-components": "1.0.2"
+    "react-router-dom": "^6.11.1"
   },
   "devDependencies": {
     "@types/loadable__component": "^5.13.8",
@@ -34,7 +33,7 @@
     "@types/react": "^18.2.0",
     "@xfe-repo/web-register": "1.0.3",
     "@xfe-repo/typescript-config": "0.0.3",
-    "@xfe-repo/eslint-config": "0.0.1"
+    "@xfe-repo/eslint-config": "0.0.2"
   },
   "scripts": {
     "build": "tsup",