swico 0.9.0-beta16 → 0.9.0-beta18
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 +1 -1
- package/src/index.d.ts +1 -1
- package/src/index.js +2 -1
- package/src/mock-history.d.ts +2 -0
- package/src/mock-history.js +3 -1
- package/src/template/react/$env/history.d.ts +2 -0
- package/src/template/react/$env/history.js +50 -3
- package/src/template/react/$env/index.js +1 -23
package/package.json
CHANGED
package/src/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { GlobalData, GlobalSwicoConfigType } from './utils/config';
|
|
2
2
|
export type CustomConfigType = GlobalData['customConfig'];
|
|
3
3
|
export type { GlobalSwicoConfigType };
|
|
4
|
-
export { history } from './mock-history';
|
|
4
|
+
export { history, RouterProvider } from './mock-history';
|
|
5
5
|
declare let Outlet: any, Link: any, useLocation: any, useNav: any;
|
|
6
6
|
export { Outlet, Link, useLocation, useNav };
|
|
7
7
|
export interface DefineSwicoConfigType {
|
package/src/index.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.defineGlobal = exports.defineConfig = exports.useNav = exports.useLocation = exports.Link = exports.Outlet = exports.history = void 0;
|
|
3
|
+
exports.defineGlobal = exports.defineConfig = exports.useNav = exports.useLocation = exports.Link = exports.Outlet = exports.RouterProvider = exports.history = void 0;
|
|
4
4
|
var mock_history_1 = require("./mock-history");
|
|
5
5
|
Object.defineProperty(exports, "history", { enumerable: true, get: function () { return mock_history_1.history; } });
|
|
6
|
+
Object.defineProperty(exports, "RouterProvider", { enumerable: true, get: function () { return mock_history_1.RouterProvider; } });
|
|
6
7
|
var Outlet, Link, useLocation, useNav;
|
|
7
8
|
var defineConfig = function (env, config) { return config; };
|
|
8
9
|
exports.defineConfig = defineConfig;
|
package/src/mock-history.d.ts
CHANGED
package/src/mock-history.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.history = void 0;
|
|
3
|
+
exports.RouterProvider = exports.history = void 0;
|
|
4
4
|
exports.history = {};
|
|
5
|
+
var RouterProvider = function () { return null; };
|
|
6
|
+
exports.RouterProvider = RouterProvider;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { SwicoHistoryType, SwicoLocationType } from '../../../typings/global-type';
|
|
2
|
+
import React from 'react';
|
|
2
3
|
export declare const compareURLPatterns: (urlPatternWithValues: string, urlPatternWithParams: string) => boolean;
|
|
3
4
|
export declare const interpolatePath: (pathTemplate: string, params: Record<string, any>) => string;
|
|
4
5
|
export declare const formatAncPath: (ancPath: string) => string;
|
|
@@ -15,3 +16,4 @@ export declare const getHistory: (router: any) => {
|
|
|
15
16
|
readonly location: SwicoLocationType;
|
|
16
17
|
};
|
|
17
18
|
export declare let history: SwicoHistoryType;
|
|
19
|
+
export declare const RouterProvider: () => React.JSX.Element;
|
|
@@ -1,12 +1,39 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
5
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.history = exports.getHistory = exports.pathNameList = exports.formatAncPath = exports.interpolatePath = exports.compareURLPatterns = void 0;
|
|
29
|
+
exports.RouterProvider = exports.history = exports.getHistory = exports.pathNameList = exports.formatAncPath = exports.interpolatePath = exports.compareURLPatterns = void 0;
|
|
30
|
+
var index_1 = require("./index");
|
|
7
31
|
var qs_1 = __importDefault(require("qs"));
|
|
8
32
|
var routes_1 = __importDefault(require("./routes"));
|
|
9
33
|
var config_1 = require("./config");
|
|
34
|
+
var react_router_dom_1 = require("react-router-dom");
|
|
35
|
+
var layout_1 = __importDefault(require("../../layout"));
|
|
36
|
+
var react_1 = __importStar(require("react"));
|
|
10
37
|
var lastIndexBase = config_1.routerBase[config_1.routerBase.length - 1];
|
|
11
38
|
var formatRouterBase = lastIndexBase === '/' ? config_1.routerBase.slice(0, config_1.routerBase.length - 1) : config_1.routerBase;
|
|
12
39
|
var compareURLPatterns = function (urlPatternWithValues, urlPatternWithParams) {
|
|
@@ -161,10 +188,30 @@ var getHistory = function (router) {
|
|
|
161
188
|
}
|
|
162
189
|
},
|
|
163
190
|
get location() {
|
|
164
|
-
console.log('router.state', router.state);
|
|
165
|
-
console.log('router.state.location', router.state.location);
|
|
166
191
|
return getLocation(router.state.location);
|
|
167
192
|
}
|
|
168
193
|
};
|
|
169
194
|
};
|
|
170
195
|
exports.getHistory = getHistory;
|
|
196
|
+
var RouterProvider = function () {
|
|
197
|
+
var routeList = [
|
|
198
|
+
{
|
|
199
|
+
element: react_1.default.createElement(layout_1.default, null),
|
|
200
|
+
path: '/',
|
|
201
|
+
children: (0, index_1.getChildrenRouteList)(routes_1.default, '')
|
|
202
|
+
}
|
|
203
|
+
];
|
|
204
|
+
var router = (config_1.routerType === 'hash' ? react_router_dom_1.createHashRouter : react_router_dom_1.createBrowserRouter)(routeList, {
|
|
205
|
+
basename: config_1.routerBase
|
|
206
|
+
});
|
|
207
|
+
if (config_1.routerBase && config_1.routerBase !== '/') {
|
|
208
|
+
if (config_1.routerType === 'browser' && window.location.pathname === '/') {
|
|
209
|
+
window.location.replace("".concat(config_1.routerBase));
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
(0, react_1.useLayoutEffect)(function () {
|
|
213
|
+
exports.history = (0, exports.getHistory)(router);
|
|
214
|
+
});
|
|
215
|
+
return react_1.default.createElement(react_router_dom_1.RouterProvider, { router: router });
|
|
216
|
+
};
|
|
217
|
+
exports.RouterProvider = RouterProvider;
|
|
@@ -32,10 +32,7 @@ var react_1 = __importStar(require("react"));
|
|
|
32
32
|
var react_router_dom_1 = require("react-router-dom");
|
|
33
33
|
var loading_1 = __importDefault(require("../loading"));
|
|
34
34
|
var history_1 = require("./history");
|
|
35
|
-
var config_1 = require("./config");
|
|
36
35
|
require("../../global");
|
|
37
|
-
var layout_1 = __importDefault(require("../../layout"));
|
|
38
|
-
var routes_1 = __importDefault(require("./routes"));
|
|
39
36
|
var getChildrenRouteList = function (childrenRoutes, ancPathKey) {
|
|
40
37
|
return childrenRoutes === null || childrenRoutes === void 0 ? void 0 : childrenRoutes.map(function (item) {
|
|
41
38
|
var component = item.component, path = item.path, children = item.children, redirect = item.redirect;
|
|
@@ -49,24 +46,5 @@ var getChildrenRouteList = function (childrenRoutes, ancPathKey) {
|
|
|
49
46
|
});
|
|
50
47
|
};
|
|
51
48
|
exports.getChildrenRouteList = getChildrenRouteList;
|
|
52
|
-
var App = function () {
|
|
53
|
-
var routeList = [
|
|
54
|
-
{
|
|
55
|
-
element: react_1.default.createElement(layout_1.default, null),
|
|
56
|
-
path: '/',
|
|
57
|
-
children: (0, exports.getChildrenRouteList)(routes_1.default, '')
|
|
58
|
-
}
|
|
59
|
-
];
|
|
60
|
-
var router = (config_1.routerType === 'hash' ? react_router_dom_1.createHashRouter : react_router_dom_1.createBrowserRouter)(routeList);
|
|
61
|
-
if (config_1.routerBase && config_1.routerBase !== '/') {
|
|
62
|
-
if (config_1.routerType === 'browser' && window.location.pathname === '/') {
|
|
63
|
-
window.location.replace("".concat(config_1.routerBase));
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
(0, react_1.useLayoutEffect)(function () {
|
|
67
|
-
history_1.history = (0, history_1.getHistory)(router);
|
|
68
|
-
});
|
|
69
|
-
return react_1.default.createElement(react_router_dom_1.RouterProvider, { router: router, basename: config_1.routerBase });
|
|
70
|
-
};
|
|
71
49
|
var root = (0, client_1.createRoot)(document.getElementById('root'));
|
|
72
|
-
root.render(react_1.default.createElement(
|
|
50
|
+
root.render(react_1.default.createElement(history_1.RouterProvider, null));
|