swico 0.9.0-beta8 → 0.9.0-beta9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "swico",
3
- "version": "0.9.0-beta8",
3
+ "version": "0.9.0-beta9",
4
4
  "description": "Simple, efficient, and practical front-end framework",
5
5
  "main": "./src/index.js",
6
6
  "types": "./src/index.d.ts",
@@ -9,7 +9,9 @@ var qs_1 = __importDefault(require("qs"));
9
9
  var history_1 = require("history");
10
10
  var routes_1 = __importDefault(require("./routes"));
11
11
  var config_1 = require("./config");
12
+ var layout_1 = __importDefault(require("../../layout"));
12
13
  var react_router_dom_1 = require("react-router-dom");
14
+ var react_1 = __importDefault(require("react"));
13
15
  var lastIndexBase = config_1.routerBase[config_1.routerBase.length - 1];
14
16
  var formatRouterBase = lastIndexBase === '/' ? config_1.routerBase.slice(0, config_1.routerBase.length - 1) : config_1.routerBase;
15
17
  var compareURLPatterns = function (urlPatternWithValues, urlPatternWithParams) {
@@ -127,7 +129,13 @@ var getFormatHistoryOption = function (to, pathList, type) {
127
129
  };
128
130
  var getRouter = function (routerType) {
129
131
  var _a;
130
- var routeList = (0, index_1.getChildrenRouteList)(routes_1.default, '');
132
+ var routeList = [
133
+ {
134
+ element: react_1.default.createElement(layout_1.default, null),
135
+ path: '/',
136
+ children: (0, index_1.getChildrenRouteList)(routes_1.default, '')
137
+ }
138
+ ];
131
139
  var router = (routerType === 'hash' ? react_router_dom_1.createHashRouter : react_router_dom_1.createBrowserRouter)(routeList);
132
140
  var oriHistory = (_a = (routerType === 'hash' ? history_1.createHashHistory : history_1.createBrowserHistory)) === null || _a === void 0 ? void 0 : _a();
133
141
  exports.history = {
@@ -41,7 +41,7 @@ var getChildrenRouteList = function (childrenRoutes, ancPathKey) {
41
41
  return {
42
42
  element: redirect ? (react_1.default.createElement(react_router_dom_1.Navigate, { to: redirect, replace: true })) : component ? (react_1.default.createElement(react_1.Suspense, { fallback: (0, react_1.createElement)(loading_1.default) }, (0, react_1.createElement)((0, react_1.lazy)(component)))) : (react_1.default.createElement(react_router_dom_1.Outlet, null)),
43
43
  key: newAncPathKey,
44
- path: path,
44
+ path: path.startsWith('/') ? path.slice(1) : path,
45
45
  children: (0, exports.getChildrenRouteList)(children, newAncPathKey)
46
46
  };
47
47
  });