@modern-js/runtime 2.35.0 → 2.36.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 (267) hide show
  1. package/dist/cjs/cli/index.js +48 -30
  2. package/dist/cjs/common.js +27 -18
  3. package/dist/cjs/config.js +15 -3
  4. package/dist/cjs/core/appConfig.js +25 -15
  5. package/dist/cjs/core/compatible.js +69 -53
  6. package/dist/cjs/core/index.js +47 -40
  7. package/dist/cjs/core/loader/index.js +35 -9
  8. package/dist/cjs/core/loader/loaderManager.js +37 -18
  9. package/dist/cjs/core/loader/useLoader.js +53 -31
  10. package/dist/cjs/core/plugin.js +41 -34
  11. package/dist/cjs/core/types.js +15 -3
  12. package/dist/cjs/document/Body.js +35 -19
  13. package/dist/cjs/document/Comment.js +29 -14
  14. package/dist/cjs/document/DocumentContext.js +36 -10
  15. package/dist/cjs/document/DocumentStructureContext.js +36 -10
  16. package/dist/cjs/document/Head.js +40 -31
  17. package/dist/cjs/document/Html.js +37 -23
  18. package/dist/cjs/document/Links.js +28 -13
  19. package/dist/cjs/document/Root.js +37 -28
  20. package/dist/cjs/document/Script.js +29 -14
  21. package/dist/cjs/document/Scripts.js +28 -13
  22. package/dist/cjs/document/Style.js +29 -14
  23. package/dist/cjs/document/cli/index.js +72 -57
  24. package/dist/cjs/document/constants.js +64 -72
  25. package/dist/cjs/document/index.js +42 -15
  26. package/dist/cjs/exports/head.js +38 -11
  27. package/dist/cjs/exports/loadable.js +38 -11
  28. package/dist/cjs/exports/server.js +24 -7
  29. package/dist/cjs/exports/styled.js +38 -11
  30. package/dist/cjs/index.js +41 -38
  31. package/dist/cjs/router/cli/index.js +32 -24
  32. package/dist/cjs/router/index.js +39 -18
  33. package/dist/cjs/router/runtime/DefaultNotFound.js +26 -11
  34. package/dist/cjs/router/runtime/DeferredDataScripts.js +21 -8
  35. package/dist/cjs/router/runtime/DeferredDataScripts.node.js +49 -38
  36. package/dist/cjs/router/runtime/PrefetchLink.js +64 -50
  37. package/dist/cjs/router/runtime/fetch.js +24 -7
  38. package/dist/cjs/router/runtime/fetch.node.js +25 -8
  39. package/dist/cjs/router/runtime/fetch.worker.js +24 -7
  40. package/dist/cjs/router/runtime/hooks.js +26 -9
  41. package/dist/cjs/router/runtime/index.js +155 -208
  42. package/dist/cjs/router/runtime/plugin.js +64 -50
  43. package/dist/cjs/router/runtime/plugin.node.js +66 -50
  44. package/dist/cjs/router/runtime/server.js +20 -4
  45. package/dist/cjs/router/runtime/types.js +15 -3
  46. package/dist/cjs/router/runtime/utils.js +64 -51
  47. package/dist/cjs/router/runtime/withRouter.js +30 -15
  48. package/dist/cjs/runtimeContext.js +28 -18
  49. package/dist/cjs/ssr/cli/babel-plugin-ssr-loader-id.js +40 -23
  50. package/dist/cjs/ssr/cli/index.js +57 -41
  51. package/dist/cjs/ssr/cli/loadable-bundler-plugin.js +31 -13
  52. package/dist/cjs/ssr/index.js +71 -52
  53. package/dist/cjs/ssr/index.node.js +45 -27
  54. package/dist/cjs/ssr/prefetch.js +31 -18
  55. package/dist/cjs/ssr/react/index.js +27 -17
  56. package/dist/cjs/ssr/react/nossr/index.js +38 -12
  57. package/dist/cjs/ssr/react/prerender/index.js +52 -27
  58. package/dist/cjs/ssr/react/prerender/type.js +15 -3
  59. package/dist/cjs/ssr/react/prerender/util.js +33 -28
  60. package/dist/cjs/ssr/react/withCallback/index.js +27 -11
  61. package/dist/cjs/ssr/serverRender/helmet.js +23 -15
  62. package/dist/cjs/ssr/serverRender/index.js +24 -11
  63. package/dist/cjs/ssr/serverRender/renderToStream/buildTemplate.after.js +30 -13
  64. package/dist/cjs/ssr/serverRender/renderToStream/buildTemplate.share.js +25 -15
  65. package/dist/cjs/ssr/serverRender/renderToStream/bulidTemplate.before.js +48 -26
  66. package/dist/cjs/ssr/serverRender/renderToStream/index.js +49 -23
  67. package/dist/cjs/ssr/serverRender/renderToStream/renderToPipe.js +35 -23
  68. package/dist/cjs/ssr/serverRender/renderToStream/renderToPipe.worker.js +33 -22
  69. package/dist/cjs/ssr/serverRender/renderToStream/template.js +28 -11
  70. package/dist/cjs/ssr/serverRender/renderToString/buildHtml.js +31 -24
  71. package/dist/cjs/ssr/serverRender/renderToString/entry.js +81 -59
  72. package/dist/cjs/ssr/serverRender/renderToString/index.js +44 -18
  73. package/dist/cjs/ssr/serverRender/renderToString/loadable.js +61 -33
  74. package/dist/cjs/ssr/serverRender/renderToString/render.js +39 -13
  75. package/dist/cjs/ssr/serverRender/renderToString/styledComponent.js +28 -11
  76. package/dist/cjs/ssr/serverRender/renderToString/type.js +24 -7
  77. package/dist/cjs/ssr/serverRender/tracker.js +27 -18
  78. package/dist/cjs/ssr/serverRender/types.js +25 -8
  79. package/dist/cjs/ssr/serverRender/utils.js +31 -24
  80. package/dist/cjs/ssr/utils.js +42 -25
  81. package/dist/cjs/state/cli/index.js +28 -19
  82. package/dist/cjs/state/index.js +39 -18
  83. package/dist/cjs/state/plugins.js +46 -29
  84. package/dist/cjs/state/runtime/index.js +39 -11
  85. package/dist/cjs/state/runtime/plugin.js +55 -28
  86. package/dist/esm/cli/index.js +6 -2
  87. package/dist/esm/common.js +8 -3
  88. package/dist/esm/config.js +0 -1
  89. package/dist/esm/core/appConfig.js +6 -2
  90. package/dist/esm/core/compatible.js +29 -25
  91. package/dist/esm/core/index.js +13 -3
  92. package/dist/esm/core/loader/index.js +4 -1
  93. package/dist/esm/core/loader/loaderManager.js +13 -9
  94. package/dist/esm/core/loader/useLoader.js +13 -10
  95. package/dist/esm/core/plugin.js +17 -13
  96. package/dist/esm/core/types.js +0 -1
  97. package/dist/esm/document/Body.js +4 -1
  98. package/dist/esm/document/Comment.js +4 -1
  99. package/dist/esm/document/DocumentContext.js +4 -1
  100. package/dist/esm/document/DocumentStructureContext.js +4 -1
  101. package/dist/esm/document/Head.js +6 -2
  102. package/dist/esm/document/Html.js +12 -10
  103. package/dist/esm/document/Links.js +4 -1
  104. package/dist/esm/document/Root.js +6 -2
  105. package/dist/esm/document/Script.js +4 -1
  106. package/dist/esm/document/Scripts.js +4 -1
  107. package/dist/esm/document/Style.js +4 -1
  108. package/dist/esm/document/cli/index.js +18 -14
  109. package/dist/esm/document/constants.js +42 -20
  110. package/dist/esm/exports/head.js +4 -1
  111. package/dist/esm/exports/loadable.js +4 -1
  112. package/dist/esm/exports/server.js +4 -1
  113. package/dist/esm/exports/styled.js +4 -1
  114. package/dist/esm/index.js +13 -2
  115. package/dist/esm/router/cli/index.js +12 -9
  116. package/dist/esm/router/index.js +6 -2
  117. package/dist/esm/router/runtime/DefaultNotFound.js +4 -1
  118. package/dist/esm/router/runtime/DeferredDataScripts.js +4 -1
  119. package/dist/esm/router/runtime/DeferredDataScripts.node.js +14 -13
  120. package/dist/esm/router/runtime/PrefetchLink.js +17 -17
  121. package/dist/esm/router/runtime/fetch.js +3 -1
  122. package/dist/esm/router/runtime/fetch.node.js +3 -1
  123. package/dist/esm/router/runtime/fetch.worker.js +3 -1
  124. package/dist/esm/router/runtime/hooks.js +3 -1
  125. package/dist/esm/router/runtime/index.js +72 -8
  126. package/dist/esm/router/runtime/plugin.js +26 -22
  127. package/dist/esm/router/runtime/plugin.node.js +26 -22
  128. package/dist/esm/router/runtime/server.js +1 -1
  129. package/dist/esm/router/runtime/types.js +0 -1
  130. package/dist/esm/router/runtime/utils.js +29 -20
  131. package/dist/esm/router/runtime/withRouter.js +8 -5
  132. package/dist/esm/runtimeContext.js +6 -2
  133. package/dist/esm/ssr/cli/babel-plugin-ssr-loader-id.js +107 -98
  134. package/dist/esm/ssr/cli/index.js +26 -24
  135. package/dist/esm/ssr/cli/loadable-bundler-plugin.js +105 -96
  136. package/dist/esm/ssr/index.js +19 -15
  137. package/dist/esm/ssr/index.node.js +15 -12
  138. package/dist/esm/ssr/prefetch.js +10 -7
  139. package/dist/esm/ssr/react/index.js +6 -2
  140. package/dist/esm/ssr/react/nossr/index.js +4 -1
  141. package/dist/esm/ssr/react/prerender/index.js +4 -1
  142. package/dist/esm/ssr/react/prerender/type.js +0 -1
  143. package/dist/esm/ssr/react/prerender/util.js +14 -9
  144. package/dist/esm/ssr/react/withCallback/index.js +4 -1
  145. package/dist/esm/ssr/serverRender/helmet.js +4 -1
  146. package/dist/esm/ssr/serverRender/index.js +4 -1
  147. package/dist/esm/ssr/serverRender/renderToStream/buildTemplate.after.js +8 -5
  148. package/dist/esm/ssr/serverRender/renderToStream/buildTemplate.share.js +6 -2
  149. package/dist/esm/ssr/serverRender/renderToStream/bulidTemplate.before.js +7 -6
  150. package/dist/esm/ssr/serverRender/renderToStream/index.js +6 -3
  151. package/dist/esm/ssr/serverRender/renderToStream/renderToPipe.js +9 -7
  152. package/dist/esm/ssr/serverRender/renderToStream/renderToPipe.worker.js +9 -6
  153. package/dist/esm/ssr/serverRender/renderToStream/template.js +6 -3
  154. package/dist/esm/ssr/serverRender/renderToString/buildHtml.js +12 -5
  155. package/dist/esm/ssr/serverRender/renderToString/entry.js +7 -5
  156. package/dist/esm/ssr/serverRender/renderToString/index.js +8 -5
  157. package/dist/esm/ssr/serverRender/renderToString/loadable.js +37 -20
  158. package/dist/esm/ssr/serverRender/renderToString/render.js +4 -1
  159. package/dist/esm/ssr/serverRender/renderToString/styledComponent.js +4 -1
  160. package/dist/esm/ssr/serverRender/renderToString/type.js +4 -1
  161. package/dist/esm/ssr/serverRender/tracker.js +8 -3
  162. package/dist/esm/ssr/serverRender/types.js +3 -1
  163. package/dist/esm/ssr/serverRender/utils.js +12 -5
  164. package/dist/esm/ssr/utils.js +13 -7
  165. package/dist/esm/state/cli/index.js +10 -6
  166. package/dist/esm/state/index.js +6 -2
  167. package/dist/esm/state/plugins.js +10 -4
  168. package/dist/esm/state/runtime/index.js +4 -1
  169. package/dist/esm/state/runtime/plugin.js +10 -7
  170. package/dist/esm-node/cli/index.js +6 -2
  171. package/dist/esm-node/common.js +8 -3
  172. package/dist/esm-node/config.js +0 -1
  173. package/dist/esm-node/core/appConfig.js +6 -2
  174. package/dist/esm-node/core/compatible.js +17 -13
  175. package/dist/esm-node/core/index.js +13 -3
  176. package/dist/esm-node/core/loader/index.js +4 -1
  177. package/dist/esm-node/core/loader/loaderManager.js +6 -2
  178. package/dist/esm-node/core/loader/useLoader.js +12 -9
  179. package/dist/esm-node/core/plugin.js +11 -7
  180. package/dist/esm-node/core/types.js +0 -1
  181. package/dist/esm-node/document/Body.js +4 -1
  182. package/dist/esm-node/document/Comment.js +4 -1
  183. package/dist/esm-node/document/DocumentContext.js +4 -1
  184. package/dist/esm-node/document/DocumentStructureContext.js +4 -1
  185. package/dist/esm-node/document/Head.js +6 -2
  186. package/dist/esm-node/document/Html.js +7 -5
  187. package/dist/esm-node/document/Links.js +4 -1
  188. package/dist/esm-node/document/Root.js +6 -2
  189. package/dist/esm-node/document/Script.js +4 -1
  190. package/dist/esm-node/document/Scripts.js +4 -1
  191. package/dist/esm-node/document/Style.js +4 -1
  192. package/dist/esm-node/document/cli/index.js +12 -9
  193. package/dist/esm-node/document/constants.js +42 -20
  194. package/dist/esm-node/exports/head.js +4 -1
  195. package/dist/esm-node/exports/loadable.js +4 -1
  196. package/dist/esm-node/exports/server.js +4 -1
  197. package/dist/esm-node/exports/styled.js +4 -1
  198. package/dist/esm-node/index.js +13 -2
  199. package/dist/esm-node/router/cli/index.js +7 -4
  200. package/dist/esm-node/router/index.js +6 -2
  201. package/dist/esm-node/router/runtime/DefaultNotFound.js +4 -1
  202. package/dist/esm-node/router/runtime/DeferredDataScripts.js +4 -1
  203. package/dist/esm-node/router/runtime/DeferredDataScripts.node.js +8 -7
  204. package/dist/esm-node/router/runtime/PrefetchLink.js +11 -11
  205. package/dist/esm-node/router/runtime/fetch.js +3 -1
  206. package/dist/esm-node/router/runtime/fetch.node.js +3 -1
  207. package/dist/esm-node/router/runtime/fetch.worker.js +3 -1
  208. package/dist/esm-node/router/runtime/hooks.js +3 -1
  209. package/dist/esm-node/router/runtime/index.js +72 -8
  210. package/dist/esm-node/router/runtime/plugin.js +14 -10
  211. package/dist/esm-node/router/runtime/plugin.node.js +14 -10
  212. package/dist/esm-node/router/runtime/server.js +1 -1
  213. package/dist/esm-node/router/runtime/types.js +0 -1
  214. package/dist/esm-node/router/runtime/utils.js +22 -13
  215. package/dist/esm-node/router/runtime/withRouter.js +5 -2
  216. package/dist/esm-node/runtimeContext.js +6 -2
  217. package/dist/esm-node/ssr/cli/babel-plugin-ssr-loader-id.js +108 -99
  218. package/dist/esm-node/ssr/cli/index.js +15 -13
  219. package/dist/esm-node/ssr/cli/loadable-bundler-plugin.js +92 -83
  220. package/dist/esm-node/ssr/index.js +7 -3
  221. package/dist/esm-node/ssr/index.node.js +7 -4
  222. package/dist/esm-node/ssr/prefetch.js +7 -4
  223. package/dist/esm-node/ssr/react/index.js +6 -2
  224. package/dist/esm-node/ssr/react/nossr/index.js +4 -1
  225. package/dist/esm-node/ssr/react/prerender/index.js +4 -1
  226. package/dist/esm-node/ssr/react/prerender/type.js +0 -1
  227. package/dist/esm-node/ssr/react/prerender/util.js +14 -9
  228. package/dist/esm-node/ssr/react/withCallback/index.js +4 -1
  229. package/dist/esm-node/ssr/serverRender/helmet.js +4 -1
  230. package/dist/esm-node/ssr/serverRender/index.js +4 -1
  231. package/dist/esm-node/ssr/serverRender/renderToStream/buildTemplate.after.js +5 -2
  232. package/dist/esm-node/ssr/serverRender/renderToStream/buildTemplate.share.js +6 -2
  233. package/dist/esm-node/ssr/serverRender/renderToStream/bulidTemplate.before.js +7 -8
  234. package/dist/esm-node/ssr/serverRender/renderToStream/index.js +6 -3
  235. package/dist/esm-node/ssr/serverRender/renderToStream/renderToPipe.js +9 -7
  236. package/dist/esm-node/ssr/serverRender/renderToStream/renderToPipe.worker.js +8 -7
  237. package/dist/esm-node/ssr/serverRender/renderToStream/template.js +4 -1
  238. package/dist/esm-node/ssr/serverRender/renderToString/buildHtml.js +12 -5
  239. package/dist/esm-node/ssr/serverRender/renderToString/entry.js +5 -3
  240. package/dist/esm-node/ssr/serverRender/renderToString/index.js +6 -3
  241. package/dist/esm-node/ssr/serverRender/renderToString/loadable.js +33 -19
  242. package/dist/esm-node/ssr/serverRender/renderToString/render.js +4 -1
  243. package/dist/esm-node/ssr/serverRender/renderToString/styledComponent.js +4 -1
  244. package/dist/esm-node/ssr/serverRender/renderToString/type.js +4 -1
  245. package/dist/esm-node/ssr/serverRender/tracker.js +8 -3
  246. package/dist/esm-node/ssr/serverRender/types.js +3 -1
  247. package/dist/esm-node/ssr/serverRender/utils.js +12 -5
  248. package/dist/esm-node/ssr/utils.js +10 -4
  249. package/dist/esm-node/state/cli/index.js +6 -2
  250. package/dist/esm-node/state/index.js +6 -2
  251. package/dist/esm-node/state/plugins.js +10 -4
  252. package/dist/esm-node/state/runtime/index.js +4 -1
  253. package/dist/esm-node/state/runtime/plugin.js +4 -1
  254. package/dist/types/router/runtime/PrefetchLink.d.ts +1 -1
  255. package/dist/types/router/runtime/hooks.d.ts +1 -1
  256. package/dist/types/router/runtime/index.d.ts +3 -3
  257. package/dist/types/router/runtime/server.d.ts +1 -1
  258. package/dist/types/router/runtime/types.d.ts +2 -2
  259. package/dist/types/router/runtime/utils.d.ts +1 -1
  260. package/dist/types/router/runtime/withRouter.d.ts +1 -1
  261. package/dist/types/runtimeContext.d.ts +1 -1
  262. package/dist/types/ssr/serverRender/renderToString/loadable.d.ts +1 -0
  263. package/package.json +10 -11
  264. package/dist/cjs/state/types.js +0 -4
  265. package/dist/esm/state/types.js +0 -1
  266. package/dist/esm-node/state/types.js +0 -1
  267. package/dist/types/state/types.d.ts +0 -16
@@ -1,41 +1,52 @@
1
1
  "use strict";
2
- Object.defineProperty(exports, "__esModule", {
3
- value: true
4
- });
5
- function _export(target, all) {
2
+ var __create = Object.create;
3
+ var __defProp = Object.defineProperty;
4
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
5
+ var __getOwnPropNames = Object.getOwnPropertyNames;
6
+ var __getProtoOf = Object.getPrototypeOf;
7
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
8
+ var __export = (target, all) => {
6
9
  for (var name in all)
7
- Object.defineProperty(target, name, {
8
- enumerable: true,
9
- get: all[name]
10
- });
11
- }
12
- _export(exports, {
13
- createFetchHeaders: function() {
14
- return createFetchHeaders;
15
- },
16
- routerPlugin: function() {
17
- return routerPlugin;
18
- },
19
- modifyRoutes: function() {
20
- return modifyRoutes;
10
+ __defProp(target, name, { get: all[name], enumerable: true });
11
+ };
12
+ var __copyProps = (to, from, except, desc) => {
13
+ if (from && typeof from === "object" || typeof from === "function") {
14
+ for (let key of __getOwnPropNames(from))
15
+ if (!__hasOwnProp.call(to, key) && key !== except)
16
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
21
17
  }
18
+ return to;
19
+ };
20
+ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
21
+ // If the importer is in node compatibility mode or this is not an ESM
22
+ // file that has been converted to a CommonJS file using a Babel-
23
+ // compatible transform (i.e. "__esModule" has not been set), then set
24
+ // "default" to the CommonJS "module.exports" for node compatibility.
25
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
26
+ mod
27
+ ));
28
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
29
+ var plugin_node_exports = {};
30
+ __export(plugin_node_exports, {
31
+ createFetchHeaders: () => createFetchHeaders,
32
+ modifyRoutes: () => modifyRoutes,
33
+ routerPlugin: () => routerPlugin
22
34
  });
23
- const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
24
- const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
25
- const _jsxruntime = require("react/jsx-runtime");
26
- const _react = /* @__PURE__ */ _interop_require_wildcard._(require("react"));
27
- const _remixrouter = require("@modern-js/utils/runtime/remix-router");
28
- const _router = require("@modern-js/utils/runtime-node/router");
29
- const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default._(require("hoist-non-react-statics"));
30
- const _router1 = require("@modern-js/utils/runtime/router");
31
- const _runtimenode = require("@modern-js/utils/runtime-node");
32
- const _time = require("@modern-js/utils/universal/time");
33
- const _constants = require("@modern-js/utils/universal/constants");
34
- const _core = require("../../core");
35
- const _utils = require("./utils");
36
- const _fetch = require("./fetch");
37
- const _hooks = require("./hooks");
38
- (0, _fetch.installGlobals)();
35
+ module.exports = __toCommonJS(plugin_node_exports);
36
+ var import_jsx_runtime = require("react/jsx-runtime");
37
+ var import_react = require("react");
38
+ var import_remix_router = require("@modern-js/runtime-utils/remix-router");
39
+ var import_router = require("@modern-js/runtime-utils/node/router");
40
+ var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
41
+ var import_router2 = require("@modern-js/runtime-utils/router");
42
+ var import_node = require("@modern-js/runtime-utils/node");
43
+ var import_time = require("@modern-js/runtime-utils/time");
44
+ var import_constants = require("@modern-js/utils/universal/constants");
45
+ var import_core = require("../../core");
46
+ var import_utils = require("./utils");
47
+ var import_fetch = require("./fetch");
48
+ var import_hooks = require("./hooks");
49
+ (0, import_fetch.installGlobals)();
39
50
  function createFetchRequest(req) {
40
51
  const origin = `${req.protocol}://${req.host}`;
41
52
  const url = new URL(req.originalUrl || req.url, origin);
@@ -66,7 +77,7 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
66
77
  return {
67
78
  name: "@modern-js/plugin-router",
68
79
  registerHook: {
69
- modifyRoutes: _hooks.modifyRoutes
80
+ modifyRoutes: import_hooks.modifyRoutes
70
81
  },
71
82
  setup: (api) => {
72
83
  return {
@@ -78,11 +89,11 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
78
89
  }
79
90
  const { request, mode: ssrMode, nonce } = context.ssrContext;
80
91
  const baseUrl = request.baseUrl;
81
- const _basename = baseUrl === "/" ? (0, _utils.urlJoin)(baseUrl, basename) : baseUrl;
92
+ const _basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, basename) : baseUrl;
82
93
  const { reporter, serverTiming } = context.ssrContext;
83
- const requestContext = (0, _runtimenode.createRequestContext)();
84
- requestContext.set(_runtimenode.reporterCtx, reporter);
85
- let routes = createRoutes ? createRoutes() : (0, _router1.createRoutesFromElements)((0, _utils.renderRoutes)({
94
+ const requestContext = (0, import_node.createRequestContext)();
95
+ requestContext.set(import_node.reporterCtx, reporter);
96
+ let routes = createRoutes ? createRoutes() : (0, import_router2.createRoutesFromElements)((0, import_utils.renderRoutes)({
86
97
  routesConfig,
87
98
  ssrMode,
88
99
  props: {
@@ -92,21 +103,21 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
92
103
  }));
93
104
  const runner = api.useHookRunners();
94
105
  routes = runner.modifyRoutes(routes);
95
- const { query } = (0, _remixrouter.createStaticHandler)(routes, {
106
+ const { query } = (0, import_remix_router.createStaticHandler)(routes, {
96
107
  basename: _basename
97
108
  });
98
109
  const remixRequest = createFetchRequest(request);
99
- const end = (0, _time.time)();
110
+ const end = (0, import_time.time)();
100
111
  const routerContext = await query(remixRequest, {
101
112
  requestContext
102
113
  });
103
114
  const cost = end();
104
- reporter.reportTiming(_constants.LOADER_REPORTER_NAME, cost);
105
- serverTiming.addServeTiming(_constants.LOADER_REPORTER_NAME, cost);
115
+ reporter.reportTiming(import_constants.LOADER_REPORTER_NAME, cost);
116
+ serverTiming.addServeTiming(import_constants.LOADER_REPORTER_NAME, cost);
106
117
  if (routerContext instanceof Response) {
107
118
  return routerContext;
108
119
  }
109
- const router = (0, _router.createStaticRouter)(routes, routerContext);
120
+ const router = (0, import_router.createStaticRouter)(routes, routerContext);
110
121
  context.remixRouter = router;
111
122
  context.routerContext = routerContext;
112
123
  context.routes = routes;
@@ -116,7 +127,6 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
116
127
  });
117
128
  },
118
129
  hoc: ({ App }, next) => {
119
- var _routesConfig;
120
130
  if (!routesConfig) {
121
131
  return next({
122
132
  App
@@ -124,10 +134,10 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
124
134
  }
125
135
  const getRouteApp = () => {
126
136
  return (props) => {
127
- const { remixRouter, routerContext } = (0, _react.useContext)(_core.RuntimeReactContext);
128
- return /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
137
+ const { remixRouter, routerContext } = (0, import_react.useContext)(import_core.RuntimeReactContext);
138
+ return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
129
139
  ...props,
130
- children: /* @__PURE__ */ (0, _jsxruntime.jsx)(_router.StaticRouterProvider, {
140
+ children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_router.StaticRouterProvider, {
131
141
  router: remixRouter,
132
142
  context: routerContext,
133
143
  hydrate: false
@@ -136,9 +146,9 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
136
146
  };
137
147
  };
138
148
  const RouteApp = getRouteApp();
139
- if ((_routesConfig = routesConfig) === null || _routesConfig === void 0 ? void 0 : _routesConfig.globalApp) {
149
+ if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
140
150
  return next({
141
- App: (0, _hoistnonreactstatics.default)(RouteApp, routesConfig.globalApp)
151
+ App: (0, import_hoist_non_react_statics.default)(RouteApp, routesConfig.globalApp)
142
152
  });
143
153
  }
144
154
  return next({
@@ -173,3 +183,9 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
173
183
  };
174
184
  const modifyRoutes = () => {
175
185
  };
186
+ // Annotate the CommonJS export names for ESM import in node:
187
+ 0 && (module.exports = {
188
+ createFetchHeaders,
189
+ modifyRoutes,
190
+ routerPlugin
191
+ });
@@ -1,6 +1,22 @@
1
1
  "use strict";
2
- Object.defineProperty(exports, "__esModule", {
3
- value: true
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __copyProps = (to, from, except, desc) => {
7
+ if (from && typeof from === "object" || typeof from === "function") {
8
+ for (let key of __getOwnPropNames(from))
9
+ if (!__hasOwnProp.call(to, key) && key !== except)
10
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
11
+ }
12
+ return to;
13
+ };
14
+ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
15
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
16
+ var server_exports = {};
17
+ module.exports = __toCommonJS(server_exports);
18
+ __reExport(server_exports, require("@modern-js/runtime-utils/node/router"), module.exports);
19
+ // Annotate the CommonJS export names for ESM import in node:
20
+ 0 && (module.exports = {
21
+ ...require("@modern-js/runtime-utils/node/router")
4
22
  });
5
- const _export_star = require("@swc/helpers/_/_export_star");
6
- _export_star._(require("@modern-js/utils/runtime-node/router"), exports);
@@ -1,4 +1,16 @@
1
1
  "use strict";
2
- Object.defineProperty(exports, "__esModule", {
3
- value: true
4
- });
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __copyProps = (to, from, except, desc) => {
7
+ if (from && typeof from === "object" || typeof from === "function") {
8
+ for (let key of __getOwnPropNames(from))
9
+ if (!__hasOwnProp.call(to, key) && key !== except)
10
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
11
+ }
12
+ return to;
13
+ };
14
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
15
+ var types_exports = {};
16
+ module.exports = __toCommonJS(types_exports);
@@ -1,54 +1,57 @@
1
1
  "use strict";
2
- Object.defineProperty(exports, "__esModule", {
3
- value: true
4
- });
5
- function _export(target, all) {
2
+ var __create = Object.create;
3
+ var __defProp = Object.defineProperty;
4
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
5
+ var __getOwnPropNames = Object.getOwnPropertyNames;
6
+ var __getProtoOf = Object.getPrototypeOf;
7
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
8
+ var __export = (target, all) => {
6
9
  for (var name in all)
7
- Object.defineProperty(target, name, {
8
- enumerable: true,
9
- get: all[name]
10
- });
11
- }
12
- _export(exports, {
13
- getRouteComponents: function() {
14
- return getRouteComponents;
15
- },
16
- renderRoutes: function() {
17
- return renderRoutes;
18
- },
19
- getLocation: function() {
20
- return getLocation;
21
- },
22
- urlJoin: function() {
23
- return urlJoin;
24
- },
25
- standardSlash: function() {
26
- return standardSlash;
27
- },
28
- serializeErrors: function() {
29
- return serializeErrors;
30
- },
31
- deserializeErrors: function() {
32
- return deserializeErrors;
10
+ __defProp(target, name, { get: all[name], enumerable: true });
11
+ };
12
+ var __copyProps = (to, from, except, desc) => {
13
+ if (from && typeof from === "object" || typeof from === "function") {
14
+ for (let key of __getOwnPropNames(from))
15
+ if (!__hasOwnProp.call(to, key) && key !== except)
16
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
33
17
  }
18
+ return to;
19
+ };
20
+ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
21
+ // If the importer is in node compatibility mode or this is not an ESM
22
+ // file that has been converted to a CommonJS file using a Babel-
23
+ // compatible transform (i.e. "__esModule" has not been set), then set
24
+ // "default" to the CommonJS "module.exports" for node compatibility.
25
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
26
+ mod
27
+ ));
28
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
29
+ var utils_exports = {};
30
+ __export(utils_exports, {
31
+ deserializeErrors: () => deserializeErrors,
32
+ getLocation: () => getLocation,
33
+ getRouteComponents: () => getRouteComponents,
34
+ renderRoutes: () => renderRoutes,
35
+ serializeErrors: () => serializeErrors,
36
+ standardSlash: () => standardSlash,
37
+ urlJoin: () => urlJoin
34
38
  });
35
- const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
36
- const _jsxruntime = require("react/jsx-runtime");
37
- const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
38
- const _router = require("@modern-js/utils/runtime/router");
39
- const _remixrouter = require("@modern-js/utils/runtime/remix-router");
40
- const _nestedroutes = require("@modern-js/utils/runtime/nested-routes");
41
- const _DefaultNotFound = require("./DefaultNotFound");
42
- const _DeferredDataScripts = /* @__PURE__ */ _interop_require_default._(require("./DeferredDataScripts"));
39
+ module.exports = __toCommonJS(utils_exports);
40
+ var import_jsx_runtime = require("react/jsx-runtime");
41
+ var import_router = require("@modern-js/runtime-utils/router");
42
+ var import_remix_router = require("@modern-js/runtime-utils/remix-router");
43
+ var import_browser = require("@modern-js/runtime-utils/browser");
44
+ var import_DefaultNotFound = require("./DefaultNotFound");
45
+ var import_DeferredDataScripts = __toESM(require("./DeferredDataScripts"));
43
46
  function getRouteComponents(routes, { globalApp, ssrMode, props, reporter }) {
44
47
  const Layout = ({ Component, ...props2 }) => {
45
48
  const GlobalLayout = globalApp;
46
49
  if (!GlobalLayout) {
47
- return /* @__PURE__ */ (0, _jsxruntime.jsx)(Component, {
50
+ return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {
48
51
  ...props2
49
52
  });
50
53
  }
51
- return /* @__PURE__ */ (0, _jsxruntime.jsx)(GlobalLayout, {
54
+ return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GlobalLayout, {
52
55
  Component,
53
56
  ...props2
54
57
  });
@@ -56,25 +59,25 @@ function getRouteComponents(routes, { globalApp, ssrMode, props, reporter }) {
56
59
  const routeElements = [];
57
60
  for (const route of routes) {
58
61
  if (route.type === "nested") {
59
- const routeElement = (0, _nestedroutes.renderNestedRoute)(route, {
60
- DeferredDataComponent: ssrMode === "stream" ? _DeferredDataScripts.default : void 0,
62
+ const routeElement = (0, import_browser.renderNestedRoute)(route, {
63
+ DeferredDataComponent: ssrMode === "stream" ? import_DeferredDataScripts.default : void 0,
61
64
  props,
62
65
  reporter
63
66
  });
64
67
  routeElements.push(routeElement);
65
68
  } else {
66
- const routeElement = /* @__PURE__ */ (0, _jsxruntime.jsx)(_router.Route, {
69
+ const routeElement = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_router.Route, {
67
70
  path: route.path,
68
- element: /* @__PURE__ */ (0, _jsxruntime.jsx)(Layout, {
71
+ element: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Layout, {
69
72
  Component: route.component
70
73
  })
71
74
  }, route.path);
72
75
  routeElements.push(routeElement);
73
76
  }
74
77
  }
75
- routeElements.push(/* @__PURE__ */ (0, _jsxruntime.jsx)(_router.Route, {
78
+ routeElements.push(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_router.Route, {
76
79
  path: "*",
77
- element: /* @__PURE__ */ (0, _jsxruntime.jsx)(_DefaultNotFound.DefaultNotFound, {})
80
+ element: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_DefaultNotFound.DefaultNotFound, {})
78
81
  }, "*"));
79
82
  return routeElements;
80
83
  }
@@ -95,9 +98,9 @@ function renderRoutes({ routesConfig, props, ssrMode, reporter }) {
95
98
  return routeElements;
96
99
  }
97
100
  function getLocation(serverContext) {
98
- var _serverContext, _url_replace, _url;
99
- const { pathname, url } = ((_serverContext = serverContext) === null || _serverContext === void 0 ? void 0 : _serverContext.request) || {};
100
- const cleanUrl = (_url = url) === null || _url === void 0 ? void 0 : (_url_replace = _url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
101
+ var _url_replace;
102
+ const { pathname, url } = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {};
103
+ const cleanUrl = url === null || url === void 0 ? void 0 : (_url_replace = url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
101
104
  const index = (cleanUrl || "").indexOf(pathname);
102
105
  if (index === -1) {
103
106
  return pathname;
@@ -132,7 +135,7 @@ function serializeErrors(errors) {
132
135
  const entries = Object.entries(errors);
133
136
  const serialized = {};
134
137
  for (const [key, val] of entries) {
135
- if ((0, _router.isRouteErrorResponse)(val)) {
138
+ if ((0, import_router.isRouteErrorResponse)(val)) {
136
139
  serialized[key] = {
137
140
  ...val,
138
141
  __type: "RouteErrorResponse"
@@ -157,7 +160,7 @@ function deserializeErrors(errors) {
157
160
  const serialized = {};
158
161
  for (const [key, val] of entries) {
159
162
  if (val && val.__type === "RouteErrorResponse") {
160
- serialized[key] = new _remixrouter.ErrorResponse(val.status, val.statusText, val.data, val.internal === true);
163
+ serialized[key] = new import_remix_router.ErrorResponse(val.status, val.statusText, val.data, val.internal === true);
161
164
  } else if (val && val.__type === "Error") {
162
165
  const error = new Error(val.message);
163
166
  error.stack = val.stack;
@@ -168,3 +171,13 @@ function deserializeErrors(errors) {
168
171
  }
169
172
  return serialized;
170
173
  }
174
+ // Annotate the CommonJS export names for ESM import in node:
175
+ 0 && (module.exports = {
176
+ deserializeErrors,
177
+ getLocation,
178
+ getRouteComponents,
179
+ renderRoutes,
180
+ serializeErrors,
181
+ standardSlash,
182
+ urlJoin
183
+ });
@@ -1,23 +1,34 @@
1
1
  "use strict";
2
- Object.defineProperty(exports, "__esModule", {
3
- value: true
4
- });
5
- Object.defineProperty(exports, "withRouter", {
6
- enumerable: true,
7
- get: function() {
8
- return withRouter;
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __export = (target, all) => {
7
+ for (var name in all)
8
+ __defProp(target, name, { get: all[name], enumerable: true });
9
+ };
10
+ var __copyProps = (to, from, except, desc) => {
11
+ if (from && typeof from === "object" || typeof from === "function") {
12
+ for (let key of __getOwnPropNames(from))
13
+ if (!__hasOwnProp.call(to, key) && key !== except)
14
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
9
15
  }
16
+ return to;
17
+ };
18
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
+ var withRouter_exports = {};
20
+ __export(withRouter_exports, {
21
+ withRouter: () => withRouter
10
22
  });
11
- const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
12
- const _jsxruntime = require("react/jsx-runtime");
13
- const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
14
- const _router = require("@modern-js/utils/runtime/router");
23
+ module.exports = __toCommonJS(withRouter_exports);
24
+ var import_jsx_runtime = require("react/jsx-runtime");
25
+ var import_router = require("@modern-js/runtime-utils/router");
15
26
  const withRouter = (Component) => {
16
27
  return (props) => {
17
- const location = (0, _router.useLocation)();
18
- const params = (0, _router.useParams)();
19
- const navigate = (0, _router.useNavigate)();
20
- return /* @__PURE__ */ (0, _jsxruntime.jsx)(Component, {
28
+ const location = (0, import_router.useLocation)();
29
+ const params = (0, import_router.useParams)();
30
+ const navigate = (0, import_router.useNavigate)();
31
+ return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {
21
32
  ...props,
22
33
  location,
23
34
  params,
@@ -25,3 +36,7 @@ const withRouter = (Component) => {
25
36
  });
26
37
  };
27
38
  };
39
+ // Annotate the CommonJS export names for ESM import in node:
40
+ 0 && (module.exports = {
41
+ withRouter
42
+ });
@@ -1,22 +1,32 @@
1
1
  "use strict";
2
- Object.defineProperty(exports, "__esModule", {
3
- value: true
4
- });
5
- function _export(target, all) {
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __export = (target, all) => {
6
7
  for (var name in all)
7
- Object.defineProperty(target, name, {
8
- enumerable: true,
9
- get: all[name]
10
- });
11
- }
12
- _export(exports, {
13
- RuntimeReactContext: function() {
14
- return RuntimeReactContext;
15
- },
16
- ServerRouterContext: function() {
17
- return ServerRouterContext;
8
+ __defProp(target, name, { get: all[name], enumerable: true });
9
+ };
10
+ var __copyProps = (to, from, except, desc) => {
11
+ if (from && typeof from === "object" || typeof from === "function") {
12
+ for (let key of __getOwnPropNames(from))
13
+ if (!__hasOwnProp.call(to, key) && key !== except)
14
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
18
15
  }
16
+ return to;
17
+ };
18
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
+ var runtimeContext_exports = {};
20
+ __export(runtimeContext_exports, {
21
+ RuntimeReactContext: () => RuntimeReactContext,
22
+ ServerRouterContext: () => ServerRouterContext
23
+ });
24
+ module.exports = __toCommonJS(runtimeContext_exports);
25
+ var import_react = require("react");
26
+ const RuntimeReactContext = (0, import_react.createContext)({});
27
+ const ServerRouterContext = (0, import_react.createContext)({});
28
+ // Annotate the CommonJS export names for ESM import in node:
29
+ 0 && (module.exports = {
30
+ RuntimeReactContext,
31
+ ServerRouterContext
19
32
  });
20
- const _react = require("react");
21
- const RuntimeReactContext = (0, _react.createContext)({});
22
- const ServerRouterContext = (0, _react.createContext)({});
@@ -1,13 +1,30 @@
1
1
  "use strict";
2
- Object.defineProperty(exports, "__esModule", {
3
- value: true
4
- });
5
- const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
6
- const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
7
- const _crypto = /* @__PURE__ */ _interop_require_default._(require("crypto"));
8
- const _buffer = require("buffer");
9
- const _types = /* @__PURE__ */ _interop_require_wildcard._(require("@babel/types"));
10
- const _lodash = require("@modern-js/utils/lodash");
2
+ var __create = Object.create;
3
+ var __defProp = Object.defineProperty;
4
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
5
+ var __getOwnPropNames = Object.getOwnPropertyNames;
6
+ var __getProtoOf = Object.getPrototypeOf;
7
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
8
+ var __copyProps = (to, from, except, desc) => {
9
+ if (from && typeof from === "object" || typeof from === "function") {
10
+ for (let key of __getOwnPropNames(from))
11
+ if (!__hasOwnProp.call(to, key) && key !== except)
12
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
13
+ }
14
+ return to;
15
+ };
16
+ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
17
+ // If the importer is in node compatibility mode or this is not an ESM
18
+ // file that has been converted to a CommonJS file using a Babel-
19
+ // compatible transform (i.e. "__esModule" has not been set), then set
20
+ // "default" to the CommonJS "module.exports" for node compatibility.
21
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
22
+ mod
23
+ ));
24
+ var import_crypto = __toESM(require("crypto"));
25
+ var import_buffer = require("buffer");
26
+ var t = __toESM(require("@babel/types"));
27
+ var import_lodash = require("@modern-js/utils/lodash");
11
28
  const RUNTIME_PACKAGE_NAMES = [
12
29
  "@modern-js/runtime"
13
30
  ];
@@ -19,8 +36,8 @@ function getHash(filepath) {
19
36
  if (point !== -1) {
20
37
  relativePath = filepath.substring(point + cwd.length);
21
38
  }
22
- const fileBuf = _buffer.Buffer.from(relativePath);
23
- const fsHash = _crypto.default.createHash("md5");
39
+ const fileBuf = import_buffer.Buffer.from(relativePath);
40
+ const fsHash = import_crypto.default.createHash("md5");
24
41
  const md5 = fsHash.update(fileBuf).digest("hex");
25
42
  return md5;
26
43
  }
@@ -29,8 +46,8 @@ function getUseLoaderPath(path, calleeName) {
29
46
  if (!calleeName || node.callee.name !== calleeName) {
30
47
  return false;
31
48
  }
32
- const arg1 = (0, _lodash.get)(node, "arguments.0");
33
- if (_types.isFunction(arg1) || _types.isFunctionExpression(arg1) || _types.isArrowFunctionExpression(arg1) || _types.isIdentifier(arg1) || _types.isCallExpression(arg1) || _types.isMemberExpression(arg1)) {
49
+ const arg1 = (0, import_lodash.get)(node, "arguments.0");
50
+ if (t.isFunction(arg1) || t.isFunctionExpression(arg1) || t.isArrowFunctionExpression(arg1) || t.isIdentifier(arg1) || t.isCallExpression(arg1) || t.isMemberExpression(arg1)) {
34
51
  const loaderPath = path.get("arguments.0");
35
52
  if (isDuplicateInnerLoader(loaderPath)) {
36
53
  return false;
@@ -45,9 +62,9 @@ function getUseLoaderPath(path, calleeName) {
45
62
  }
46
63
  function isDuplicateInnerLoader(path) {
47
64
  const { node } = path;
48
- if (_types.isFunctionExpression(node.callee)) {
49
- if (_types.isBlockStatement(node.callee.body)) {
50
- if ((0, _lodash.get)(node.callee.body, "body.0.declarations.0.id.name") === "innerLoader" && (0, _lodash.get)(node.callee.body, "body.2.argument.name") === "innerLoader") {
65
+ if (t.isFunctionExpression(node.callee)) {
66
+ if (t.isBlockStatement(node.callee.body)) {
67
+ if ((0, import_lodash.get)(node.callee.body, "body.0.declarations.0.id.name") === "innerLoader" && (0, import_lodash.get)(node.callee.body, "body.2.argument.name") === "innerLoader") {
51
68
  return true;
52
69
  }
53
70
  }
@@ -55,12 +72,12 @@ function isDuplicateInnerLoader(path) {
55
72
  return false;
56
73
  }
57
74
  function getSelfRunLoaderExpression(loaderExpression, id) {
58
- return _types.callExpression(_types.functionExpression(null, [], _types.blockStatement([
59
- _types.variableDeclaration("var", [
60
- _types.variableDeclarator(_types.identifier("innerLoader"), loaderExpression)
75
+ return t.callExpression(t.functionExpression(null, [], t.blockStatement([
76
+ t.variableDeclaration("var", [
77
+ t.variableDeclarator(t.identifier("innerLoader"), loaderExpression)
61
78
  ]),
62
- _types.expressionStatement(_types.assignmentExpression("=", _types.memberExpression(_types.identifier("innerLoader"), _types.identifier("id")), _types.stringLiteral(id))),
63
- _types.returnStatement(_types.identifier("innerLoader"))
79
+ t.expressionStatement(t.assignmentExpression("=", t.memberExpression(t.identifier("innerLoader"), t.identifier("id")), t.stringLiteral(id))),
80
+ t.returnStatement(t.identifier("innerLoader"))
64
81
  ])), []);
65
82
  }
66
83
  module.exports = function() {
@@ -82,11 +99,11 @@ module.exports = function() {
82
99
  if (useLoader) {
83
100
  return false;
84
101
  }
85
- if (!RUNTIME_PACKAGE_NAMES.includes((0, _lodash.get)(path, "node.source.value"))) {
102
+ if (!RUNTIME_PACKAGE_NAMES.includes((0, import_lodash.get)(path, "node.source.value"))) {
86
103
  return false;
87
104
  }
88
105
  hash = getHash(state.file.opts.filename);
89
- (0, _lodash.get)(path, "node.specifiers", []).forEach(({ imported, local }) => {
106
+ (0, import_lodash.get)(path, "node.specifiers", []).forEach(({ imported, local }) => {
90
107
  if (!imported) {
91
108
  throw path.buildCodeFrameError(`please \`import { useLoader } from ${RUNTIME_PACKAGE_NAMES[0]}\``);
92
109
  }