@modern-js/runtime 1.5.0 → 1.15.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.
Files changed (8) hide show
  1. package/CHANGELOG.md +18 -0
  2. package/dist/js/modern/ssr/index.js +4 -0
  3. package/dist/js/modern/ssr/utils.js +9 -3
  4. package/dist/js/node/ssr/index.js +4 -0
  5. package/dist/js/node/ssr/utils.js +9 -3
  6. package/dist/js/treeshaking/ssr/index.js +4 -0
  7. package/dist/js/treeshaking/ssr/utils.js +8 -3
  8. package/package.json +9 -9
package/CHANGELOG.md CHANGED
@@ -1,5 +1,23 @@
1
1
  # @modern-js/runtime
2
2
 
3
+ ## 1.15.0
4
+
5
+ ### Patch Changes
6
+
7
+ - 335c97c: fix: fix runtime context format bug
8
+ fix: 修复 runtimeContext 数据格式化时的问题
9
+ - a04a11b: fix: 修复 SSR 物理降级时，获取不到请求上下文的问题
10
+ fix: should get ssrContext anyway if entry is ssr enable
11
+ - Updated dependencies [8658a78]
12
+ - Updated dependencies [0df4970]
13
+ - Updated dependencies [05d4a4f]
14
+ - Updated dependencies [ad05af9]
15
+ - Updated dependencies [5d53d1c]
16
+ - Updated dependencies [37cd159]
17
+ - @modern-js/utils@1.15.0
18
+ - @modern-js/webpack@1.15.0
19
+ - @modern-js/plugin@1.15.0
20
+
3
21
  ## 1.5.0
4
22
 
5
23
  ### Minor Changes
package/dist/js/modern/ssr/index.js CHANGED
@@ -60,6 +60,10 @@ const ssr = () => ({
60
60
  const request = (_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$_SSR_DATA = _window2._SSR_DATA) === null || _window2$_SSR_DATA === void 0 ? void 0 : (_window2$_SSR_DATA$co = _window2$_SSR_DATA.context) === null || _window2$_SSR_DATA$co === void 0 ? void 0 : _window2$_SSR_DATA$co.request;
61
61
 
62
62
  if (!request) {
63
+ context.ssrContext = _objectSpread(_objectSpread({}, context.ssrContext), {}, {
64
+ response: mockResp,
65
+ request: formatClient({})
66
+ });
63
67
  return next({
64
68
  context
65
69
  });
package/dist/js/modern/ssr/utils.js CHANGED
@@ -19,19 +19,25 @@ export const formatServer = request => {
19
19
 
20
20
  const getQuery = () => window.location.search.substring(1).split('&').reduce((res, item) => {
21
21
  const [key, value] = item.split('=');
22
- res[key] = value;
22
+
23
+ if (key) {
24
+ res[key] = value;
25
+ }
26
+
23
27
  return res;
24
28
  }, {});
25
29
 
26
30
  export const formatClient = request => {
31
+ var _request$headers, _request$headers2;
32
+
27
33
  return {
28
34
  params: request.params || {},
29
35
  host: request.host || location.host,
30
36
  pathname: request.pathname || location.pathname,
31
37
  headers: request.headers || {},
32
38
  cookieMap: request.cookieMap || {},
33
- cookie: request.headers.cookie || document.cookie,
34
- userAgent: request.headers['user-agent'] || navigator.userAgent,
39
+ cookie: ((_request$headers = request.headers) === null || _request$headers === void 0 ? void 0 : _request$headers.cookie) || document.cookie,
40
+ userAgent: ((_request$headers2 = request.headers) === null || _request$headers2 === void 0 ? void 0 : _request$headers2['user-agent']) || navigator.userAgent,
35
41
  referer: request.referer || document.referrer,
36
42
  query: request.query || getQuery(),
37
43
  url: location.href
package/dist/js/node/ssr/index.js CHANGED
@@ -89,6 +89,10 @@ const ssr = () => ({
89
89
  const request = (_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$_SSR_DATA = _window2._SSR_DATA) === null || _window2$_SSR_DATA === void 0 ? void 0 : (_window2$_SSR_DATA$co = _window2$_SSR_DATA.context) === null || _window2$_SSR_DATA$co === void 0 ? void 0 : _window2$_SSR_DATA$co.request;
90
90
 
91
91
  if (!request) {
92
+ context.ssrContext = _objectSpread(_objectSpread({}, context.ssrContext), {}, {
93
+ response: mockResp,
94
+ request: (0, _utils.formatClient)({})
95
+ });
92
96
  return next({
93
97
  context
94
98
  });
package/dist/js/node/ssr/utils.js CHANGED
@@ -28,19 +28,25 @@ exports.formatServer = formatServer;
28
28
 
29
29
  const getQuery = () => window.location.search.substring(1).split('&').reduce((res, item) => {
30
30
  const [key, value] = item.split('=');
31
- res[key] = value;
31
+
32
+ if (key) {
33
+ res[key] = value;
34
+ }
35
+
32
36
  return res;
33
37
  }, {});
34
38
 
35
39
  const formatClient = request => {
40
+ var _request$headers, _request$headers2;
41
+
36
42
  return {
37
43
  params: request.params || {},
38
44
  host: request.host || location.host,
39
45
  pathname: request.pathname || location.pathname,
40
46
  headers: request.headers || {},
41
47
  cookieMap: request.cookieMap || {},
42
- cookie: request.headers.cookie || document.cookie,
43
- userAgent: request.headers['user-agent'] || navigator.userAgent,
48
+ cookie: ((_request$headers = request.headers) === null || _request$headers === void 0 ? void 0 : _request$headers.cookie) || document.cookie,
49
+ userAgent: ((_request$headers2 = request.headers) === null || _request$headers2 === void 0 ? void 0 : _request$headers2['user-agent']) || navigator.userAgent,
44
50
  referer: request.referer || document.referrer,
45
51
  query: request.query || getQuery(),
46
52
  url: location.href
package/dist/js/treeshaking/ssr/index.js CHANGED
@@ -83,6 +83,10 @@ var ssr = function ssr() {
83
83
  var request = (_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$_SSR_DATA = _window2._SSR_DATA) === null || _window2$_SSR_DATA === void 0 ? void 0 : (_window2$_SSR_DATA$co = _window2$_SSR_DATA.context) === null || _window2$_SSR_DATA$co === void 0 ? void 0 : _window2$_SSR_DATA$co.request;
84
84
 
85
85
  if (!request) {
86
+ context.ssrContext = _objectSpread(_objectSpread({}, context.ssrContext), {}, {
87
+ response: mockResp,
88
+ request: formatClient({})
89
+ });
86
90
  return next({
87
91
  context: context
88
92
  });
package/dist/js/treeshaking/ssr/utils.js CHANGED
@@ -22,20 +22,25 @@ var getQuery = function getQuery() {
22
22
  key = _item$split2[0],
23
23
  value = _item$split2[1];
24
24
 
25
- res[key] = value;
25
+ if (key) {
26
+ res[key] = value;
27
+ }
28
+
26
29
  return res;
27
30
  }, {});
28
31
  };
29
32
 
30
33
  export var formatClient = function formatClient(request) {
34
+ var _request$headers, _request$headers2;
35
+
31
36
  return {
32
37
  params: request.params || {},
33
38
  host: request.host || location.host,
34
39
  pathname: request.pathname || location.pathname,
35
40
  headers: request.headers || {},
36
41
  cookieMap: request.cookieMap || {},
37
- cookie: request.headers.cookie || document.cookie,
38
- userAgent: request.headers['user-agent'] || navigator.userAgent,
42
+ cookie: ((_request$headers = request.headers) === null || _request$headers === void 0 ? void 0 : _request$headers.cookie) || document.cookie,
43
+ userAgent: ((_request$headers2 = request.headers) === null || _request$headers2 === void 0 ? void 0 : _request$headers2['user-agent']) || navigator.userAgent,
39
44
  referer: request.referer || document.referrer,
40
45
  query: request.query || getQuery(),
41
46
  url: location.href
package/package.json CHANGED
@@ -11,7 +11,7 @@
11
11
  "modern",
12
12
  "modern.js"
13
13
  ],
14
- "version": "1.5.0",
14
+ "version": "1.15.0",
15
15
  "jsnext:source": "./src/index.ts",
16
16
  "types": "./type.d.ts",
17
17
  "main": "./dist/js/node/index.js",
@@ -140,9 +140,9 @@
140
140
  "@loadable/babel-plugin": "^5.13.2",
141
141
  "@loadable/server": "^5.15.1",
142
142
  "@loadable/component": "^5.15.0",
143
- "@modern-js/plugin": "^1.4.2",
144
- "@modern-js/webpack": "^1.12.4",
145
- "@modern-js/utils": "^1.9.0",
143
+ "@modern-js/plugin": "1.15.0",
144
+ "@modern-js/webpack": "1.15.0",
145
+ "@modern-js/utils": "1.15.0",
146
146
  "@modern-js-reduck/plugin-auto-actions": "^1.0.2",
147
147
  "@modern-js-reduck/plugin-devtools": "^1.0.3",
148
148
  "@modern-js-reduck/plugin-effects": "^1.0.2",
@@ -162,9 +162,9 @@
162
162
  "ts-jest": "^27.0.4",
163
163
  "typescript": "^4",
164
164
  "jest": "^27",
165
- "@modern-js/core": "1.14.0",
166
- "@modern-js/types": "1.6.2",
167
- "@modern-js/utils": "1.9.0",
165
+ "@modern-js/core": "1.15.0",
166
+ "@modern-js/types": "1.15.0",
167
+ "@modern-js/utils": "1.15.0",
168
168
  "@types/jest": "^27",
169
169
  "@types/node": "^14",
170
170
  "@types/react": "^17",
@@ -172,8 +172,8 @@
172
172
  "@types/react-side-effect": "^1.1.1",
173
173
  "@types/loadable__webpack-plugin": "^5.7.3",
174
174
  "@types/serialize-javascript": "^5.0.1",
175
- "@scripts/build": "0.0.0",
176
- "@scripts/jest-config": "0.0.0",
175
+ "@scripts/build": "1.15.0",
176
+ "@scripts/jest-config": "1.15.0",
177
177
  "@testing-library/react": "^12.0.0",
178
178
  "@testing-library/react-hooks": "^7.0.1",
179
179
  "@types/hoist-non-react-statics": "^3.3.1",