@modern-js/app-tools 1.22.1 → 2.0.0-alpha.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 (325) hide show
  1. package/CHANGELOG.md +1383 -87
  2. package/bin/modern.js +13 -1
  3. package/dist/js/modern/analyze/Builder.js +39 -0
  4. package/dist/js/modern/analyze/constants.js +48 -15
  5. package/dist/js/modern/analyze/generateCode.js +286 -133
  6. package/dist/js/modern/analyze/getBundleEntry.js +39 -41
  7. package/dist/js/modern/analyze/getClientRoutes/getRoutes.js +220 -0
  8. package/dist/js/modern/analyze/getClientRoutes/getRoutesLegacy.js +216 -0
  9. package/dist/js/modern/analyze/getClientRoutes/index.js +6 -0
  10. package/dist/js/modern/analyze/getClientRoutes/utils.js +31 -0
  11. package/dist/js/modern/analyze/getFileSystemEntry.js +74 -39
  12. package/dist/js/modern/analyze/getHtmlTemplate.js +90 -57
  13. package/dist/js/modern/analyze/getServerRoutes.js +123 -140
  14. package/dist/js/modern/analyze/index.js +220 -133
  15. package/dist/js/modern/analyze/isDefaultExportFunction.js +30 -20
  16. package/dist/js/modern/analyze/makeLegalIdentifier.js +10 -13
  17. package/dist/js/modern/analyze/nestedRoutes.js +166 -0
  18. package/dist/js/modern/analyze/templates.js +289 -29
  19. package/dist/js/modern/analyze/utils.js +128 -58
  20. package/dist/js/modern/builder/builderPlugins/compatModern.js +233 -0
  21. package/dist/js/modern/builder/index.js +154 -0
  22. package/dist/js/modern/builder/loaders/routerLoader.js +17 -0
  23. package/dist/js/modern/builder/loaders/serverModuleLoader.js +7 -0
  24. package/dist/js/modern/builder/share.js +46 -0
  25. package/dist/js/modern/builder/webpackPlugins/htmlAsyncChunkPlugin.js +30 -0
  26. package/dist/js/modern/builder/webpackPlugins/htmlBottomTemplate.js +37 -0
  27. package/dist/js/modern/builder/webpackPlugins/routerPlugin.js +113 -0
  28. package/dist/js/modern/commands/build.js +75 -138
  29. package/dist/js/modern/commands/deploy.js +27 -4
  30. package/dist/js/modern/commands/dev.js +102 -66
  31. package/dist/js/modern/commands/index.js +1 -1
  32. package/dist/js/modern/commands/inspect.js +33 -64
  33. package/dist/js/modern/commands/serve.js +54 -0
  34. package/dist/js/modern/config/default.js +173 -0
  35. package/dist/js/modern/config/index.js +8 -0
  36. package/dist/js/modern/config/initial/createHtmlConfig.js +35 -0
  37. package/dist/js/modern/config/initial/createOutputConfig.js +68 -0
  38. package/dist/js/modern/config/initial/createSourceConfig.js +39 -0
  39. package/dist/js/modern/config/initial/createToolsConfig.js +42 -0
  40. package/dist/js/modern/config/initial/index.js +16 -0
  41. package/dist/js/modern/config/initial/inits.js +153 -0
  42. package/dist/js/modern/config/initial/transformNormalizedConfig.js +47 -0
  43. package/dist/js/modern/defineConfig.js +27 -0
  44. package/dist/js/modern/exports/server.js +4 -1
  45. package/dist/js/modern/hooks.js +37 -21
  46. package/dist/js/modern/index.js +185 -94
  47. package/dist/js/modern/initialize/index.js +120 -0
  48. package/dist/js/modern/locale/en.js +20 -22
  49. package/dist/js/modern/locale/index.js +6 -6
  50. package/dist/js/modern/locale/zh.js +21 -23
  51. package/dist/js/modern/schema/Schema.js +40 -0
  52. package/dist/js/modern/schema/index.js +88 -0
  53. package/dist/js/modern/schema/legacy.js +148 -0
  54. package/dist/js/modern/types/config/deploy.js +0 -0
  55. package/dist/js/modern/types/config/dev.js +0 -0
  56. package/dist/js/modern/types/config/experiments.js +0 -0
  57. package/dist/js/modern/types/config/html.js +0 -0
  58. package/dist/js/modern/types/config/index.js +1 -0
  59. package/dist/js/modern/types/config/output.js +0 -0
  60. package/dist/js/modern/types/config/performance.js +0 -0
  61. package/dist/js/modern/types/config/security.js +0 -0
  62. package/dist/js/modern/types/config/source.js +0 -0
  63. package/dist/js/modern/types/config/tools.js +0 -0
  64. package/dist/js/modern/types/hooks.js +0 -0
  65. package/dist/js/modern/types/index.js +3 -0
  66. package/dist/js/modern/types/legacyConfig/deploy.js +0 -0
  67. package/dist/js/modern/types/legacyConfig/dev.js +0 -0
  68. package/dist/js/modern/types/legacyConfig/index.js +0 -0
  69. package/dist/js/modern/types/legacyConfig/output.js +0 -0
  70. package/dist/js/modern/types/legacyConfig/source.js +0 -0
  71. package/dist/js/modern/types/legacyConfig/tools.js +0 -0
  72. package/dist/js/modern/utils/commands.js +13 -0
  73. package/dist/js/modern/utils/config.js +102 -52
  74. package/dist/js/modern/utils/createFileWatcher.js +115 -0
  75. package/dist/js/modern/utils/createServer.js +67 -10
  76. package/dist/js/modern/utils/getServerInternalPlugins.js +58 -0
  77. package/dist/js/modern/utils/getSpecifiedEntries.js +46 -25
  78. package/dist/js/modern/utils/language.js +6 -3
  79. package/dist/js/modern/utils/printInstructions.js +29 -9
  80. package/dist/js/modern/utils/restart.js +44 -0
  81. package/dist/js/modern/utils/routes.js +29 -14
  82. package/dist/js/node/analyze/Builder.js +64 -0
  83. package/dist/js/node/analyze/constants.js +86 -33
  84. package/dist/js/node/analyze/generateCode.js +305 -163
  85. package/dist/js/node/analyze/getBundleEntry.js +66 -58
  86. package/dist/js/node/analyze/getClientRoutes/getRoutes.js +242 -0
  87. package/dist/js/node/analyze/getClientRoutes/getRoutesLegacy.js +238 -0
  88. package/dist/js/node/analyze/getClientRoutes/index.js +30 -0
  89. package/dist/js/node/analyze/getClientRoutes/utils.js +58 -0
  90. package/dist/js/node/analyze/getFileSystemEntry.js +99 -58
  91. package/dist/js/node/analyze/getHtmlTemplate.js +121 -83
  92. package/dist/js/node/analyze/getServerRoutes.js +146 -160
  93. package/dist/js/node/analyze/index.js +243 -161
  94. package/dist/js/node/analyze/isDefaultExportFunction.js +59 -38
  95. package/dist/js/node/analyze/makeLegalIdentifier.js +31 -19
  96. package/dist/js/node/analyze/nestedRoutes.js +193 -0
  97. package/dist/js/node/analyze/templates.js +316 -43
  98. package/dist/js/node/analyze/utils.js +158 -78
  99. package/dist/js/node/builder/builderPlugins/compatModern.js +258 -0
  100. package/dist/js/node/builder/index.js +177 -0
  101. package/dist/js/node/builder/loaders/routerLoader.js +38 -0
  102. package/dist/js/node/builder/loaders/serverModuleLoader.js +28 -0
  103. package/dist/js/node/builder/share.js +75 -0
  104. package/dist/js/node/builder/webpackPlugins/htmlAsyncChunkPlugin.js +53 -0
  105. package/dist/js/node/builder/webpackPlugins/htmlBottomTemplate.js +60 -0
  106. package/dist/js/node/builder/webpackPlugins/routerPlugin.js +135 -0
  107. package/dist/js/node/commands/build.js +97 -159
  108. package/dist/js/node/commands/deploy.js +49 -12
  109. package/dist/js/node/commands/dev.js +121 -93
  110. package/dist/js/node/commands/index.js +19 -44
  111. package/dist/js/node/commands/inspect.js +56 -93
  112. package/dist/js/node/commands/serve.js +83 -0
  113. package/dist/js/node/config/default.js +195 -0
  114. package/dist/js/node/config/index.js +34 -0
  115. package/dist/js/node/config/initial/createHtmlConfig.js +58 -0
  116. package/dist/js/node/config/initial/createOutputConfig.js +91 -0
  117. package/dist/js/node/config/initial/createSourceConfig.js +62 -0
  118. package/dist/js/node/config/initial/createToolsConfig.js +65 -0
  119. package/dist/js/node/config/initial/index.js +41 -0
  120. package/dist/js/node/config/initial/inits.js +176 -0
  121. package/dist/js/node/config/initial/transformNormalizedConfig.js +70 -0
  122. package/dist/js/node/defineConfig.js +49 -0
  123. package/dist/js/node/exports/server.js +25 -11
  124. package/dist/js/node/hooks.js +53 -36
  125. package/dist/js/node/index.js +216 -128
  126. package/dist/js/node/initialize/index.js +135 -0
  127. package/dist/js/node/locale/en.js +40 -26
  128. package/dist/js/node/locale/index.js +31 -18
  129. package/dist/js/node/locale/zh.js +41 -27
  130. package/dist/js/node/schema/Schema.js +63 -0
  131. package/dist/js/node/schema/index.js +118 -0
  132. package/dist/js/node/schema/legacy.js +169 -0
  133. package/dist/js/node/types/config/deploy.js +15 -0
  134. package/dist/js/node/types/config/dev.js +15 -0
  135. package/dist/js/node/types/config/experiments.js +15 -0
  136. package/dist/js/node/types/config/html.js +15 -0
  137. package/dist/js/node/types/config/index.js +17 -0
  138. package/dist/js/node/types/config/output.js +15 -0
  139. package/dist/js/node/types/config/performance.js +15 -0
  140. package/dist/js/node/types/config/security.js +15 -0
  141. package/dist/js/node/types/config/source.js +15 -0
  142. package/dist/js/node/types/config/tools.js +15 -0
  143. package/dist/js/node/types/hooks.js +15 -0
  144. package/dist/js/node/types/index.js +19 -0
  145. package/dist/js/node/types/legacyConfig/deploy.js +15 -0
  146. package/dist/js/node/types/legacyConfig/dev.js +15 -0
  147. package/dist/js/node/types/legacyConfig/index.js +15 -0
  148. package/dist/js/node/types/legacyConfig/output.js +15 -0
  149. package/dist/js/node/types/legacyConfig/source.js +15 -0
  150. package/dist/js/node/types/legacyConfig/tools.js +15 -0
  151. package/dist/js/node/utils/commands.js +37 -0
  152. package/dist/js/node/utils/config.js +125 -75
  153. package/dist/js/node/utils/createFileWatcher.js +139 -0
  154. package/dist/js/node/utils/createServer.js +96 -25
  155. package/dist/js/node/utils/getServerInternalPlugins.js +79 -0
  156. package/dist/js/node/utils/getSpecifiedEntries.js +68 -34
  157. package/dist/js/node/utils/language.js +28 -10
  158. package/dist/js/node/utils/printInstructions.js +51 -19
  159. package/dist/js/node/utils/restart.js +67 -0
  160. package/dist/js/node/utils/routes.js +58 -24
  161. package/dist/js/node/utils/types.js +15 -0
  162. package/dist/js/treeshaking/analyze/Builder.js +199 -0
  163. package/dist/js/treeshaking/analyze/constants.js +37 -0
  164. package/dist/js/treeshaking/analyze/generateCode.js +615 -0
  165. package/dist/js/treeshaking/analyze/getBundleEntry.js +64 -0
  166. package/dist/js/treeshaking/analyze/getClientRoutes/getRoutes.js +233 -0
  167. package/dist/js/treeshaking/analyze/getClientRoutes/getRoutesLegacy.js +231 -0
  168. package/dist/js/treeshaking/analyze/getClientRoutes/index.js +3 -0
  169. package/dist/js/treeshaking/analyze/getClientRoutes/utils.js +23 -0
  170. package/dist/js/treeshaking/analyze/getFileSystemEntry.js +107 -0
  171. package/dist/js/treeshaking/analyze/getHtmlTemplate.js +302 -0
  172. package/dist/js/treeshaking/analyze/getServerRoutes.js +222 -0
  173. package/dist/js/treeshaking/analyze/index.js +589 -0
  174. package/dist/js/treeshaking/analyze/isDefaultExportFunction.js +47 -0
  175. package/dist/js/treeshaking/analyze/makeLegalIdentifier.js +13 -0
  176. package/dist/js/treeshaking/analyze/nestedRoutes.js +426 -0
  177. package/dist/js/treeshaking/analyze/templates.js +446 -0
  178. package/dist/js/treeshaking/analyze/utils.js +390 -0
  179. package/dist/js/treeshaking/builder/builderPlugins/compatModern.js +304 -0
  180. package/dist/js/treeshaking/builder/index.js +374 -0
  181. package/dist/js/treeshaking/builder/loaders/routerLoader.js +13 -0
  182. package/dist/js/treeshaking/builder/loaders/serverModuleLoader.js +5 -0
  183. package/dist/js/treeshaking/builder/share.js +40 -0
  184. package/dist/js/treeshaking/builder/webpackPlugins/htmlAsyncChunkPlugin.js +110 -0
  185. package/dist/js/treeshaking/builder/webpackPlugins/htmlBottomTemplate.js +72 -0
  186. package/dist/js/treeshaking/builder/webpackPlugins/routerPlugin.js +343 -0
  187. package/dist/js/treeshaking/commands/build.js +291 -0
  188. package/dist/js/treeshaking/commands/deploy.js +154 -0
  189. package/dist/js/treeshaking/commands/dev.js +319 -0
  190. package/dist/js/treeshaking/commands/index.js +3 -0
  191. package/dist/js/treeshaking/commands/inspect.js +149 -0
  192. package/dist/js/treeshaking/commands/serve.js +199 -0
  193. package/dist/js/treeshaking/config/default.js +208 -0
  194. package/dist/js/treeshaking/config/index.js +3 -0
  195. package/dist/js/treeshaking/config/initial/createHtmlConfig.js +19 -0
  196. package/dist/js/treeshaking/config/initial/createOutputConfig.js +41 -0
  197. package/dist/js/treeshaking/config/initial/createSourceConfig.js +42 -0
  198. package/dist/js/treeshaking/config/initial/createToolsConfig.js +23 -0
  199. package/dist/js/treeshaking/config/initial/index.js +12 -0
  200. package/dist/js/treeshaking/config/initial/inits.js +213 -0
  201. package/dist/js/treeshaking/config/initial/transformNormalizedConfig.js +35 -0
  202. package/dist/js/treeshaking/defineConfig.js +61 -0
  203. package/dist/js/treeshaking/exports/server.js +2 -0
  204. package/dist/js/treeshaking/hooks.js +31 -0
  205. package/dist/js/treeshaking/index.js +694 -0
  206. package/dist/js/treeshaking/initialize/index.js +300 -0
  207. package/dist/js/treeshaking/locale/en.js +35 -0
  208. package/dist/js/treeshaking/locale/index.js +9 -0
  209. package/dist/js/treeshaking/locale/zh.js +35 -0
  210. package/dist/js/treeshaking/schema/Schema.js +273 -0
  211. package/dist/js/treeshaking/schema/index.js +181 -0
  212. package/dist/js/treeshaking/schema/legacy.js +337 -0
  213. package/dist/js/treeshaking/types/config/deploy.js +1 -0
  214. package/dist/js/treeshaking/types/config/dev.js +1 -0
  215. package/dist/js/treeshaking/types/config/experiments.js +1 -0
  216. package/dist/js/treeshaking/types/config/html.js +1 -0
  217. package/dist/js/treeshaking/types/config/index.js +1 -0
  218. package/dist/js/treeshaking/types/config/output.js +1 -0
  219. package/dist/js/treeshaking/types/config/performance.js +1 -0
  220. package/dist/js/treeshaking/types/config/security.js +1 -0
  221. package/dist/js/treeshaking/types/config/source.js +1 -0
  222. package/dist/js/treeshaking/types/config/tools.js +1 -0
  223. package/dist/js/treeshaking/types/hooks.js +1 -0
  224. package/dist/js/treeshaking/types/index.js +3 -0
  225. package/dist/js/treeshaking/types/legacyConfig/deploy.js +1 -0
  226. package/dist/js/treeshaking/types/legacyConfig/dev.js +1 -0
  227. package/dist/js/treeshaking/types/legacyConfig/index.js +1 -0
  228. package/dist/js/treeshaking/types/legacyConfig/output.js +1 -0
  229. package/dist/js/treeshaking/types/legacyConfig/source.js +1 -0
  230. package/dist/js/treeshaking/types/legacyConfig/tools.js +1 -0
  231. package/dist/js/treeshaking/utils/commands.js +10 -0
  232. package/dist/js/treeshaking/utils/config.js +302 -0
  233. package/dist/js/treeshaking/utils/createFileWatcher.js +283 -0
  234. package/dist/js/treeshaking/utils/createServer.js +258 -0
  235. package/dist/js/treeshaking/utils/getServerInternalPlugins.js +210 -0
  236. package/dist/js/treeshaking/utils/getSpecifiedEntries.js +185 -0
  237. package/dist/js/treeshaking/utils/language.js +6 -0
  238. package/dist/js/treeshaking/utils/printInstructions.js +152 -0
  239. package/dist/js/treeshaking/utils/restart.js +187 -0
  240. package/dist/js/treeshaking/utils/routes.js +153 -0
  241. package/dist/js/treeshaking/utils/types.js +1 -0
  242. package/dist/types/analyze/Builder.d.ts +8 -0
  243. package/dist/types/analyze/constants.d.ts +13 -1
  244. package/dist/types/analyze/generateCode.d.ts +3 -2
  245. package/dist/types/analyze/getBundleEntry.d.ts +2 -2
  246. package/dist/types/analyze/{getClientRoutes.d.ts → getClientRoutes/getRoutes.d.ts} +2 -7
  247. package/dist/types/analyze/getClientRoutes/getRoutesLegacy.d.ts +15 -0
  248. package/dist/types/analyze/getClientRoutes/index.d.ts +2 -0
  249. package/dist/types/analyze/getClientRoutes/utils.d.ts +5 -0
  250. package/dist/types/analyze/getFileSystemEntry.d.ts +2 -2
  251. package/dist/types/analyze/getHtmlTemplate.d.ts +3 -3
  252. package/dist/types/analyze/getServerRoutes.d.ts +3 -2
  253. package/dist/types/analyze/index.d.ts +3 -40
  254. package/dist/types/analyze/nestedRoutes.d.ts +5 -0
  255. package/dist/types/analyze/templates.d.ts +24 -5
  256. package/dist/types/analyze/utils.d.ts +12 -2
  257. package/dist/types/builder/builderPlugins/compatModern.d.ts +14 -0
  258. package/dist/types/builder/index.d.ts +18 -0
  259. package/dist/types/builder/loaders/routerLoader.d.ts +3 -0
  260. package/dist/types/builder/loaders/serverModuleLoader.d.ts +3 -0
  261. package/dist/types/builder/share.d.ts +26 -0
  262. package/dist/types/builder/webpackPlugins/htmlAsyncChunkPlugin.d.ts +8 -0
  263. package/dist/types/builder/webpackPlugins/htmlBottomTemplate.d.ts +10 -0
  264. package/dist/types/builder/webpackPlugins/routerPlugin.d.ts +4 -0
  265. package/dist/types/commands/build.d.ts +2 -1
  266. package/dist/types/commands/deploy.d.ts +2 -1
  267. package/dist/types/commands/dev.d.ts +2 -1
  268. package/dist/types/commands/index.d.ts +1 -1
  269. package/dist/types/commands/inspect.d.ts +10 -6
  270. package/dist/types/commands/serve.d.ts +3 -0
  271. package/dist/types/config/default.d.ts +3 -0
  272. package/dist/types/config/index.d.ts +2 -0
  273. package/dist/types/config/initial/createHtmlConfig.d.ts +2 -0
  274. package/dist/types/config/initial/createOutputConfig.d.ts +2 -0
  275. package/dist/types/config/initial/createSourceConfig.d.ts +2 -0
  276. package/dist/types/config/initial/createToolsConfig.d.ts +2 -0
  277. package/dist/types/config/initial/index.d.ts +4 -0
  278. package/dist/types/config/initial/inits.d.ts +4 -0
  279. package/dist/types/config/initial/transformNormalizedConfig.d.ts +2 -0
  280. package/dist/types/defineConfig.d.ts +8 -0
  281. package/dist/types/hooks.d.ts +2 -37
  282. package/dist/types/index.d.ts +9 -3
  283. package/dist/types/initialize/index.d.ts +5 -0
  284. package/dist/types/locale/en.d.ts +1 -2
  285. package/dist/types/locale/index.d.ts +2 -4
  286. package/dist/types/locale/zh.d.ts +1 -2
  287. package/dist/types/schema/Schema.d.ts +14 -0
  288. package/dist/types/schema/index.d.ts +4 -0
  289. package/dist/types/schema/legacy.d.ts +3 -0
  290. package/dist/types/types/config/deploy.d.ts +9 -0
  291. package/dist/types/types/config/dev.d.ts +13 -0
  292. package/dist/types/types/config/experiments.d.ts +4 -0
  293. package/dist/types/types/config/html.d.ts +4 -0
  294. package/dist/types/types/config/index.d.ts +66 -0
  295. package/dist/types/types/config/output.d.ts +22 -0
  296. package/dist/types/types/config/performance.d.ts +4 -0
  297. package/dist/types/types/config/security.d.ts +4 -0
  298. package/dist/types/types/config/source.d.ts +24 -0
  299. package/dist/types/types/config/tools.d.ts +24 -0
  300. package/dist/types/types/hooks.d.ts +89 -0
  301. package/dist/types/types/index.d.ts +23 -0
  302. package/dist/types/types/legacyConfig/deploy.d.ts +8 -0
  303. package/dist/types/types/legacyConfig/dev.d.ts +13 -0
  304. package/dist/types/types/legacyConfig/index.d.ts +33 -0
  305. package/dist/types/types/legacyConfig/output.d.ts +51 -0
  306. package/dist/types/types/legacyConfig/source.d.ts +25 -0
  307. package/dist/types/types/legacyConfig/tools.d.ts +17 -0
  308. package/dist/types/utils/commands.d.ts +2 -0
  309. package/dist/types/utils/config.d.ts +2 -2
  310. package/dist/types/utils/createFileWatcher.d.ts +4 -0
  311. package/dist/types/utils/createServer.d.ts +9 -1
  312. package/dist/types/utils/getServerInternalPlugins.d.ts +2 -0
  313. package/dist/types/utils/printInstructions.d.ts +3 -2
  314. package/dist/types/utils/restart.d.ts +3 -0
  315. package/dist/types/utils/types.d.ts +2 -3
  316. package/lib/types.d.ts +1 -1
  317. package/package.json +37 -46
  318. package/dist/js/modern/analyze/getClientRoutes.js +0 -219
  319. package/dist/js/modern/commands/start.js +0 -31
  320. package/dist/js/modern/utils/createCompiler.js +0 -61
  321. package/dist/js/node/analyze/getClientRoutes.js +0 -241
  322. package/dist/js/node/commands/start.js +0 -47
  323. package/dist/js/node/utils/createCompiler.js +0 -81
  324. package/dist/types/commands/start.d.ts +0 -2
  325. package/dist/types/utils/createCompiler.d.ts +0 -13
package/dist/js/modern/analyze/templates.js CHANGED
@@ -1,7 +1,49 @@
1
- export const index = ({
1
+ var __defProp = Object.defineProperty;
2
+ var __defProps = Object.defineProperties;
3
+ var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
4
+ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __propIsEnum = Object.prototype.propertyIsEnumerable;
7
+ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
8
+ var __spreadValues = (a, b) => {
9
+ for (var prop in b || (b = {}))
10
+ if (__hasOwnProp.call(b, prop))
11
+ __defNormalProp(a, prop, b[prop]);
12
+ if (__getOwnPropSymbols)
13
+ for (var prop of __getOwnPropSymbols(b)) {
14
+ if (__propIsEnum.call(b, prop))
15
+ __defNormalProp(a, prop, b[prop]);
16
+ }
17
+ return a;
18
+ };
19
+ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
20
+ var __async = (__this, __arguments, generator) => {
21
+ return new Promise((resolve, reject) => {
22
+ var fulfilled = (value) => {
23
+ try {
24
+ step(generator.next(value));
25
+ } catch (e) {
26
+ reject(e);
27
+ }
28
+ };
29
+ var rejected = (value) => {
30
+ try {
31
+ step(generator.throw(value));
32
+ } catch (e) {
33
+ reject(e);
34
+ }
35
+ };
36
+ var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
37
+ step((generator = generator.apply(__this, __arguments)).next());
38
+ });
39
+ };
40
+ import path from "path";
41
+ import { fs, slash } from "@modern-js/utils";
42
+ import { TEMP_LOADERS_DIR } from "./constants";
43
+ const index = ({
2
44
  mountId,
3
45
  imports,
4
- renderFunction,
46
+ renderFunction: renderFunction2,
5
47
  exportStatement
6
48
  }) => `
7
49
  const IS_BROWSER = typeof window !== 'undefined' && window.name !== 'nodejs';
@@ -15,27 +57,25 @@ let AppWrapper = null;
15
57
  let root = null;
16
58
 
17
59
  function render() {
18
- ${renderFunction}
60
+ ${renderFunction2}
19
61
  }
20
62
 
21
63
  AppWrapper = render();
22
64
 
23
65
  ${exportStatement};
24
66
  `;
25
- export const renderFunction = ({
67
+ const renderFunction = ({
26
68
  plugins,
27
69
  customBootstrap,
28
- fileSystemRoutes
70
+ fileSystemRoutes: fileSystemRoutes2
29
71
  }) => `
30
72
  AppWrapper = createApp({
31
73
  plugins: [
32
- ${plugins.map(({
33
- name,
34
- options,
35
- args
36
- }) => `${name}({...${options}, ...App?.config?.${args || name}}),`).join('\n')}
74
+ ${plugins.map(
75
+ ({ name, options, args }) => `${name}({...${options}, ...App?.config?.${args || name}}),`
76
+ ).join("\n")}
37
77
  ]
38
- })(${fileSystemRoutes ? '' : `App`})
78
+ })(${fileSystemRoutes2 ? "" : `App`})
39
79
 
40
80
  if (IS_BROWSER) {
41
81
  ${customBootstrap ? `customBootstrap(AppWrapper);` : `bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM);`}
@@ -43,19 +83,19 @@ export const renderFunction = ({
43
83
 
44
84
  return AppWrapper
45
85
  `;
46
- export const html = partials => `
86
+ const html = (partials) => `
47
87
  <!DOCTYPE html>
48
88
  <html>
49
89
  <head>
50
90
  <%= meta %>
51
91
  <title><%= title %></title>
52
92
 
53
- ${partials.top.join('\n')}
93
+ ${partials.top.join("\n")}
54
94
 
55
95
  <script>
56
96
  window.__assetPrefix__ = '<%= assetPrefix %>';
57
- </script>
58
- ${partials.head.join('\n')}
97
+ <\/script>
98
+ ${partials.head.join("\n")}
59
99
 
60
100
  <!--<?- chunksMap.css ?>-->
61
101
  </head>
@@ -65,7 +105,7 @@ export const html = partials => `
65
105
  We're sorry but react app doesn't work properly without JavaScript enabled. Please enable it to continue.
66
106
  </noscript>
67
107
  <div id="<%= mountId %>"><!--<?- html ?>--></div>
68
- ${partials.body.join('\n')}
108
+ ${partials.body.join("\n")}
69
109
  <!--<?- chunksMap.js ?>-->
70
110
  <!--<?- SSRDataScript ?>-->
71
111
  <!--<?- bottomTemplate ?>-->
@@ -73,16 +113,236 @@ export const html = partials => `
73
113
 
74
114
  </html>
75
115
  `;
76
- export const fileSystemRoutes = ({
77
- routes
78
- }) => `
79
- import loadable from '@modern-js/runtime/loadable';
80
-
81
- ${routes.map(({
82
- component,
83
- _component
84
- }) => `const ${component} = loadable(() => import('${_component}'));`).join('\n\n')}
85
-
86
-
87
- export const routes = ${JSON.stringify(routes, null, 2).replace(/"component"\s*:\s*"(\S+)"/g, '"component": $1')}
88
- `;
116
+ const routesForServer = ({
117
+ routes,
118
+ internalDirectory,
119
+ entryName
120
+ }) => {
121
+ const loaders = [];
122
+ const loaderIndexFile = path.join(
123
+ internalDirectory,
124
+ entryName,
125
+ TEMP_LOADERS_DIR,
126
+ "index.js"
127
+ );
128
+ const traverseRouteTree = (route) => {
129
+ var _a;
130
+ let children;
131
+ if ("children" in route && route.children) {
132
+ children = (_a = route == null ? void 0 : route.children) == null ? void 0 : _a.map(traverseRouteTree);
133
+ }
134
+ let loader;
135
+ if (route.type === "nested") {
136
+ if (route.loader) {
137
+ loaders.push(route.loader);
138
+ loader = `loader_${loaders.length - 1}`;
139
+ }
140
+ }
141
+ const finalRoute = __spreadProps(__spreadValues({}, route), {
142
+ loader,
143
+ children
144
+ });
145
+ return finalRoute;
146
+ };
147
+ let routesCode = `
148
+ export const routes = [
149
+ `;
150
+ for (const route of routes) {
151
+ if ("type" in route) {
152
+ const newRoute = traverseRouteTree(route);
153
+ routesCode += `${JSON.stringify(newRoute, null, 2).replace(
154
+ /"(loader_[^"])"/g,
155
+ "$1"
156
+ )},`;
157
+ } else {
158
+ routesCode += `${JSON.stringify(route, null, 2)}`;
159
+ }
160
+ }
161
+ routesCode += `
162
+ ];`;
163
+ let importLoadersCode = "";
164
+ if (loaders.length > 0) {
165
+ importLoadersCode = `
166
+ import { ${loaders.map(
167
+ (loader, index2) => `loader_${index2}`
168
+ )} } from "${slash(loaderIndexFile)}"`;
169
+ }
170
+ return `
171
+ ${importLoadersCode}
172
+ ${routesCode}
173
+ `;
174
+ };
175
+ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
176
+ routes,
177
+ ssrMode,
178
+ nestedRoutesEntry,
179
+ entryName,
180
+ internalDirectory,
181
+ internalDirAlias
182
+ }) {
183
+ const loadings = [];
184
+ const errors = [];
185
+ const loaders = [];
186
+ const loadersMap = {};
187
+ const loadersIndexFile = path.join(
188
+ internalDirAlias,
189
+ entryName,
190
+ TEMP_LOADERS_DIR,
191
+ "index.js"
192
+ );
193
+ const loadersMapFile = path.join(
194
+ internalDirectory,
195
+ entryName,
196
+ TEMP_LOADERS_DIR,
197
+ "map.json"
198
+ );
199
+ const importLazyCode = `
200
+ import { lazy } from "react";
201
+ import loadable, { lazy as loadableLazy } from "@modern-js/runtime/loadable"
202
+ `;
203
+ let rootLayoutCode = ``;
204
+ let dataLoaderPath = "";
205
+ let componentLoaderPath = "";
206
+ if (ssrMode) {
207
+ dataLoaderPath = require.resolve("@modern-js/plugin-data-loader/loader");
208
+ if (nestedRoutesEntry) {
209
+ dataLoaderPath = `${dataLoaderPath}?routesDir=${nestedRoutesEntry}&mapFile=${loadersMapFile}!`;
210
+ }
211
+ componentLoaderPath = `${path.join(
212
+ __dirname,
213
+ "../builder/loaders/routerLoader"
214
+ )}!`;
215
+ }
216
+ const traverseRouteTree = (route) => {
217
+ var _a;
218
+ let children;
219
+ if ("children" in route && route.children) {
220
+ children = (_a = route == null ? void 0 : route.children) == null ? void 0 : _a.map(traverseRouteTree);
221
+ }
222
+ let loading;
223
+ let error;
224
+ let loader;
225
+ let component = "";
226
+ if (route.type === "nested") {
227
+ if (route.loading) {
228
+ loadings.push(route.loading);
229
+ loading = `loading_${loadings.length - 1}`;
230
+ }
231
+ if (route.error) {
232
+ errors.push(route.error);
233
+ error = `error_${errors.length - 1}`;
234
+ }
235
+ if (route.loader) {
236
+ loaders.push(route.loader);
237
+ const loaderId = loaders.length - 1;
238
+ loader = `loader_${loaderId}`;
239
+ loadersMap[loader] = route.id;
240
+ }
241
+ if (route._component) {
242
+ if (route.isRoot) {
243
+ rootLayoutCode = `import RootLayout from '${route._component}'`;
244
+ component = `RootLayout`;
245
+ } else if (ssrMode === "string") {
246
+ component = `loadable(() => import(/* webpackChunkName: "${route.id}" */ '${componentLoaderPath}${route._component}'))`;
247
+ } else {
248
+ component = `lazy(() => import(/* webpackChunkName: "${route.id}" */ '${componentLoaderPath}${route._component}'))`;
249
+ }
250
+ }
251
+ } else if (route._component) {
252
+ component = `loadable(() => import('${route._component}'))`;
253
+ }
254
+ const finalRoute = __spreadProps(__spreadValues({}, route), {
255
+ loading,
256
+ loader,
257
+ error,
258
+ children
259
+ });
260
+ if (route._component) {
261
+ finalRoute.component = component;
262
+ }
263
+ return finalRoute;
264
+ };
265
+ let routeComponentsCode = `
266
+ export const routes = [
267
+ `;
268
+ for (const route of routes) {
269
+ if ("type" in route) {
270
+ const newRoute = traverseRouteTree(route);
271
+ routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(lazy.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"')},`;
272
+ } else {
273
+ const component = `loadable(() => import('${route._component}'))`;
274
+ const finalRoute = __spreadProps(__spreadValues({}, route), {
275
+ component
276
+ });
277
+ routeComponentsCode += `${JSON.stringify(finalRoute, null, 2).replace(/"(loadable[^"]*)"/g, "$1").replace(/"(lazy[^"]*)"/g, "$1")},`;
278
+ }
279
+ }
280
+ routeComponentsCode += `
281
+ ];`;
282
+ const importLoadingCode = loadings.map((loading, index2) => {
283
+ return `import loading_${index2} from '${loading}';
284
+ `;
285
+ }).join("");
286
+ const importErrorComponentsCode = errors.map((error, index2) => {
287
+ return `import error_${index2} from '${error}';
288
+ `;
289
+ }).join("");
290
+ let importLoadersCode = "";
291
+ if (loaders.length > 0) {
292
+ importLoadersCode = `
293
+ import { ${loaders.map(
294
+ (loader, index2) => `loader_${index2}`
295
+ )} } from "${slash(dataLoaderPath)}${slash(loadersIndexFile)}"
296
+ `;
297
+ const loaderEntryCode = loaders.map((loader, index2) => {
298
+ return `export * from './loader_${index2}.js';`;
299
+ }).join("\n");
300
+ const loaderEntryFile = path.join(
301
+ internalDirectory,
302
+ entryName,
303
+ TEMP_LOADERS_DIR,
304
+ "entry.js"
305
+ );
306
+ yield fs.ensureFile(loaderEntryFile);
307
+ yield fs.writeFile(loaderEntryFile, loaderEntryCode);
308
+ yield fs.writeJSON(loadersMapFile, loadersMap);
309
+ yield Promise.all(
310
+ loaders.map((loader, index2) => __async(void 0, null, function* () {
311
+ const name = `loader_${index2}`;
312
+ const filename = path.join(
313
+ internalDirectory,
314
+ entryName,
315
+ TEMP_LOADERS_DIR,
316
+ `${name}.js`
317
+ );
318
+ let code = "";
319
+ if (loader.includes(".loader.")) {
320
+ code = `
321
+ export { default as ${name} } from '${slash(loader)}'
322
+ `;
323
+ } else {
324
+ code = `
325
+ export { loader as ${name} } from '${slash(loader)}'
326
+ `;
327
+ }
328
+ yield fs.ensureFile(filename);
329
+ yield fs.writeFile(filename, code);
330
+ }))
331
+ );
332
+ }
333
+ return `
334
+ ${importLazyCode}
335
+ ${rootLayoutCode}
336
+ ${importLoadingCode}
337
+ ${importErrorComponentsCode}
338
+ ${importLoadersCode}
339
+ ${routeComponentsCode}
340
+ `;
341
+ });
342
+ export {
343
+ fileSystemRoutes,
344
+ html,
345
+ index,
346
+ renderFunction,
347
+ routesForServer
348
+ };
package/dist/js/modern/analyze/utils.js CHANGED
@@ -1,92 +1,162 @@
1
- import fs from 'fs';
2
- import path from 'path';
3
- import { isReact18, normalizeToPosixPath } from '@modern-js/utils';
4
- import { FILE_SYSTEM_ROUTES_FILE_NAME } from "./constants";
5
- export const walkDirectory = dir => fs.readdirSync(dir).reduce((previous, filename) => {
1
+ var __async = (__this, __arguments, generator) => {
2
+ return new Promise((resolve, reject) => {
3
+ var fulfilled = (value) => {
4
+ try {
5
+ step(generator.next(value));
6
+ } catch (e) {
7
+ reject(e);
8
+ }
9
+ };
10
+ var rejected = (value) => {
11
+ try {
12
+ step(generator.throw(value));
13
+ } catch (e) {
14
+ reject(e);
15
+ }
16
+ };
17
+ var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
18
+ step((generator = generator.apply(__this, __arguments)).next());
19
+ });
20
+ };
21
+ import fs from "fs";
22
+ import path from "path";
23
+ import { isReact18, normalizeToPosixPath, fs as fse } from "@modern-js/utils";
24
+ import { transform } from "esbuild";
25
+ import { parse } from "es-module-lexer";
26
+ import {
27
+ FILE_SYSTEM_ROUTES_FILE_NAME,
28
+ LOADER_EXPORT_NAME,
29
+ NESTED_ROUTE
30
+ } from "./constants";
31
+ const walkDirectory = (dir) => fs.readdirSync(dir).reduce((previous, filename) => {
6
32
  const filePath = path.join(dir, filename);
7
-
8
33
  if (fs.statSync(filePath).isDirectory()) {
9
34
  return [...previous, ...walkDirectory(filePath)];
10
35
  } else {
11
36
  return [...previous, filePath];
12
37
  }
13
38
  }, []);
14
- export const getDefaultImports = ({
39
+ const getDefaultImports = ({
15
40
  entrypoint,
16
41
  srcDirectory,
17
42
  internalSrcAlias,
18
43
  internalDirAlias,
19
44
  internalDirectory
20
45
  }) => {
21
- const {
22
- entryName,
23
- fileSystemRoutes,
24
- customBootstrap,
25
- entry
26
- } = entrypoint;
27
- const imports = [{
28
- specifiers: [{
29
- local: 'React'
30
- }],
31
- value: 'react'
32
- }, {
33
- specifiers: [{
34
- local: 'ReactDOM'
35
- }],
36
- value: isReact18(path.join(internalDirectory, '../../')) ? 'react-dom/client' : 'react-dom'
37
- }, {
38
- specifiers: [{
39
- imported: 'createApp'
40
- }, {
41
- imported: 'bootstrap'
42
- }],
43
- value: '@modern-js/runtime'
44
- }, customBootstrap && {
45
- specifiers: [{
46
- local: 'customBootstrap'
47
- }],
48
- value: normalizeToPosixPath(customBootstrap.replace(srcDirectory, internalSrcAlias))
49
- }].filter(Boolean);
50
-
46
+ const { entryName, fileSystemRoutes, customBootstrap, entry } = entrypoint;
47
+ console.log("getDefaultImports customBootstrap", customBootstrap, entrypoint);
48
+ const imports = [
49
+ {
50
+ specifiers: [{ local: "React" }],
51
+ value: "react"
52
+ },
53
+ {
54
+ specifiers: [{ local: "ReactDOM" }],
55
+ value: isReact18(path.join(internalDirectory, "../../")) ? "react-dom/client" : "react-dom"
56
+ },
57
+ {
58
+ specifiers: [{ imported: "createApp" }, { imported: "bootstrap" }],
59
+ value: "@modern-js/runtime"
60
+ },
61
+ customBootstrap && {
62
+ specifiers: [{ local: "customBootstrap" }],
63
+ value: normalizeToPosixPath(
64
+ customBootstrap.replace(srcDirectory, internalSrcAlias)
65
+ )
66
+ }
67
+ ].filter(Boolean);
51
68
  if (fileSystemRoutes) {
52
69
  const route = {
53
- specifiers: [{
54
- imported: 'routes'
55
- }],
56
- value: normalizeToPosixPath(`${internalDirAlias}/${entryName}/${FILE_SYSTEM_ROUTES_FILE_NAME}`)
70
+ specifiers: [{ imported: "routes" }],
71
+ value: normalizeToPosixPath(
72
+ `${internalDirAlias}/${entryName}/${FILE_SYSTEM_ROUTES_FILE_NAME.replace(
73
+ ".js",
74
+ ""
75
+ )}`
76
+ )
57
77
  };
58
-
59
78
  if (fileSystemRoutes.globalApp) {
60
79
  imports.push({
61
- specifiers: [{
62
- local: 'App'
63
- }],
64
- value: normalizeToPosixPath(fileSystemRoutes.globalApp.replace(srcDirectory, internalSrcAlias))
80
+ specifiers: [{ local: "App" }],
81
+ value: normalizeToPosixPath(
82
+ fileSystemRoutes.globalApp.replace(srcDirectory, internalSrcAlias)
83
+ )
65
84
  });
66
85
  } else {
67
- route.initialize = 'const App = false;';
86
+ route.initialize = "const App = false;";
68
87
  }
69
-
88
+ imports.push(route);
89
+ } else if (customBootstrap) {
90
+ const route = {
91
+ specifiers: [{ imported: "routes" }],
92
+ value: normalizeToPosixPath(
93
+ `${internalDirAlias}/${entryName}/${FILE_SYSTEM_ROUTES_FILE_NAME.replace(
94
+ ".js",
95
+ ""
96
+ )}`
97
+ )
98
+ };
99
+ route.initialize = "const App = false;";
70
100
  imports.push(route);
71
101
  } else {
72
102
  imports.push({
73
- specifiers: [{
74
- local: 'App'
75
- }],
76
- value: normalizeToPosixPath(entry.replace(srcDirectory, internalSrcAlias))
103
+ specifiers: [{ local: "App" }],
104
+ value: normalizeToPosixPath(
105
+ entry.replace(srcDirectory, internalSrcAlias)
106
+ )
77
107
  });
78
108
  }
79
-
80
109
  return imports;
81
110
  };
82
- export const isRouteComponentFile = filePath => {
111
+ const isPageComponentFile = (filePath) => {
83
112
  if (/\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/.test(filePath)) {
84
113
  return false;
85
114
  }
86
-
87
- if (['.js', '.jsx', '.ts', '.tsx'].includes(path.extname(filePath))) {
115
+ if ([".js", ".jsx", ".ts", ".tsx"].includes(path.extname(filePath))) {
88
116
  return true;
89
117
  }
90
-
91
118
  return false;
92
- };
119
+ };
120
+ const isNestedRouteComponent = (nestedRouteEntries, absoluteFilePath) => {
121
+ const reg = new RegExp(
122
+ `(${NESTED_ROUTE.LAYOUT_FILE}|${NESTED_ROUTE.PAGE_FILE}})\\.tsx?$`
123
+ );
124
+ return nestedRouteEntries.some((nestedRoutesEntry) => {
125
+ if (absoluteFilePath.includes(nestedRoutesEntry) && reg.test(absoluteFilePath)) {
126
+ return true;
127
+ }
128
+ return false;
129
+ });
130
+ };
131
+ const replaceWithAlias = (base, filePath, alias) => normalizeToPosixPath(path.join(alias, path.relative(base, filePath)));
132
+ const parseModule = (_0) => __async(void 0, [_0], function* ({
133
+ source,
134
+ filename
135
+ }) {
136
+ let content = source;
137
+ if (filename.endsWith(".tsx") || filename.endsWith(".jsx")) {
138
+ const result = yield transform(content, {
139
+ loader: path.extname(filename).slice(1),
140
+ format: "esm"
141
+ });
142
+ content = result.code;
143
+ }
144
+ return yield parse(content);
145
+ });
146
+ const hasLoader = (filename) => __async(void 0, null, function* () {
147
+ const source = yield fse.readFile(filename);
148
+ const [, moduleExports] = yield parseModule({
149
+ source: source.toString(),
150
+ filename
151
+ });
152
+ return moduleExports.some((e) => e.n === LOADER_EXPORT_NAME);
153
+ });
154
+ export {
155
+ getDefaultImports,
156
+ hasLoader,
157
+ isNestedRouteComponent,
158
+ isPageComponentFile,
159
+ parseModule,
160
+ replaceWithAlias,
161
+ walkDirectory
162
+ };