@modern-js/runtime 2.26.0 → 2.27.0
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/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# @modern-js/runtime
|
|
2
2
|
|
|
3
|
+
## 2.27.0
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 21be212: fix: add support for nodenext moduleResolution
|
|
8
|
+
fix: TS 类型支持 moduleResolution 为 nodenext
|
|
9
|
+
- 8322a51: chore: migrate packages from tsc to module-lib build
|
|
10
|
+
|
|
11
|
+
chore: 将使用 tsc 的包迁移到 module-lib 构建
|
|
12
|
+
|
|
13
|
+
- fb51b98: fix: fix remixRouter not existed in conventional routes
|
|
14
|
+
fix: 修复 remixRouter 在约定式路由下不存在问题
|
|
15
|
+
- b591092: fix: fix `modifyRoutes` in SSR
|
|
16
|
+
fix: 修复 SSR 时, `modifyRoutes` 执行时机
|
|
17
|
+
- Updated dependencies [91d14b8]
|
|
18
|
+
- Updated dependencies [6d7104d]
|
|
19
|
+
- @modern-js/utils@2.27.0
|
|
20
|
+
- @modern-js/plugin@2.27.0
|
|
21
|
+
- @modern-js/types@2.27.0
|
|
22
|
+
|
|
3
23
|
## 2.26.0
|
|
4
24
|
|
|
5
25
|
### Minor Changes
|
|
@@ -76,13 +76,15 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
|
|
|
76
76
|
const { request, mode: ssrMode, nonce } = context.ssrContext;
|
|
77
77
|
const baseUrl = request.baseUrl;
|
|
78
78
|
const _basename = baseUrl === "/" ? (0, _utils.urlJoin)(baseUrl, basename) : baseUrl;
|
|
79
|
-
|
|
79
|
+
let routes = createRoutes ? createRoutes() : (0, _router1.createRoutesFromElements)((0, _utils.renderRoutes)({
|
|
80
80
|
routesConfig,
|
|
81
81
|
ssrMode,
|
|
82
82
|
props: {
|
|
83
83
|
nonce
|
|
84
84
|
}
|
|
85
85
|
}));
|
|
86
|
+
const runner = api.useHookRunners();
|
|
87
|
+
routes = runner.modifyRoutes(routes);
|
|
86
88
|
const { query } = (0, _remixrouter.createStaticHandler)(routes, {
|
|
87
89
|
basename: _basename
|
|
88
90
|
});
|
|
@@ -96,8 +98,6 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
|
|
|
96
98
|
context.routerContext = routerContext;
|
|
97
99
|
context.routes = routes;
|
|
98
100
|
context.routeManifest = context.ssrContext.routeManifest;
|
|
99
|
-
const runner = api.useHookRunners();
|
|
100
|
-
runner.modifyRoutes(routes);
|
|
101
101
|
return next({
|
|
102
102
|
context
|
|
103
103
|
});
|
|
@@ -133,6 +133,12 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
|
|
|
133
133
|
},
|
|
134
134
|
pickContext: ({ context, pickedContext }, next) => {
|
|
135
135
|
const { remixRouter } = context;
|
|
136
|
+
if (!remixRouter) {
|
|
137
|
+
return next({
|
|
138
|
+
context,
|
|
139
|
+
pickedContext
|
|
140
|
+
});
|
|
141
|
+
}
|
|
136
142
|
const router = {
|
|
137
143
|
navigate: remixRouter.navigate,
|
|
138
144
|
get location() {
|
|
@@ -87,7 +87,7 @@ export var routerPlugin = function(param) {
|
|
|
87
87
|
init: function init(param2, next) {
|
|
88
88
|
var context = param2.context;
|
|
89
89
|
return _async_to_generator(function() {
|
|
90
|
-
var _context_ssrContext, request, ssrMode, nonce, baseUrl, _basename, routes, query, remixRequest, routerContext, router
|
|
90
|
+
var _context_ssrContext, request, ssrMode, nonce, baseUrl, _basename, routes, runner, query, remixRequest, routerContext, router;
|
|
91
91
|
return _ts_generator(this, function(_state) {
|
|
92
92
|
switch (_state.label) {
|
|
93
93
|
case 0:
|
|
@@ -109,6 +109,8 @@ export var routerPlugin = function(param) {
|
|
|
109
109
|
nonce: nonce
|
|
110
110
|
}
|
|
111
111
|
}));
|
|
112
|
+
runner = api.useHookRunners();
|
|
113
|
+
routes = runner.modifyRoutes(routes);
|
|
112
114
|
query = createStaticHandler(routes, {
|
|
113
115
|
basename: _basename
|
|
114
116
|
}).query;
|
|
@@ -130,8 +132,6 @@ export var routerPlugin = function(param) {
|
|
|
130
132
|
context.routerContext = routerContext;
|
|
131
133
|
context.routes = routes;
|
|
132
134
|
context.routeManifest = context.ssrContext.routeManifest;
|
|
133
|
-
runner = api.useHookRunners();
|
|
134
|
-
runner.modifyRoutes(routes);
|
|
135
135
|
return [
|
|
136
136
|
2,
|
|
137
137
|
next({
|
|
@@ -174,6 +174,12 @@ export var routerPlugin = function(param) {
|
|
|
174
174
|
pickContext: function(param2, next) {
|
|
175
175
|
var context = param2.context, pickedContext = param2.pickedContext;
|
|
176
176
|
var remixRouter = context.remixRouter;
|
|
177
|
+
if (!remixRouter) {
|
|
178
|
+
return next({
|
|
179
|
+
context: context,
|
|
180
|
+
pickedContext: pickedContext
|
|
181
|
+
});
|
|
182
|
+
}
|
|
177
183
|
var router = {
|
|
178
184
|
navigate: remixRouter.navigate,
|
|
179
185
|
get location() {
|
|
@@ -52,13 +52,15 @@ export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
|
|
|
52
52
|
const { request, mode: ssrMode, nonce } = context.ssrContext;
|
|
53
53
|
const baseUrl = request.baseUrl;
|
|
54
54
|
const _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
|
|
55
|
-
|
|
55
|
+
let routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
|
|
56
56
|
routesConfig,
|
|
57
57
|
ssrMode,
|
|
58
58
|
props: {
|
|
59
59
|
nonce
|
|
60
60
|
}
|
|
61
61
|
}));
|
|
62
|
+
const runner = api.useHookRunners();
|
|
63
|
+
routes = runner.modifyRoutes(routes);
|
|
62
64
|
const { query } = createStaticHandler(routes, {
|
|
63
65
|
basename: _basename
|
|
64
66
|
});
|
|
@@ -72,8 +74,6 @@ export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
|
|
|
72
74
|
context.routerContext = routerContext;
|
|
73
75
|
context.routes = routes;
|
|
74
76
|
context.routeManifest = context.ssrContext.routeManifest;
|
|
75
|
-
const runner = api.useHookRunners();
|
|
76
|
-
runner.modifyRoutes(routes);
|
|
77
77
|
return next({
|
|
78
78
|
context
|
|
79
79
|
});
|
|
@@ -109,6 +109,12 @@ export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
|
|
|
109
109
|
},
|
|
110
110
|
pickContext: ({ context, pickedContext }, next) => {
|
|
111
111
|
const { remixRouter } = context;
|
|
112
|
+
if (!remixRouter) {
|
|
113
|
+
return next({
|
|
114
|
+
context,
|
|
115
|
+
pickedContext
|
|
116
|
+
});
|
|
117
|
+
}
|
|
112
118
|
const router = {
|
|
113
119
|
navigate: remixRouter.navigate,
|
|
114
120
|
get location() {
|
package/package.json
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"modern",
|
|
16
16
|
"modern.js"
|
|
17
17
|
],
|
|
18
|
-
"version": "2.
|
|
18
|
+
"version": "2.27.0",
|
|
19
19
|
"engines": {
|
|
20
20
|
"node": ">=14.17.6"
|
|
21
21
|
},
|
|
@@ -29,6 +29,10 @@
|
|
|
29
29
|
"types": "./dist/types/index.d.ts",
|
|
30
30
|
"default": "./dist/esm/index.js"
|
|
31
31
|
},
|
|
32
|
+
"./types": "./types/index.d.ts",
|
|
33
|
+
"./types/index": "./types/index.d.ts",
|
|
34
|
+
"./types/router": "./types/router.d.ts",
|
|
35
|
+
"./types/model": "./types/model.d.ts",
|
|
32
36
|
"./loadable": {
|
|
33
37
|
"jsnext:source": "./src/exports/loadable.ts",
|
|
34
38
|
"types": "./dist/types/exports/loadable.d.ts",
|
|
@@ -169,9 +173,9 @@
|
|
|
169
173
|
"redux-logger": "^3.0.6",
|
|
170
174
|
"styled-components": "^5.3.1",
|
|
171
175
|
"@swc/helpers": "0.5.1",
|
|
172
|
-
"@modern-js/plugin": "2.
|
|
173
|
-
"@modern-js/types": "2.
|
|
174
|
-
"@modern-js/utils": "2.
|
|
176
|
+
"@modern-js/plugin": "2.27.0",
|
|
177
|
+
"@modern-js/types": "2.27.0",
|
|
178
|
+
"@modern-js/utils": "2.27.0"
|
|
175
179
|
},
|
|
176
180
|
"peerDependencies": {
|
|
177
181
|
"react": ">=17",
|
|
@@ -192,14 +196,13 @@
|
|
|
192
196
|
"ts-jest": "^29.1.0",
|
|
193
197
|
"typescript": "^5",
|
|
194
198
|
"webpack": "^5.88.1",
|
|
195
|
-
"@modern-js/app-tools": "2.
|
|
196
|
-
"@modern-js/core": "2.
|
|
197
|
-
"@modern-js/server-core": "2.
|
|
198
|
-
"@scripts/
|
|
199
|
-
"@scripts/
|
|
199
|
+
"@modern-js/app-tools": "2.27.0",
|
|
200
|
+
"@modern-js/core": "2.27.0",
|
|
201
|
+
"@modern-js/server-core": "2.27.0",
|
|
202
|
+
"@scripts/jest-config": "2.27.0",
|
|
203
|
+
"@scripts/build": "2.27.0"
|
|
200
204
|
},
|
|
201
205
|
"sideEffects": false,
|
|
202
|
-
"modernConfig": {},
|
|
203
206
|
"publishConfig": {
|
|
204
207
|
"registry": "https://registry.npmjs.org/",
|
|
205
208
|
"access": "public",
|