@modern-js/runtime 2.19.1 → 2.21.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 (139) hide show
  1. package/CHANGELOG.md +51 -0
  2. package/dist/cjs/cli/index.js +6 -10
  3. package/dist/cjs/core/compatible.js +4 -47
  4. package/dist/cjs/core/index.js +4 -16
  5. package/dist/cjs/core/loader/index.js +2 -6
  6. package/dist/cjs/core/loader/loaderManager.js +2 -6
  7. package/dist/cjs/core/loader/useLoader.js +2 -6
  8. package/dist/cjs/document/Body.js +2 -41
  9. package/dist/cjs/document/Comment.js +2 -6
  10. package/dist/cjs/document/DocumentContext.js +2 -6
  11. package/dist/cjs/document/DocumentStructureContext.js +2 -6
  12. package/dist/cjs/document/Head.js +2 -41
  13. package/dist/cjs/document/Html.js +2 -6
  14. package/dist/cjs/document/Links.js +2 -6
  15. package/dist/cjs/document/Root.js +2 -41
  16. package/dist/cjs/document/Script.js +2 -6
  17. package/dist/cjs/document/Scripts.js +2 -6
  18. package/dist/cjs/document/cli/index.js +9 -10
  19. package/dist/cjs/document/index.js +12 -24
  20. package/dist/cjs/exports/head.js +3 -19
  21. package/dist/cjs/exports/loadable.js +3 -19
  22. package/dist/cjs/exports/styled.js +3 -19
  23. package/dist/cjs/router/index.js +3 -19
  24. package/dist/cjs/router/runtime/DefaultNotFound.js +2 -6
  25. package/dist/cjs/router/runtime/DeferredDataScripts.node.js +4 -4
  26. package/dist/cjs/router/runtime/PrefetchLink.js +9 -48
  27. package/dist/cjs/router/runtime/index.js +57 -70
  28. package/dist/cjs/router/runtime/plugin.js +10 -14
  29. package/dist/cjs/router/runtime/plugin.node.js +11 -54
  30. package/dist/cjs/router/runtime/server.js +2 -14
  31. package/dist/cjs/router/runtime/utils.js +9 -12
  32. package/dist/cjs/router/runtime/withRouter.js +6 -10
  33. package/dist/cjs/ssr/cli/babel-plugin-ssr-loader-id.js +4 -47
  34. package/dist/cjs/ssr/cli/index.js +3 -7
  35. package/dist/cjs/ssr/cli/loadable-bundler-plugin.js +5 -21
  36. package/dist/cjs/ssr/index.js +4 -20
  37. package/dist/cjs/ssr/index.node.js +4 -20
  38. package/dist/cjs/ssr/react/nossr/index.js +2 -41
  39. package/dist/cjs/ssr/react/prerender/index.js +8 -63
  40. package/dist/cjs/ssr/react/withCallback/index.js +2 -41
  41. package/dist/cjs/ssr/serverRender/renderToStream/buildTemplate.after.js +6 -2
  42. package/dist/cjs/ssr/serverRender/renderToStream/bulidTemplate.before.js +5 -9
  43. package/dist/cjs/ssr/serverRender/renderToStream/index.js +2 -6
  44. package/dist/cjs/ssr/serverRender/renderToStream/renderToPipe.js +10 -12
  45. package/dist/cjs/ssr/serverRender/renderToStream/renderToPipe.worker.js +11 -11
  46. package/dist/cjs/ssr/serverRender/renderToString/entry.js +28 -77
  47. package/dist/cjs/ssr/serverRender/renderToString/index.js +2 -6
  48. package/dist/cjs/ssr/serverRender/renderToString/loadable.js +7 -4
  49. package/dist/cjs/ssr/serverRender/renderToString/reduce.js +2 -6
  50. package/dist/cjs/ssr/serverRender/renderToString/template.js +6 -18
  51. package/dist/cjs/ssr/serverRender/utils.js +7 -1
  52. package/dist/cjs/ssr/utils.js +2 -6
  53. package/dist/cjs/state/index.js +3 -19
  54. package/dist/cjs/state/plugins.js +4 -8
  55. package/dist/cjs/state/runtime/index.js +4 -20
  56. package/dist/cjs/state/runtime/plugin.js +4 -20
  57. package/dist/esm/cli/index.js +3 -132
  58. package/dist/esm/core/compatible.js +7 -233
  59. package/dist/esm/core/loader/loaderManager.js +7 -212
  60. package/dist/esm/core/loader/useLoader.js +4 -117
  61. package/dist/esm/core/plugin.js +3 -132
  62. package/dist/esm/document/cli/index.js +12 -198
  63. package/dist/esm/document/constants.js +1 -13
  64. package/dist/esm/router/cli/index.js +2 -52
  65. package/dist/esm/router/runtime/DeferredDataScripts.node.js +2 -59
  66. package/dist/esm/router/runtime/PrefetchLink.js +7 -251
  67. package/dist/esm/router/runtime/index.js +6 -4
  68. package/dist/esm/router/runtime/plugin.js +3 -53
  69. package/dist/esm/router/runtime/plugin.node.js +10 -252
  70. package/dist/esm/router/runtime/server.js +1 -1
  71. package/dist/esm/router/runtime/utils.js +8 -151
  72. package/dist/esm/router/runtime/withRouter.js +3 -53
  73. package/dist/esm/ssr/cli/index.js +1 -1
  74. package/dist/esm/ssr/cli/loadable-bundler-plugin.js +6 -108
  75. package/dist/esm/ssr/index.js +5 -184
  76. package/dist/esm/ssr/index.node.js +5 -184
  77. package/dist/esm/ssr/prefetch.js +4 -133
  78. package/dist/esm/ssr/react/nossr/index.js +1 -58
  79. package/dist/esm/ssr/react/prerender/index.js +7 -145
  80. package/dist/esm/ssr/serverRender/index.js +3 -132
  81. package/dist/esm/ssr/serverRender/renderToStream/buildTemplate.after.js +7 -30
  82. package/dist/esm/ssr/serverRender/renderToStream/bulidTemplate.before.js +3 -73
  83. package/dist/esm/ssr/serverRender/renderToStream/index.js +3 -132
  84. package/dist/esm/ssr/serverRender/renderToStream/renderToPipe.js +13 -71
  85. package/dist/esm/ssr/serverRender/renderToStream/renderToPipe.worker.js +18 -197
  86. package/dist/esm/ssr/serverRender/renderToStream/template.js +1 -58
  87. package/dist/esm/ssr/serverRender/renderToString/entry.js +19 -188
  88. package/dist/esm/ssr/serverRender/renderToString/index.js +3 -132
  89. package/dist/esm/ssr/serverRender/renderToString/loadable.js +8 -5
  90. package/dist/esm/ssr/serverRender/renderToString/template.js +4 -93
  91. package/dist/esm/ssr/serverRender/time.js +1 -58
  92. package/dist/esm/ssr/serverRender/time.worker.js +1 -58
  93. package/dist/esm/ssr/serverRender/utils.js +7 -0
  94. package/dist/esm/ssr/utils.js +2 -86
  95. package/dist/esm/state/runtime/plugin.js +3 -110
  96. package/dist/esm-node/document/cli/index.js +5 -2
  97. package/dist/esm-node/router/runtime/DeferredDataScripts.node.js +1 -1
  98. package/dist/esm-node/router/runtime/PrefetchLink.js +1 -1
  99. package/dist/esm-node/router/runtime/index.js +6 -4
  100. package/dist/esm-node/router/runtime/plugin.js +1 -1
  101. package/dist/esm-node/router/runtime/plugin.node.js +3 -3
  102. package/dist/esm-node/router/runtime/server.js +1 -1
  103. package/dist/esm-node/router/runtime/utils.js +3 -2
  104. package/dist/esm-node/router/runtime/withRouter.js +1 -1
  105. package/dist/esm-node/ssr/cli/index.js +1 -1
  106. package/dist/esm-node/ssr/cli/loadable-bundler-plugin.js +1 -13
  107. package/dist/esm-node/ssr/react/prerender/index.js +1 -13
  108. package/dist/esm-node/ssr/serverRender/renderToStream/buildTemplate.after.js +6 -2
  109. package/dist/esm-node/ssr/serverRender/renderToStream/bulidTemplate.before.js +1 -1
  110. package/dist/esm-node/ssr/serverRender/renderToStream/renderToPipe.js +10 -12
  111. package/dist/esm-node/ssr/serverRender/renderToStream/renderToPipe.worker.js +11 -11
  112. package/dist/esm-node/ssr/serverRender/renderToString/entry.js +12 -18
  113. package/dist/esm-node/ssr/serverRender/renderToString/loadable.js +8 -5
  114. package/dist/esm-node/ssr/serverRender/renderToString/template.js +1 -13
  115. package/dist/esm-node/ssr/serverRender/utils.js +5 -0
  116. package/dist/types/cli/index.d.ts +0 -2
  117. package/dist/types/core/loader/loaderManager.d.ts +0 -1
  118. package/dist/types/core/loader/useLoader.d.ts +0 -5
  119. package/dist/types/core/plugin.d.ts +1 -6
  120. package/dist/types/document/cli/index.d.ts +0 -2
  121. package/dist/types/router/cli/index.d.ts +0 -2
  122. package/dist/types/router/runtime/DeferredDataScripts.d.ts +0 -1
  123. package/dist/types/router/runtime/DeferredDataScripts.node.d.ts +0 -1
  124. package/dist/types/router/runtime/PrefetchLink.d.ts +1 -3
  125. package/dist/types/router/runtime/hooks.d.ts +1 -1
  126. package/dist/types/router/runtime/index.d.ts +3 -4
  127. package/dist/types/router/runtime/server.d.ts +1 -1
  128. package/dist/types/router/runtime/types.d.ts +1 -3
  129. package/dist/types/router/runtime/utils.d.ts +1 -3
  130. package/dist/types/router/runtime/withRouter.d.ts +1 -1
  131. package/dist/types/runtimeContext.d.ts +1 -1
  132. package/dist/types/ssr/cli/index.d.ts +0 -2
  133. package/dist/types/ssr/serverRender/renderToStream/type.d.ts +2 -2
  134. package/dist/types/ssr/serverRender/renderToString/entry.d.ts +1 -0
  135. package/dist/types/ssr/serverRender/renderToString/type.d.ts +1 -0
  136. package/dist/types/ssr/serverRender/utils.d.ts +2 -1
  137. package/dist/types/state/cli/index.d.ts +0 -2
  138. package/dist/types/state/types.d.ts +0 -1
  139. package/package.json +28 -21
package/CHANGELOG.md CHANGED
@@ -1,5 +1,56 @@
1
1
  # @modern-js/runtime
2
2
 
3
+ ## 2.21.0
4
+
5
+ ### Minor Changes
6
+
7
+ - 0a1aa3b: feat: the runtime package export `loadable_bundler_plugin`
8
+ feat: runtime 包导出 `loadable_bundler_plugin`
9
+
10
+ ### Patch Changes
11
+
12
+ - e81eeaf: refactor: guard react-router version consistency
13
+ refactor: 保证 react-router 相关包的版本一致性
14
+ - 26dcf3a: chore: bump typescript to v5 in devDependencies
15
+
16
+ chore: 升级 devDependencies 中的 typescript 版本到 v5
17
+
18
+ - 8b7c6d4: chore: update reduck
19
+ chore: 更新 reduck
20
+ - 807f04a: fix(plugin-runtime): streaming ssr split chunk so that can't match `SHELL_STREAM_END_MARK`
21
+ fix(plugin-runtime): streaming ssr chunk 进行分割导致无法匹配 `SHELL_STREAM_END_MARK`
22
+ - 0fc15ca: fix: fix `@modern-js/utils` subpath exports
23
+ fix: 修复 `@modern-js/utils` 子路径导出
24
+ - 43b4e83: feat: support security.nonce for add nonce attribute on script tag
25
+ feat: 支持 security.nonce 配置,为 script 标签添加 nonce 属性
26
+ - ad78387: chore(deps): bump babel-related dependencies to latest version
27
+
28
+ chore(deps): 升级 babel 相关依赖到最新版本
29
+
30
+ - Updated dependencies [e81eeaf]
31
+ - Updated dependencies [26dcf3a]
32
+ - Updated dependencies [1ef03dc]
33
+ - Updated dependencies [056627f]
34
+ - Updated dependencies [0fc15ca]
35
+ - Updated dependencies [43b4e83]
36
+ - Updated dependencies [ad78387]
37
+ - @modern-js/utils@2.21.0
38
+ - @modern-js/plugin@2.21.0
39
+ - @modern-js/types@2.21.0
40
+
41
+ ## 2.20.0
42
+
43
+ ### Patch Changes
44
+
45
+ - 6b9d90a: chore: remove @babel/runtime. add @swc/helper and enable `externalHelper` config.
46
+ chore: 移除 @babel/runtime 依赖. 增加 @swc/helpers 依赖并且开启 `externalHelpers` 配置
47
+ - Updated dependencies [3c4e0a5]
48
+ - Updated dependencies [6b9d90a]
49
+ - Updated dependencies [5f055ab]
50
+ - @modern-js/utils@2.20.0
51
+ - @modern-js/plugin@2.20.0
52
+ - @modern-js/types@2.20.0
53
+
3
54
  ## 2.19.1
4
55
 
5
56
  ### Patch Changes
@@ -6,17 +6,13 @@ Object.defineProperty(exports, "default", {
6
6
  enumerable: true,
7
7
  get: () => _default
8
8
  });
9
- const _path = /* @__PURE__ */ _interop_require_default(require("path"));
9
+ const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
10
+ const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
10
11
  const _utils = require("@modern-js/utils");
11
- const _cli = /* @__PURE__ */ _interop_require_default(require("../state/cli"));
12
- const _cli1 = /* @__PURE__ */ _interop_require_default(require("../ssr/cli"));
13
- const _cli2 = /* @__PURE__ */ _interop_require_default(require("../router/cli"));
14
- const _cli3 = /* @__PURE__ */ _interop_require_default(require("../document/cli"));
15
- function _interop_require_default(obj) {
16
- return obj && obj.__esModule ? obj : {
17
- default: obj
18
- };
19
- }
12
+ const _cli = /* @__PURE__ */ _interop_require_default._(require("../state/cli"));
13
+ const _cli1 = /* @__PURE__ */ _interop_require_default._(require("../ssr/cli"));
14
+ const _cli2 = /* @__PURE__ */ _interop_require_default._(require("../router/cli"));
15
+ const _cli3 = /* @__PURE__ */ _interop_require_default._(require("../document/cli"));
20
16
  const _default = () => ({
21
17
  name: "@modern-js/runtime",
22
18
  post: [
@@ -14,58 +14,15 @@ _export(exports, {
14
14
  bootstrap: () => bootstrap,
15
15
  useRuntimeContext: () => useRuntimeContext
16
16
  });
17
+ const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
18
+ const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
17
19
  const _jsxruntime = require("react/jsx-runtime");
18
- const _react = /* @__PURE__ */ _interop_require_wildcard(require("react"));
19
- const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default(require("hoist-non-react-statics"));
20
+ const _react = /* @__PURE__ */ _interop_require_wildcard._(require("react"));
21
+ const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default._(require("hoist-non-react-statics"));
20
22
  const _constants = require("@modern-js/utils/universal/constants");
21
23
  const _runtimeContext = require("../runtimeContext");
22
24
  const _plugin = require("./plugin");
23
25
  const _loaderManager = require("./loader/loaderManager");
24
- function _interop_require_default(obj) {
25
- return obj && obj.__esModule ? obj : {
26
- default: obj
27
- };
28
- }
29
- function _getRequireWildcardCache(nodeInterop) {
30
- if (typeof WeakMap !== "function")
31
- return null;
32
- var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
33
- var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
34
- return (_getRequireWildcardCache = function(nodeInterop2) {
35
- return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
36
- })(nodeInterop);
37
- }
38
- function _interop_require_wildcard(obj, nodeInterop) {
39
- if (!nodeInterop && obj && obj.__esModule) {
40
- return obj;
41
- }
42
- if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
43
- return {
44
- default: obj
45
- };
46
- }
47
- var cache = _getRequireWildcardCache(nodeInterop);
48
- if (cache && cache.has(obj)) {
49
- return cache.get(obj);
50
- }
51
- var newObj = {};
52
- var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
53
- for (var key in obj) {
54
- if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
55
- var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
56
- if (desc && (desc.get || desc.set)) {
57
- Object.defineProperty(newObj, key, desc);
58
- } else {
59
- newObj[key] = obj[key];
60
- }
61
- }
62
- }
63
- newObj.default = obj;
64
- if (cache) {
65
- cache.set(obj, newObj);
66
- }
67
- return newObj;
68
- }
69
26
  const IS_REACT18 = process.env.IS_REACT18 === "true";
70
27
  function isClientArgs(id) {
71
28
  return typeof id === "string" || typeof HTMLElement !== "undefined" && id instanceof HTMLElement;
@@ -19,22 +19,10 @@ _export(exports, {
19
19
  RuntimeReactContext: () => _runtimeContext.RuntimeReactContext,
20
20
  ServerRouterContext: () => _runtimeContext.ServerRouterContext
21
21
  });
22
+ const _export_star = require("@swc/helpers/_/_export_star");
22
23
  const _plugin = require("./plugin");
23
24
  const _appConfig = require("./appConfig");
24
- _export_star(require("./compatible"), exports);
25
+ _export_star._(require("./compatible"), exports);
25
26
  const _runtimeContext = require("../runtimeContext");
26
- _export_star(require("./loader"), exports);
27
- _export_star(require("@modern-js/plugin"), exports);
28
- function _export_star(from, to) {
29
- Object.keys(from).forEach(function(k) {
30
- if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
31
- Object.defineProperty(to, k, {
32
- enumerable: true,
33
- get: function() {
34
- return from[k];
35
- }
36
- });
37
- }
38
- });
39
- return from;
40
- }
27
+ _export_star._(require("./loader"), exports);
28
+ _export_star._(require("@modern-js/plugin"), exports);
@@ -6,9 +6,5 @@ Object.defineProperty(exports, "useLoader", {
6
6
  enumerable: true,
7
7
  get: () => _useLoader.default
8
8
  });
9
- const _useLoader = /* @__PURE__ */ _interop_require_default(require("./useLoader"));
10
- function _interop_require_default(obj) {
11
- return obj && obj.__esModule ? obj : {
12
- default: obj
13
- };
14
- }
9
+ const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
10
+ const _useLoader = /* @__PURE__ */ _interop_require_default._(require("./useLoader"));
@@ -13,12 +13,8 @@ _export(exports, {
13
13
  LoaderStatus: () => LoaderStatus,
14
14
  createLoaderManager: () => createLoaderManager
15
15
  });
16
- const _invariant = /* @__PURE__ */ _interop_require_default(require("invariant"));
17
- function _interop_require_default(obj) {
18
- return obj && obj.__esModule ? obj : {
19
- default: obj
20
- };
21
- }
16
+ const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
17
+ const _invariant = /* @__PURE__ */ _interop_require_default._(require("invariant"));
22
18
  const createGetId = () => {
23
19
  const idCache = /* @__PURE__ */ new Map();
24
20
  return (objectId) => {
@@ -6,15 +6,11 @@ Object.defineProperty(exports, "default", {
6
6
  enumerable: true,
7
7
  get: () => _default
8
8
  });
9
+ const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
9
10
  const _react = require("react");
10
- const _invariant = /* @__PURE__ */ _interop_require_default(require("invariant"));
11
+ const _invariant = /* @__PURE__ */ _interop_require_default._(require("invariant"));
11
12
  const _runtimeContext = require("../../runtimeContext");
12
13
  const _loaderManager = require("./loaderManager");
13
- function _interop_require_default(obj) {
14
- return obj && obj.__esModule ? obj : {
15
- default: obj
16
- };
17
- }
18
14
  const useLoader = (loaderFn, options = {
19
15
  params: void 0
20
16
  }) => {
@@ -6,51 +6,12 @@ Object.defineProperty(exports, "Body", {
6
6
  enumerable: true,
7
7
  get: () => Body
8
8
  });
9
+ const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
9
10
  const _jsxruntime = require("react/jsx-runtime");
10
- const _react = /* @__PURE__ */ _interop_require_wildcard(require("react"));
11
+ const _react = /* @__PURE__ */ _interop_require_wildcard._(require("react"));
11
12
  const _constants = require("./constants");
12
13
  const _DocumentStructureContext = require("./DocumentStructureContext");
13
14
  const _Root = require("./Root");
14
- function _getRequireWildcardCache(nodeInterop) {
15
- if (typeof WeakMap !== "function")
16
- return null;
17
- var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
18
- var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
19
- return (_getRequireWildcardCache = function(nodeInterop2) {
20
- return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
21
- })(nodeInterop);
22
- }
23
- function _interop_require_wildcard(obj, nodeInterop) {
24
- if (!nodeInterop && obj && obj.__esModule) {
25
- return obj;
26
- }
27
- if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
28
- return {
29
- default: obj
30
- };
31
- }
32
- var cache = _getRequireWildcardCache(nodeInterop);
33
- if (cache && cache.has(obj)) {
34
- return cache.get(obj);
35
- }
36
- var newObj = {};
37
- var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
38
- for (var key in obj) {
39
- if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
40
- var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
41
- if (desc && (desc.get || desc.set)) {
42
- Object.defineProperty(newObj, key, desc);
43
- } else {
44
- newObj[key] = obj[key];
45
- }
46
- }
47
- }
48
- newObj.default = obj;
49
- if (cache) {
50
- cache.set(obj, newObj);
51
- }
52
- return newObj;
53
- }
54
15
  function Body(props) {
55
16
  const { hasSetRoot } = (0, _react.useContext)(_DocumentStructureContext.DocumentStructureContext);
56
17
  const { children } = props;
@@ -6,14 +6,10 @@ Object.defineProperty(exports, "Comment", {
6
6
  enumerable: true,
7
7
  get: () => Comment
8
8
  });
9
+ const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
9
10
  const _jsxruntime = require("react/jsx-runtime");
10
- const _react = /* @__PURE__ */ _interop_require_default(require("react"));
11
+ const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
11
12
  const _constants = require("./constants");
12
- function _interop_require_default(obj) {
13
- return obj && obj.__esModule ? obj : {
14
- default: obj
15
- };
16
- }
17
13
  function Comment(props) {
18
14
  const { comment, children } = props;
19
15
  const commentStr = encodeURIComponent(children || comment || "");
@@ -6,12 +6,8 @@ Object.defineProperty(exports, "DocumentContext", {
6
6
  enumerable: true,
7
7
  get: () => DocumentContext
8
8
  });
9
- const _react = /* @__PURE__ */ _interop_require_default(require("react"));
10
- function _interop_require_default(obj) {
11
- return obj && obj.__esModule ? obj : {
12
- default: obj
13
- };
14
- }
9
+ const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
10
+ const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
15
11
  const DocumentContext = /* @__PURE__ */ _react.default.createContext({
16
12
  config: {},
17
13
  templateParams: {},
@@ -6,12 +6,8 @@ Object.defineProperty(exports, "DocumentStructureContext", {
6
6
  enumerable: true,
7
7
  get: () => DocumentStructureContext
8
8
  });
9
- const _react = /* @__PURE__ */ _interop_require_default(require("react"));
10
- function _interop_require_default(obj) {
11
- return obj && obj.__esModule ? obj : {
12
- default: obj
13
- };
14
- }
9
+ const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
10
+ const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
15
11
  const DocumentStructureContext = /* @__PURE__ */ _react.default.createContext({
16
12
  hasSetHead: false,
17
13
  hasSetScripts: false,
@@ -13,52 +13,13 @@ _export(exports, {
13
13
  Head: () => Head,
14
14
  DefaultHead: () => DefaultHead
15
15
  });
16
+ const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
16
17
  const _jsxruntime = require("react/jsx-runtime");
17
- const _react = /* @__PURE__ */ _interop_require_wildcard(require("react"));
18
+ const _react = /* @__PURE__ */ _interop_require_wildcard._(require("react"));
18
19
  const _DocumentStructureContext = require("./DocumentStructureContext");
19
20
  const _Scripts = require("./Scripts");
20
21
  const _Links = require("./Links");
21
22
  const _constants = require("./constants");
22
- function _getRequireWildcardCache(nodeInterop) {
23
- if (typeof WeakMap !== "function")
24
- return null;
25
- var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
26
- var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
27
- return (_getRequireWildcardCache = function(nodeInterop2) {
28
- return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
29
- })(nodeInterop);
30
- }
31
- function _interop_require_wildcard(obj, nodeInterop) {
32
- if (!nodeInterop && obj && obj.__esModule) {
33
- return obj;
34
- }
35
- if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
36
- return {
37
- default: obj
38
- };
39
- }
40
- var cache = _getRequireWildcardCache(nodeInterop);
41
- if (cache && cache.has(obj)) {
42
- return cache.get(obj);
43
- }
44
- var newObj = {};
45
- var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
46
- for (var key in obj) {
47
- if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
48
- var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
49
- if (desc && (desc.get || desc.set)) {
50
- Object.defineProperty(newObj, key, desc);
51
- } else {
52
- newObj[key] = obj[key];
53
- }
54
- }
55
- }
56
- newObj.default = obj;
57
- if (cache) {
58
- cache.set(obj, newObj);
59
- }
60
- return newObj;
61
- }
62
23
  function Head(props) {
63
24
  const { hasSetScripts, hasSetLinks } = (0, _react.useContext)(_DocumentStructureContext.DocumentStructureContext);
64
25
  const { children } = props;
@@ -6,16 +6,12 @@ Object.defineProperty(exports, "Html", {
6
6
  enumerable: true,
7
7
  get: () => Html
8
8
  });
9
+ const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
9
10
  const _jsxruntime = require("react/jsx-runtime");
10
- const _react = /* @__PURE__ */ _interop_require_default(require("react"));
11
+ const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
11
12
  const _Body = require("./Body");
12
13
  const _DocumentStructureContext = require("./DocumentStructureContext");
13
14
  const _Head = require("./Head");
14
- function _interop_require_default(obj) {
15
- return obj && obj.__esModule ? obj : {
16
- default: obj
17
- };
18
- }
19
15
  function findTargetChild(tag, children) {
20
16
  return children.find((item) => getEleType(item) === tag);
21
17
  }
@@ -6,14 +6,10 @@ Object.defineProperty(exports, "Links", {
6
6
  enumerable: true,
7
7
  get: () => Links
8
8
  });
9
+ const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
9
10
  const _jsxruntime = require("react/jsx-runtime");
10
- const _react = /* @__PURE__ */ _interop_require_default(require("react"));
11
+ const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
11
12
  const _constants = require("./constants");
12
- function _interop_require_default(obj) {
13
- return obj && obj.__esModule ? obj : {
14
- default: obj
15
- };
16
- }
17
13
  function Links() {
18
14
  return /* @__PURE__ */ (0, _jsxruntime.jsx)(_jsxruntime.Fragment, {
19
15
  children: _constants.DOCUMENT_LINKS_PLACEHOLDER
@@ -13,50 +13,11 @@ _export(exports, {
13
13
  Root: () => Root,
14
14
  DefaultRoot: () => DefaultRoot
15
15
  });
16
+ const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
16
17
  const _jsxruntime = require("react/jsx-runtime");
17
- const _react = /* @__PURE__ */ _interop_require_wildcard(require("react"));
18
+ const _react = /* @__PURE__ */ _interop_require_wildcard._(require("react"));
18
19
  const _DocumentContext = require("./DocumentContext");
19
20
  const _constants = require("./constants");
20
- function _getRequireWildcardCache(nodeInterop) {
21
- if (typeof WeakMap !== "function")
22
- return null;
23
- var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
24
- var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
25
- return (_getRequireWildcardCache = function(nodeInterop2) {
26
- return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
27
- })(nodeInterop);
28
- }
29
- function _interop_require_wildcard(obj, nodeInterop) {
30
- if (!nodeInterop && obj && obj.__esModule) {
31
- return obj;
32
- }
33
- if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
34
- return {
35
- default: obj
36
- };
37
- }
38
- var cache = _getRequireWildcardCache(nodeInterop);
39
- if (cache && cache.has(obj)) {
40
- return cache.get(obj);
41
- }
42
- var newObj = {};
43
- var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
44
- for (var key in obj) {
45
- if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
46
- var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
47
- if (desc && (desc.get || desc.set)) {
48
- Object.defineProperty(newObj, key, desc);
49
- } else {
50
- newObj[key] = obj[key];
51
- }
52
- }
53
- }
54
- newObj.default = obj;
55
- if (cache) {
56
- cache.set(obj, newObj);
57
- }
58
- return newObj;
59
- }
60
21
  function Root(props) {
61
22
  const { rootId, children } = props;
62
23
  const { templateParams: { mountId = "root" } } = (0, _react.useContext)(_DocumentContext.DocumentContext);
@@ -6,14 +6,10 @@ Object.defineProperty(exports, "Script", {
6
6
  enumerable: true,
7
7
  get: () => Script
8
8
  });
9
+ const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
9
10
  const _jsxruntime = require("react/jsx-runtime");
10
- const _react = /* @__PURE__ */ _interop_require_default(require("react"));
11
+ const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
11
12
  const _constants = require("./constants");
12
- function _interop_require_default(obj) {
13
- return obj && obj.__esModule ? obj : {
14
- default: obj
15
- };
16
- }
17
13
  function Script(props) {
18
14
  const { content } = props;
19
15
  const contentStr = content.toString();
@@ -6,14 +6,10 @@ Object.defineProperty(exports, "Scripts", {
6
6
  enumerable: true,
7
7
  get: () => Scripts
8
8
  });
9
+ const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
9
10
  const _jsxruntime = require("react/jsx-runtime");
10
- const _react = /* @__PURE__ */ _interop_require_default(require("react"));
11
+ const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
11
12
  const _constants = require("./constants");
12
- function _interop_require_default(obj) {
13
- return obj && obj.__esModule ? obj : {
14
- default: obj
15
- };
16
- }
17
13
  function Scripts() {
18
14
  return /* @__PURE__ */ (0, _jsxruntime.jsx)(_jsxruntime.Fragment, {
19
15
  children: `${_constants.DOCUMENT_SCRIPTS_PLACEHOLDER}`
@@ -13,18 +13,14 @@ _export(exports, {
13
13
  getDocumenByEntryName: () => getDocumenByEntryName,
14
14
  default: () => _default
15
15
  });
16
- const _path = /* @__PURE__ */ _interop_require_default(require("path"));
17
- const _react = /* @__PURE__ */ _interop_require_default(require("react"));
18
- const _server = /* @__PURE__ */ _interop_require_default(require("react-dom/server"));
16
+ const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
17
+ const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
18
+ const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
19
+ const _server = /* @__PURE__ */ _interop_require_default._(require("react-dom/server"));
19
20
  const _esbuild = require("esbuild");
20
21
  const _utils = require("@modern-js/utils");
21
22
  const _DocumentContext = require("../DocumentContext");
22
23
  const _constants = require("../constants");
23
- function _interop_require_default(obj) {
24
- return obj && obj.__esModule ? obj : {
25
- default: obj
26
- };
27
- }
28
24
  const debug = (0, _utils.createDebugger)("html_genarate");
29
25
  const getDocumenByEntryName = function(entrypoints, entryName, fallbackDir) {
30
26
  var _entrypoints_find;
@@ -66,8 +62,9 @@ const _default = () => {
66
62
  return null;
67
63
  }
68
64
  return async ({ htmlWebpackPlugin }) => {
65
+ const config = api.useResolvedConfigContext();
69
66
  const documentParams = getDocParams({
70
- config: api.useResolvedConfigContext(),
67
+ config,
71
68
  entryName,
72
69
  templateParameters
73
70
  });
@@ -141,7 +138,9 @@ const _default = () => {
141
138
  htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName !== "script" && item.tagName !== "link").join("")
142
139
  ].join("");
143
140
  if (html.includes(_constants.DOCUMENT_SCRIPT_PLACEHOLDER_START) && html.includes(_constants.DOCUMENT_SCRIPT_PLACEHOLDER_END)) {
144
- html = html.replace(new RegExp(`${_constants.DOCUMENT_SCRIPT_PLACEHOLDER_START}(.*?)${_constants.DOCUMENT_SCRIPT_PLACEHOLDER_END}`, "g"), (_scriptStr, $1) => `<script>${decodeURIComponent($1)}</script>`);
141
+ const { nonce } = config.security;
142
+ const nonceAttr = nonce ? `nonce=${nonce}` : "";
143
+ html = html.replace(new RegExp(`${_constants.DOCUMENT_SCRIPT_PLACEHOLDER_START}(.*?)${_constants.DOCUMENT_SCRIPT_PLACEHOLDER_END}`, "g"), (_scriptStr, $1) => `<script ${nonceAttr}>${decodeURIComponent($1)}</script>`);
145
144
  }
146
145
  if (html.includes(_constants.DOCUMENT_COMMENT_PLACEHOLDER_START) && html.includes(_constants.DOCUMENT_COMMENT_PLACEHOLDER_END)) {
147
146
  html = html.replace(new RegExp(`${_constants.DOCUMENT_COMMENT_PLACEHOLDER_START}(.*?)${_constants.DOCUMENT_COMMENT_PLACEHOLDER_END}`, "g"), (_scriptStr, $1) => `${decodeURIComponent($1)}`);
@@ -2,27 +2,15 @@
2
2
  Object.defineProperty(exports, "__esModule", {
3
3
  value: true
4
4
  });
5
- _export_star(require("./Html"), exports);
6
- _export_star(require("./DocumentContext"), exports);
7
- _export_star(require("./DocumentStructureContext"), exports);
8
- _export_star(require("./Head"), exports);
9
- _export_star(require("./Body"), exports);
10
- _export_star(require("./Root"), exports);
11
- _export_star(require("./Links"), exports);
12
- _export_star(require("./Comment"), exports);
13
- _export_star(require("./Scripts"), exports);
14
- _export_star(require("./Script"), exports);
15
- _export_star(require("./constants"), exports);
16
- function _export_star(from, to) {
17
- Object.keys(from).forEach(function(k) {
18
- if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
19
- Object.defineProperty(to, k, {
20
- enumerable: true,
21
- get: function() {
22
- return from[k];
23
- }
24
- });
25
- }
26
- });
27
- return from;
28
- }
5
+ const _export_star = require("@swc/helpers/_/_export_star");
6
+ _export_star._(require("./Html"), exports);
7
+ _export_star._(require("./DocumentContext"), exports);
8
+ _export_star._(require("./DocumentStructureContext"), exports);
9
+ _export_star._(require("./Head"), exports);
10
+ _export_star._(require("./Body"), exports);
11
+ _export_star._(require("./Root"), exports);
12
+ _export_star._(require("./Links"), exports);
13
+ _export_star._(require("./Comment"), exports);
14
+ _export_star._(require("./Scripts"), exports);
15
+ _export_star._(require("./Script"), exports);
16
+ _export_star._(require("./constants"), exports);
@@ -6,23 +6,7 @@ Object.defineProperty(exports, "default", {
6
6
  enumerable: true,
7
7
  get: () => _default
8
8
  });
9
- const _reacthelmet = /* @__PURE__ */ _interop_require_default(_export_star(require("react-helmet"), exports));
10
- function _export_star(from, to) {
11
- Object.keys(from).forEach(function(k) {
12
- if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
13
- Object.defineProperty(to, k, {
14
- enumerable: true,
15
- get: function() {
16
- return from[k];
17
- }
18
- });
19
- }
20
- });
21
- return from;
22
- }
23
- function _interop_require_default(obj) {
24
- return obj && obj.__esModule ? obj : {
25
- default: obj
26
- };
27
- }
9
+ const _export_star = require("@swc/helpers/_/_export_star");
10
+ const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
11
+ const _reacthelmet = /* @__PURE__ */ _interop_require_default._(_export_star._(require("react-helmet"), exports));
28
12
  const _default = _reacthelmet.default;
@@ -6,23 +6,7 @@ Object.defineProperty(exports, "default", {
6
6
  enumerable: true,
7
7
  get: () => _default
8
8
  });
9
- const _component = /* @__PURE__ */ _interop_require_default(_export_star(require("@loadable/component"), exports));
10
- function _export_star(from, to) {
11
- Object.keys(from).forEach(function(k) {
12
- if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
13
- Object.defineProperty(to, k, {
14
- enumerable: true,
15
- get: function() {
16
- return from[k];
17
- }
18
- });
19
- }
20
- });
21
- return from;
22
- }
23
- function _interop_require_default(obj) {
24
- return obj && obj.__esModule ? obj : {
25
- default: obj
26
- };
27
- }
9
+ const _export_star = require("@swc/helpers/_/_export_star");
10
+ const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
11
+ const _component = /* @__PURE__ */ _interop_require_default._(_export_star._(require("@loadable/component"), exports));
28
12
  const _default = _component.default;