@modern-js/plugin-router-v5 2.60.0 → 2.60.1
Sign up to get free protection for your applications and to get access to all the features.
@@ -89,14 +89,14 @@ const routerPlugin = (userConfig = {}) => {
|
|
89
89
|
};
|
90
90
|
}
|
91
91
|
return (props) => {
|
92
|
-
var
|
92
|
+
var _request_baseUrl;
|
93
93
|
const runtimeContext = (0, import_react.useContext)(import_runtime.RuntimeReactContext);
|
94
94
|
const { ssrContext } = runtimeContext;
|
95
95
|
const location1 = (0, import_utils.getLocation)(ssrContext);
|
96
96
|
const routerContext = (ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.redirection) || {};
|
97
97
|
const request = ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.request;
|
98
|
-
const baseUrl =
|
99
|
-
const basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, historyOptions.basename) : baseUrl;
|
98
|
+
const baseUrl = request === null || request === void 0 ? void 0 : (_request_baseUrl = request.baseUrl) === null || _request_baseUrl === void 0 ? void 0 : _request_baseUrl.replace(/^\/*/, "/");
|
99
|
+
const basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, runtimeContext._internalRouterBaseName || historyOptions.basename) : baseUrl;
|
100
100
|
const runner = api.useHookRunners();
|
101
101
|
const routes2 = runner.modifyRoutes(originRoutes);
|
102
102
|
finalRouteConfig && (finalRouteConfig.routes = routes2);
|
@@ -69,14 +69,14 @@ var routerPlugin = function() {
|
|
69
69
|
};
|
70
70
|
}
|
71
71
|
return function(props) {
|
72
|
-
var
|
72
|
+
var _request_baseUrl;
|
73
73
|
var runtimeContext = useContext(RuntimeReactContext);
|
74
74
|
var ssrContext = runtimeContext.ssrContext;
|
75
75
|
var location1 = getLocation(ssrContext);
|
76
76
|
var routerContext = (ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.redirection) || {};
|
77
77
|
var request = ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.request;
|
78
|
-
var baseUrl =
|
79
|
-
var basename = baseUrl === "/" ? urlJoin(baseUrl, historyOptions.basename) : baseUrl;
|
78
|
+
var baseUrl = request === null || request === void 0 ? void 0 : (_request_baseUrl = request.baseUrl) === null || _request_baseUrl === void 0 ? void 0 : _request_baseUrl.replace(/^\/*/, "/");
|
79
|
+
var basename = baseUrl === "/" ? urlJoin(baseUrl, runtimeContext._internalRouterBaseName || historyOptions.basename) : baseUrl;
|
80
80
|
var runner = api.useHookRunners();
|
81
81
|
var routes2 = runner.modifyRoutes(originRoutes);
|
82
82
|
finalRouteConfig && (finalRouteConfig.routes = routes2);
|
@@ -66,14 +66,14 @@ const routerPlugin = (userConfig = {}) => {
|
|
66
66
|
};
|
67
67
|
}
|
68
68
|
return (props) => {
|
69
|
-
var
|
69
|
+
var _request_baseUrl;
|
70
70
|
const runtimeContext = useContext(RuntimeReactContext);
|
71
71
|
const { ssrContext } = runtimeContext;
|
72
72
|
const location1 = getLocation(ssrContext);
|
73
73
|
const routerContext = (ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.redirection) || {};
|
74
74
|
const request = ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.request;
|
75
|
-
const baseUrl =
|
76
|
-
const basename = baseUrl === "/" ? urlJoin(baseUrl, historyOptions.basename) : baseUrl;
|
75
|
+
const baseUrl = request === null || request === void 0 ? void 0 : (_request_baseUrl = request.baseUrl) === null || _request_baseUrl === void 0 ? void 0 : _request_baseUrl.replace(/^\/*/, "/");
|
76
|
+
const basename = baseUrl === "/" ? urlJoin(baseUrl, runtimeContext._internalRouterBaseName || historyOptions.basename) : baseUrl;
|
77
77
|
const runner = api.useHookRunners();
|
78
78
|
const routes2 = runner.modifyRoutes(originRoutes);
|
79
79
|
finalRouteConfig && (finalRouteConfig.routes = routes2);
|
package/package.json
CHANGED
@@ -15,7 +15,7 @@
|
|
15
15
|
"modern",
|
16
16
|
"modern.js"
|
17
17
|
],
|
18
|
-
"version": "2.60.
|
18
|
+
"version": "2.60.1",
|
19
19
|
"jsnext:source": "./src/index.ts",
|
20
20
|
"types": "./dist/types/cli/index.d.ts",
|
21
21
|
"main": "./dist/cjs/cli/index.js",
|
@@ -59,15 +59,15 @@
|
|
59
59
|
"@types/react-router-dom": "^5.1.8",
|
60
60
|
"history": "^4.7.9",
|
61
61
|
"react-router-dom": "^5.3.4",
|
62
|
-
"@modern-js/
|
63
|
-
"@modern-js/types": "2.60.
|
64
|
-
"@modern-js/
|
65
|
-
"@modern-js/utils": "2.60.
|
62
|
+
"@modern-js/runtime-utils": "2.60.1",
|
63
|
+
"@modern-js/types": "2.60.1",
|
64
|
+
"@modern-js/plugin": "2.60.1",
|
65
|
+
"@modern-js/utils": "2.60.1"
|
66
66
|
},
|
67
67
|
"peerDependencies": {
|
68
68
|
"react": ">=17",
|
69
69
|
"react-dom": ">=17",
|
70
|
-
"@modern-js/runtime": "^2.60.
|
70
|
+
"@modern-js/runtime": "^2.60.1"
|
71
71
|
},
|
72
72
|
"devDependencies": {
|
73
73
|
"@testing-library/react": "^13.4.0",
|
@@ -79,11 +79,11 @@
|
|
79
79
|
"react-dom": "^18",
|
80
80
|
"ts-jest": "^29.1.0",
|
81
81
|
"typescript": "^5",
|
82
|
-
"@modern-js/
|
83
|
-
"@modern-js/
|
84
|
-
"@scripts/
|
85
|
-
"@
|
86
|
-
"@
|
82
|
+
"@modern-js/app-tools": "2.60.1",
|
83
|
+
"@modern-js/core": "2.60.1",
|
84
|
+
"@scripts/jest-config": "2.60.1",
|
85
|
+
"@modern-js/runtime": "2.60.1",
|
86
|
+
"@scripts/build": "2.60.1"
|
87
87
|
},
|
88
88
|
"sideEffects": false,
|
89
89
|
"publishConfig": {
|