swico 0.4.0-beta1 → 0.4.0-beta2
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
|
@@ -73,8 +73,7 @@ var getHistory = function (routerBase, routerType) {
|
|
|
73
73
|
var history;
|
|
74
74
|
var originalHistory = (_a = (routerType === 'hash' ? history_1.createHashHistory : history_1.createBrowserHistory)) === null || _a === void 0 ? void 0 : _a();
|
|
75
75
|
var lastIndexBase = routerBase[routerBase.length - 1];
|
|
76
|
-
var formatRouterBase =
|
|
77
|
-
(lastIndexBase === '/' ? routerBase.slice(0, routerBase.length - 1) : routerBase);
|
|
76
|
+
var formatRouterBase = lastIndexBase === '/' ? routerBase.slice(0, routerBase.length - 1) : routerBase;
|
|
78
77
|
history = {
|
|
79
78
|
go: originalHistory.go,
|
|
80
79
|
back: originalHistory.back,
|
|
@@ -52,7 +52,7 @@ var App = function () {
|
|
|
52
52
|
window.Swico = {
|
|
53
53
|
history: history
|
|
54
54
|
};
|
|
55
|
-
return (react_1.default.createElement(history_1.HistoryRouter, { basename: config_1.
|
|
55
|
+
return (react_1.default.createElement(history_1.HistoryRouter, { basename: config_1.routerBase, history: originalHistory },
|
|
56
56
|
react_1.default.createElement(react_router_dom_1.Routes, null,
|
|
57
57
|
react_1.default.createElement(react_router_dom_1.Route, { element: react_1.default.createElement(layout_1.default, null), path: '' }, renderChildrenRouteList(routes_1.default, '')))));
|
|
58
58
|
};
|
package/src/utils/config.js
CHANGED
|
@@ -259,7 +259,7 @@ var formatTemplateFileText = function (_a, templateType) {
|
|
|
259
259
|
replaceConfigText = configText;
|
|
260
260
|
if (base) {
|
|
261
261
|
replaceConfigText = replaceConfigText.replace(/exports\.routerBase\s*=\s*(.*)/gm, function (match, p1) {
|
|
262
|
-
return "exports.routerBase = '".concat(base, "';");
|
|
262
|
+
return "exports.routerBase = '".concat((templateType === 'react' && type === 'hash') ? '/' : base, "';");
|
|
263
263
|
});
|
|
264
264
|
}
|
|
265
265
|
if (type) {
|